diff --git a/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java b/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java
index 307fcc3..93cdb1c 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java
@@ -1,7 +1,5 @@
 package org.micromanager.lightsheetmanager;
 
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
-import org.micromanager.lightsheetmanager.gui.LightSheetManagerFrame;
 import org.micromanager.lightsheetmanager.gui.utils.WindowUtils;
 import org.micromanager.MenuPlugin;
 import org.micromanager.Studio;
@@ -14,11 +12,11 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
     public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2024";
     public static final String description = "A plugin to control various types of light sheet microscopes.";
     public static final String menuName = "Light Sheet Manager";
-    public static final String version = "0.4.4";
+    public static final String version = "0.4.5";
 
     private Studio studio_;
+    private LightSheetManager model_;
     private LightSheetManagerFrame frame_;
-    private LightSheetManagerModel model_;
 
     @Override
     public void setContext(final Studio studio) {
@@ -39,11 +37,11 @@ public void onPluginSelected() {
 
         // TODO: capture all errors like this?
         try {
-            model_ = new LightSheetManagerModel(studio_);
+            model_ = new LightSheetManager(studio_);
             final boolean isLoaded = model_.setup();
             frame_ = new LightSheetManagerFrame(model_, isLoaded);
             if (isLoaded) {
-                model_.acquisitions().setFrame(frame_); // TODO: remove later
+                model_.acquisitions().setFrame(frame_);
             }
             frame_.setVisible(true);
             frame_.toFront();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/internal/DefaultLightSheetManager.java b/src/main/java/org/micromanager/lightsheetmanager/api/internal/DefaultLightSheetManager.java
index bcc3848..8cd7335 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/api/internal/DefaultLightSheetManager.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/api/internal/DefaultLightSheetManager.java
@@ -1,41 +1,41 @@
-package org.micromanager.lightsheetmanager.api.internal;
-
-
-import org.micromanager.lightsheetmanager.api.AutofocusSettings;
-import org.micromanager.lightsheetmanager.api.LightSheetManager;
-import org.micromanager.lightsheetmanager.api.TimingSettings;
-import org.micromanager.lightsheetmanager.api.VolumeSettings;
-
-public class DefaultLightSheetManager implements LightSheetManager {
-   
-   /**
-    * Access to a AutofocusSettingsBuilder.
-    *
-    * @return AutofocusSettings.Builder with default settings.
-    */
-   @Override
-   public AutofocusSettings.Builder autofocusSettingsBuilder() {
-      return new DefaultAutofocusSettings.Builder();
-   }
-
-   /**
-    * Access to a VolumeSettingsBuilder.
-    *
-    * @return VolumeSettings.Builder with default settings.
-    */
-   @Override
-   public VolumeSettings.Builder volumeSettingsBuilder() {
-      return new DefaultVolumeSettings.Builder();
-   }
-
-   /**
-    * Access to a TimingSettingsBuilder.
-    *
-    * @return TimingSettings.Builder with default settings.
-    */
-   @Override
-   public TimingSettings.Builder timingSettingsBuilder() {
-      return new DefaultTimingSettings.Builder();
-   }
-   
-}
+//package org.micromanager.lightsheetmanager.api.internal;
+//
+//
+//import org.micromanager.lightsheetmanager.api.AutofocusSettings;
+//import org.micromanager.lightsheetmanager.api.LightSheetManagerAPI;
+//import org.micromanager.lightsheetmanager.api.TimingSettings;
+//import org.micromanager.lightsheetmanager.api.VolumeSettings;
+//
+//public class DefaultLightSheetManager implements LightSheetManagerAPI {
+//
+//   /**
+//    * Access to a AutofocusSettingsBuilder.
+//    *
+//    * @return AutofocusSettings.Builder with default settings.
+//    */
+//   @Override
+//   public AutofocusSettings.Builder autofocusSettingsBuilder() {
+//      return new DefaultAutofocusSettings.Builder();
+//   }
+//
+//   /**
+//    * Access to a VolumeSettingsBuilder.
+//    *
+//    * @return VolumeSettings.Builder with default settings.
+//    */
+//   @Override
+//   public VolumeSettings.Builder volumeSettingsBuilder() {
+//      return new DefaultVolumeSettings.Builder();
+//   }
+//
+//   /**
+//    * Access to a TimingSettingsBuilder.
+//    *
+//    * @return TimingSettings.Builder with default settings.
+//    */
+//   @Override
+//   public TimingSettings.Builder timingSettingsBuilder() {
+//      return new DefaultTimingSettings.Builder();
+//   }
+//
+//}
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/frames/NavigationFrame.java b/src/main/java/org/micromanager/lightsheetmanager/gui/frames/NavigationFrame.java
index ed64837..302abe6 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/frames/NavigationFrame.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/frames/NavigationFrame.java
@@ -2,7 +2,7 @@
 
 import net.miginfocom.swing.MigLayout;
 import org.micromanager.lightsheetmanager.gui.tabs.navigation.NavigationPanel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.internal.utils.WindowPositioning;
 
 import javax.swing.JFrame;
@@ -11,7 +11,7 @@ public class NavigationFrame extends JFrame {
 
     private NavigationPanel navigationPanel_;
 
-    public NavigationFrame(final LightSheetManagerModel model) {
+    public NavigationFrame(final LightSheetManager model) {
         WindowPositioning.setUpBoundsMemory(this, this.getClass(), this.getClass().getSimpleName());
         setLayout(new MigLayout("", "", ""));
         navigationPanel_ = new NavigationPanel(model);
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/frames/XYZGridFrame.java b/src/main/java/org/micromanager/lightsheetmanager/gui/frames/XYZGridFrame.java
index cadcff6..71971c6 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/frames/XYZGridFrame.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/frames/XYZGridFrame.java
@@ -7,7 +7,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
 import org.micromanager.internal.utils.WindowPositioning;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.XYZGrid;
 
 import javax.swing.JFrame;
@@ -43,9 +43,9 @@ public class XYZGridFrame extends JFrame {
     private JLabel lblYCountValue_;
     private JLabel lblZCountValue_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public XYZGridFrame(final LightSheetManagerModel model) {
+    public XYZGridFrame(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         WindowPositioning.setUpBoundsMemory(this, this.getClass(), this.getClass().getSimpleName());
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
index 5a85df1..5d7b66e 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
@@ -12,7 +12,7 @@
 import org.micromanager.lightsheetmanager.gui.tabs.acquisition.VolumeDurationPanel;
 import org.micromanager.lightsheetmanager.gui.tabs.acquisition.MultiPositionPanel;
 import org.micromanager.lightsheetmanager.gui.tabs.acquisition.TimePointsPanel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.gui.tabs.channels.ChannelTablePanel;
 import org.micromanager.lightsheetmanager.gui.tabs.acquisition.SliceSettingsPanel;
 import org.micromanager.lightsheetmanager.gui.tabs.acquisition.VolumeSettingsPanel;
@@ -69,9 +69,9 @@ public class AcquisitionTab extends Panel implements ListeningPanel {
     // acquisition playlist
     private final AcquisitionTableFrame acqTableFrame_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public AcquisitionTab(final LightSheetManagerModel model) {
+    public AcquisitionTab(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         studio_ = model_.studio();
         acqTableFrame_ = new AcquisitionTableFrame(studio_);
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java
index 2ca8424..5cef4a2 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java
@@ -10,7 +10,7 @@
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.awt.Font;
 import java.util.Objects;
@@ -43,9 +43,9 @@ public class AutofocusTab extends Panel implements ListeningPanel {
     private Spinner spnMaxOffsetSetup_;
     private CheckBox cbxAutoUpdateFocusFound_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public AutofocusTab(final LightSheetManagerModel model) {
+    public AutofocusTab(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         createUserInterface();
         createEventHandlers();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java
index d80f627..3fd6ec8 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java
@@ -7,7 +7,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.cameras.CameraBase;
 
 import java.awt.Font;
@@ -25,9 +25,9 @@ public class CameraTab extends Panel implements ListeningPanel {
     private ComboBox cmbCameraTriggerMode_;
 
     private TabPanel tabPanel_;
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public CameraTab(final LightSheetManagerModel model, final TabPanel tabPanel) {
+    public CameraTab(final LightSheetManager model, final TabPanel tabPanel) {
         tabPanel_ = Objects.requireNonNull(tabPanel);
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DataTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DataTab.java
index 73fbe46..c17d698 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DataTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DataTab.java
@@ -7,7 +7,7 @@
 
 import org.micromanager.internal.utils.FileDialogs;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAcquisitionSettingsSCAPE;
-import org.micromanager.lightsheetmanager.gui.LightSheetManagerFrame;
+import org.micromanager.lightsheetmanager.LightSheetManagerFrame;
 import org.micromanager.lightsheetmanager.gui.components.Button;
 import org.micromanager.lightsheetmanager.gui.components.CheckBox;
 import org.micromanager.lightsheetmanager.gui.components.Label;
@@ -16,7 +16,7 @@
 import org.micromanager.lightsheetmanager.gui.components.RadioButton;
 import org.micromanager.lightsheetmanager.gui.components.TextField;
 import org.micromanager.lightsheetmanager.model.DataStorage;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import javax.swing.JLabel;
 import java.util.Objects;
@@ -32,10 +32,10 @@ public class DataTab extends Panel implements ListeningPanel {
 
     private final FileDialogs.FileType directorySelect_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
     private LightSheetManagerFrame frame_;
 
-    public DataTab(final LightSheetManagerModel model,
+    public DataTab(final LightSheetManager model,
                    final LightSheetManagerFrame frame) {
         model_ = Objects.requireNonNull(model);
         frame_ = Objects.requireNonNull(frame);
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DeviceTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DeviceTab.java
index 54e10a3..e870466 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DeviceTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DeviceTab.java
@@ -4,7 +4,7 @@
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.model.DeviceManager;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import javax.swing.JLabel;
 import java.util.Objects;
@@ -17,9 +17,9 @@ public class DeviceTab extends Panel implements ListeningPanel {
     private Button btnCreateConfigGroup_;
 
     private DeviceManager devices_;
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public DeviceTab(final LightSheetManagerModel model) {
+    public DeviceTab(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         devices_ = model_.devices();
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java
index dca7753..c2938f1 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java
@@ -3,7 +3,7 @@
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.tabs.navigation.NavigationPanel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -11,9 +11,9 @@ public class NavigationTab extends Panel implements ListeningPanel {
 
     private final NavigationPanel navigationPanel_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public NavigationTab(final LightSheetManagerModel model) {
+    public NavigationTab(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         navigationPanel_ = new NavigationPanel(model_);
         add(navigationPanel_, "");
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SettingsTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SettingsTab.java
index bf0c3a0..d1337b9 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SettingsTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SettingsTab.java
@@ -5,10 +5,8 @@
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
-import org.micromanager.lightsheetmanager.model.devices.XYStage;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
-import org.micromanager.lightsheetmanager.model.devices.vendor.ASIXYStage;
 
 import javax.swing.JLabel;
 import java.util.Objects;
@@ -33,9 +31,9 @@ public class SettingsTab extends Panel implements ListeningPanel {
     private boolean isUsingPLogic_;
     private boolean isUsingScanSettings_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public SettingsTab(final LightSheetManagerModel model) {
+    public SettingsTab(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         createUserInterface();
         createEventHandlers();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java
index a582ca1..b90a5a9 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java
@@ -5,7 +5,7 @@
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.tabs.setup.SetupPanel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.awt.Font;
 import java.util.Objects;
@@ -15,9 +15,9 @@ public class SetupPathTab extends Panel implements ListeningPanel {
     private int pathNum_;
     private SetupPanel setupPanel_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public SetupPathTab(final LightSheetManagerModel model, final int pathNum) {
+    public SetupPathTab(final LightSheetManager model, final int pathNum) {
         model_ = Objects.requireNonNull(model);
         pathNum_ = pathNum;
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/TabPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/TabPanel.java
index 5432587..01ca859 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/TabPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/TabPanel.java
@@ -1,8 +1,8 @@
 package org.micromanager.lightsheetmanager.gui.tabs;
 
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
-import org.micromanager.lightsheetmanager.gui.LightSheetManagerFrame;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManagerFrame;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.DeviceManager;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.TabbedPane;
@@ -30,10 +30,10 @@ public class TabPanel extends Panel {
 
     private DeviceManager devices_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
     private final LightSheetManagerFrame frame_;
 
-    public TabPanel(final LightSheetManagerModel model,
+    public TabPanel(final LightSheetManager model,
                     final LightSheetManagerFrame frame,
                     final int width, final int height) {
         model_ = Objects.requireNonNull(model);
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java
index c24c3f4..491f9c3 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java
@@ -5,7 +5,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -22,9 +22,9 @@ public class AdvancedTimingPanel extends Panel {
 
     private CheckBox cbxAlternateScanDirection_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public AdvancedTimingPanel(final LightSheetManagerModel model) {
+    public AdvancedTimingPanel(final LightSheetManager model) {
         super("Advanced Timing Settings");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/MultiPositionPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/MultiPositionPanel.java
index e4fae28..5d2d422 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/MultiPositionPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/MultiPositionPanel.java
@@ -7,7 +7,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
 import org.micromanager.lightsheetmanager.gui.frames.XYZGridFrame;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -19,9 +19,9 @@ public class MultiPositionPanel extends Panel {
     private Button btnEditPositionList_;
 
     private final XYZGridFrame xyzGridFrame_;
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public MultiPositionPanel(final LightSheetManagerModel model, final CheckBox cbxUseMultiPositions) {
+    public MultiPositionPanel(final LightSheetManager model, final CheckBox cbxUseMultiPositions) {
         super(cbxUseMultiPositions);
         model_ = Objects.requireNonNull(model);
         xyzGridFrame_ = new XYZGridFrame(model_);
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java
index 7a5282e..9af0bdc 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java
@@ -7,7 +7,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -31,9 +31,9 @@ public class SliceSettingsPanel extends Panel {
     private Spinner spnShutterWidth_;
     private Spinner spnShutterSpeed_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public SliceSettingsPanel(final LightSheetManagerModel model) {
+    public SliceSettingsPanel(final LightSheetManager model) {
         super("Slice Settings");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java
index 78571c4..af1c6c3 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java
@@ -5,7 +5,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -16,9 +16,9 @@ public class TimePointsPanel extends Panel {
     private Spinner spnNumTimePoints_;
     private Spinner spnTimePointInterval_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public TimePointsPanel(final LightSheetManagerModel model, final CheckBox cbxUseTimePoints) {
+    public TimePointsPanel(final LightSheetManager model, final CheckBox cbxUseTimePoints) {
         super(cbxUseTimePoints);
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeDurationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeDurationPanel.java
index cb984cf..e274425 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeDurationPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeDurationPanel.java
@@ -2,7 +2,7 @@
 
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -16,9 +16,9 @@ public class VolumeDurationPanel extends Panel {
     private Label lblVolumeTimeValue_;
     private Label lblTotalTimeValue_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public VolumeDurationPanel(final LightSheetManagerModel model) {
+    public VolumeDurationPanel(final LightSheetManager model) {
         super("Durations");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeSettingsPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeSettingsPanel.java
index 29d11ec..8532092 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeSettingsPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumeSettingsPanel.java
@@ -2,7 +2,7 @@
 
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.api.internal.DefaultVolumeSettings;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.gui.components.ComboBox;
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
@@ -20,9 +20,9 @@ public class VolumeSettingsPanel extends Panel {
     private Spinner spnSliceStepSize_;
     private Spinner spnNumSlices_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public VolumeSettingsPanel(final LightSheetManagerModel model) {
+    public VolumeSettingsPanel(final LightSheetManager model) {
         super("Volume Settings");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java
index 630433b..34405b5 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java
@@ -1,7 +1,7 @@
 package org.micromanager.lightsheetmanager.gui.tabs.channels;
 
 import mmcorej.StrVector;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 import org.micromanager.lightsheetmanager.model.channels.ChannelTableData;
 
@@ -22,9 +22,9 @@ public class ChannelTable extends JScrollPane {
     private ChannelTableData tableData_;
     private ChannelTableModel tableModel_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public ChannelTable(final LightSheetManagerModel model) {
+    public ChannelTable(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
 
         final String channelGroup = model_.acquisitions().settings().channelGroup();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java
index 52de721..bf8e4b6 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java
@@ -4,7 +4,7 @@
 import org.micromanager.lightsheetmanager.gui.components.CheckBox;
 import org.micromanager.lightsheetmanager.gui.components.ComboBox;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.api.data.MultiChannelMode;
 import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 
@@ -25,9 +25,9 @@ public class ChannelTablePanel extends Panel {
 
     private ChannelTable table_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public ChannelTablePanel(final LightSheetManagerModel model, final CheckBox checkBox) {
+    public ChannelTablePanel(final LightSheetManager model, final CheckBox checkBox) {
         super(checkBox);
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/NavigationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/NavigationPanel.java
index 7a35601..cddc321 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/NavigationPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/NavigationPanel.java
@@ -6,7 +6,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import mmcorej.DeviceType;
 import org.micromanager.Studio;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import javax.swing.JLabel;
 import javax.swing.border.TitledBorder;
@@ -33,9 +33,9 @@ public class NavigationPanel extends Panel {
     private PositionUpdater positionUpdater_;
     private ArrayList<ControlPanel> controlPanels_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public NavigationPanel(final LightSheetManagerModel model) {
+    public NavigationPanel(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         studio_ = model_.studio();
         devices_ = model_.devices();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/BeamSheetControlPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/BeamSheetControlPanel.java
index f42c43c..ee404df 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/BeamSheetControlPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/BeamSheetControlPanel.java
@@ -8,7 +8,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Slider;
 import org.micromanager.lightsheetmanager.gui.components.TextField;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import javax.swing.JLabel;
 import java.awt.EventQueue;
@@ -49,9 +49,9 @@ public class BeamSheetControlPanel extends Panel {
     // TODO: this is temporary solution until, update this var so we don't have to rebuild the acqSettings
     private double currentOffset_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public BeamSheetControlPanel(final LightSheetManagerModel model, final int pathNum) {
+    public BeamSheetControlPanel(final LightSheetManager model, final int pathNum) {
         super("Light Sheet Synchronization");
         model_ = Objects.requireNonNull(model);
         pathNum_ = pathNum;
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
index 4b79511..78fe7a3 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
@@ -8,7 +8,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.ToggleButton;
 import org.micromanager.lightsheetmanager.gui.data.Icons;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.cameras.CameraBase;
 
 import java.util.Objects;
@@ -29,9 +29,9 @@ public class CameraPanel extends Panel {
     private ToggleButton btnInvertedPath_;
     private ToggleButton btnLiveMode_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public CameraPanel(final LightSheetManagerModel model) {
+    public CameraPanel(final LightSheetManager model) {
         super("Cameras");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ExcitationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ExcitationPanel.java
index 6a3797d..ce60fbc 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ExcitationPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ExcitationPanel.java
@@ -4,7 +4,7 @@
 import org.micromanager.lightsheetmanager.gui.components.CheckBox;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
 
 import javax.swing.JLabel;
@@ -22,9 +22,9 @@ public class ExcitationPanel extends Panel implements ListeningPanel {
 
     private boolean isUsingPLogic_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public ExcitationPanel(final LightSheetManagerModel model) {
+    public ExcitationPanel(final LightSheetManager model) {
         super("Scanner");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/JoystickPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/JoystickPanel.java
index 02cc0e1..04a7d50 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/JoystickPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/JoystickPanel.java
@@ -2,7 +2,7 @@
 
 import org.micromanager.lightsheetmanager.gui.components.ComboBox;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import javax.swing.JLabel;
 import java.util.Objects;
@@ -14,9 +14,9 @@ public class JoystickPanel extends Panel {
     private ComboBox cmbLeftWheel_;
     private ComboBox cmbRightWheel_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public JoystickPanel(final LightSheetManagerModel model) {
+    public JoystickPanel(final LightSheetManager model) {
         super("Joystick");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
index a7d8f5c..338eff1 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
@@ -7,7 +7,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Button;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.TextField;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIPiezo;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
 
@@ -34,9 +34,9 @@ public class PiezoCalibrationPanel extends Panel {
 
     private boolean isUsingPLogic_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public PiezoCalibrationPanel(final LightSheetManagerModel model, final int pathNum) {
+    public PiezoCalibrationPanel(final LightSheetManager model, final int pathNum) {
         super("Piezo/Slice Calibration");
         model_ = Objects.requireNonNull(model);
         pathNum_ = pathNum;
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java
index e608e3e..3d713c2 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java
@@ -4,7 +4,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Button;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.TextField;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIPiezo;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
 
@@ -40,9 +40,9 @@ public class PositionPanel extends Panel {
 
     private boolean isUsingPLogic_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public PositionPanel(final LightSheetManagerModel model, final int pathNum) {
+    public PositionPanel(final LightSheetManager model, final int pathNum) {
         super("Positions");
         model_ = Objects.requireNonNull(model);
         pathNum_ = pathNum;
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
index bd46183..d0e8d1f 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
@@ -3,7 +3,7 @@
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 
 import java.util.Objects;
 
@@ -30,9 +30,9 @@ public class SetupPanel extends Panel implements ListeningPanel {
 
     private SingleAxisPanel singleAxisPanel_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public SetupPanel(final LightSheetManagerModel model, final int pathNum) {
+    public SetupPanel(final LightSheetManager model, final int pathNum) {
         model_ = Objects.requireNonNull(model);
         pathNum_ = pathNum;
 
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java
index 22824df..bf5ea3d 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java
@@ -4,7 +4,7 @@
 import org.micromanager.lightsheetmanager.gui.components.ComboBox;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.Spinner;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
 import org.micromanager.lightsheetmanager.model.devices.vendor.SingleAxis;
 
@@ -24,9 +24,9 @@ public class SingleAxisPanel extends Panel {
 
     private boolean isUsingPLogic_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public SingleAxisPanel(final LightSheetManagerModel model) {
+    public SingleAxisPanel(final LightSheetManager model) {
         super("Scanner - Single Axis Y");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java b/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java
index 6343e71..6c3360d 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java
@@ -2,6 +2,7 @@
 
 import mmcorej.Configuration;
 import mmcorej.StrVector;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.api.data.CameraLibrary;
 import mmcorej.CMMCore;
 import mmcorej.DeviceType;
@@ -48,9 +49,9 @@ public class DeviceManager {
 
     private static String deviceAdapterName_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public DeviceManager(final Studio studio, final LightSheetManagerModel model) {
+    public DeviceManager(final Studio studio, final LightSheetManager model) {
         studio_ = Objects.requireNonNull(studio);
         model_ = Objects.requireNonNull(model);
         core_ = studio_.core();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/PLogicDISPIM.java b/src/main/java/org/micromanager/lightsheetmanager/model/PLogicDISPIM.java
index 24ac444..6d70161 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/PLogicDISPIM.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/PLogicDISPIM.java
@@ -3,6 +3,7 @@
 import mmcorej.CMMCore;
 import mmcorej.Configuration;
 import org.micromanager.Studio;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.api.AcquisitionSettingsDISPIM;
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.DISPIMDevice;
@@ -69,9 +70,9 @@ public class PLogicDISPIM {
 
     private final DefaultAcquisitionSettingsDISPIM acqSettings_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public PLogicDISPIM(final LightSheetManagerModel model) {
+    public PLogicDISPIM(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         studio_ = model_.studio();
         devices_ = model_.devices();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/PLogicSCAPE.java b/src/main/java/org/micromanager/lightsheetmanager/model/PLogicSCAPE.java
index db18900..cb7768c 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/PLogicSCAPE.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/PLogicSCAPE.java
@@ -3,6 +3,7 @@
 import mmcorej.CMMCore;
 import mmcorej.Configuration;
 import org.micromanager.Studio;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
@@ -60,9 +61,9 @@ public class PLogicSCAPE {
 
     private final DefaultAcquisitionSettingsSCAPE acqSettings_;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public PLogicSCAPE(final LightSheetManagerModel model) {
+    public PLogicSCAPE(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         studio_ = model_.studio();
         devices_ = model_.devices();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java b/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java
index 435fa9a..66eab6d 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java
@@ -3,6 +3,7 @@
 import mmcorej.org.json.JSONException;
 import mmcorej.org.json.JSONObject;
 import org.micromanager.UserProfile;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAcquisitionSettingsSCAPE;
 import org.micromanager.propertymap.MutablePropertyMapView;
@@ -31,9 +32,9 @@ public class UserSettings {
     // Note: increase this value based on the amount of nested json in the settings
     private static final int MAX_RECURSION_DEPTH_JSON = 4;
 
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public UserSettings(final LightSheetManagerModel model) {
+    public UserSettings(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         // setup user profile
         final UserProfile profile = model_.getStudio().getUserProfile();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/XYZGrid.java b/src/main/java/org/micromanager/lightsheetmanager/model/XYZGrid.java
index bb1f6f0..e5732cd 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/XYZGrid.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/XYZGrid.java
@@ -3,6 +3,7 @@
 import org.micromanager.MultiStagePosition;
 import org.micromanager.PositionList;
 import org.micromanager.StagePosition;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.api.data.DISPIMDevice;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIXYStage;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIZStage;
@@ -37,9 +38,9 @@ public class XYZGrid {
     private int overlapYZ_;
     private boolean clearYZ_;
 
-    private LightSheetManagerModel model_;
+    private LightSheetManager model_;
 
-    public XYZGrid(final LightSheetManagerModel model) {
+    public XYZGrid(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
     }
 
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
index 8bf1538..5907035 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
@@ -17,10 +17,10 @@
 import org.micromanager.lightsheetmanager.LightSheetManagerPlugin;
 import org.micromanager.lightsheetmanager.api.AcquisitionManager;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAcquisitionSettingsSCAPE;
-import org.micromanager.lightsheetmanager.gui.LightSheetManagerFrame;
+import org.micromanager.lightsheetmanager.LightSheetManagerFrame;
 import org.micromanager.lightsheetmanager.model.autofocus.AutofocusRunner;
 import org.micromanager.lightsheetmanager.model.DataStorage;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
 
@@ -53,9 +53,9 @@ public abstract class AcquisitionEngine implements AcquisitionManager, MMAcquist
     // TODO: remove later, hacky method to stop position updater for now
     protected LightSheetManagerFrame frame_;
 
-    protected final LightSheetManagerModel model_;
+    protected final LightSheetManager model_;
 
-    public AcquisitionEngine(final LightSheetManagerModel model) {
+    public AcquisitionEngine(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         studio_ = model.studio();
         core_ = model.core();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java
index a4741d0..8d5352a 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java
@@ -15,14 +15,13 @@
 import org.micromanager.data.internal.DefaultSummaryMetadata;
 import org.micromanager.data.internal.ndtiff.NDTiffAdapter;
 import org.micromanager.internal.MMStudio;
-import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.api.data.MultiChannelMode;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAcquisitionSettingsDISPIM;
 import org.micromanager.lightsheetmanager.api.internal.DefaultTimingSettings;
 import org.micromanager.lightsheetmanager.model.DataStorage;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.PLogicDISPIM;
 import org.micromanager.lightsheetmanager.model.devices.NIDAQ;
 import org.micromanager.lightsheetmanager.model.devices.cameras.CameraBase;
@@ -38,7 +37,7 @@ public class AcquisitionEngineDISPIM extends AcquisitionEngine {
    // TODO: remove this when a more generic method is available and get from base class
     private DefaultAcquisitionSettingsDISPIM acqSettings_;
 
-    public AcquisitionEngineDISPIM(final LightSheetManagerModel model) {
+    public AcquisitionEngineDISPIM(final LightSheetManager model) {
         super(model);
         // TODO: remove this when a more generic method is available and get from base class
         acqSettings_ = new DefaultAcquisitionSettingsDISPIM.Builder().build();
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java
index 855dd03..e084990 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java
@@ -23,7 +23,7 @@
 import org.micromanager.lightsheetmanager.api.internal.DefaultTimingSettings;
 import org.micromanager.lightsheetmanager.gui.utils.DialogUtils;
 import org.micromanager.lightsheetmanager.model.DataStorage;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.PLogicSCAPE;
 import org.micromanager.lightsheetmanager.model.devices.NIDAQ;
 import org.micromanager.lightsheetmanager.model.devices.cameras.AndorCamera;
@@ -49,7 +49,7 @@ public class AcquisitionEngineSCAPE extends AcquisitionEngine {
     private double scanSpeedX_;
     private double scanAccelX_;
 
-    public AcquisitionEngineSCAPE(final LightSheetManagerModel model) {
+    public AcquisitionEngineSCAPE(final LightSheetManager model) {
         super(model);
     }
 
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/autofocus/AutofocusRunner.java b/src/main/java/org/micromanager/lightsheetmanager/model/autofocus/AutofocusRunner.java
index 19f93a5..f0aa856 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/autofocus/AutofocusRunner.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/autofocus/AutofocusRunner.java
@@ -5,7 +5,7 @@
 import org.micromanager.Studio;
 import org.micromanager.lightsheetmanager.api.data.AutofocusMode;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAcquisitionSettingsSCAPE;
-import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
+import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIPiezo;
 import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
 
@@ -16,9 +16,9 @@ public class AutofocusRunner {
     private AutofocusResult lastAutofocusResult_;
 
     private final Studio studio_;
-    private final LightSheetManagerModel model_;
+    private final LightSheetManager model_;
 
-    public AutofocusRunner(final LightSheetManagerModel model) {
+    public AutofocusRunner(final LightSheetManager model) {
         model_ = Objects.requireNonNull(model);
         studio_ = model_.studio();