BlocksTechnology
diff --git a/BlocksScreen/lib/panels/mainWindow.py b/BlocksScreen/lib/panels/mainWindow.py
diff --git a/...ksScreen/lib/panels/widgets/cancelPage.py → ...b/panels/widgets/MainWindow/cancelPage.py b/...ksScreen/lib/panels/widgets/cancelPage.py → ...b/panels/widgets/MainWindow/cancelPage.py
diff --git a/...reen/lib/panels/widgets/connectionPage.py → ...nels/widgets/MainWindow/connectionPage.py b/...reen/lib/panels/widgets/connectionPage.py → ...nels/widgets/MainWindow/connectionPage.py
diff --git a/...en/lib/panels/widgets/notificationPage.py → ...ls/widgets/MainWindow/notificationPage.py b/...en/lib/panels/widgets/notificationPage.py → ...ls/widgets/MainWindow/notificationPage.py
diff --git a/...ksScreen/lib/panels/widgets/updatePage.py → ...b/panels/widgets/MainWindow/updatePage.py b/...ksScreen/lib/panels/widgets/updatePage.py → ...b/panels/widgets/MainWindow/updatePage.py
diff --git a/BlocksScreen/lib/ui/mainWindow.ui b/BlocksScreen/lib/ui/mainWindow.ui
diff --git a/BlocksScreen/lib/ui/mainWindow_ui.py b/BlocksScreen/lib/ui/mainWindow_ui.py
diff --git a/BlocksScreen/lib/ui/mainWindow_v2.ui b/BlocksScreen/lib/ui/mainWindow_v2.ui
diff --git a/BlocksScreen/lib/ui/mainWindow_v2_ui.py b/BlocksScreen/lib/ui/mainWindow_v2_ui.py
diff --git a/scripts/requirements-dev.txt b/scripts/requirements-dev.txt
@@ -7,6 +7,7 @@ pytest-timeout
 pytest-qt
 pytest-asyncio
 PyQt6
+numpy==2.1.0
 docstr_coverage
 bandit
 requests>=2.32.5

diff --git a/tests/panels/conftest.py b/tests/panels/conftest.py
@@ -9,8 +9,19 @@
 
 import sys
 import types
+from pathlib import Path
 from unittest.mock import MagicMock
 
+_project_root = Path(__file__).resolve().parent.parent.parent
+
+# Other test directories (e.g. tests/lib/conftest.py) leak a bare
+# ``MagicMock()`` stub for "lib.utils" into sys.modules with no teardown,
+# which breaks the real ``lib.utils.*`` imports below on a full-suite run.
+# Clear any stale "lib"/"lib.*" entries before rebuilding our own stubs.
+for _stale in list(sys.modules):
+    if _stale == "lib" or _stale.startswith("lib."):
+        del sys.modules[_stale]
+
 _STUB_MODULES = (
     "events",
     "configfile",
@@ -31,11 +42,11 @@
     "lib.panels.utilitiesTab",
     "lib.panels.widgets",
     "lib.panels.widgets.basePopup",
-    "lib.panels.widgets.cancelPage",
-    "lib.panels.widgets.connectionPage",
+    "lib.panels.widgets.MainWindow.cancelPage",
+    "lib.panels.widgets.MainWindow.connectionPage",
     "lib.panels.widgets.loadWidget",
-    "lib.panels.widgets.notificationPage",
-    "lib.panels.widgets.updatePage",
+    "lib.panels.widgets.MainWindow.notificationPage",
+    "lib.panels.widgets.MainWindow.updatePage",
     "lib.printer",
     "lib.ui",
     "lib.ui.mainWindow_ui",
@@ -56,6 +67,11 @@
     _mod.__path__ = []  # marks it as a package so submodule imports resolve
     sys.modules[_name] = _mod
 
+# "lib.utils" is deliberately NOT in _STUB_MODULES: blocks_tabwidget,
+# display_button, and icon_button are plain PyQt6 widgets with no heavy
+# deps, so let them load for real from disk instead of stubbing them.
+sys.modules["lib"].__path__ = [str(_project_root / "BlocksScreen" / "lib")]
+
 # events.* is referenced as a bare attribute in type annotations
 # (e.g. ``event: events.WebSocketMessageReceived``), evaluated eagerly at
 # class-definition time — needs to resolve any attribute, not just a fixed set.
@@ -79,11 +95,11 @@
 sys.modules["lib.panels.printTab"].PrintTab = MagicMock
 sys.modules["lib.panels.utilitiesTab"].UtilitiesTab = MagicMock
 sys.modules["lib.panels.widgets.basePopup"].BasePopup = MagicMock
-sys.modules["lib.panels.widgets.cancelPage"].CancelPage = MagicMock
-sys.modules["lib.panels.widgets.connectionPage"].ConnectionPage = MagicMock
+sys.modules["lib.panels.widgets.MainWindow.cancelPage"].CancelPage = MagicMock
+sys.modules["lib.panels.widgets.MainWindow.connectionPage"].ConnectionPage = MagicMock
 sys.modules["lib.panels.widgets.loadWidget"].LoadingOverlayWidget = MagicMock
-sys.modules["lib.panels.widgets.notificationPage"].NotificationPage = MagicMock
-sys.modules["lib.panels.widgets.updatePage"].UpdatePage = MagicMock
+sys.modules["lib.panels.widgets.MainWindow.notificationPage"].NotificationPage = MagicMock
+sys.modules["lib.panels.widgets.MainWindow.updatePage"].UpdatePage = MagicMock
 sys.modules["lib.printer"].Printer = MagicMock
 sys.modules["lib.ui.mainWindow_ui"].Ui_MainWindow = MagicMock
 sys.modules["lib.updater_worker"].UpdaterWorker = MagicMock

diff --git a/tests/panels/test_main_window_unit.py b/tests/panels/test_main_window_unit.py
@@ -62,7 +62,8 @@ def _make_nav_window(print_state: str) -> SimpleNamespace:
         _print_state=print_state,
         printPanel=print_panel,
         filamentPanel=MagicMock(),
-        ui=SimpleNamespace(main_content_widget=main_content, printTab=print_tab),
+        main_content_widget=main_content,
+        printTab=print_tab,
     )
     for name in (
         "_is_job_active",

diff --git a/tests/widgets/test_connection_page.py b/tests/widgets/test_connection_page.py
@@ -1,7 +1,7 @@
 import pytest
 from unittest.mock import MagicMock
 from events import KlippyDisconnected, KlippyReady
-from BlocksScreen.lib.panels.widgets.connectionPage import (
+from BlocksScreen.lib.panels.widgets.MainWindow.connectionPage import (
     ConnectionState,
     ConnectionPage,
 )

diff --git a/tests/widgets/test_update_page_unit.py b/tests/widgets/test_update_page_unit.py
@@ -11,14 +11,14 @@
 def page(qapp):
     """UpdatePage instance with all heavy UI deps mocked."""
     patches = [
-        patch("BlocksScreen.lib.panels.widgets.updatePage.LoadingOverlayWidget"),
-        patch("BlocksScreen.lib.panels.widgets.updatePage.BlocksCustomButton"),
-        patch("BlocksScreen.lib.panels.widgets.updatePage.IconButton"),
+        patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.LoadingOverlayWidget"),
+        patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.BlocksCustomButton"),
+        patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.IconButton"),
     ]
     for p in patches:
         p.start()
 
-    from BlocksScreen.lib.panels.widgets.updatePage import UpdatePage
+    from BlocksScreen.lib.panels.widgets.MainWindow.updatePage import UpdatePage
 
     def _mock_setup(self):
         for attr in (
@@ -498,7 +498,7 @@ def test_bad_payload_keeps_statuses_and_toasts(self, page):
 
 class TestConfirmPopupCleanup:
     def test_second_confirm_deletes_previous_popup(self, page):
-        with patch("BlocksScreen.lib.panels.widgets.updatePage.BasePopup") as popup_cls:
+        with patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.BasePopup") as popup_cls:
             first = MagicMock()
             second = MagicMock()
             popup_cls.side_effect = [first, second]