Merge with cbillington/backout (Pull request labscript-suite#33)

__main__.py

@@ -133,19 +133,19 @@
 # And for icons:
 import qtutils.icons
 # Analysis Submission code
-from blacs.analysis_submission import AnalysisSubmission
+from analysis_submission import AnalysisSubmission
 # Queue Manager Code
-from blacs.experiment_queue import QueueManager, QueueTreeview
+from experiment_queue import QueueManager, QueueTreeview
 # Module containing hardware compatibility:
 import labscript_devices
 # Save/restore frontpanel code
-from blacs.front_panel_settings import FrontPanelSettings
+from front_panel_settings import FrontPanelSettings
 # Notifications system
-from blacs.notifications import Notifications
+from notifications import Notifications
 # Preferences system
 from labscript_utils.settings import Settings
 #import settings_pages
-import blacs.plugins as plugins
+import plugins
 
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 

device_base_class.py

@@ -23,9 +23,9 @@
 import labscript_utils.excepthook
 from qtutils import UiLoader
 
-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 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 labscript_utils.qtwidgets.toolpalette import ToolPaletteGroup