diff --git a/chatterino.pro b/chatterino.pro
index 935bda8e1..3a3d84bec 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -91,11 +91,9 @@ werr {
     message("Enabling error on warning")
 }
 
-# src
 SOURCES += \
     src/Application.cpp \
     src/Channel.cpp \
-    src/ChannelData.cpp \
     src/Common.cpp \
     src/controllers/accounts/Account.cpp \
     src/controllers/accounts/AccountController.cpp \
@@ -168,7 +166,16 @@ SOURCES += \
     src/widgets/AttachedWindow.cpp \
     src/widgets/BaseWidget.cpp \
     src/widgets/BaseWindow.cpp \
-    src/widgets/EmotePopup.cpp \
+    src/widgets/dialogs/EmotePopup.cpp \
+    src/widgets/dialogs/LastRunCrashDialog.cpp \
+    src/widgets/dialogs/LoginDialog.cpp \
+    src/widgets/dialogs/NotificationPopup.cpp \
+    src/widgets/dialogs/QualityPopup.cpp \
+    src/widgets/dialogs/SelectChannelDialog.cpp \
+    src/widgets/dialogs/SettingsDialog.cpp \
+    src/widgets/dialogs/TextInputDialog.cpp \
+    src/widgets/dialogs/UserInfoPopup.cpp \
+    src/widgets/dialogs/WelcomeDialog.cpp \
     src/widgets/helper/ChannelView.cpp \
     src/widgets/helper/ComboBoxItemDelegate.cpp \
     src/widgets/helper/DebugPopup.cpp \
@@ -184,20 +191,10 @@ SOURCES += \
     src/widgets/helper/SearchPopup.cpp \
     src/widgets/helper/SettingsDialogTab.cpp \
     src/widgets/helper/SignalLabel.cpp \
-    src/widgets/splits/SplitColumn.cpp \
-    src/widgets/splits/SplitHeader.cpp \
-    src/widgets/splits/SplitInput.cpp \
-    src/widgets/splits/SplitOverlay.cpp \
     src/widgets/helper/TitlebarButton.cpp \
     src/widgets/Label.cpp \
-    src/widgets/LastRunCrashDialog.cpp \
-    src/widgets/LoginDialog.cpp \
     src/widgets/Notebook.cpp \
-    src/widgets/NotificationPopup.cpp \
-    src/widgets/QualityPopup.cpp \
     src/widgets/Scrollbar.cpp \
-    src/widgets/SelectChannelDialog.cpp \
-    src/widgets/SettingsDialog.cpp \
     src/widgets/settingspages/AboutPage.cpp \
     src/widgets/settingspages/AccountsPage.cpp \
     src/widgets/settingspages/AppearancePage.cpp \
@@ -214,20 +211,19 @@ SOURCES += \
     src/widgets/settingspages/SettingsPage.cpp \
     src/widgets/settingspages/SpecialChannelsPage.cpp \
     src/widgets/splits/Split.cpp \
+    src/widgets/splits/SplitColumn.cpp \
     src/widgets/splits/SplitContainer.cpp \
+    src/widgets/splits/SplitHeader.cpp \
+    src/widgets/splits/SplitInput.cpp \
+    src/widgets/splits/SplitOverlay.cpp \
     src/widgets/StreamView.cpp \
-    src/widgets/TextInputDialog.cpp \
     src/widgets/TooltipWidget.cpp \
-    src/widgets/UserInfoPopup.cpp \
-    src/widgets/WelcomeDialog.cpp \
     src/widgets/Window.cpp
 
 HEADERS  += \
     src/Application.hpp \
     src/Channel.hpp \
-    src/ChannelData.hpp \
     src/Common.hpp \
-    src/Const.hpp \
     src/controllers/accounts/Account.hpp \
     src/controllers/accounts/AccountController.hpp \
     src/controllers/accounts/AccountModel.hpp \
@@ -243,10 +239,10 @@ HEADERS  += \
     src/controllers/taggedusers/TaggedUser.hpp \
     src/controllers/taggedusers/TaggedUsersController.hpp \
     src/controllers/taggedusers/TaggedUsersModel.hpp \
-    src/Credentials.hpp \
+    src/debug/AssertInGuiThread.hpp \
+    src/debug/Benchmark.hpp \
     src/debug/Log.hpp \
     src/LockedObject.hpp \
-    src/messages/HighlightPhrase.hpp \
     src/messages/Image.hpp \
     src/messages/layouts/MessageLayout.hpp \
     src/messages/layouts/MessageLayoutContainer.hpp \
@@ -271,6 +267,8 @@ HEADERS  += \
     src/providers/irc/IrcChannel2.hpp \
     src/providers/irc/IrcConnection2.hpp \
     src/providers/irc/IrcServer.hpp \
+    src/providers/twitch/Const.hpp \
+    src/providers/twitch/Credentials.hpp \
     src/providers/twitch/EmoteValue.hpp \
     src/providers/twitch/IrcMessageHandler.hpp \
     src/providers/twitch/Pubsub.hpp \
@@ -300,8 +298,6 @@ HEADERS  += \
     src/singletons/ThemeManager.hpp \
     src/singletons/UpdateManager.hpp \
     src/singletons/WindowManager.hpp \
-    src/util/AssertInGuiThread.hpp \
-    src/util/Benchmark.hpp \
     src/util/Clamp.hpp \
     src/util/CombinePath.hpp \
     src/util/CompletionModel.hpp \
@@ -338,7 +334,16 @@ HEADERS  += \
     src/widgets/AttachedWindow.hpp \
     src/widgets/BaseWidget.hpp \
     src/widgets/BaseWindow.hpp \
-    src/widgets/EmotePopup.hpp \
+    src/widgets/dialogs/EmotePopup.hpp \
+    src/widgets/dialogs/LastRunCrashDialog.hpp \
+    src/widgets/dialogs/LoginDialog.hpp \
+    src/widgets/dialogs/NotificationPopup.hpp \
+    src/widgets/dialogs/QualityPopup.hpp \
+    src/widgets/dialogs/SelectChannelDialog.hpp \
+    src/widgets/dialogs/SettingsDialog.hpp \
+    src/widgets/dialogs/TextInputDialog.hpp \
+    src/widgets/dialogs/UserInfoPopup.hpp \
+    src/widgets/dialogs/WelcomeDialog.hpp \
     src/widgets/helper/ChannelView.hpp \
     src/widgets/helper/ComboBoxItemDelegate.hpp \
     src/widgets/helper/DebugPopup.hpp \
@@ -356,20 +361,10 @@ HEADERS  += \
     src/widgets/helper/SettingsDialogTab.hpp \
     src/widgets/helper/Shortcut.hpp \
     src/widgets/helper/SignalLabel.hpp \
-    src/widgets/splits/SplitColumn.hpp \
-    src/widgets/splits/SplitHeader.hpp \
-    src/widgets/splits/SplitInput.hpp \
-    src/widgets/splits/SplitOverlay.hpp \
     src/widgets/helper/TitlebarButton.hpp \
     src/widgets/Label.hpp \
-    src/widgets/LastRunCrashDialog.hpp \
-    src/widgets/LoginDialog.hpp \
     src/widgets/Notebook.hpp \
-    src/widgets/NotificationPopup.hpp \
-    src/widgets/QualityPopup.hpp \
     src/widgets/Scrollbar.hpp \
-    src/widgets/SelectChannelDialog.hpp \
-    src/widgets/SettingsDialog.hpp \
     src/widgets/settingspages/AboutPage.hpp \
     src/widgets/settingspages/AccountsPage.hpp \
     src/widgets/settingspages/AppearancePage.hpp \
@@ -386,13 +381,13 @@ HEADERS  += \
     src/widgets/settingspages/SettingsPage.hpp \
     src/widgets/settingspages/SpecialChannelsPage.hpp \
     src/widgets/splits/Split.hpp \
+    src/widgets/splits/SplitColumn.hpp \
     src/widgets/splits/SplitContainer.hpp \
+    src/widgets/splits/SplitHeader.hpp \
+    src/widgets/splits/SplitInput.hpp \
+    src/widgets/splits/SplitOverlay.hpp \
     src/widgets/StreamView.hpp \
-    src/widgets/TextInputDialog.hpp \
-    src/widgets/Titlebar.hpp \
     src/widgets/TooltipWidget.hpp \
-    src/widgets/UserInfoPopup.hpp \
-    src/widgets/WelcomeDialog.hpp \
     src/widgets/Window.hpp
 
 RESOURCES += \
diff --git a/src/controllers/highlights/HighlightController.cpp b/src/controllers/highlights/HighlightController.cpp
index 198553271..301e8dbe2 100644
--- a/src/controllers/highlights/HighlightController.cpp
+++ b/src/controllers/highlights/HighlightController.cpp
@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "controllers/highlights/HighlightModel.hpp"
-#include "widgets/NotificationPopup.hpp"
+#include "widgets/dialogs/NotificationPopup.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/util/AssertInGuiThread.hpp b/src/debug/AssertInGuiThread.hpp
similarity index 100%
rename from src/util/AssertInGuiThread.hpp
rename to src/debug/AssertInGuiThread.hpp
diff --git a/src/util/Benchmark.hpp b/src/debug/Benchmark.hpp
similarity index 100%
rename from src/util/Benchmark.hpp
rename to src/debug/Benchmark.hpp
diff --git a/src/main.cpp b/src/main.cpp
index c66242388..0cb2f1d28 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@
 #include "singletons/UpdateManager.hpp"
 #include "util/DebugCount.hpp"
 #include "util/NetworkManager.hpp"
-#include "widgets/LastRunCrashDialog.hpp"
+#include "widgets/dialogs/LastRunCrashDialog.hpp"
 
 #include <QAbstractNativeEventFilter>
 #include <QApplication>
diff --git a/src/messages/HighlightPhrase.hpp b/src/messages/HighlightPhrase.hpp
deleted file mode 100644
index b2f7ff504..000000000
--- a/src/messages/HighlightPhrase.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//#pragma once
-
-//#include "util/SerializeCustom.hpp"
-
-//#include <QString>
-//#include <pajlada/settings/serialize.hpp>
-
-//namespace chatterino {
-//namespace messages {
-
-//struct HighlightPhrase {
-//    QString key;
-//    bool alert;
-//    bool sound;
-//    bool regex;
-
-//    bool operator==(const HighlightPhrase &other) const
-//    {
-//        return std::tie(this->key, this->sound, this->alert, this->regex) ==
-//               std::tie(other.key, other.sound, other.alert, other.regex);
-//    }
-//};
-//}  // namespace messages
-//}  // namespace chatterino
-
-//namespace pajlada {
-//namespace Settings {
-
-//template <>
-//struct Serialize<chatterino::messages::HighlightPhrase> {
-//    static rapidjson::Value get(const chatterino::messages::HighlightPhrase &value,
-//                                rapidjson::Document::AllocatorType &a)
-//    {
-//        rapidjson::Value ret(rapidjson::kObjectType);
-
-//        AddMember(ret, "key", value.key, a);
-//        AddMember(ret, "alert", value.alert, a);
-//        AddMember(ret, "sound", value.sound, a);
-//        AddMember(ret, "regex", value.regex, a);
-
-//        return ret;
-//    }
-//};
-
-//template <>
-//struct Deserialize<chatterino::messages::HighlightPhrase> {
-//    static chatterino::messages::HighlightPhrase get(const rapidjson::Value &value)
-//    {
-//        chatterino::messages::HighlightPhrase ret;
-//        if (!value.IsObject()) {
-//            return ret;
-//        }
-
-//        if (value.HasMember("key")) {
-//            const rapidjson::Value &key = value["key"];
-//            if (key.IsString()) {
-//                ret.key = key.GetString();
-//            }
-//        }
-
-//        if (value.HasMember("alert")) {
-//            const rapidjson::Value &alert = value["alert"];
-//            if (alert.IsBool()) {
-//                ret.alert = alert.GetBool();
-//            }
-//        }
-
-//        if (value.HasMember("sound")) {
-//            const rapidjson::Value &sound = value["sound"];
-//            if (sound.IsBool()) {
-//                ret.sound = sound.GetBool();
-//            }
-//        }
-
-//        if (value.HasMember("regex")) {
-//            const rapidjson::Value &regex = value["regex"];
-//            if (regex.IsBool()) {
-//                ret.regex = regex.GetBool();
-//            }
-//        }
-
-//        return ret;
-//    }
-//};
-
-//}  // namespace Settings
-//}  // namespace pajlada
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index a214d48d3..ef7220559 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -4,7 +4,7 @@
 #include "messages/layouts/MessageLayoutContainer.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/Benchmark.hpp"
+#include "debug/Benchmark.hpp"
 #include "util/Emotemap.hpp"
 
 namespace chatterino {
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index cd5644087..221483b07 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -4,7 +4,7 @@
 #include "singletons/EmoteManager.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "util/Benchmark.hpp"
+#include "debug/Benchmark.hpp"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/src/Const.hpp b/src/providers/twitch/Const.hpp
similarity index 100%
rename from src/Const.hpp
rename to src/providers/twitch/Const.hpp
diff --git a/src/Credentials.hpp b/src/providers/twitch/Credentials.hpp
similarity index 100%
rename from src/Credentials.hpp
rename to src/providers/twitch/Credentials.hpp
diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp
index ebec5d223..06472adc8 100644
--- a/src/providers/twitch/TwitchAccount.cpp
+++ b/src/providers/twitch/TwitchAccount.cpp
@@ -1,6 +1,6 @@
 #include "providers/twitch/TwitchAccount.hpp"
 
-#include "Const.hpp"
+#include "providers/twitch/Const.hpp"
 #include "debug/Log.hpp"
 #include "util/NetworkRequest.hpp"
 #include "util/RapidjsonHelpers.hpp"
diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp
index 97329dfde..5222e2604 100644
--- a/src/providers/twitch/TwitchAccountManager.cpp
+++ b/src/providers/twitch/TwitchAccountManager.cpp
@@ -1,7 +1,7 @@
 #include "providers/twitch/TwitchAccountManager.hpp"
 
 #include "Common.hpp"
-#include "Const.hpp"
+#include "providers/twitch/Const.hpp"
 #include "debug/Log.hpp"
 
 namespace chatterino {
diff --git a/src/providers/twitch/TwitchEmotes.cpp b/src/providers/twitch/TwitchEmotes.cpp
index 30a572d6d..cd3fef55a 100644
--- a/src/providers/twitch/TwitchEmotes.cpp
+++ b/src/providers/twitch/TwitchEmotes.cpp
@@ -2,7 +2,7 @@
 
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
-#include "util/Benchmark.hpp"
+#include "debug/Benchmark.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "util/UrlFetch.hpp"
 
diff --git a/src/singletons/FontManager.cpp b/src/singletons/FontManager.cpp
index ccbc7156d..9fbbcd51b 100644
--- a/src/singletons/FontManager.cpp
+++ b/src/singletons/FontManager.cpp
@@ -4,7 +4,7 @@
 #include <QtGlobal>
 
 #include "Application.hpp"
-#include "util/AssertInGuiThread.hpp"
+#include "debug/AssertInGuiThread.hpp"
 #include "WindowManager.hpp"
 
 #ifdef Q_OS_WIN32
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index fe067e468..b65b45b22 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -6,10 +6,10 @@
 #include "singletons/FontManager.hpp"
 #include "singletons/PathManager.hpp"
 #include "singletons/ThemeManager.hpp"
-#include "util/AssertInGuiThread.hpp"
+#include "debug/AssertInGuiThread.hpp"
 #include "util/Clamp.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
-#include "widgets/SettingsDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
 
 #include <QJsonArray>
 #include <QJsonDocument>
diff --git a/src/util/SignalVector2.hpp b/src/util/SignalVector2.hpp
index 8492b8fce..81e9f42f9 100644
--- a/src/util/SignalVector2.hpp
+++ b/src/util/SignalVector2.hpp
@@ -6,7 +6,7 @@
 #include <pajlada/signals/signal.hpp>
 #include <vector>
 
-#include "util/AssertInGuiThread.hpp"
+#include "debug/AssertInGuiThread.hpp"
 
 namespace chatterino {
 namespace util {
diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp
index a230b8d6a..15a807ec3 100644
--- a/src/util/StreamLink.cpp
+++ b/src/util/StreamLink.cpp
@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "Helpers.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "widgets/QualityPopup.hpp"
+#include "widgets/dialogs/QualityPopup.hpp"
 
 #include <QErrorMessage>
 #include <QFileInfo>
diff --git a/src/util/UrlFetch.hpp b/src/util/UrlFetch.hpp
index 302c45e1f..1b9fc8a2b 100644
--- a/src/util/UrlFetch.hpp
+++ b/src/util/UrlFetch.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "controllers/accounts/AccountController.hpp"
-#include "Credentials.hpp"
+#include "providers/twitch/Credentials.hpp"
 #include "debug/Log.hpp"
 #include "util/NetworkManager.hpp"
 #include "util/NetworkRequest.hpp"
diff --git a/src/widgets/AccountSwitchPopupWidget.cpp b/src/widgets/AccountSwitchPopupWidget.cpp
index 56f0b75ae..044250a6d 100644
--- a/src/widgets/AccountSwitchPopupWidget.cpp
+++ b/src/widgets/AccountSwitchPopupWidget.cpp
@@ -1,6 +1,6 @@
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "debug/Log.hpp"
-#include "widgets/SettingsDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
 
 #include <QHBoxLayout>
 #include <QLayout>
diff --git a/src/widgets/AccountSwitchWidget.cpp b/src/widgets/AccountSwitchWidget.cpp
index 2414a5c59..ae126a4fe 100644
--- a/src/widgets/AccountSwitchWidget.cpp
+++ b/src/widgets/AccountSwitchWidget.cpp
@@ -1,7 +1,7 @@
 #include "AccountSwitchWidget.hpp"
 
 #include "Application.hpp"
-#include "Const.hpp"
+#include "providers/twitch/Const.hpp"
 #include "controllers/accounts/AccountController.hpp"
 
 namespace chatterino {
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index 965d20aeb..ff7a2e79e 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -7,7 +7,7 @@
 #include "widgets/helper/NotebookButton.hpp"
 #include "widgets/helper/NotebookTab.hpp"
 #include "widgets/helper/Shortcut.hpp"
-#include "widgets/SettingsDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 #include "widgets/Window.hpp"
 
diff --git a/src/widgets/Titlebar.hpp b/src/widgets/Titlebar.hpp
deleted file mode 100644
index 43e068719..000000000
--- a/src/widgets/Titlebar.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <QWidget>
-
-namespace chatterino {
-namespace widgets {
-
-class TitleBar : public QWidget
-{
-public:
-    TitleBar(QWidget *parent = nullptr);
-};
-
-}  // namespace widgets
-}  // namespace chatterino
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index bc7191c58..807c4a44c 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -11,9 +11,9 @@
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/helper/Shortcut.hpp"
 #include "widgets/Notebook.hpp"
-#include "widgets/SettingsDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/splits/Split.hpp"
-#include "widgets/WelcomeDialog.hpp"
+#include "widgets/dialogs/WelcomeDialog.hpp"
 
 #include <QApplication>
 #include <QDesktopServices>
diff --git a/src/widgets/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
similarity index 100%
rename from src/widgets/EmotePopup.cpp
rename to src/widgets/dialogs/EmotePopup.cpp
diff --git a/src/widgets/EmotePopup.hpp b/src/widgets/dialogs/EmotePopup.hpp
similarity index 100%
rename from src/widgets/EmotePopup.hpp
rename to src/widgets/dialogs/EmotePopup.hpp
diff --git a/src/widgets/LastRunCrashDialog.cpp b/src/widgets/dialogs/LastRunCrashDialog.cpp
similarity index 100%
rename from src/widgets/LastRunCrashDialog.cpp
rename to src/widgets/dialogs/LastRunCrashDialog.cpp
diff --git a/src/widgets/LastRunCrashDialog.hpp b/src/widgets/dialogs/LastRunCrashDialog.hpp
similarity index 100%
rename from src/widgets/LastRunCrashDialog.hpp
rename to src/widgets/dialogs/LastRunCrashDialog.hpp
diff --git a/src/widgets/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp
similarity index 99%
rename from src/widgets/LoginDialog.cpp
rename to src/widgets/dialogs/LoginDialog.cpp
index 77dcce095..e70fb103c 100644
--- a/src/widgets/LoginDialog.cpp
+++ b/src/widgets/dialogs/LoginDialog.cpp
@@ -1,4 +1,4 @@
-#include "widgets/LoginDialog.hpp"
+#include "widgets/dialogs/LoginDialog.hpp"
 #include "Common.hpp"
 #include "util/UrlFetch.hpp"
 #ifdef USEWINSDK
diff --git a/src/widgets/LoginDialog.hpp b/src/widgets/dialogs/LoginDialog.hpp
similarity index 100%
rename from src/widgets/LoginDialog.hpp
rename to src/widgets/dialogs/LoginDialog.hpp
diff --git a/src/widgets/NotificationPopup.cpp b/src/widgets/dialogs/NotificationPopup.cpp
similarity index 100%
rename from src/widgets/NotificationPopup.cpp
rename to src/widgets/dialogs/NotificationPopup.cpp
diff --git a/src/widgets/NotificationPopup.hpp b/src/widgets/dialogs/NotificationPopup.hpp
similarity index 100%
rename from src/widgets/NotificationPopup.hpp
rename to src/widgets/dialogs/NotificationPopup.hpp
diff --git a/src/widgets/QualityPopup.cpp b/src/widgets/dialogs/QualityPopup.cpp
similarity index 100%
rename from src/widgets/QualityPopup.cpp
rename to src/widgets/dialogs/QualityPopup.cpp
diff --git a/src/widgets/QualityPopup.hpp b/src/widgets/dialogs/QualityPopup.hpp
similarity index 95%
rename from src/widgets/QualityPopup.hpp
rename to src/widgets/dialogs/QualityPopup.hpp
index ca88ab962..251cecfc0 100644
--- a/src/widgets/QualityPopup.hpp
+++ b/src/widgets/dialogs/QualityPopup.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BaseWindow.hpp"
+#include "widgets/BaseWindow.hpp"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
diff --git a/src/widgets/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp
similarity index 100%
rename from src/widgets/SelectChannelDialog.cpp
rename to src/widgets/dialogs/SelectChannelDialog.cpp
diff --git a/src/widgets/SelectChannelDialog.hpp b/src/widgets/dialogs/SelectChannelDialog.hpp
similarity index 100%
rename from src/widgets/SelectChannelDialog.hpp
rename to src/widgets/dialogs/SelectChannelDialog.hpp
diff --git a/src/widgets/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
similarity index 99%
rename from src/widgets/SettingsDialog.cpp
rename to src/widgets/dialogs/SettingsDialog.cpp
index f77c69f60..7e97d3e1d 100644
--- a/src/widgets/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -1,4 +1,4 @@
-#include "widgets/SettingsDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
 
 #include "Application.hpp"
 #include "util/LayoutCreator.hpp"
diff --git a/src/widgets/SettingsDialog.hpp b/src/widgets/dialogs/SettingsDialog.hpp
similarity index 97%
rename from src/widgets/SettingsDialog.hpp
rename to src/widgets/dialogs/SettingsDialog.hpp
index 6b095984d..9eefadf56 100644
--- a/src/widgets/SettingsDialog.hpp
+++ b/src/widgets/dialogs/SettingsDialog.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BaseWindow.hpp"
+#include "widgets/BaseWindow.hpp"
 
 #include <QPushButton>
 #include <QStackedLayout>
diff --git a/src/widgets/TextInputDialog.cpp b/src/widgets/dialogs/TextInputDialog.cpp
similarity index 95%
rename from src/widgets/TextInputDialog.cpp
rename to src/widgets/dialogs/TextInputDialog.cpp
index a6507570e..589e06b24 100644
--- a/src/widgets/TextInputDialog.cpp
+++ b/src/widgets/dialogs/TextInputDialog.cpp
@@ -1,4 +1,4 @@
-#include "widgets/TextInputDialog.hpp"
+#include "widgets/dialogs/TextInputDialog.hpp"
 #include <QSizePolicy>
 
 namespace chatterino {
diff --git a/src/widgets/TextInputDialog.hpp b/src/widgets/dialogs/TextInputDialog.hpp
similarity index 100%
rename from src/widgets/TextInputDialog.hpp
rename to src/widgets/dialogs/TextInputDialog.hpp
diff --git a/src/widgets/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
similarity index 100%
rename from src/widgets/UserInfoPopup.cpp
rename to src/widgets/dialogs/UserInfoPopup.cpp
diff --git a/src/widgets/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
similarity index 100%
rename from src/widgets/UserInfoPopup.hpp
rename to src/widgets/dialogs/UserInfoPopup.hpp
diff --git a/src/widgets/WelcomeDialog.cpp b/src/widgets/dialogs/WelcomeDialog.cpp
similarity index 100%
rename from src/widgets/WelcomeDialog.cpp
rename to src/widgets/dialogs/WelcomeDialog.cpp
diff --git a/src/widgets/WelcomeDialog.hpp b/src/widgets/dialogs/WelcomeDialog.hpp
similarity index 100%
rename from src/widgets/WelcomeDialog.hpp
rename to src/widgets/dialogs/WelcomeDialog.hpp
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 1f0bf5307..ad20f4bc9 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -9,11 +9,11 @@
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "util/Benchmark.hpp"
+#include "debug/Benchmark.hpp"
 #include "util/DistanceBetweenPoints.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/TooltipWidget.hpp"
-#include "widgets/UserInfoPopup.hpp"
+#include "widgets/dialogs/UserInfoPopup.hpp"
 
 #include <QClipboard>
 #include <QDebug>
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index 40fc89a3a..05f169f71 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -8,8 +8,8 @@
 #include "util/Clamp.hpp"
 #include "util/Helpers.hpp"
 #include "widgets/Notebook.hpp"
-#include "widgets/SettingsDialog.hpp"
-#include "widgets/TextInputDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
+#include "widgets/dialogs/TextInputDialog.hpp"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/src/widgets/helper/SettingsDialogTab.cpp b/src/widgets/helper/SettingsDialogTab.cpp
index aece18907..1e02ca88e 100644
--- a/src/widgets/helper/SettingsDialogTab.cpp
+++ b/src/widgets/helper/SettingsDialogTab.cpp
@@ -1,5 +1,5 @@
 #include "widgets/helper/SettingsDialogTab.hpp"
-#include "widgets/SettingsDialog.hpp"
+#include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"
 
 #include <QPainter>
diff --git a/src/widgets/settingspages/AccountsPage.cpp b/src/widgets/settingspages/AccountsPage.cpp
index 3eac1c911..640fc7022 100644
--- a/src/widgets/settingspages/AccountsPage.cpp
+++ b/src/widgets/settingspages/AccountsPage.cpp
@@ -1,12 +1,12 @@
 #include "AccountsPage.hpp"
 
 #include "Application.hpp"
-#include "Const.hpp"
+#include "providers/twitch/Const.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/accounts/AccountModel.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
-#include "widgets/LoginDialog.hpp"
+#include "widgets/dialogs/LoginDialog.hpp"
 
 #include <QDialogButtonBox>
 #include <QHeaderView>
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index d2b8c07d3..50cdc17a0 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -15,11 +15,11 @@
 #include "widgets/helper/SearchPopup.hpp"
 #include "widgets/helper/Shortcut.hpp"
 #include "widgets/splits/SplitOverlay.hpp"
-#include "widgets/QualityPopup.hpp"
-#include "widgets/SelectChannelDialog.hpp"
+#include "widgets/dialogs/QualityPopup.hpp"
+#include "widgets/dialogs/SelectChannelDialog.hpp"
 #include "widgets/splits/SplitContainer.hpp"
-#include "widgets/TextInputDialog.hpp"
-#include "widgets/UserInfoPopup.hpp"
+#include "widgets/dialogs/TextInputDialog.hpp"
+#include "widgets/dialogs/UserInfoPopup.hpp"
 #include "widgets/Window.hpp"
 
 #include <QApplication>
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index 4860f4b70..0a0bb0bfb 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -3,7 +3,7 @@
 #include "Common.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "util/AssertInGuiThread.hpp"
+#include "debug/AssertInGuiThread.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/NotebookTab.hpp"
diff --git a/src/widgets/splits/SplitInput.hpp b/src/widgets/splits/SplitInput.hpp
index c042b6d61..64131465e 100644
--- a/src/widgets/splits/SplitInput.hpp
+++ b/src/widgets/splits/SplitInput.hpp
@@ -2,7 +2,7 @@
 
 #include "widgets/helper/ResizingTextEdit.hpp"
 #include "widgets/BaseWidget.hpp"
-#include "widgets/EmotePopup.hpp"
+#include "widgets/dialogs/EmotePopup.hpp"
 #include "widgets/helper/RippleEffectLabel.hpp"
 
 #include <QHBoxLayout>