diff --git a/UI/update/win-update.cpp b/frontend/utility/AutoUpdateThread.cpp
similarity index 96%
rename from UI/update/win-update.cpp
rename to frontend/utility/AutoUpdateThread.cpp
index 73ef8e696..f72e56f77 100644
--- a/UI/update/win-update.cpp
+++ b/frontend/utility/AutoUpdateThread.cpp
@@ -1,30 +1,19 @@
-#include "../win-update/updater/manifest.hpp"
-#include "update-helpers.hpp"
-#include "shared-update.hpp"
-#include "update-window.hpp"
-#include "remote-text.hpp"
-#include "win-update.hpp"
-#include "obs-app.hpp"
+#include "AutoUpdateThread.hpp"
+#include "ui_OBSUpdate.h"
+
+#include <OBSApp.hpp>
+#include <dialogs/OBSUpdate.hpp>
+#include <updater/manifest.hpp>
+#include <utility/WhatsNewInfoThread.hpp>
+#include <utility/update-helpers.hpp>
 
 #include <qt-wrappers.hpp>
-#include <QMessageBox>
-
-#include <string>
-#include <mutex>
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <shellapi.h>
 
-#include <util/windows/WinHandle.hpp>
-#include <util/util.hpp>
-
-#ifdef BROWSER_AVAILABLE
-#include <browser-panel.hpp>
-#endif
-
-using namespace std;
-using namespace updater;
+#include "moc_AutoUpdateThread.cpp"
 
 /* ------------------------------------------------------------------------ */
 
@@ -50,6 +39,11 @@ using namespace updater;
 
 /* ------------------------------------------------------------------------ */
 
+using namespace std;
+using namespace updater;
+
+extern char *GetConfigPathPtr(const char *name);
+
 static bool ParseUpdateManifest(const char *manifest_data, bool *updatesAvailable, string &notes, string &updateVer,
 				const string &branch)
 try {
diff --git a/UI/update/win-update.hpp b/frontend/utility/AutoUpdateThread.hpp
similarity index 97%
rename from UI/update/win-update.hpp
rename to frontend/utility/AutoUpdateThread.hpp
index d345f204b..a0b3b0b4c 100644
--- a/UI/update/win-update.hpp
+++ b/frontend/utility/AutoUpdateThread.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QThread>
-#include <QString>
 
 class AutoUpdateThread : public QThread {
 	Q_OBJECT
diff --git a/UI/goliveapi-censoredjson.cpp b/frontend/utility/GoLiveAPI_CensoredJson.cpp
similarity index 98%
rename from UI/goliveapi-censoredjson.cpp
rename to frontend/utility/GoLiveAPI_CensoredJson.cpp
index bd59e5d1e..fc14bd372 100644
--- a/UI/goliveapi-censoredjson.cpp
+++ b/frontend/utility/GoLiveAPI_CensoredJson.cpp
@@ -1,7 +1,9 @@
-#include "goliveapi-censoredjson.hpp"
-#include <unordered_map>
+#include "GoLiveAPI_CensoredJson.hpp"
+
 #include <nlohmann/json.hpp>
 
+#include <unordered_map>
+
 void censorRecurse(obs_data_t *);
 void censorRecurseArray(obs_data_array_t *);
 
diff --git a/UI/goliveapi-censoredjson.hpp b/frontend/utility/GoLiveAPI_CensoredJson.hpp
similarity index 99%
rename from UI/goliveapi-censoredjson.hpp
rename to frontend/utility/GoLiveAPI_CensoredJson.hpp
index 20f141c7f..004eace63 100644
--- a/UI/goliveapi-censoredjson.hpp
+++ b/frontend/utility/GoLiveAPI_CensoredJson.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <obs.hpp>
+
 #include <QString>
 #include <nlohmann/json_fwd.hpp>
 
diff --git a/UI/goliveapi-network.cpp b/frontend/utility/GoLiveAPI_Network.cpp
similarity index 95%
rename from UI/goliveapi-network.cpp
rename to frontend/utility/GoLiveAPI_Network.cpp
index dc557bbc1..b0688a006 100644
--- a/UI/goliveapi-network.cpp
+++ b/frontend/utility/GoLiveAPI_Network.cpp
@@ -1,17 +1,18 @@
-#include "goliveapi-network.hpp"
-#include "goliveapi-censoredjson.hpp"
+#include "GoLiveAPI_Network.hpp"
+#include "GoLiveAPI_CensoredJson.hpp"
+
+#include <OBSApp.hpp>
+#include <utility/MultitrackVideoError.hpp>
+#include <utility/RemoteTextThread.hpp>
 
 #include <obs.hpp>
-#include <obs-app.hpp>
-#include <remote-text.hpp>
-#include "multitrack-video-error.hpp"
 
-#include <qstring.h>
-#include <string>
 #include <QMessageBox>
 #include <QThreadPool>
-
 #include <nlohmann/json.hpp>
+#include <qstring.h>
+
+#include <string>
 
 using json = nlohmann::json;
 
diff --git a/UI/goliveapi-network.hpp b/frontend/utility/GoLiveAPI_Network.hpp
similarity index 99%
rename from UI/goliveapi-network.hpp
rename to frontend/utility/GoLiveAPI_Network.hpp
index 2a2daecf8..451526068 100644
--- a/UI/goliveapi-network.hpp
+++ b/frontend/utility/GoLiveAPI_Network.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <obs.hpp>
-#include <QString>
-
 #include "models/multitrack-video.hpp"
 
+#include <obs.hpp>
+
+#include <QString>
+
 /** Returns either GO_LIVE_API_PRODUCTION_URL or a command line override. */
 QString MultitrackVideoAutoConfigURL(obs_service_t *service);
 
diff --git a/UI/goliveapi-postdata.cpp b/frontend/utility/GoLiveAPI_PostData.cpp
similarity index 96%
rename from UI/goliveapi-postdata.cpp
rename to frontend/utility/GoLiveAPI_PostData.cpp
index 9056764db..1aeb871a7 100644
--- a/UI/goliveapi-postdata.cpp
+++ b/frontend/utility/GoLiveAPI_PostData.cpp
@@ -1,11 +1,10 @@
-#include "goliveapi-postdata.hpp"
+#include "GoLiveAPI_PostData.hpp"
+#include "models/multitrack-video.hpp"
+
+#include <utility/system-info.hpp>
 
 #include <nlohmann/json.hpp>
 
-#include "system-info.hpp"
-
-#include "models/multitrack-video.hpp"
-
 GoLiveApi::PostData constructGoLivePost(QString streamKey, const std::optional<uint64_t> &maximum_aggregate_bitrate,
 					const std::optional<uint32_t> &maximum_video_tracks, bool vod_track_enabled)
 {
diff --git a/UI/goliveapi-postdata.hpp b/frontend/utility/GoLiveAPI_PostData.hpp
similarity index 99%
rename from UI/goliveapi-postdata.hpp
rename to frontend/utility/GoLiveAPI_PostData.hpp
index 23f010883..42c9c921f 100644
--- a/UI/goliveapi-postdata.hpp
+++ b/frontend/utility/GoLiveAPI_PostData.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
-#include <obs.hpp>
-#include <optional>
-#include <QString>
 #include "models/multitrack-video.hpp"
 
+#include <obs.hpp>
+
+#include <QString>
+
+#include <optional>
+
 GoLiveApi::PostData constructGoLivePost(QString streamKey, const std::optional<uint64_t> &maximum_aggregate_bitrate,
 					const std::optional<uint32_t> &maximum_video_tracks, bool vod_track_enabled);
diff --git a/UI/multitrack-video-error.cpp b/frontend/utility/MultitrackVideoError.cpp
similarity index 94%
rename from UI/multitrack-video-error.cpp
rename to frontend/utility/MultitrackVideoError.cpp
index 8f4b478b4..5f7d95b1c 100644
--- a/UI/multitrack-video-error.cpp
+++ b/frontend/utility/MultitrackVideoError.cpp
@@ -1,8 +1,9 @@
-#include "multitrack-video-error.hpp"
+#include "MultitrackVideoError.hpp"
+
+#include <OBSApp.hpp>
 
 #include <QMessageBox>
 #include <QPushButton>
-#include "obs-app.hpp"
 
 MultitrackVideoError MultitrackVideoError::critical(QString error)
 {
diff --git a/UI/multitrack-video-error.hpp b/frontend/utility/MultitrackVideoError.hpp
similarity index 99%
rename from UI/multitrack-video-error.hpp
rename to frontend/utility/MultitrackVideoError.hpp
index 7ce79fe72..b36f2f274 100644
--- a/UI/multitrack-video-error.hpp
+++ b/frontend/utility/MultitrackVideoError.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <QString>
 
 class QWidget;
diff --git a/UI/multitrack-video-output.cpp b/frontend/utility/MultitrackVideoOutput.cpp
similarity index 97%
rename from UI/multitrack-video-output.cpp
rename to frontend/utility/MultitrackVideoOutput.cpp
index 2a54505ee..1ee0fe170 100644
--- a/UI/multitrack-video-output.cpp
+++ b/frontend/utility/MultitrackVideoOutput.cpp
@@ -1,42 +1,21 @@
-#include "multitrack-video-output.hpp"
+#include "MultitrackVideoError.hpp"
+#include "MultitrackVideoOutput.hpp"
+#include "models/multitrack-video.hpp"
+#include "GoLiveAPI_Network.hpp"
+#include "GoLiveAPI_PostData.hpp"
+
+#include <OBSApp.hpp>
 
-#include <util/dstr.hpp>
-#include <util/platform.h>
-#include <util/profiler.hpp>
-#include <util/util.hpp>
-#include <obs-frontend-api.h>
-#include <obs-app.hpp>
-#include <obs.hpp>
-#include <remote-text.hpp>
-#include <window-basic-main.hpp>
 #include <bpm.h>
+#include <util/dstr.hpp>
 
-#include <algorithm>
-#include <cinttypes>
-#include <cmath>
-#include <numeric>
-#include <optional>
-#include <string>
-#include <vector>
-
-#include <QAbstractButton>
-#include <QMessageBox>
-#include <QObject>
 #include <QPushButton>
-#include <QScopeGuard>
-#include <QString>
-#include <QThreadPool>
+#include <QMessageBox>
+#include <QThread>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QUuid>
 
-#include <nlohmann/json.hpp>
-
-#include "system-info.hpp"
-#include "goliveapi-postdata.hpp"
-#include "goliveapi-network.hpp"
-#include "multitrack-video-error.hpp"
-#include "models/multitrack-video.hpp"
+#include <cinttypes>
 
 Qt::ConnectionType BlockingConnectionTypeFor(QObject *object)
 {
diff --git a/UI/multitrack-video-output.hpp b/frontend/utility/MultitrackVideoOutput.hpp
similarity index 97%
rename from UI/multitrack-video-output.hpp
rename to frontend/utility/MultitrackVideoOutput.hpp
index 024cd8bca..851ef3562 100644
--- a/UI/multitrack-video-output.hpp
+++ b/frontend/utility/MultitrackVideoOutput.hpp
@@ -3,16 +3,16 @@
 #include <obs.hpp>
 #include <util/config-file.h>
 
-#include <atomic>
+#include <memory>
 #include <mutex>
 #include <optional>
+#include <string>
 #include <vector>
 
-#include <QObject>
-
 #define NOMINMAX
 
 class QString;
+class QWidget;
 
 void StreamStopHandler(void *arg, calldata_t *data);
 void StreamDeactivateHandler(void *arg, calldata_t *data);
diff --git a/UI/obs-proxy-style.cpp b/frontend/utility/OBSProxyStyle.cpp
similarity index 97%
rename from UI/obs-proxy-style.cpp
rename to frontend/utility/OBSProxyStyle.cpp
index 4daf7f47a..e598e1938 100644
--- a/UI/obs-proxy-style.cpp
+++ b/frontend/utility/OBSProxyStyle.cpp
@@ -1,5 +1,6 @@
-#include "obs-proxy-style.hpp"
-#include <QStyleOptionButton>
+#include "OBSProxyStyle.hpp"
+
+#include <QStyleOption>
 
 static inline uint qt_intensity(uint r, uint g, uint b)
 {
diff --git a/UI/obs-proxy-style.hpp b/frontend/utility/OBSProxyStyle.hpp
similarity index 100%
rename from UI/obs-proxy-style.hpp
rename to frontend/utility/OBSProxyStyle.hpp
diff --git a/UI/remote-text.cpp b/frontend/utility/RemoteTextThread.cpp
similarity index 98%
rename from UI/remote-text.cpp
rename to frontend/utility/RemoteTextThread.cpp
index 4b81e32bb..9541fd439 100644
--- a/UI/remote-text.cpp
+++ b/frontend/utility/RemoteTextThread.cpp
@@ -15,16 +15,21 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include <util/curl/curl-helper.h>
+#include "RemoteTextThread.hpp"
+
+#include <OBSApp.hpp>
+
 #include <qt-wrappers.hpp>
-#include "obs-app.hpp"
-#include "moc_remote-text.cpp"
+#include <util/curl/curl-helper.h>
+
+#include "moc_RemoteTextThread.cpp"
 
 using namespace std;
 
 static auto curl_deleter = [](CURL *curl) {
 	curl_easy_cleanup(curl);
 };
+
 using Curl = unique_ptr<CURL, decltype(curl_deleter)>;
 
 static size_t string_write(char *ptr, size_t size, size_t nmemb, string &str)
diff --git a/UI/remote-text.hpp b/frontend/utility/RemoteTextThread.hpp
similarity index 98%
rename from UI/remote-text.hpp
rename to frontend/utility/RemoteTextThread.hpp
index f6f8efbc1..af24a51bc 100644
--- a/UI/remote-text.hpp
+++ b/frontend/utility/RemoteTextThread.hpp
@@ -18,8 +18,6 @@
 #pragma once
 
 #include <QThread>
-#include <vector>
-#include <string>
 
 class RemoteTextThread : public QThread {
 	Q_OBJECT
diff --git a/UI/screenshot-obj.hpp b/frontend/utility/ScreenshotObj.hpp
similarity index 98%
rename from UI/screenshot-obj.hpp
rename to frontend/utility/ScreenshotObj.hpp
index 037b7f84d..01a4fefd8 100644
--- a/UI/screenshot-obj.hpp
+++ b/frontend/utility/ScreenshotObj.hpp
@@ -17,11 +17,13 @@
 
 #pragma once
 
-#include <QObject>
-#include <string>
-#include <thread>
 #include <obs.hpp>
 
+#include <QImage>
+#include <QObject>
+
+#include <thread>
+
 class ScreenshotObj : public QObject {
 	Q_OBJECT
 
diff --git a/UI/window-basic-vcam.hpp b/frontend/utility/VCamConfig.hpp
similarity index 95%
rename from UI/window-basic-vcam.hpp
rename to frontend/utility/VCamConfig.hpp
index a3a5b6a2f..a3fa42953 100644
--- a/UI/window-basic-vcam.hpp
+++ b/frontend/utility/VCamConfig.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <string>
-
 constexpr const char *VIRTUAL_CAM_ID = "virtualcam_output";
 
 enum VCamOutputType {
diff --git a/UI/youtube-api-wrappers.cpp b/frontend/utility/YoutubeApiWrappers.cpp
similarity index 98%
rename from UI/youtube-api-wrappers.cpp
rename to frontend/utility/YoutubeApiWrappers.cpp
index 1ed397f04..fba625495 100644
--- a/UI/youtube-api-wrappers.cpp
+++ b/frontend/utility/YoutubeApiWrappers.cpp
@@ -1,19 +1,16 @@
-#include "moc_youtube-api-wrappers.cpp"
+#include "YoutubeApiWrappers.hpp"
 
-#include <QUrl>
-#include <QMimeDatabase>
-#include <QFile>
+#include <utility/RemoteTextThread.hpp>
+#include <utility/obf.h>
+#include <widgets/OBSBasic.hpp>
 
-#include <string>
-#include <iostream>
 #include <qt-wrappers.hpp>
+#include <ui-config.h>
 
-#include "auth-youtube.hpp"
-#include "obs-app.hpp"
-#include "window-basic-main.hpp"
-#include "remote-text.hpp"
-#include "ui-config.h"
-#include "obf.h"
+#include <QFile>
+#include <QMimeDatabase>
+
+#include "moc_YoutubeApiWrappers.cpp"
 
 using namespace json11;
 
diff --git a/UI/youtube-api-wrappers.hpp b/frontend/utility/YoutubeApiWrappers.hpp
similarity index 98%
rename from UI/youtube-api-wrappers.hpp
rename to frontend/utility/YoutubeApiWrappers.hpp
index 5216d2eb2..9cabb7091 100644
--- a/UI/youtube-api-wrappers.hpp
+++ b/frontend/utility/YoutubeApiWrappers.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "auth-youtube.hpp"
+#include <oauth/YoutubeAuth.hpp>
 
 #include <json11.hpp>
+
 #include <QString>
 
 struct ChannelDescription {
diff --git a/UI/audio-encoders.cpp b/frontend/utility/audio-encoders.cpp
similarity index 98%
rename from UI/audio-encoders.cpp
rename to frontend/utility/audio-encoders.cpp
index 692f25719..357ec45ca 100644
--- a/UI/audio-encoders.cpp
+++ b/frontend/utility/audio-encoders.cpp
@@ -1,15 +1,10 @@
-#include <algorithm>
-#include <iomanip>
-#include <map>
-#include <memory>
+#include "audio-encoders.hpp"
+
+#include <OBSApp.hpp>
+#include <widgets/OBSMainWindow.hpp>
+
 #include <mutex>
 #include <sstream>
-#include <string>
-#include <vector>
-
-#include "audio-encoders.hpp"
-#include "obs-app.hpp"
-#include "window-main.hpp"
 
 using namespace std;
 
diff --git a/UI/audio-encoders.hpp b/frontend/utility/audio-encoders.hpp
similarity index 96%
rename from UI/audio-encoders.hpp
rename to frontend/utility/audio-encoders.hpp
index b7fd0ab10..4a5f1b15c 100644
--- a/UI/audio-encoders.hpp
+++ b/frontend/utility/audio-encoders.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <obs.hpp>
-
 #include <map>
+#include <string>
 #include <vector>
 
 const std::map<int, std::string> &GetSimpleAACEncoderBitrateMap();
diff --git a/UI/update/crypto-helpers-mac.mm b/frontend/utility/crypto-helpers-mac.mm
similarity index 100%
rename from UI/update/crypto-helpers-mac.mm
rename to frontend/utility/crypto-helpers-mac.mm
diff --git a/UI/update/crypto-helpers-mbedtls.cpp b/frontend/utility/crypto-helpers-mbedtls.cpp
similarity index 93%
rename from UI/update/crypto-helpers-mbedtls.cpp
rename to frontend/utility/crypto-helpers-mbedtls.cpp
index f17c98764..caaef80dc 100644
--- a/UI/update/crypto-helpers-mbedtls.cpp
+++ b/frontend/utility/crypto-helpers-mbedtls.cpp
@@ -1,7 +1,7 @@
 #include "crypto-helpers.hpp"
 
-#include "mbedtls/md.h"
-#include "mbedtls/pk.h"
+#include <mbedtls/md.h>
+#include <mbedtls/pk.h>
 
 bool VerifySignature(const uint8_t *pubKey, const size_t pubKeyLen, const uint8_t *buf, const size_t len,
 		     const uint8_t *sig, const size_t sigLen)
diff --git a/UI/update/crypto-helpers.hpp b/frontend/utility/crypto-helpers.hpp
similarity index 100%
rename from UI/update/crypto-helpers.hpp
rename to frontend/utility/crypto-helpers.hpp
index 8fe9c594e..890ec40c8 100644
--- a/UI/update/crypto-helpers.hpp
+++ b/frontend/utility/crypto-helpers.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stdlib.h>
 #include <cstdint>
+#include <stdlib.h>
 
 bool VerifySignature(const uint8_t *pubKey, const size_t pubKeyLen, const uint8_t *buf, const size_t len,
 		     const uint8_t *sig, const size_t sigLen);
diff --git a/UI/display-helpers.hpp b/frontend/utility/display-helpers.hpp
similarity index 98%
rename from UI/display-helpers.hpp
rename to frontend/utility/display-helpers.hpp
index 586cbfeb6..a3b5d4457 100644
--- a/UI/display-helpers.hpp
+++ b/frontend/utility/display-helpers.hpp
@@ -17,8 +17,12 @@
 
 #pragma once
 
-#include <graphics/vec4.h>
 #include <graphics/matrix4.h>
+#include <graphics/vec4.h>
+#include <obs.hpp>
+
+#include <QSize>
+#include <QWidget>
 
 static inline void GetScaleAndCenterPos(int baseCX, int baseCY, int windowCX, int windowCY, int &x, int &y,
 					float &scale)
diff --git a/UI/item-widget-helpers.cpp b/frontend/utility/item-widget-helpers.cpp
similarity index 97%
rename from UI/item-widget-helpers.cpp
rename to frontend/utility/item-widget-helpers.cpp
index cd8ee8dc6..f6477e7e0 100644
--- a/UI/item-widget-helpers.cpp
+++ b/frontend/utility/item-widget-helpers.cpp
@@ -15,6 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
+#include "item-widget-helpers.hpp"
+
 #include <QListWidget>
 
 QListWidgetItem *TakeListItem(QListWidget *widget, int row)
diff --git a/UI/item-widget-helpers.hpp b/frontend/utility/item-widget-helpers.hpp
similarity index 98%
rename from UI/item-widget-helpers.hpp
rename to frontend/utility/item-widget-helpers.hpp
index 599b83125..ae18ec7a8 100644
--- a/UI/item-widget-helpers.hpp
+++ b/frontend/utility/item-widget-helpers.hpp
@@ -22,6 +22,8 @@
  * such as references to sources/etc from getting stuck in the Qt event queue
  * with no way of controlling when they'll be released. */
 
+#include <QObject>
+
 class QListWidget;
 class QListWidgetItem;
 
diff --git a/UI/update/models/branches.hpp b/frontend/utility/models/branches.hpp
similarity index 100%
rename from UI/update/models/branches.hpp
rename to frontend/utility/models/branches.hpp
diff --git a/UI/models/multitrack-video.hpp b/frontend/utility/models/multitrack-video.hpp
similarity index 100%
rename from UI/models/multitrack-video.hpp
rename to frontend/utility/models/multitrack-video.hpp
diff --git a/UI/update/models/whatsnew.hpp b/frontend/utility/models/whatsnew.hpp
similarity index 100%
rename from UI/update/models/whatsnew.hpp
rename to frontend/utility/models/whatsnew.hpp
diff --git a/UI/obf.c b/frontend/utility/obf.c
similarity index 99%
rename from UI/obf.c
rename to frontend/utility/obf.c
index feba1886e..f144e76fc 100644
--- a/UI/obf.c
+++ b/frontend/utility/obf.c
@@ -1,4 +1,5 @@
 #include "obf.h"
+
 #include <stdbool.h>
 
 #define LOWER_HALFBYTE(x) ((x) & 0xF)
diff --git a/UI/obf.h b/frontend/utility/obf.h
similarity index 100%
rename from UI/obf.h
rename to frontend/utility/obf.h
diff --git a/UI/platform-osx.mm b/frontend/utility/platform-osx.mm
similarity index 97%
rename from UI/platform-osx.mm
rename to frontend/utility/platform-osx.mm
index 75f4adfba..c9648b00f 100644
--- a/UI/platform-osx.mm
+++ b/frontend/utility/platform-osx.mm
@@ -15,20 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include <sstream>
-#include <dlfcn.h>
-#include <util/base.h>
-#include <util/threading.h>
-#include <obs-config.h>
-#include "platform.hpp"
-#include "obs-app.hpp"
+#import "platform.hpp"
 
-#include <unistd.h>
+#import <OBSApp.hpp>
+
+#import <util/threading.h>
 
-#import <AppKit/AppKit.h>
-#import <CoreFoundation/CoreFoundation.h>
 #import <AVFoundation/AVFoundation.h>
-#import <ApplicationServices/ApplicationServices.h>
+#import <AppKit/AppKit.h>
+#import <dlfcn.h>
 
 using namespace std;
 
diff --git a/UI/platform-windows.cpp b/frontend/utility/platform-windows.cpp
similarity index 98%
rename from UI/platform-windows.cpp
rename to frontend/utility/platform-windows.cpp
index d5d76ccc4..c6256b28c 100644
--- a/UI/platform-windows.cpp
+++ b/frontend/utility/platform-windows.cpp
@@ -15,30 +15,28 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include <algorithm>
-#include <sstream>
-#include "obs-config.h"
-#include "obs-app.hpp"
 #include "platform.hpp"
 
-#include <qt-wrappers.hpp>
-#include <util/windows/win-version.h>
-#include <util/platform.h>
+#include <OBSApp.hpp>
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <util/windows/ComPtr.hpp>
+#include <util/windows/WinHandle.hpp>
+#include <util/windows/win-version.h>
+
+#include <Dwmapi.h>
+#include <audiopolicy.h>
+#include <mmdeviceapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
-#include <Dwmapi.h>
-#include <mmdeviceapi.h>
-#include <audiopolicy.h>
-
-#include <util/windows/WinHandle.hpp>
-#include <util/windows/HRError.hpp>
-#include <util/windows/ComPtr.hpp>
+#include <sstream>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 using namespace std;
 
+extern bool portable_mode;
+extern int GetConfigPath(char *path, size_t size, const char *name);
+
 static inline bool check_path(const char *data, const char *path, string &output)
 {
 	ostringstream str;
diff --git a/UI/platform-x11.cpp b/frontend/utility/platform-x11.cpp
similarity index 94%
rename from UI/platform-x11.cpp
rename to frontend/utility/platform-x11.cpp
index 5520e019b..86bd05142 100644
--- a/UI/platform-x11.cpp
+++ b/frontend/utility/platform-x11.cpp
@@ -16,44 +16,53 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include <obs-config.h>
-#include "obs-app.hpp"
-
-#include <QGuiApplication>
-#include <QScreen>
-#include <QDBusConnection>
-#include <QDBusMessage>
-#include <QDBusReply>
-
-#include <unistd.h>
-#include <sstream>
-#include <locale.h>
-
 #include "platform.hpp"
 
-#ifdef __linux__
-#include <sys/socket.h>
-#include <string.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <sys/un.h>
+#include <OBSApp.hpp>
+
+#include <obs-config.h>
+#include <util/bmem.h>
+#include <util/platform.h>
+
+#include <QDBusConnection>
+#include <QDBusReply>
+
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <condition_variable>
+#include <mutex>
+#endif
+#include <sstream>
+#include <string>
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <thread>
+#endif
+#include <vector>
+
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <fcntl.h>
+#include <libprocstat.h>
+#include <pthread_np.h>
 #endif
 #if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <sys/param.h>
-#include <fcntl.h>
-#include <sys/sysctl.h>
-#include <sys/user.h>
-#include <libprocstat.h>
-#include <pthread_np.h>
-
-#include <condition_variable>
-#include <mutex>
-#include <thread>
 #endif
+#ifdef __linux__
+#include <sys/socket.h>
+#endif
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/sysctl.h>
+#endif
+#ifdef __linux__
+#include <sys/un.h>
+#endif
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/user.h>
+#endif
+#include <unistd.h>
 
+using std::ostringstream;
 using std::string;
 using std::vector;
-using std::ostringstream;
 
 #ifdef __linux__
 void CheckIfAlreadyRunning(bool &already_running)
diff --git a/UI/platform.hpp b/frontend/utility/platform.hpp
similarity index 100%
rename from UI/platform.hpp
rename to frontend/utility/platform.hpp
diff --git a/UI/system-info-macos.mm b/frontend/utility/system-info-macos.mm
similarity index 100%
rename from UI/system-info-macos.mm
rename to frontend/utility/system-info-macos.mm
diff --git a/UI/system-info-posix.cpp b/frontend/utility/system-info-posix.cpp
similarity index 100%
rename from UI/system-info-posix.cpp
rename to frontend/utility/system-info-posix.cpp
diff --git a/UI/system-info-windows.cpp b/frontend/utility/system-info-windows.cpp
similarity index 99%
rename from UI/system-info-windows.cpp
rename to frontend/utility/system-info-windows.cpp
index 084cdffe6..d428c06dd 100644
--- a/UI/system-info-windows.cpp
+++ b/frontend/utility/system-info-windows.cpp
@@ -1,15 +1,16 @@
 #include "system-info.hpp"
 
-#include <dxgi.h>
-#include <cinttypes>
-#include <shlobj.h>
-
 #include <util/dstr.hpp>
 #include <util/platform.h>
 #include <util/windows/ComPtr.hpp>
 #include <util/windows/win-registry.h>
 #include <util/windows/win-version.h>
 
+#include <cinttypes>
+
+#include <dxgi.h>
+#include <shlobj.h>
+
 static std::optional<std::vector<GoLiveApi::Gpu>> system_gpu_data()
 {
 	ComPtr<IDXGIFactory1> factory;
diff --git a/UI/system-info.hpp b/frontend/utility/system-info.hpp
similarity index 100%
rename from UI/system-info.hpp
rename to frontend/utility/system-info.hpp
diff --git a/UI/undo-stack-obs.cpp b/frontend/utility/undo_stack.cpp
similarity index 97%
rename from UI/undo-stack-obs.cpp
rename to frontend/utility/undo_stack.cpp
index 163a1180d..8ce5d6cc3 100644
--- a/UI/undo-stack-obs.cpp
+++ b/frontend/utility/undo_stack.cpp
@@ -1,6 +1,8 @@
-#include "moc_undo-stack-obs.cpp"
+#include "undo_stack.hpp"
 
-#include <util/util.hpp>
+#include <OBSApp.hpp>
+
+#include "moc_undo_stack.cpp"
 
 #define MAX_STACK_SIZE 5000
 
diff --git a/UI/undo-stack-obs.hpp b/frontend/utility/undo_stack.hpp
similarity index 96%
rename from UI/undo-stack-obs.hpp
rename to frontend/utility/undo_stack.hpp
index 050471279..6486d9922 100644
--- a/UI/undo-stack-obs.hpp
+++ b/frontend/utility/undo_stack.hpp
@@ -1,15 +1,13 @@
 #pragma once
 
+#include "ui_OBSBasic.h"
+
 #include <QObject>
 #include <QString>
 #include <QTimer>
 
 #include <deque>
-#include <functional>
 #include <string>
-#include <memory>
-
-#include "ui_OBSBasic.h"
 
 class undo_stack : public QObject {
 	Q_OBJECT
diff --git a/UI/update/update-helpers.cpp b/frontend/utility/update-helpers.cpp
similarity index 100%
rename from UI/update/update-helpers.cpp
rename to frontend/utility/update-helpers.cpp
diff --git a/UI/update/update-helpers.hpp b/frontend/utility/update-helpers.hpp
similarity index 81%
rename from UI/update/update-helpers.hpp
rename to frontend/utility/update-helpers.hpp
index 14d6e2c97..f07ee4f9a 100644
--- a/UI/update/update-helpers.hpp
+++ b/frontend/utility/update-helpers.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstdint>
 #include <string>
 
 std::string strprintf(const char *format, ...);
diff --git a/UI/win-dll-blocklist.c b/frontend/utility/win-dll-blocklist.c
similarity index 100%
rename from UI/win-dll-blocklist.c
rename to frontend/utility/win-dll-blocklist.c