diff --git a/tracewin b/scripts/tracewin
similarity index 100%
rename from tracewin
rename to scripts/tracewin
diff --git a/tracewin_errorstudy b/scripts/tracewin_errorstudy
similarity index 100%
rename from tracewin_errorstudy
rename to scripts/tracewin_errorstudy
diff --git a/setup.py b/setup.py
index 6ff95ecbd1c70cb6c63f7017166914b68cad04cd..f7778ac62a06f97822e49302afbb3ab78de48ee9 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,6 @@ setup(name='ESS Python Tools',
         'Programming Language :: Python :: 2.7',
     ],
     packages=['ess'],
-    scripts=['tracewin'],
+    scripts=['scripts/tracewin', 'scripts/tracewin_errorstudy'],
 )