diff --git a/pxy_bots/handlers/__init__.py b/pxy_bots/handlers/__init__.py
index 2d1d546..ed31a4b 100644
--- a/pxy_bots/handlers/__init__.py
+++ b/pxy_bots/handlers/__init__.py
@@ -1,4 +1,4 @@
-from pxy_bots.handlers import start, help_command, handle_location, respond
+from .common import start, help_command, handle_location, respond
 from .handlers_citizen import next_truck, report_trash, private_pickup, green_balance
 from .handlers_city import next_route, complete_stop, missed_stop, my_eco_score as city_eco_score
 from .handlers_private import available_jobs, accept_job, next_pickup, complete_pickup, my_eco_score as private_eco_score
diff --git a/pxy_bots/handlers.py b/pxy_bots/handlers/common.py
similarity index 100%
rename from pxy_bots/handlers.py
rename to pxy_bots/handlers/common.py