diff --git a/bec_widgets/widgets/__init__.py b/bec_widgets/widgets/__init__.py
index 76c264a6..4cada696 100644
--- a/bec_widgets/widgets/__init__.py
+++ b/bec_widgets/widgets/__init__.py
@@ -1,6 +1,6 @@
 from .editor import BECEditor
 from .figure import BECFigure, FigureConfig
-from .monitor import BECMonitor, ConfigDialog
+from .monitor import BECMonitor
 from .monitor_scatter_2D import BECMonitor2DScatter
 from .motor_control import (
     MotorControlAbsolute,
@@ -12,4 +12,3 @@ from .motor_control import (
 from .motor_map import MotorMap
 from .plots import BECCurve, BECPlotBase, BECWaveform1D
 from .scan_control import ScanControl
-from .toolbar import ModularToolBar
diff --git a/bec_widgets/widgets/editor/editor.py b/bec_widgets/widgets/editor/editor.py
index ecb8acdf..bda1ee1d 100644
--- a/bec_widgets/widgets/editor/editor.py
+++ b/bec_widgets/widgets/editor/editor.py
@@ -12,7 +12,7 @@ from qtpy.QtCore import Qt, QThread, Signal
 from qtpy.QtGui import QColor, QFont
 from qtpy.QtWidgets import QApplication, QFileDialog, QSplitter, QTextEdit, QVBoxLayout, QWidget
 
-from bec_widgets.widgets import ModularToolBar
+from bec_widgets.widgets.toolbar import ModularToolBar
 
 
 class AutoCompleter(QThread):
diff --git a/bec_widgets/widgets/monitor/__init__.py b/bec_widgets/widgets/monitor/__init__.py
index 3be54f6d..a91ef3f8 100644
--- a/bec_widgets/widgets/monitor/__init__.py
+++ b/bec_widgets/widgets/monitor/__init__.py
@@ -1,2 +1 @@
-from .config_dialog import ConfigDialog
 from .monitor import BECMonitor
diff --git a/bec_widgets/widgets/monitor/monitor.py b/bec_widgets/widgets/monitor/monitor.py
index 0a9a7a85..843b5c4c 100644
--- a/bec_widgets/widgets/monitor/monitor.py
+++ b/bec_widgets/widgets/monitor/monitor.py
@@ -13,6 +13,7 @@ from qtpy.QtWidgets import QApplication, QMessageBox
 from bec_widgets.utils import Colors, Crosshair, yaml_dialog
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.validation import MonitorConfigValidator
+from bec_widgets.widgets.monitor.config_dialog import ConfigDialog
 
 # just for demonstration purposes if script run directly
 CONFIG_SCAN_MODE = {
@@ -596,7 +597,6 @@ class BECMonitor(pg.GraphicsLayoutWidget):
 
     def show_config_dialog(self):
         """Show the configuration dialog."""
-        from bec_widgets.widgets import ConfigDialog
 
         dialog = ConfigDialog(
             client=self.client, default_config=self.config, skip_validation=self.skip_validation
diff --git a/bec_widgets/widgets/plots/image.py b/bec_widgets/widgets/plots/image.py
index 20fe90a0..9ac6b74d 100644
--- a/bec_widgets/widgets/plots/image.py
+++ b/bec_widgets/widgets/plots/image.py
@@ -13,7 +13,8 @@ from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils import BECConnector, ConnectionConfig
-from bec_widgets.widgets.plots import BECPlotBase, WidgetConfig
+
+from .plot_base import BECPlotBase, WidgetConfig
 
 
 class ProcessingConfig(BaseModel):
diff --git a/tests/test_config_dialog.py b/tests/test_config_dialog.py
index 8ec5d4a5..5405a64d 100644
--- a/tests/test_config_dialog.py
+++ b/tests/test_config_dialog.py
@@ -6,7 +6,7 @@ import pytest
 import yaml
 from qtpy.QtWidgets import QTableWidgetItem, QTabWidget
 
-from bec_widgets.widgets import ConfigDialog
+from bec_widgets.widgets.monitor.config_dialog import ConfigDialog
 
 
 def load_test_config(config_name):