diff --git a/UI/auth-base.cpp b/frontend/oauth/Auth.cpp
similarity index 94%
rename from UI/auth-base.cpp
rename to frontend/oauth/Auth.cpp
index 1f0999fe0..89b579f8e 100644
--- a/UI/auth-base.cpp
+++ b/frontend/oauth/Auth.cpp
@@ -1,8 +1,8 @@
-#include "moc_auth-base.cpp"
-#include "window-basic-main.hpp"
+#include "Auth.hpp"
 
-#include <vector>
-#include <map>
+#include <widgets/OBSBasic.hpp>
+
+#include "moc_Auth.cpp"
 
 struct AuthInfo {
 	Auth::Def def;
diff --git a/UI/auth-base.hpp b/frontend/oauth/Auth.hpp
similarity index 96%
rename from UI/auth-base.hpp
rename to frontend/oauth/Auth.hpp
index 9745f63fe..c983c5463 100644
--- a/UI/auth-base.hpp
+++ b/frontend/oauth/Auth.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <QObject>
-#include <functional>
-#include <memory>
 
 class Auth : public QObject {
 	Q_OBJECT
diff --git a/UI/auth-listener.cpp b/frontend/oauth/AuthListener.cpp
similarity index 95%
rename from UI/auth-listener.cpp
rename to frontend/oauth/AuthListener.cpp
index e652da4d3..9298a18e5 100644
--- a/UI/auth-listener.cpp
+++ b/frontend/oauth/AuthListener.cpp
@@ -1,12 +1,14 @@
-#include "moc_auth-listener.cpp"
+#include "AuthListener.hpp"
+
+#include <OBSApp.hpp>
 
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QString>
-#include <QtNetwork/QTcpSocket>
 #include <qt-wrappers.hpp>
 
-#include "obs-app.hpp"
+#include <QRegularExpression>
+#include <QTcpServer>
+#include <QTcpSocket>
+
+#include "moc_AuthListener.cpp"
 
 #define LOGO_URL "https://obsproject.com/assets/images/new_icon_small-r.png"
 
diff --git a/UI/auth-listener.hpp b/frontend/oauth/AuthListener.hpp
similarity index 90%
rename from UI/auth-listener.hpp
rename to frontend/oauth/AuthListener.hpp
index fa1db2dea..65bcf540e 100644
--- a/UI/auth-listener.hpp
+++ b/frontend/oauth/AuthListener.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <QObject>
-#include <QtNetwork/QTcpServer>
+
+class QTcpServer;
 
 class AuthListener : public QObject {
 	Q_OBJECT
diff --git a/UI/auth-restream.cpp b/frontend/oauth/RestreamAuth.cpp
similarity index 96%
rename from UI/auth-restream.cpp
rename to frontend/oauth/RestreamAuth.cpp
index c832ee83d..e428e889d 100644
--- a/UI/auth-restream.cpp
+++ b/frontend/oauth/RestreamAuth.cpp
@@ -1,19 +1,17 @@
-#include "moc_auth-restream.cpp"
+#include "RestreamAuth.hpp"
+
+#include <dialogs/OAuthLogin.hpp>
+#include <docks/BrowserDock.hpp>
+#include <utility/RemoteTextThread.hpp>
+#include <utility/obf.h>
+#include <widgets/OBSBasic.hpp>
 
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <qt-wrappers.hpp>
-#include <json11.hpp>
-#include <ctime>
-#include <sstream>
+#include <ui-config.h>
 
-#include <obs-app.hpp>
-#include "window-dock-browser.hpp"
-#include "window-basic-main.hpp"
-#include "remote-text.hpp"
-#include "ui-config.h"
-#include "obf.h"
+#include <json11.hpp>
+
+#include "moc_RestreamAuth.cpp"
 
 using namespace json11;
 
diff --git a/UI/auth-restream.hpp b/frontend/oauth/RestreamAuth.hpp
similarity index 90%
rename from UI/auth-restream.hpp
rename to frontend/oauth/RestreamAuth.hpp
index 16c77e813..6ea9128a1 100644
--- a/UI/auth-restream.hpp
+++ b/frontend/oauth/RestreamAuth.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "auth-oauth.hpp"
-
-class BrowserDock;
+#include "OAuth.hpp"
 
 class RestreamAuth : public OAuthStreamKey {
 	Q_OBJECT
diff --git a/UI/auth-twitch.cpp b/frontend/oauth/TwitchAuth.cpp
similarity index 97%
rename from UI/auth-twitch.cpp
rename to frontend/oauth/TwitchAuth.cpp
index 40f70b567..c6852e29d 100644
--- a/UI/auth-twitch.cpp
+++ b/frontend/oauth/TwitchAuth.cpp
@@ -1,22 +1,17 @@
-#include "moc_auth-twitch.cpp"
+#include "TwitchAuth.hpp"
 
-#include <QRegularExpression>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QUuid>
+#include <dialogs/OAuthLogin.hpp>
+#include <docks/BrowserDock.hpp>
+#include <utility/RemoteTextThread.hpp>
+#include <utility/obf.h>
+#include <widgets/OBSBasic.hpp>
 
 #include <qt-wrappers.hpp>
-#include <obs-app.hpp>
+#include <ui-config.h>
 
-#include "window-dock-browser.hpp"
-#include "window-basic-main.hpp"
-#include "remote-text.hpp"
+#include <QUuid>
 
-#include <json11.hpp>
-
-#include "ui-config.h"
-#include "obf.h"
+#include "moc_TwitchAuth.cpp"
 
 using namespace json11;
 
diff --git a/UI/auth-twitch.hpp b/frontend/oauth/TwitchAuth.hpp
similarity index 86%
rename from UI/auth-twitch.hpp
rename to frontend/oauth/TwitchAuth.hpp
index 9fb3ba773..bbd8ca4b9 100644
--- a/UI/auth-twitch.hpp
+++ b/frontend/oauth/TwitchAuth.hpp
@@ -1,14 +1,10 @@
 #pragma once
 
-#include <QDialog>
-#include <QTimer>
-#include <string>
-#include <memory>
+#include "OAuth.hpp"
 
 #include <json11.hpp>
-#include "auth-oauth.hpp"
 
-class BrowserDock;
+#include <QTimer>
 
 class TwitchAuth : public OAuthStreamKey {
 	Q_OBJECT