diff --git a/UI/basic-controls.cpp b/frontend/widgets/OBSBasicControls.cpp
similarity index 99%
rename from UI/basic-controls.cpp
rename to frontend/widgets/OBSBasicControls.cpp
index fe9483136..7fcc1bc06 100644
--- a/UI/basic-controls.cpp
+++ b/frontend/widgets/OBSBasicControls.cpp
@@ -1,6 +1,7 @@
-#include "moc_basic-controls.cpp"
+#include "OBSBasicControls.hpp"
+#include "OBSBasic.hpp"
 
-#include "window-basic-main.hpp"
+#include "moc_OBSBasicControls.cpp"
 
 OBSBasicControls::OBSBasicControls(OBSBasic *main) : QFrame(nullptr), ui(new Ui::OBSBasicControls)
 {
diff --git a/UI/basic-controls.hpp b/frontend/widgets/OBSBasicControls.hpp
similarity index 100%
rename from UI/basic-controls.hpp
rename to frontend/widgets/OBSBasicControls.hpp
index 6aa677802..a79c43b47 100644
--- a/UI/basic-controls.hpp
+++ b/frontend/widgets/OBSBasicControls.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <memory>
+#include "ui_OBSBasicControls.h"
 
 #include <QFrame>
 #include <QPointer>
 #include <QScopedPointer>
 
-class OBSBasic;
+#include <memory>
 
-#include "ui_OBSBasicControls.h"
+class OBSBasic;
 
 class OBSBasicControls : public QFrame {
 	Q_OBJECT
diff --git a/UI/window-basic-preview.cpp b/frontend/widgets/OBSBasicPreview.cpp
similarity index 99%
rename from UI/window-basic-preview.cpp
rename to frontend/widgets/OBSBasicPreview.cpp
index 361e318c2..2e4464ee6 100644
--- a/UI/window-basic-preview.cpp
+++ b/frontend/widgets/OBSBasicPreview.cpp
@@ -1,16 +1,9 @@
-#include <QGuiApplication>
-#include <QMouseEvent>
+#include "OBSBasicPreview.hpp"
 
-#include <cmath>
-#include <string>
-#include <graphics/vec4.h>
-#include <graphics/matrix4.h>
-#include <util/dstr.hpp>
-#include "moc_window-basic-preview.cpp"
-#include "window-basic-main.hpp"
-#include "obs-app.hpp"
-#include "platform.hpp"
-#include "display-helpers.hpp"
+#include <utility/display-helpers.hpp>
+#include <widgets/OBSBasic.hpp>
+
+#include "moc_OBSBasicPreview.cpp"
 
 #define HANDLE_RADIUS 4.0f
 #define HANDLE_SEL_RADIUS (HANDLE_RADIUS * 1.5f)
diff --git a/UI/window-basic-preview.hpp b/frontend/widgets/OBSBasicPreview.hpp
similarity index 96%
rename from UI/window-basic-preview.hpp
rename to frontend/widgets/OBSBasicPreview.hpp
index e880a8dac..67d7db296 100644
--- a/UI/window-basic-preview.hpp
+++ b/frontend/widgets/OBSBasicPreview.hpp
@@ -1,17 +1,10 @@
 #pragma once
 
-#include <obs.hpp>
-#include <graphics/vec2.h>
-#include <graphics/matrix4.h>
-#include <util/threading.h>
-#include <mutex>
-#include <vector>
-#include "qt-display.hpp"
-#include "obs-app.hpp"
-#include "preview-controls.hpp"
+#include "OBSQTDisplay.hpp"
 
-class OBSBasic;
-class QMouseEvent;
+#include <graphics/matrix4.h>
+
+#include <mutex>
 
 #define ITEM_LEFT (1 << 0)
 #define ITEM_RIGHT (1 << 1)
diff --git a/UI/window-basic-stats.cpp b/frontend/widgets/OBSBasicStats.cpp
similarity index 98%
rename from UI/window-basic-stats.cpp
rename to frontend/widgets/OBSBasicStats.cpp
index bb8ab0bd8..f4a224f37 100644
--- a/UI/window-basic-stats.cpp
+++ b/frontend/widgets/OBSBasicStats.cpp
@@ -1,19 +1,16 @@
-#include "obs-frontend-api/obs-frontend-api.h"
+#include "OBSBasicStats.hpp"
 
-#include "moc_window-basic-stats.cpp"
-#include "window-basic-main.hpp"
-#include "platform.hpp"
-#include "obs-app.hpp"
+#include <widgets/OBSBasic.hpp>
 
 #include <qt-wrappers.hpp>
+
+#include <QGridLayout>
+#include <QLabel>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
-#include <QScreen>
 
-#include <string>
+#include "moc_OBSBasicStats.cpp"
 
 #define TIMER_INTERVAL 2000
 #define REC_TIME_LEFT_INTERVAL 30000
diff --git a/UI/window-basic-stats.hpp b/frontend/widgets/OBSBasicStats.hpp
similarity index 95%
rename from UI/window-basic-stats.hpp
rename to frontend/widgets/OBSBasicStats.hpp
index c1d434bf6..350b5c866 100644
--- a/UI/window-basic-stats.hpp
+++ b/frontend/widgets/OBSBasicStats.hpp
@@ -1,16 +1,15 @@
 #pragma once
 
+#include <obs-frontend-api.h>
 #include <obs.hpp>
 #include <util/platform.h>
-#include <obs-frontend-api.h>
-#include <QPointer>
-#include <QWidget>
-#include <QTimer>
-#include <QLabel>
-#include <QList>
 
+#include <QFrame>
+#include <QPointer>
+#include <QTimer>
+
+class QLabel;
 class QGridLayout;
-class QCloseEvent;
 
 class OBSBasicStats : public QFrame {
 	Q_OBJECT
diff --git a/UI/window-main.hpp b/frontend/widgets/OBSMainWindow.hpp
similarity index 76%
rename from UI/window-main.hpp
rename to frontend/widgets/OBSMainWindow.hpp
index cfecfc375..ad726ac34 100644
--- a/UI/window-main.hpp
+++ b/frontend/widgets/OBSMainWindow.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QMainWindow>
-
 #include <util/config-file.h>
 
+#include <QMainWindow>
+
 class OBSMainWindow : public QMainWindow {
 	Q_OBJECT
 
@@ -12,6 +12,4 @@ public:
 
 	virtual config_t *Config() const = 0;
 	virtual void OBSInit() = 0;
-
-	virtual int GetProfilePath(char *path, size_t size, const char *file) const = 0;
 };
diff --git a/UI/window-projector.cpp b/frontend/widgets/OBSProjector.cpp
similarity index 97%
rename from UI/window-projector.cpp
rename to frontend/widgets/OBSProjector.cpp
index 60f873bc9..7d6beb0d8 100644
--- a/UI/window-projector.cpp
+++ b/frontend/widgets/OBSProjector.cpp
@@ -1,15 +1,17 @@
-#include <QAction>
-#include <QGuiApplication>
-#include <QMouseEvent>
-#include <QMenu>
-#include <QScreen>
+#include "OBSProjector.hpp"
+
+#include <OBSApp.hpp>
+#include <components/Multiview.hpp>
+#include <utility/display-helpers.hpp>
+#include <utility/platform.hpp>
+#include <widgets/OBSBasic.hpp>
+
 #include <qt-wrappers.hpp>
-#include "moc_window-projector.cpp"
-#include "obs-app.hpp"
-#include "window-basic-main.hpp"
-#include "display-helpers.hpp"
-#include "platform.hpp"
-#include "multiview.hpp"
+
+#include <QScreen>
+#include <QWindow>
+
+#include "moc_OBSProjector.cpp"
 
 static QList<OBSProjector *> multiviewProjectors;
 
diff --git a/UI/window-projector.hpp b/frontend/widgets/OBSProjector.hpp
similarity index 94%
rename from UI/window-projector.hpp
rename to frontend/widgets/OBSProjector.hpp
index f95063261..417192ee0 100644
--- a/UI/window-projector.hpp
+++ b/frontend/widgets/OBSProjector.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <obs.hpp>
-#include "qt-display.hpp"
-#include "multiview.hpp"
+#include "OBSQTDisplay.hpp"
+
+class Multiview;
 
 enum class ProjectorType {
 	Source,
@@ -12,8 +12,6 @@ enum class ProjectorType {
 	Multiview,
 };
 
-class QMouseEvent;
-
 class OBSProjector : public OBSQTDisplay {
 	Q_OBJECT