diff --git a/BlocksScreen/lib/panels/printTab.py b/BlocksScreen/lib/panels/printTab.py
index 36f62024..0e6bdc4c 100644
--- a/BlocksScreen/lib/panels/printTab.py
+++ b/BlocksScreen/lib/panels/printTab.py
@@ -6,15 +6,15 @@
 from configfile import BlocksScreenConfig, get_configparser
 from lib.files import Files
 from lib.moonrakerComm import MoonWebSocket
-from lib.panels.widgets.babystepPage import BabystepPage
 from lib.panels.widgets.basePopup import BasePopup
-from lib.panels.widgets.confirmPage import ConfirmWidget
-from lib.panels.widgets.filesPage import FilesPage
-from lib.panels.widgets.jobStatusPage import JobStatusWidget
 from lib.panels.widgets.numpadPage import CustomNumpad
-from lib.panels.widgets.sensorsPanel import SensorsWindow
+from lib.panels.widgets.PrintTab.babystepPage import BabystepPage
+from lib.panels.widgets.PrintTab.confirmPage import ConfirmWidget
+from lib.panels.widgets.PrintTab.filesPage import FilesPage
+from lib.panels.widgets.PrintTab.jobStatusPage import JobStatusWidget
+from lib.panels.widgets.PrintTab.sensorsPanel import SensorsWindow
+from lib.panels.widgets.PrintTab.tunePage import TuneWidget
 from lib.panels.widgets.slider_selector_page import SliderPage
-from lib.panels.widgets.tunePage import TuneWidget
 from lib.printer import Printer
 from lib.utils.blocks_button import BlocksCustomButton
 from lib.utils.display_button import DisplayButton
diff --git a/BlocksScreen/lib/panels/widgets/babystepPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py
similarity index 100%
rename from BlocksScreen/lib/panels/widgets/babystepPage.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/babystepPage.py
diff --git a/BlocksScreen/lib/panels/widgets/confirmPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py
similarity index 100%
rename from BlocksScreen/lib/panels/widgets/confirmPage.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/confirmPage.py
diff --git a/BlocksScreen/lib/panels/widgets/filesPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/filesPage.py
similarity index 100%
rename from BlocksScreen/lib/panels/widgets/filesPage.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/filesPage.py
diff --git a/BlocksScreen/lib/panels/widgets/jobStatusPage.py b/BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py
similarity index 100%
rename from BlocksScreen/lib/panels/widgets/jobStatusPage.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/jobStatusPage.py
diff --git a/BlocksScreen/lib/panels/widgets/sensorWidget.py b/BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py
similarity index 100%
rename from BlocksScreen/lib/panels/widgets/sensorWidget.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/sensorWidget.py
diff --git a/BlocksScreen/lib/panels/widgets/sensorsPanel.py b/BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py
similarity index 99%
rename from BlocksScreen/lib/panels/widgets/sensorsPanel.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py
index 0f79fe97..e3880076 100644
--- a/BlocksScreen/lib/panels/widgets/sensorsPanel.py
+++ b/BlocksScreen/lib/panels/widgets/PrintTab/sensorsPanel.py
@@ -1,6 +1,6 @@
 import typing
 
-from lib.panels.widgets.sensorWidget import SensorWidget
+from lib.panels.widgets.PrintTab.sensorWidget import SensorWidget
 from lib.utils.blocks_frame import BlocksCustomFrame
 from lib.utils.icon_button import IconButton
 from lib.utils.list_model import EntryDelegate, EntryListModel, ListItem
diff --git a/BlocksScreen/lib/panels/widgets/tunePage.py b/BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py
similarity index 100%
rename from BlocksScreen/lib/panels/widgets/tunePage.py
rename to BlocksScreen/lib/panels/widgets/PrintTab/tunePage.py
diff --git a/tests/widgets/test_job_status_page_unit.py b/tests/widgets/test_job_status_page_unit.py
index bb7b3cff..83f5d34b 100644
--- a/tests/widgets/test_job_status_page_unit.py
+++ b/tests/widgets/test_job_status_page_unit.py
@@ -56,7 +56,7 @@ def set_progress(self, *a):  # real CustomProgressBar takes a 0-1 float
     sys.modules[_name] = _mod  # force-set so network conftest stubs don't win
 
 import events  # noqa: F401  # ensure events is importable before jobStatusPage loads
-from lib.panels.widgets.jobStatusPage import JobStatusWidget
+from lib.panels.widgets.PrintTab.jobStatusPage import JobStatusWidget
 
 
 @pytest.fixture()