diff --git a/setup.cfg b/setup.cfg
index d0214ff..444a369 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,9 +29,9 @@ warnerrors = True
 [entry_points]
 console_scripts =
     turbo-hipster = turbo_hipster.cmd.server:main
-    turbo-hipster-analyse = turbo_hipster.analyse_historical:main
-    turbo-hipster-report = turbo_hipster.report_historical:main
-    turbo-hipster-queue-logger = turbo_hipster.queue_logger:main
+    turbo-hipster-analyse = turbo_hipster.cmd.analyse_historical:main
+    turbo-hipster-report = turbo_hipster.cmd.report_historical:main
+    turbo-hipster-queue-logger = turbo_hipster.cmd.queue_logger:main
 
 [build_sphinx]
 source-dir = doc/source
diff --git a/turbo_hipster/analyse_historical.py b/turbo_hipster/cmd/analyse_historical.py
similarity index 98%
rename from turbo_hipster/analyse_historical.py
rename to turbo_hipster/cmd/analyse_historical.py
index 0032931..09002aa 100644
--- a/turbo_hipster/analyse_historical.py
+++ b/turbo_hipster/cmd/analyse_historical.py
@@ -25,7 +25,7 @@ import sys
 
 import swiftclient
 
-from task_plugins.gate_real_db_upgrade import handle_results
+from turbo_hipster.task_plugins.gate_real_db_upgrade import handle_results
 
 
 def main():
diff --git a/turbo_hipster/queue_logger.py b/turbo_hipster/cmd/queue_logger.py
similarity index 100%
rename from turbo_hipster/queue_logger.py
rename to turbo_hipster/cmd/queue_logger.py
diff --git a/turbo_hipster/report_historical.py b/turbo_hipster/cmd/report_historical.py
similarity index 100%
rename from turbo_hipster/report_historical.py
rename to turbo_hipster/cmd/report_historical.py