diff --git a/bec_widgets/examples/jupyter_console/jupyter_console_window.py b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
index 911e9b66..09c10f21 100644
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -10,8 +10,8 @@ from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.utils import BECDispatcher, UILoader
-from bec_widgets.widgets import BECFigure
 from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole
 
 # class JupyterConsoleWidget(RichJupyterWidget):  # pragma: no cover:
diff --git a/bec_widgets/widgets/__init__.py b/bec_widgets/widgets/__init__.py
index 37b622a6..00f7a11a 100644
--- a/bec_widgets/widgets/__init__.py
+++ b/bec_widgets/widgets/__init__.py
@@ -1,5 +1,5 @@
-from .buttons import StopButton
-from .dock import BECDock, BECDockArea
-from .figure import BECFigure, FigureConfig
-from .scan_control import ScanControl
-from .spiral_progress_bar import SpiralProgressBar
+# from .buttons import StopButton
+# from .dock import BECDock, BECDockArea
+# from .figure import BECFigure, FigureConfig
+# from .scan_control import ScanControl
+# from .spiral_progress_bar import SpiralProgressBar
diff --git a/bec_widgets/widgets/dock/dock.py b/bec_widgets/widgets/dock/dock.py
index 948faf92..7f5ab8a3 100644
--- a/bec_widgets/widgets/dock/dock.py
+++ b/bec_widgets/widgets/dock/dock.py
@@ -11,7 +11,7 @@ from bec_widgets.utils import BECConnector, ConnectionConfig, GridLayoutManager
 if TYPE_CHECKING:
     from qtpy.QtWidgets import QWidget
 
-    from bec_widgets.widgets import BECDockArea
+    from bec_widgets.widgets.dock import BECDockArea
 
 
 class DockConfig(ConnectionConfig):
diff --git a/docs/user/customisation.md b/docs/user/customisation.md
index 70dcd7c4..abd707b5 100644
--- a/docs/user/customisation.md
+++ b/docs/user/customisation.md
@@ -48,7 +48,7 @@ users to interact. BEC Widgets must be placed in the window:
 
 ```
 from qtpy.QWidgets import QMainWindow
-from bec_widgets.widgets import BECFigure
+from bec_widgets.widgets.figure import BECFigure
 
 window = QMainWindow()
 bec_figure = BECFigure(gui_id="my_gui_app_id")
@@ -78,7 +78,7 @@ Final example:
 ```
 import sys
 from qtpy.QtWidgets import QMainWindow, QApplication
-from bec_widgets.widgets import BECFigure
+from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
 
 # creation of the Qt application
diff --git a/docs/user/widgets/buttons.md b/docs/user/widgets/buttons.md
index df93a24a..011ec581 100644
--- a/docs/user/widgets/buttons.md
+++ b/docs/user/widgets/buttons.md
@@ -24,7 +24,7 @@ a `StopButton` within a GUI layout:
 
 ```python
 from qtpy.QtWidgets import QWidget, QVBoxLayout
-from bec_widgets.widgets import StopButton
+from bec_widgets.widgets.buttons import StopButton
 
 
 class MyGui(QWidget):
diff --git a/tests/end-2-end/conftest.py b/tests/end-2-end/conftest.py
index 63fdde76..1f4a9653 100644
--- a/tests/end-2-end/conftest.py
+++ b/tests/end-2-end/conftest.py
@@ -8,7 +8,8 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_widgets.cli.client_utils import _start_plot_process
 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
-from bec_widgets.widgets import BECDockArea, BECFigure
+from bec_widgets.widgets.dock import BECDockArea
+from bec_widgets.widgets.figure import BECFigure
 
 
 # make threads check in autouse, **will be executed at the end**; better than
diff --git a/tests/unit_tests/test_bec_dock.py b/tests/unit_tests/test_bec_dock.py
index a886b093..95ddfc95 100644
--- a/tests/unit_tests/test_bec_dock.py
+++ b/tests/unit_tests/test_bec_dock.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from bec_widgets.widgets import BECDock, BECDockArea
+from bec_widgets.widgets.dock import BECDock, BECDockArea
 
 from .client_mocks import mocked_client
 
diff --git a/tests/unit_tests/test_bec_figure.py b/tests/unit_tests/test_bec_figure.py
index 2764d7b0..44b62e52 100644
--- a/tests/unit_tests/test_bec_figure.py
+++ b/tests/unit_tests/test_bec_figure.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-from bec_widgets.widgets import BECFigure
+from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.image.image import BECImageShow
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
 from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform
diff --git a/tests/unit_tests/test_scan_control.py b/tests/unit_tests/test_scan_control.py
index 2b7d65d0..9ecedf90 100644
--- a/tests/unit_tests/test_scan_control.py
+++ b/tests/unit_tests/test_scan_control.py
@@ -5,7 +5,7 @@ import pytest
 from qtpy.QtWidgets import QLineEdit
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets import ScanControl
+from bec_widgets.widgets.scan_control import ScanControl
 from tests.unit_tests.test_msgs.available_scans_message import available_scans_message
 
 
diff --git a/tests/unit_tests/test_spiral_progress_bar.py b/tests/unit_tests/test_spiral_progress_bar.py
index 3eebc133..11d01179 100644
--- a/tests/unit_tests/test_spiral_progress_bar.py
+++ b/tests/unit_tests/test_spiral_progress_bar.py
@@ -5,7 +5,7 @@ from bec_lib.endpoints import MessageEndpoints
 from pydantic import ValidationError
 
 from bec_widgets.utils import Colors
-from bec_widgets.widgets import SpiralProgressBar
+from bec_widgets.widgets.spiral_progress_bar import SpiralProgressBar
 from bec_widgets.widgets.spiral_progress_bar.ring import RingConfig, RingConnections
 from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBarConfig
 
diff --git a/tests/unit_tests/test_stop_button.py b/tests/unit_tests/test_stop_button.py
index 99be7feb..c57c60d5 100644
--- a/tests/unit_tests/test_stop_button.py
+++ b/tests/unit_tests/test_stop_button.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from bec_widgets.widgets import StopButton
+from bec_widgets.widgets.buttons import StopButton
 
 from .client_mocks import mocked_client