diff --git a/__main__.py b/__main__.py
index 7b84d224..e3e5ea7f 100644
--- a/__main__.py
+++ b/__main__.py
@@ -133,19 +133,19 @@
 # And for icons:
 import qtutils.icons
 # Analysis Submission code
-from analysis_submission import AnalysisSubmission
+from blacs.analysis_submission import AnalysisSubmission
 # Queue Manager Code
-from experiment_queue import QueueManager, QueueTreeview
+from blacs.experiment_queue import QueueManager, QueueTreeview
 # Module containing hardware compatibility:
 import labscript_devices
 # Save/restore frontpanel code
-from front_panel_settings import FrontPanelSettings
+from blacs.front_panel_settings import FrontPanelSettings
 # Notifications system
-from notifications import Notifications
+from blacs.notifications import Notifications
 # Preferences system
 from labscript_utils.settings import Settings
 #import settings_pages
-import plugins
+import blacs.plugins as plugins
 
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
diff --git a/device_base_class.py b/device_base_class.py
index 611c7b8f..8e5ca10a 100644
--- a/device_base_class.py
+++ b/device_base_class.py
@@ -23,9 +23,9 @@
 import labscript_utils.excepthook
 from qtutils import UiLoader
 
-from tab_base_classes import Tab, Worker, define_state
-from tab_base_classes import MODE_MANUAL, MODE_TRANSITION_TO_BUFFERED, MODE_TRANSITION_TO_MANUAL, MODE_BUFFERED  
-from output_classes import AO, DO, DDS
+from blacs.tab_base_classes import Tab, Worker, define_state
+from blacs.tab_base_classes import MODE_MANUAL, MODE_TRANSITION_TO_BUFFERED, MODE_TRANSITION_TO_MANUAL, MODE_BUFFERED
+from blacs.output_classes import AO, DO, DDS
 from labscript_utils.qtwidgets.toolpalette import ToolPaletteGroup