diff --git a/chatterino.pro b/chatterino.pro
index 3a3d84bec..5c92411d6 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -93,8 +93,11 @@ werr {
 
 SOURCES += \
     src/Application.cpp \
-    src/Channel.cpp \
-    src/Common.cpp \
+    src/common/Channel.cpp \
+    src/common/CompletionModel.cpp \
+    src/common/Emotemap.cpp \
+    src/common/NetworkManager.cpp \
+    src/common/NetworkRequest.cpp \
     src/controllers/accounts/Account.cpp \
     src/controllers/accounts/AccountController.cpp \
     src/controllers/accounts/AccountModel.cpp \
@@ -153,11 +156,7 @@ SOURCES += \
     src/singletons/ThemeManager.cpp \
     src/singletons/UpdateManager.cpp \
     src/singletons/WindowManager.cpp \
-    src/util/CompletionModel.cpp \
     src/util/DebugCount.cpp \
-    src/util/Emotemap.cpp \
-    src/util/NetworkManager.cpp \
-    src/util/NetworkRequest.cpp \
     src/util/RapidjsonHelpers.cpp \
     src/util/StreamLink.cpp \
     src/util/WindowsHelper.cpp \
@@ -222,8 +221,26 @@ SOURCES += \
 
 HEADERS  += \
     src/Application.hpp \
-    src/Channel.hpp \
-    src/Common.hpp \
+    src/common/Channel.hpp \
+    src/common/Common.hpp \
+    src/common/CompletionModel.hpp \
+    src/common/Emotemap.hpp \
+    src/common/FlagsEnum.hpp \
+    src/common/LockedObject.hpp \
+    src/common/MutexValue.hpp \
+    src/common/NetworkManager.hpp \
+    src/common/NetworkRequest.hpp \
+    src/common/NetworkRequester.hpp \
+    src/common/NetworkWorker.hpp \
+    src/common/NullablePtr.hpp \
+    src/common/Property.hpp \
+    src/common/ProviderId.hpp \
+    src/common/SerializeCustom.hpp \
+    src/common/SignalVector.hpp \
+    src/common/SignalVector2.hpp \
+    src/common/SignalVectorModel.hpp \
+    src/common/UrlFetch.hpp \
+    src/common/Version.hpp \
     src/controllers/accounts/Account.hpp \
     src/controllers/accounts/AccountController.hpp \
     src/controllers/accounts/AccountModel.hpp \
@@ -242,7 +259,6 @@ HEADERS  += \
     src/debug/AssertInGuiThread.hpp \
     src/debug/Benchmark.hpp \
     src/debug/Log.hpp \
-    src/LockedObject.hpp \
     src/messages/Image.hpp \
     src/messages/layouts/MessageLayout.hpp \
     src/messages/layouts/MessageLayoutContainer.hpp \
@@ -256,9 +272,7 @@ HEADERS  += \
     src/messages/MessageElement.hpp \
     src/messages/MessageParseArgs.hpp \
     src/messages/Selection.hpp \
-    src/NullablePtr.hpp \
     src/PrecompiledHeader.hpp \
-    src/ProviderId.hpp \
     src/providers/bttv/BttvEmotes.hpp \
     src/providers/emoji/Emojis.hpp \
     src/providers/ffz/FfzEmotes.hpp \
@@ -282,7 +296,6 @@ HEADERS  += \
     src/providers/twitch/TwitchMessageBuilder.hpp \
     src/providers/twitch/TwitchServer.hpp \
     src/providers/twitch/TwitchUser.hpp \
-    src/SignalVector.hpp \
     src/singletons/EmoteManager.hpp \
     src/singletons/FontManager.hpp \
     src/singletons/helper/ChatterinoSetting.hpp \
@@ -300,35 +313,21 @@ HEADERS  += \
     src/singletons/WindowManager.hpp \
     src/util/Clamp.hpp \
     src/util/CombinePath.hpp \
-    src/util/CompletionModel.hpp \
     src/util/ConcurrentMap.hpp \
     src/util/DebugCount.hpp \
     src/util/DistanceBetweenPoints.hpp \
-    src/util/Emotemap.hpp \
-    src/util/FlagsEnum.hpp \
     src/util/Helpers.hpp \
     src/util/IrcHelpers.hpp \
     src/util/LayoutCreator.hpp \
-    src/util/MutexValue.hpp \
     src/util/NativeEventHelper.hpp \
-    src/util/NetworkManager.hpp \
-    src/util/NetworkRequest.hpp \
-    src/util/NetworkRequester.hpp \
-    src/util/NetworkWorker.hpp \
     src/util/PostToThread.hpp \
-    src/util/Property.hpp \
     src/util/QstringHash.hpp \
     src/util/RapidjsonHelpers.hpp \
     src/util/RemoveScrollAreaBackground.hpp \
-    src/util/SerializeCustom.hpp \
     src/util/SharedPtrElementLess.hpp \
-    src/util/SignalVector2.hpp \
-    src/util/SignalVectorModel.hpp \
     src/util/StandardItemHelper.hpp \
     src/util/StreamLink.hpp \
-    src/util/UrlFetch.hpp \
     src/util/WindowsHelper.hpp \
-    src/Version.hpp \
     src/widgets/AccountSwitchPopupWidget.hpp \
     src/widgets/AccountSwitchWidget.hpp \
     src/widgets/AttachedWindow.hpp \
@@ -390,8 +389,8 @@ HEADERS  += \
     src/widgets/TooltipWidget.hpp \
     src/widgets/Window.hpp
 
-RESOURCES += \
-    resources/resources.qrc
+RESOURCES += \ 
+    resources/resources.qrc \
 
 DISTFILES +=
 
diff --git a/files b/files
new file mode 100644
index 000000000..65b349acb
--- /dev/null
+++ b/files
@@ -0,0 +1,26 @@
+find src/ -type f -exec sed -i 's`Channel.cpp"`common/Channel.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`Channel.hpp"`common/Channel.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`Common.hpp"`common/Common.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`LockedObject.hpp"`common/LockedObject.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`NullablePtr.hpp"`common/NullablePtr.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`ProviderId.hpp"`common/ProviderId.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`SignalVector.hpp"`common/SignalVector.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/CompletionModel.cpp"`common/CompletionModel.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/CompletionModel.hpp"`common/CompletionModel.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Emotemap.cpp"`common/Emotemap.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Emotemap.hpp"`common/Emotemap.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/FlagsEnum.hpp"`common/FlagsEnum.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/MutexValue.hpp"`common/MutexValue.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkManager.cpp"`common/NetworkManager.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkManager.hpp"`common/NetworkManager.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkRequest.cpp"`common/NetworkRequest.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkRequest.hpp"`common/NetworkRequest.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkRequester.hpp"`common/NetworkRequester.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkWorker.hpp"`common/NetworkWorker.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Property.hpp"`common/Property.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/SerializeCustom.hpp"`common/SerializeCustom.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/SignalVector2.hpp"`common/SignalVector2.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/SignalVectorModel.hpp"`common/SignalVectorModel.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/UrlFetch.hpp"`common/UrlFetch.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Version.hpp"`common/Version.hpp"`' {} \;
+
diff --git a/src/Common.cpp b/src/Common.cpp
deleted file mode 100644
index 0ac02013c..000000000
--- a/src/Common.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-------------------------------------------------------------------- 
-* Precompiled header source file used by Visual Studio.NET to generate
-* the .pch file.
-*
-* Due to issues with the dependencies checker within the IDE, it
-* sometimes fails to recompile the PCH file, if we force the IDE to
-* create the PCH file directly from the header file.
-*
-* This file is auto-generated by qmake since no PRECOMPILED_SOURCE was
-* specified, and is used as the common stdafx.cpp. The file is only
-* generated when creating .vcxproj project files, and is not used for
-* command line compilations by nmake.
-*
-* WARNING: All changes made in this file will be lost.
---------------------------------------------------------------------*/
-#include "Common.hpp"
diff --git a/src/Channel.cpp b/src/common/Channel.cpp
similarity index 99%
rename from src/Channel.cpp
rename to src/common/Channel.cpp
index e5fccf658..29cf426f3 100644
--- a/src/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -1,4 +1,4 @@
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
diff --git a/src/Channel.hpp b/src/common/Channel.hpp
similarity index 98%
rename from src/Channel.hpp
rename to src/common/Channel.hpp
index d9374edbd..df7d5c72e 100644
--- a/src/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -3,7 +3,7 @@
 #include "messages/Image.hpp"
 #include "messages/LimitedQueue.hpp"
 #include "messages/Message.hpp"
-#include "util/CompletionModel.hpp"
+#include "common/CompletionModel.hpp"
 #include "util/ConcurrentMap.hpp"
 
 #include <QString>
diff --git a/src/Common.hpp b/src/common/Common.hpp
similarity index 100%
rename from src/Common.hpp
rename to src/common/Common.hpp
diff --git a/src/util/CompletionModel.cpp b/src/common/CompletionModel.cpp
similarity index 95%
rename from src/util/CompletionModel.cpp
rename to src/common/CompletionModel.cpp
index 6df1d6e20..af6f5961c 100644
--- a/src/util/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -1,7 +1,7 @@
-#include "util/CompletionModel.hpp"
+#include "common/CompletionModel.hpp"
 
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Log.hpp"
 #include "singletons/EmoteManager.hpp"
diff --git a/src/util/CompletionModel.hpp b/src/common/CompletionModel.hpp
similarity index 94%
rename from src/util/CompletionModel.hpp
rename to src/common/CompletionModel.hpp
index 8bb86468c..92bff5bb8 100644
--- a/src/util/CompletionModel.hpp
+++ b/src/common/CompletionModel.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 
 #include <QAbstractListModel>
 
diff --git a/src/util/Emotemap.cpp b/src/common/Emotemap.cpp
similarity index 100%
rename from src/util/Emotemap.cpp
rename to src/common/Emotemap.cpp
diff --git a/src/util/Emotemap.hpp b/src/common/Emotemap.hpp
similarity index 100%
rename from src/util/Emotemap.hpp
rename to src/common/Emotemap.hpp
diff --git a/src/util/FlagsEnum.hpp b/src/common/FlagsEnum.hpp
similarity index 100%
rename from src/util/FlagsEnum.hpp
rename to src/common/FlagsEnum.hpp
diff --git a/src/LockedObject.hpp b/src/common/LockedObject.hpp
similarity index 100%
rename from src/LockedObject.hpp
rename to src/common/LockedObject.hpp
diff --git a/src/util/MutexValue.hpp b/src/common/MutexValue.hpp
similarity index 100%
rename from src/util/MutexValue.hpp
rename to src/common/MutexValue.hpp
diff --git a/src/util/NetworkManager.cpp b/src/common/NetworkManager.cpp
similarity index 92%
rename from src/util/NetworkManager.cpp
rename to src/common/NetworkManager.cpp
index f3c2650ba..5bc2f1b39 100644
--- a/src/util/NetworkManager.cpp
+++ b/src/common/NetworkManager.cpp
@@ -1,4 +1,4 @@
-#include "util/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 
 #include <QNetworkAccessManager>
 
diff --git a/src/util/NetworkManager.hpp b/src/common/NetworkManager.hpp
similarity index 98%
rename from src/util/NetworkManager.hpp
rename to src/common/NetworkManager.hpp
index 64fe400e7..5e90cf529 100644
--- a/src/util/NetworkManager.hpp
+++ b/src/common/NetworkManager.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "debug/Log.hpp"
-#include "util/NetworkRequester.hpp"
-#include "util/NetworkWorker.hpp"
+#include "common/NetworkRequester.hpp"
+#include "common/NetworkWorker.hpp"
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/src/util/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
similarity index 96%
rename from src/util/NetworkRequest.cpp
rename to src/common/NetworkRequest.cpp
index 36648fd7f..33d51bb41 100644
--- a/src/util/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -1,4 +1,4 @@
-#include "util/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 
 #include "Application.hpp"
 
diff --git a/src/util/NetworkRequest.hpp b/src/common/NetworkRequest.hpp
similarity index 99%
rename from src/util/NetworkRequest.hpp
rename to src/common/NetworkRequest.hpp
index 564f358df..7ae8d98f9 100644
--- a/src/util/NetworkRequest.hpp
+++ b/src/common/NetworkRequest.hpp
@@ -2,9 +2,9 @@
 
 #include "Application.hpp"
 #include "singletons/PathManager.hpp"
-#include "util/NetworkManager.hpp"
-#include "util/NetworkRequester.hpp"
-#include "util/NetworkWorker.hpp"
+#include "common/NetworkManager.hpp"
+#include "common/NetworkRequester.hpp"
+#include "common/NetworkWorker.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
diff --git a/src/util/NetworkRequester.hpp b/src/common/NetworkRequester.hpp
similarity index 100%
rename from src/util/NetworkRequester.hpp
rename to src/common/NetworkRequester.hpp
diff --git a/src/util/NetworkWorker.hpp b/src/common/NetworkWorker.hpp
similarity index 100%
rename from src/util/NetworkWorker.hpp
rename to src/common/NetworkWorker.hpp
diff --git a/src/NullablePtr.hpp b/src/common/NullablePtr.hpp
similarity index 100%
rename from src/NullablePtr.hpp
rename to src/common/NullablePtr.hpp
diff --git a/src/util/Property.hpp b/src/common/Property.hpp
similarity index 100%
rename from src/util/Property.hpp
rename to src/common/Property.hpp
diff --git a/src/ProviderId.hpp b/src/common/ProviderId.hpp
similarity index 100%
rename from src/ProviderId.hpp
rename to src/common/ProviderId.hpp
diff --git a/src/util/SerializeCustom.hpp b/src/common/SerializeCustom.hpp
similarity index 100%
rename from src/util/SerializeCustom.hpp
rename to src/common/SerializeCustom.hpp
diff --git a/src/SignalVector.hpp b/src/common/SignalVector.hpp
similarity index 100%
rename from src/SignalVector.hpp
rename to src/common/SignalVector.hpp
diff --git a/src/util/SignalVector2.hpp b/src/common/SignalVector2.hpp
similarity index 100%
rename from src/util/SignalVector2.hpp
rename to src/common/SignalVector2.hpp
diff --git a/src/util/SignalVectorModel.hpp b/src/common/SignalVectorModel.hpp
similarity index 96%
rename from src/util/SignalVectorModel.hpp
rename to src/common/SignalVectorModel.hpp
index 1ad24ed52..31352bb5e 100644
--- a/src/util/SignalVectorModel.hpp
+++ b/src/common/SignalVectorModel.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 #include <QAbstractTableModel>
 #include <QStandardItem>
diff --git a/src/util/UrlFetch.hpp b/src/common/UrlFetch.hpp
similarity index 98%
rename from src/util/UrlFetch.hpp
rename to src/common/UrlFetch.hpp
index 1b9fc8a2b..0a4ccd280 100644
--- a/src/util/UrlFetch.hpp
+++ b/src/common/UrlFetch.hpp
@@ -3,8 +3,8 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/Credentials.hpp"
 #include "debug/Log.hpp"
-#include "util/NetworkManager.hpp"
-#include "util/NetworkRequest.hpp"
+#include "common/NetworkManager.hpp"
+#include "common/NetworkRequest.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
diff --git a/src/Version.hpp b/src/common/Version.hpp
similarity index 100%
rename from src/Version.hpp
rename to src/common/Version.hpp
diff --git a/src/controllers/accounts/Account.hpp b/src/controllers/accounts/Account.hpp
index 07e7c0806..e3e601944 100644
--- a/src/controllers/accounts/Account.hpp
+++ b/src/controllers/accounts/Account.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ProviderId.hpp"
+#include "common/ProviderId.hpp"
 
 #include <QString>
 
diff --git a/src/controllers/accounts/AccountController.hpp b/src/controllers/accounts/AccountController.hpp
index 72cf0d275..cd10e7f07 100644
--- a/src/controllers/accounts/AccountController.hpp
+++ b/src/controllers/accounts/AccountController.hpp
@@ -5,7 +5,7 @@
 #include "controllers/accounts/Account.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
 #include "util/SharedPtrElementLess.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/accounts/AccountModel.hpp b/src/controllers/accounts/AccountModel.hpp
index a3ba4f89f..b85575a45 100644
--- a/src/controllers/accounts/AccountModel.hpp
+++ b/src/controllers/accounts/AccountModel.hpp
@@ -2,7 +2,7 @@
 
 #include "controllers/accounts/Account.hpp"
 #include "util/QstringHash.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 #include <unordered_map>
 
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 70c3ae71f..a6c6911d6 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -1,6 +1,7 @@
 #include "CommandController.hpp"
 
 #include "Application.hpp"
+#include "common/SignalVector2.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandModel.hpp"
@@ -9,7 +10,6 @@
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/PathManager.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/SignalVector2.hpp"
 
 #include <QApplication>
 #include <QFile>
diff --git a/src/controllers/commands/CommandController.hpp b/src/controllers/commands/CommandController.hpp
index 57277b554..25534d06c 100644
--- a/src/controllers/commands/CommandController.hpp
+++ b/src/controllers/commands/CommandController.hpp
@@ -5,7 +5,7 @@
 #include <mutex>
 
 #include "controllers/commands/Command.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 class Channel;
diff --git a/src/controllers/commands/CommandModel.hpp b/src/controllers/commands/CommandModel.hpp
index 85c2aead8..947fd647d 100644
--- a/src/controllers/commands/CommandModel.hpp
+++ b/src/controllers/commands/CommandModel.hpp
@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "controllers/commands/Command.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/highlights/HighlightController.hpp b/src/controllers/highlights/HighlightController.hpp
index 31d3c5969..e134222f5 100644
--- a/src/controllers/highlights/HighlightController.hpp
+++ b/src/controllers/highlights/HighlightController.hpp
@@ -3,7 +3,7 @@
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "messages/Message.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/highlights/HighlightModel.hpp b/src/controllers/highlights/HighlightModel.hpp
index a21497730..9f2f639a6 100644
--- a/src/controllers/highlights/HighlightModel.hpp
+++ b/src/controllers/highlights/HighlightModel.hpp
@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "controllers/highlights/HighlightPhrase.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/highlights/HighlightPhrase.hpp b/src/controllers/highlights/HighlightPhrase.hpp
index fa2f8edec..3c14063f9 100644
--- a/src/controllers/highlights/HighlightPhrase.hpp
+++ b/src/controllers/highlights/HighlightPhrase.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "util/RapidjsonHelpers.hpp"
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <QRegularExpression>
 #include <QString>
diff --git a/src/controllers/ignores/IgnoreController.hpp b/src/controllers/ignores/IgnoreController.hpp
index 966403b84..16ff64d66 100644
--- a/src/controllers/ignores/IgnoreController.hpp
+++ b/src/controllers/ignores/IgnoreController.hpp
@@ -2,7 +2,7 @@
 
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/ignores/IgnoreModel.hpp b/src/controllers/ignores/IgnoreModel.hpp
index f451ec4ff..1eb08c235 100644
--- a/src/controllers/ignores/IgnoreModel.hpp
+++ b/src/controllers/ignores/IgnoreModel.hpp
@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "controllers/ignores/IgnorePhrase.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp
index 960e60ed0..fc8b3f049 100644
--- a/src/controllers/ignores/IgnorePhrase.hpp
+++ b/src/controllers/ignores/IgnorePhrase.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "util/RapidjsonHelpers.hpp"
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <QRegularExpression>
 #include <QString>
diff --git a/src/controllers/taggedusers/TaggedUser.hpp b/src/controllers/taggedusers/TaggedUser.hpp
index 3a8d3b173..c22e26942 100644
--- a/src/controllers/taggedusers/TaggedUser.hpp
+++ b/src/controllers/taggedusers/TaggedUser.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "common/ProviderId.hpp"
+
 #include <QString>
-#include <providerid.hpp>
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/taggedusers/TaggedUsersController.hpp b/src/controllers/taggedusers/TaggedUsersController.hpp
index 229addea5..3aa6f1b56 100644
--- a/src/controllers/taggedusers/TaggedUsersController.hpp
+++ b/src/controllers/taggedusers/TaggedUsersController.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "controllers/taggedusers/TaggedUser.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/controllers/taggedusers/TaggedUsersModel.hpp b/src/controllers/taggedusers/TaggedUsersModel.hpp
index 877e17c2f..f4a2ad3cf 100644
--- a/src/controllers/taggedusers/TaggedUsersModel.hpp
+++ b/src/controllers/taggedusers/TaggedUsersModel.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "controllers/taggedusers/TaggedUser.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {
diff --git a/src/main.cpp b/src/main.cpp
index 0cb2f1d28..9c8727efb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
 #include "singletons/PathManager.hpp"
 #include "singletons/UpdateManager.hpp"
 #include "util/DebugCount.hpp"
-#include "util/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 #include "widgets/dialogs/LastRunCrashDialog.hpp"
 
 #include <QAbstractNativeEventFilter>
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index d1bee2097..1e34b162c 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -5,9 +5,9 @@
 #include "singletons/EmoteManager.hpp"
 #include "singletons/IrcManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "util/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 #include "util/PostToThread.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #include <QBuffer>
 #include <QImageReader>
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index 0310f41ca..5938d3c94 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -2,7 +2,7 @@
 
 #include "messages/MessageElement.hpp"
 #include "providers/twitch/PubsubActions.hpp"
-#include "util/FlagsEnum.hpp"
+#include "common/FlagsEnum.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 
 #include <QTime>
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index ef7220559..d9188b659 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -5,7 +5,7 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "debug/Benchmark.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 namespace chatterino {
 namespace messages {
diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp
index 71151884d..2aee249de 100644
--- a/src/messages/MessageElement.hpp
+++ b/src/messages/MessageElement.hpp
@@ -4,7 +4,7 @@
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
 #include "singletons/FontManager.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <QRect>
 #include <QString>
diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp
index b1a1c6809..9d4a64277 100644
--- a/src/messages/layouts/MessageLayout.hpp
+++ b/src/messages/layouts/MessageLayout.hpp
@@ -4,7 +4,7 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "messages/Message.hpp"
 #include "messages/Selection.hpp"
-#include "util/FlagsEnum.hpp"
+#include "common/FlagsEnum.hpp"
 
 #include <QPixmap>
 
diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
index 972c5959b..e14835f0d 100644
--- a/src/providers/bttv/BttvEmotes.cpp
+++ b/src/providers/bttv/BttvEmotes.cpp
@@ -2,7 +2,7 @@
 
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {
diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp
index 550652d4e..28c0a091a 100644
--- a/src/providers/bttv/BttvEmotes.hpp
+++ b/src/providers/bttv/BttvEmotes.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SignalVector.hpp"
+#include "common/SignalVector.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <map>
 
diff --git a/src/providers/emoji/Emojis.hpp b/src/providers/emoji/Emojis.hpp
index 4fd668fbe..e25ae6857 100644
--- a/src/providers/emoji/Emojis.hpp
+++ b/src/providers/emoji/Emojis.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SignalVector.hpp"
+#include "common/SignalVector.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <QMap>
 #include <QRegularExpression>
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index d7d3bb5da..e2ff448af 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -2,7 +2,7 @@
 
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {
diff --git a/src/providers/ffz/FfzEmotes.hpp b/src/providers/ffz/FfzEmotes.hpp
index b9dfb99d7..6da337b28 100644
--- a/src/providers/ffz/FfzEmotes.hpp
+++ b/src/providers/ffz/FfzEmotes.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SignalVector.hpp"
+#include "common/SignalVector.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <map>
 
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index dc4c0584e..ca8d15e9c 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -1,6 +1,6 @@
 #include "AbstractIrcServer.hpp"
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"
 
diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp
index b7f2e2e35..9f3af770e 100644
--- a/src/providers/irc/AbstractIrcServer.hpp
+++ b/src/providers/irc/AbstractIrcServer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "providers/irc/IrcConnection2.hpp"
 
 #include <IrcMessage>
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 5dbb26dfb..81354b8d5 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -327,22 +327,12 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
 void IrcMessageHandler::handleWriteConnectionNoticeMessage(Communi::IrcNoticeMessage *message)
 {
     static std::unordered_set<std::string> readConnectionOnlyIDs{
-        "host_on",
-        "host_off",
-        "host_target_went_offline",
-        "emote_only_on",
-        "emote_only_off",
-        "slow_on",
-        "slow_off",
-        "subs_on",
-        "subs_off",
-        "r9k_on",
-        "r9k_off",
+        "host_on", "host_off", "host_target_went_offline", "emote_only_on", "emote_only_off",
+        "slow_on", "slow_off", "subs_on", "subs_off", "r9k_on", "r9k_off",
 
         // Display for user who times someone out. This implies you're a moderator, at which point
         // you will be connected to PubSub and receive a better message from there
-        "timeout_success",
-        "ban_success",
+        "timeout_success", "ban_success",
     };
 
     QVariant v = message->tag("msg-id");
diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp
index 06472adc8..1b4835f85 100644
--- a/src/providers/twitch/TwitchAccount.cpp
+++ b/src/providers/twitch/TwitchAccount.cpp
@@ -2,9 +2,9 @@
 
 #include "providers/twitch/Const.hpp"
 #include "debug/Log.hpp"
-#include "util/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 #include "util/RapidjsonHelpers.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {
diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp
index 5222e2604..235b6b481 100644
--- a/src/providers/twitch/TwitchAccountManager.cpp
+++ b/src/providers/twitch/TwitchAccountManager.cpp
@@ -1,6 +1,6 @@
 #include "providers/twitch/TwitchAccountManager.hpp"
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "providers/twitch/Const.hpp"
 #include "debug/Log.hpp"
 
diff --git a/src/providers/twitch/TwitchAccountManager.hpp b/src/providers/twitch/TwitchAccountManager.hpp
index a9b97bcd1..cc7d81310 100644
--- a/src/providers/twitch/TwitchAccountManager.hpp
+++ b/src/providers/twitch/TwitchAccountManager.hpp
@@ -2,7 +2,7 @@
 
 #include "providers/twitch/TwitchAccount.hpp"
 #include "util/SharedPtrElementLess.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 #include <pajlada/settings/setting.hpp>
 
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 3e4a117be..2e06b03cb 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -1,6 +1,6 @@
 #include "providers/twitch/TwitchChannel.hpp"
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
 #include "providers/twitch/Pubsub.hpp"
@@ -9,7 +9,7 @@
 #include "singletons/IrcManager.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "util/PostToThread.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #include <IrcConnection>
 #include <QThread>
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index 5826fe154..84b544ffd 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -2,12 +2,12 @@
 
 #include <IrcConnection>
 
-#include "Channel.hpp"
-#include "Common.hpp"
+#include "common/Channel.hpp"
+#include "common/Common.hpp"
 #include "singletons/EmoteManager.hpp"
 #include "singletons/IrcManager.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/MutexValue.hpp"
+#include "common/MutexValue.hpp"
 
 #include <pajlada/signals/signalholder.hpp>
 
diff --git a/src/providers/twitch/TwitchEmotes.cpp b/src/providers/twitch/TwitchEmotes.cpp
index cd3fef55a..9a9e8ecbd 100644
--- a/src/providers/twitch/TwitchEmotes.cpp
+++ b/src/providers/twitch/TwitchEmotes.cpp
@@ -4,7 +4,7 @@
 #include "messages/Image.hpp"
 #include "debug/Benchmark.hpp"
 #include "util/RapidjsonHelpers.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #define TWITCH_EMOTE_TEMPLATE "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
 
diff --git a/src/providers/twitch/TwitchEmotes.hpp b/src/providers/twitch/TwitchEmotes.hpp
index 62f5e8ce9..8bf6e5319 100644
--- a/src/providers/twitch/TwitchEmotes.hpp
+++ b/src/providers/twitch/TwitchEmotes.hpp
@@ -4,7 +4,7 @@
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <map>
 
diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp
index 327af0648..865062b46 100644
--- a/src/providers/twitch/TwitchServer.hpp
+++ b/src/providers/twitch/TwitchServer.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "common/MutexValue.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "util/MutexValue.hpp"
 
 #include <chrono>
 #include <memory>
diff --git a/src/singletons/IrcManager.cpp b/src/singletons/IrcManager.cpp
index 2c2070015..9df7d6d90 100644
--- a/src/singletons/IrcManager.cpp
+++ b/src/singletons/IrcManager.cpp
@@ -1,5 +1,5 @@
 //#include "singletons/IrcManager.hpp"
-//#include "Channel.hpp"
+//#include "common/Channel.hpp"
 //#include "debug/Log.hpp"
 //#include "messages/MessageParseArgs.hpp"
 //#include "providers/twitch/TwitchAccount.hpp"
@@ -11,7 +11,7 @@
 //#include "singletons/SettingsManager.hpp"
 //#include "singletons/WindowManager.hpp"
 //#include "util/PostToThread.hpp"
-//#include "util/UrlFetch.hpp"
+//#include "common/UrlFetch.hpp"
 
 //#include <irccommand.h>
 //#include <QJsonArray>
diff --git a/src/singletons/ResourceManager.cpp b/src/singletons/ResourceManager.cpp
index 032f6c064..bc600458c 100644
--- a/src/singletons/ResourceManager.cpp
+++ b/src/singletons/ResourceManager.cpp
@@ -1,5 +1,5 @@
 #include "ResourceManager.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #include <QIcon>
 #include <QPixmap>
diff --git a/src/singletons/ResourceManager.hpp b/src/singletons/ResourceManager.hpp
index ceeee895b..42ac18ce7 100644
--- a/src/singletons/ResourceManager.hpp
+++ b/src/singletons/ResourceManager.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <QIcon>
 #include <QRegularExpression>
diff --git a/src/singletons/ThemeManager.hpp b/src/singletons/ThemeManager.hpp
index 917c627cf..6ffbb04ab 100644
--- a/src/singletons/ThemeManager.hpp
+++ b/src/singletons/ThemeManager.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <QBrush>
 #include <QColor>
diff --git a/src/singletons/UpdateManager.cpp b/src/singletons/UpdateManager.cpp
index e271622b8..0e0760f19 100644
--- a/src/singletons/UpdateManager.cpp
+++ b/src/singletons/UpdateManager.cpp
@@ -1,9 +1,9 @@
 #include "UpdateManager.hpp"
 
+#include "common/NetworkRequest.hpp"
+#include "common/Version.hpp"
 #include "util/CombinePath.hpp"
-#include "util/NetworkRequest.hpp"
 #include "util/PostToThread.hpp"
-#include "Version.hpp"
 
 #include <QMessageBox>
 #include <QProcess>
diff --git a/src/util/RapidjsonHelpers.hpp b/src/util/RapidjsonHelpers.hpp
index 632c1e60c..abc06e31d 100644
--- a/src/util/RapidjsonHelpers.hpp
+++ b/src/util/RapidjsonHelpers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <rapidjson/document.h>
 #include <pajlada/settings/serialize.hpp>
diff --git a/src/widgets/AttachedWindow.hpp b/src/widgets/AttachedWindow.hpp
index b83ee8f2e..ccf16142c 100644
--- a/src/widgets/AttachedWindow.hpp
+++ b/src/widgets/AttachedWindow.hpp
@@ -2,7 +2,7 @@
 
 #include <QWidget>
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/splits/Split.hpp"
 
 namespace chatterino {
diff --git a/src/widgets/StreamView.cpp b/src/widgets/StreamView.cpp
index 74822e6c6..5d5b25e46 100644
--- a/src/widgets/StreamView.cpp
+++ b/src/widgets/StreamView.cpp
@@ -1,6 +1,6 @@
 #include "StreamView.hpp"
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/splits/Split.hpp"
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 807c4a44c..93e284103 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -1,19 +1,19 @@
 #include "widgets/Window.hpp"
 
 #include "Application.hpp"
+#include "common/Version.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/IrcManager.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "Version.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
-#include "widgets/helper/Shortcut.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
-#include "widgets/splits/Split.hpp"
 #include "widgets/dialogs/WelcomeDialog.hpp"
+#include "widgets/helper/Shortcut.hpp"
+#include "widgets/splits/Split.hpp"
 
 #include <QApplication>
 #include <QDesktopServices>
diff --git a/src/widgets/dialogs/EmotePopup.hpp b/src/widgets/dialogs/EmotePopup.hpp
index 7b374795a..2fd655944 100644
--- a/src/widgets/dialogs/EmotePopup.hpp
+++ b/src/widgets/dialogs/EmotePopup.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
diff --git a/src/widgets/dialogs/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp
index e70fb103c..0ef7edfcb 100644
--- a/src/widgets/dialogs/LoginDialog.cpp
+++ b/src/widgets/dialogs/LoginDialog.cpp
@@ -1,6 +1,6 @@
 #include "widgets/dialogs/LoginDialog.hpp"
-#include "Common.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/Common.hpp"
+#include "common/UrlFetch.hpp"
 #ifdef USEWINSDK
 #include <Windows.h>
 #endif
diff --git a/src/widgets/dialogs/NotificationPopup.hpp b/src/widgets/dialogs/NotificationPopup.hpp
index 871fabb3b..e343db3ab 100644
--- a/src/widgets/dialogs/NotificationPopup.hpp
+++ b/src/widgets/dialogs/NotificationPopup.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "messages/Message.hpp"
 #include "widgets/BaseWindow.hpp"
 
diff --git a/src/widgets/dialogs/SelectChannelDialog.hpp b/src/widgets/dialogs/SelectChannelDialog.hpp
index 64f88250c..e41bccb4b 100644
--- a/src/widgets/dialogs/SelectChannelDialog.hpp
+++ b/src/widgets/dialogs/SelectChannelDialog.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 #include "widgets/Notebook.hpp"
 
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index e52db607d..e7d31cb7b 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -5,7 +5,7 @@
 #include "singletons/ResourceManager.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/PostToThread.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/helper/Line.hpp"
 #include "widgets/helper/RippleEffectLabel.hpp"
 #include "widgets/Label.hpp"
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index 26f542ffe..373f5e01b 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 
 #include <pajlada/signals/signal.hpp>
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index e72776b6d..9f0422d51 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "messages/Image.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index 05f169f71..f9b05ea9f 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -1,7 +1,7 @@
 #include "widgets/helper/NotebookTab.hpp"
 
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "debug/Log.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"
diff --git a/src/widgets/helper/NotebookTab.hpp b/src/widgets/helper/NotebookTab.hpp
index 19c3a2e81..d44016542 100644
--- a/src/widgets/helper/NotebookTab.hpp
+++ b/src/widgets/helper/NotebookTab.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/RippleEffectButton.hpp"
 
diff --git a/src/widgets/helper/ResizingTextEdit.cpp b/src/widgets/helper/ResizingTextEdit.cpp
index d9476cc7b..2cb953cb8 100644
--- a/src/widgets/helper/ResizingTextEdit.cpp
+++ b/src/widgets/helper/ResizingTextEdit.cpp
@@ -1,6 +1,6 @@
 #include "widgets/helper/ResizingTextEdit.hpp"
-#include "Common.hpp"
-#include "util/CompletionModel.hpp"
+#include "common/Common.hpp"
+#include "common/CompletionModel.hpp"
 
 ResizingTextEdit::ResizingTextEdit()
 {
diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp
index 3d523d248..832684434 100644
--- a/src/widgets/helper/SearchPopup.cpp
+++ b/src/widgets/helper/SearchPopup.cpp
@@ -4,7 +4,7 @@
 #include <QLineEdit>
 #include <QVBoxLayout>
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
 namespace chatterino {
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 50cdc17a0..a92e22410 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -1,7 +1,7 @@
 #include "widgets/splits/Split.hpp"
 
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "providers/twitch/EmoteValue.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -10,7 +10,7 @@
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/StreamLink.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/helper/DebugPopup.hpp"
 #include "widgets/helper/SearchPopup.hpp"
 #include "widgets/helper/Shortcut.hpp"
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index 55ffb9fd9..fb7fdca2c 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/MessageElement.hpp"
-#include "NullablePtr.hpp"
-#include "util/SerializeCustom.hpp"
+#include "common/NullablePtr.hpp"
+#include "common/SerializeCustom.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/RippleEffectLabel.hpp"
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index 0a0bb0bfb..aeb87b1c1 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -1,6 +1,6 @@
 #include "widgets/splits/SplitContainer.hpp"
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
 #include "debug/AssertInGuiThread.hpp"
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index ebbe2f2dc..17a0296b7 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -6,7 +6,7 @@
 #include "singletons/ResourceManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "util/LayoutCreator.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index 2bea4d1f8..4a8065f68 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -8,7 +8,7 @@
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "util/LayoutCreator.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"