diff --git a/source/Core/Threads/OperatingModes/CJC.cpp b/source/Core/Threads/UI/logic/CJC.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/CJC.cpp
rename to source/Core/Threads/UI/logic/CJC.cpp
diff --git a/source/Core/Threads/OperatingModes/DebugMenu.cpp b/source/Core/Threads/UI/logic/DebugMenu.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/DebugMenu.cpp
rename to source/Core/Threads/UI/logic/DebugMenu.cpp
diff --git a/source/Core/Threads/OperatingModes/HomeScreen.cpp b/source/Core/Threads/UI/logic/HomeScreen.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/HomeScreen.cpp
rename to source/Core/Threads/UI/logic/HomeScreen.cpp
diff --git a/source/Core/Threads/OperatingModes/OperatingModes.cpp b/source/Core/Threads/UI/logic/OperatingModes.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/OperatingModes.cpp
rename to source/Core/Threads/UI/logic/OperatingModes.cpp
diff --git a/source/Core/Threads/OperatingModes/OperatingModes.h b/source/Core/Threads/UI/logic/OperatingModes.h
similarity index 100%
rename from source/Core/Threads/OperatingModes/OperatingModes.h
rename to source/Core/Threads/UI/logic/OperatingModes.h
diff --git a/source/Core/Threads/OperatingModes/SettingsMenu.cpp b/source/Core/Threads/UI/logic/SettingsMenu.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/SettingsMenu.cpp
rename to source/Core/Threads/UI/logic/SettingsMenu.cpp
diff --git a/source/Core/Threads/OperatingModes/ShowStartupWarnings.cpp b/source/Core/Threads/UI/logic/ShowStartupWarnings.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/ShowStartupWarnings.cpp
rename to source/Core/Threads/UI/logic/ShowStartupWarnings.cpp
diff --git a/source/Core/Threads/OperatingModes/Sleep.cpp b/source/Core/Threads/UI/logic/Sleep.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/Sleep.cpp
rename to source/Core/Threads/UI/logic/Sleep.cpp
diff --git a/source/Core/Threads/OperatingModes/Soldering.cpp b/source/Core/Threads/UI/logic/Soldering.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/Soldering.cpp
rename to source/Core/Threads/UI/logic/Soldering.cpp
diff --git a/source/Core/Threads/OperatingModes/SolderingProfile.cpp b/source/Core/Threads/UI/logic/SolderingProfile.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/SolderingProfile.cpp
rename to source/Core/Threads/UI/logic/SolderingProfile.cpp
diff --git a/source/Core/Threads/OperatingModes/TemperatureAdjust.cpp b/source/Core/Threads/UI/logic/TemperatureAdjust.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/TemperatureAdjust.cpp
rename to source/Core/Threads/UI/logic/TemperatureAdjust.cpp
diff --git a/source/Core/Threads/OperatingModes/USBPDDebug_FS2711.cpp b/source/Core/Threads/UI/logic/USBPDDebug_FS2711.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/USBPDDebug_FS2711.cpp
rename to source/Core/Threads/UI/logic/USBPDDebug_FS2711.cpp
diff --git a/source/Core/Threads/OperatingModes/USBPDDebug_FUSB.cpp b/source/Core/Threads/UI/logic/USBPDDebug_FUSB.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/USBPDDebug_FUSB.cpp
rename to source/Core/Threads/UI/logic/USBPDDebug_FUSB.cpp
diff --git a/source/Core/Threads/OperatingModes/USBPDDebug_HUSB238.cpp b/source/Core/Threads/UI/logic/USBPDDebug_HUSB238.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/USBPDDebug_HUSB238.cpp
rename to source/Core/Threads/UI/logic/USBPDDebug_HUSB238.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/DrawTipTemperature.cpp b/source/Core/Threads/UI/logic/utils/DrawTipTemperature.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/DrawTipTemperature.cpp
rename to source/Core/Threads/UI/logic/utils/DrawTipTemperature.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/GUIDelay.cpp b/source/Core/Threads/UI/logic/utils/GUIDelay.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/GUIDelay.cpp
rename to source/Core/Threads/UI/logic/utils/GUIDelay.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h b/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h
rename to source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h
diff --git a/source/Core/Threads/OperatingModes/utils/PrintVoltage.cpp b/source/Core/Threads/UI/logic/utils/PrintVoltage.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/PrintVoltage.cpp
rename to source/Core/Threads/UI/logic/utils/PrintVoltage.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/ShowWarning.cpp b/source/Core/Threads/UI/logic/utils/ShowWarning.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/ShowWarning.cpp
rename to source/Core/Threads/UI/logic/utils/ShowWarning.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/SolderingCommon.cpp b/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/SolderingCommon.cpp
rename to source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/SolderingCommon.h b/source/Core/Threads/UI/logic/utils/SolderingCommon.h
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/SolderingCommon.h
rename to source/Core/Threads/UI/logic/utils/SolderingCommon.h
diff --git a/source/Core/Threads/OperatingModes/utils/checkUndervoltage.cpp b/source/Core/Threads/UI/logic/utils/checkUndervoltage.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/checkUndervoltage.cpp
rename to source/Core/Threads/UI/logic/utils/checkUndervoltage.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/drawPowerSourceIcon.cpp b/source/Core/Threads/UI/logic/utils/drawPowerSourceIcon.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/drawPowerSourceIcon.cpp
rename to source/Core/Threads/UI/logic/utils/drawPowerSourceIcon.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/getSleepTimeout.cpp b/source/Core/Threads/UI/logic/utils/getSleepTimeout.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/getSleepTimeout.cpp
rename to source/Core/Threads/UI/logic/utils/getSleepTimeout.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/min.cpp b/source/Core/Threads/UI/logic/utils/min.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/min.cpp
rename to source/Core/Threads/UI/logic/utils/min.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/printSleepCountdown.cpp b/source/Core/Threads/UI/logic/utils/printSleepCountdown.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/printSleepCountdown.cpp
rename to source/Core/Threads/UI/logic/utils/printSleepCountdown.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/shouldDeviceShutdown.cpp b/source/Core/Threads/UI/logic/utils/shouldDeviceShutdown.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/shouldDeviceShutdown.cpp
rename to source/Core/Threads/UI/logic/utils/shouldDeviceShutdown.cpp
diff --git a/source/Core/Threads/OperatingModes/utils/shouldDeviceSleep.cpp b/source/Core/Threads/UI/logic/utils/shouldDeviceSleep.cpp
similarity index 100%
rename from source/Core/Threads/OperatingModes/utils/shouldDeviceSleep.cpp
rename to source/Core/Threads/UI/logic/utils/shouldDeviceSleep.cpp