diff --git a/src/__init__.py b/src/__init__.py
index 56356ba..297bded 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -5,7 +5,7 @@ import os, inspect, time
 
 # Application imports
 from utils import Settings
-from signal_classes import Controller
+from controller import Controller
 from __builtins__ import Builtins
 
 
diff --git a/src/signal_classes/Controller.py b/src/controller/Controller.py
similarity index 100%
rename from src/signal_classes/Controller.py
rename to src/controller/Controller.py
diff --git a/src/signal_classes/Controller_Data.py b/src/controller/Controller_Data.py
similarity index 100%
rename from src/signal_classes/Controller_Data.py
rename to src/controller/Controller_Data.py
diff --git a/src/signal_classes/IPCServerMixin.py b/src/controller/IPCServerMixin.py
similarity index 100%
rename from src/signal_classes/IPCServerMixin.py
rename to src/controller/IPCServerMixin.py
diff --git a/src/signal_classes/__init__.py b/src/controller/__init__.py
similarity index 100%
rename from src/signal_classes/__init__.py
rename to src/controller/__init__.py
diff --git a/src/signal_classes/mixins/DummyMixin.py b/src/controller/mixins/DummyMixin.py
similarity index 100%
rename from src/signal_classes/mixins/DummyMixin.py
rename to src/controller/mixins/DummyMixin.py
diff --git a/src/signal_classes/mixins/__init__.py b/src/controller/mixins/__init__.py
similarity index 100%
rename from src/signal_classes/mixins/__init__.py
rename to src/controller/mixins/__init__.py