Move all files under src/

145 files changed, 282 insertions, 280 deletions

diff --git a/.ci/format.sh b/.ci/format.sh
index 89fa4e88..d87bfb66 100755
--- a/.ci/format.sh
+++ b/.ci/format.sh
@@ -9,6 +9,6 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-FILES=`find include src -type f -type f \( -iname "*.cc" -o -iname "*.h" \)`
+FILES=`find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \)`
 
 clang-format -i $FILES && git diff --exit-code
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8204df9c..59c2ce32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ message(STATUS "Version: ${PROJECT_VERSION}")
 
 cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME)
 set(BUILD_USER $ENV{USER})
-configure_file(cmake/version.hpp config/version.hpp)
+configure_file(cmake/version.h config/version.h)
 
 
 #
@@ -144,82 +144,82 @@ configure_file(cmake/version.hpp config/version.hpp)
 #
 set(SRC_FILES
     # Dialogs
-    src/dialogs/CreateRoom.cc
-    src/dialogs/ImageOverlay.cc
-    src/dialogs/PreviewUploadOverlay.cc
-    src/dialogs/InviteUsers.cc
-    src/dialogs/JoinRoom.cc
+    src/dialogs/CreateRoom.cpp
+    src/dialogs/ImageOverlay.cpp
+    src/dialogs/PreviewUploadOverlay.cpp
+    src/dialogs/InviteUsers.cpp
+    src/dialogs/JoinRoom.cpp
     src/dialogs/MemberList.cpp
-    src/dialogs/LeaveRoom.cc
-    src/dialogs/Logout.cc
-    src/dialogs/ReadReceipts.cc
+    src/dialogs/LeaveRoom.cpp
+    src/dialogs/Logout.cpp
+    src/dialogs/ReadReceipts.cpp
     src/dialogs/ReCaptcha.cpp
     src/dialogs/RoomSettings.cpp
 
     # Emoji
-    src/emoji/Category.cc
-    src/emoji/ItemDelegate.cc
-    src/emoji/Panel.cc
-    src/emoji/PickButton.cc
-    src/emoji/Provider.cc
+    src/emoji/Category.cpp
+    src/emoji/ItemDelegate.cpp
+    src/emoji/Panel.cpp
+    src/emoji/PickButton.cpp
+    src/emoji/Provider.cpp
 
     # Timeline
-    src/timeline/TimelineViewManager.cc
-    src/timeline/TimelineItem.cc
-    src/timeline/TimelineView.cc
-    src/timeline/widgets/AudioItem.cc
-    src/timeline/widgets/FileItem.cc
-    src/timeline/widgets/ImageItem.cc
-    src/timeline/widgets/VideoItem.cc
+    src/timeline/TimelineViewManager.cpp
+    src/timeline/TimelineItem.cpp
+    src/timeline/TimelineView.cpp
+    src/timeline/widgets/AudioItem.cpp
+    src/timeline/widgets/FileItem.cpp
+    src/timeline/widgets/ImageItem.cpp
+    src/timeline/widgets/VideoItem.cpp
 
     # UI components
-    src/ui/Avatar.cc
-    src/ui/Badge.cc
-    src/ui/LoadingIndicator.cc
+    src/ui/Avatar.cpp
+    src/ui/Badge.cpp
+    src/ui/LoadingIndicator.cpp
     src/ui/InfoMessage.cpp
-    src/ui/FlatButton.cc
-    src/ui/FloatingButton.cc
-    src/ui/Label.cc
-    src/ui/OverlayModal.cc
-    src/ui/ScrollBar.cc
-    src/ui/SnackBar.cc
-    src/ui/RaisedButton.cc
-    src/ui/Ripple.cc
-    src/ui/RippleOverlay.cc
-    src/ui/OverlayWidget.cc
-    src/ui/TextField.cc
-    src/ui/ToggleButton.cc
-    src/ui/Theme.cc
-    src/ui/ThemeManager.cc
-
-    src/AvatarProvider.cc
-    src/Cache.cc
-    src/ChatPage.cc
-    src/CommunitiesListItem.cc
-    src/CommunitiesList.cc
-    src/InviteeItem.cc
-    src/LoginPage.cc
+    src/ui/FlatButton.cpp
+    src/ui/FloatingButton.cpp
+    src/ui/Label.cpp
+    src/ui/OverlayModal.cpp
+    src/ui/ScrollBar.cpp
+    src/ui/SnackBar.cpp
+    src/ui/RaisedButton.cpp
+    src/ui/Ripple.cpp
+    src/ui/RippleOverlay.cpp
+    src/ui/OverlayWidget.cpp
+    src/ui/TextField.cpp
+    src/ui/ToggleButton.cpp
+    src/ui/Theme.cpp
+    src/ui/ThemeManager.cpp
+
+    src/AvatarProvider.cpp
+    src/Cache.cpp
+    src/ChatPage.cpp
+    src/CommunitiesListItem.cpp
+    src/CommunitiesList.cpp
+    src/InviteeItem.cpp
+    src/LoginPage.cpp
     src/Logging.cpp
-    src/MainWindow.cc
-    src/MatrixClient.cc
-    src/QuickSwitcher.cc
+    src/MainWindow.cpp
+    src/MatrixClient.cpp
+    src/QuickSwitcher.cpp
     src/Olm.cpp
-    src/RegisterPage.cc
-    src/RoomInfoListItem.cc
-    src/RoomList.cc
-    src/RunGuard.cc
-    src/SideBarActions.cc
-    src/Splitter.cc
+    src/RegisterPage.cpp
+    src/RoomInfoListItem.cpp
+    src/RoomList.cpp
+    src/RunGuard.cpp
+    src/SideBarActions.cpp
+    src/Splitter.cpp
     src/SuggestionsPopup.cpp
-    src/TextInputWidget.cc
-    src/TopRoomBar.cc
-    src/TrayIcon.cc
-    src/TypingDisplay.cc
-    src/Utils.cc
-    src/UserInfoWidget.cc
-    src/UserSettingsPage.cc
-    src/WelcomePage.cc
-    src/main.cc
+    src/TextInputWidget.cpp
+    src/TopRoomBar.cpp
+    src/TrayIcon.cpp
+    src/TypingDisplay.cpp
+    src/Utils.cpp
+    src/UserInfoWidget.cpp
+    src/UserSettingsPage.cpp
+    src/WelcomePage.cpp
+    src/main.cpp
 )
 
 # ExternalProject dependencies
@@ -252,82 +252,81 @@ if(NOT TWEENY_INCLUDE_DIR)
 endif()
 include_directories(SYSTEM ${TWEENY_INCLUDE_DIR})
 
-include_directories(include)
-include_directories(include/ui)
+include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/config)
 
 qt5_wrap_cpp(MOC_HEADERS
     # Dialogs
-    include/dialogs/CreateRoom.h
-    include/dialogs/ImageOverlay.h
-    include/dialogs/PreviewUploadOverlay.h
-    include/dialogs/InviteUsers.h
-    include/dialogs/JoinRoom.h
-    include/dialogs/MemberList.hpp
-    include/dialogs/LeaveRoom.h
-    include/dialogs/Logout.h
-    include/dialogs/ReadReceipts.h
-    include/dialogs/ReCaptcha.hpp
-    include/dialogs/RoomSettings.hpp
+    src/dialogs/CreateRoom.h
+    src/dialogs/ImageOverlay.h
+    src/dialogs/PreviewUploadOverlay.h
+    src/dialogs/InviteUsers.h
+    src/dialogs/JoinRoom.h
+    src/dialogs/MemberList.h
+    src/dialogs/LeaveRoom.h
+    src/dialogs/Logout.h
+    src/dialogs/ReadReceipts.h
+    src/dialogs/ReCaptcha.h
+    src/dialogs/RoomSettings.h
 
     # Emoji
-    include/emoji/Category.h
-    include/emoji/ItemDelegate.h
-    include/emoji/Panel.h
-    include/emoji/PickButton.h
+    src/emoji/Category.h
+    src/emoji/ItemDelegate.h
+    src/emoji/Panel.h
+    src/emoji/PickButton.h
 
     # Timeline
-    include/timeline/TimelineItem.h
-    include/timeline/TimelineView.h
-    include/timeline/TimelineViewManager.h
-    include/timeline/widgets/AudioItem.h
-    include/timeline/widgets/FileItem.h
-    include/timeline/widgets/ImageItem.h
-    include/timeline/widgets/VideoItem.h
+    src/timeline/TimelineItem.h
+    src/timeline/TimelineView.h
+    src/timeline/TimelineViewManager.h
+    src/timeline/widgets/AudioItem.h
+    src/timeline/widgets/FileItem.h
+    src/timeline/widgets/ImageItem.h
+    src/timeline/widgets/VideoItem.h
 
     # UI components
-    include/ui/Avatar.h
-    include/ui/Badge.h
-    include/ui/LoadingIndicator.h
-    include/ui/InfoMessage.hpp
-    include/ui/FlatButton.h
-    include/ui/Label.h
-    include/ui/FloatingButton.h
-    include/ui/OverlayWidget.h
-    include/ui/ScrollBar.h
-    include/ui/SnackBar.h
-    include/ui/RaisedButton.h
-    include/ui/Ripple.h
-    include/ui/RippleOverlay.h
-    include/ui/TextField.h
-    include/ui/ToggleButton.h
-    include/ui/Theme.h
-    include/ui/ThemeManager.h
-
-    include/notifications/Manager.h
-
-    include/AvatarProvider.h
-    include/Cache.h
-    include/ChatPage.h
-    include/CommunitiesListItem.h
-    include/CommunitiesList.h
-    include/LoginPage.h
-    include/MainWindow.h
-    include/InviteeItem.h
-    include/QuickSwitcher.h
-    include/RegisterPage.h
-    include/RoomInfoListItem.h
-    include/RoomList.h
-    include/SideBarActions.h
-    include/Splitter.h
-    include/SuggestionsPopup.hpp
-    include/TextInputWidget.h
-    include/TopRoomBar.h
-    include/TrayIcon.h
-    include/TypingDisplay.h
-    include/UserInfoWidget.h
-    include/UserSettingsPage.h
-    include/WelcomePage.h
+    src/ui/Avatar.h
+    src/ui/Badge.h
+    src/ui/LoadingIndicator.h
+    src/ui/InfoMessage.h
+    src/ui/FlatButton.h
+    src/ui/Label.h
+    src/ui/FloatingButton.h
+    src/ui/OverlayWidget.h
+    src/ui/ScrollBar.h
+    src/ui/SnackBar.h
+    src/ui/RaisedButton.h
+    src/ui/Ripple.h
+    src/ui/RippleOverlay.h
+    src/ui/TextField.h
+    src/ui/ToggleButton.h
+    src/ui/Theme.h
+    src/ui/ThemeManager.h
+
+    src/notifications/Manager.h
+
+    src/AvatarProvider.h
+    src/Cache.h
+    src/ChatPage.h
+    src/CommunitiesListItem.h
+    src/CommunitiesList.h
+    src/LoginPage.h
+    src/MainWindow.h
+    src/InviteeItem.h
+    src/QuickSwitcher.h
+    src/RegisterPage.h
+    src/RoomInfoListItem.h
+    src/RoomList.h
+    src/SideBarActions.h
+    src/Splitter.h
+    src/SuggestionsPopup.h
+    src/TextInputWidget.h
+    src/TopRoomBar.h
+    src/TrayIcon.h
+    src/TypingDisplay.h
+    src/UserInfoWidget.h
+    src/UserSettingsPage.h
+    src/WelcomePage.h
 )
 
 #
diff --git a/cmake/version.hpp b/cmake/version.h
index 204bc895..204bc895 100644
--- a/cmake/version.hpp
+++ b/cmake/version.h
diff --git a/src/AvatarProvider.cc b/src/AvatarProvider.cpp
index b4c1188a..dbfc1945 100644
--- a/src/AvatarProvider.cc
+++ b/src/AvatarProvider.cpp
@@ -20,7 +20,7 @@
 
 #include "AvatarProvider.h"
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 
 namespace AvatarProvider {
diff --git a/include/AvatarProvider.h b/src/AvatarProvider.h
index 4b4e15e9..4b4e15e9 100644
--- a/include/AvatarProvider.h
+++ b/src/AvatarProvider.h
diff --git a/src/Cache.cc b/src/Cache.cpp
index 614e8a90..6f71b746 100644
--- a/src/Cache.cc
+++ b/src/Cache.cpp
@@ -28,7 +28,6 @@
 #include <variant.hpp>
 
 #include "Cache.h"
-#include "Logging.hpp"
 #include "Utils.h"
 
 //! Should be changed when a breaking change occurs in the cache format.
diff --git a/include/Cache.h b/src/Cache.h
index 14f991e8..fa8355a5 100644
--- a/include/Cache.h
+++ b/src/Cache.h
@@ -31,7 +31,7 @@
 #include <mtxclient/crypto/client.hpp>
 #include <mutex>
 
-#include "Logging.hpp"
+#include "Logging.h"
 
 using mtx::events::state::JoinRule;
 
diff --git a/src/ChatPage.cc b/src/ChatPage.cpp
index ff059cee..cc7a5741 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cpp
@@ -23,22 +23,22 @@
 #include "AvatarProvider.h"
 #include "Cache.h"
 #include "ChatPage.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "Olm.hpp"
-#include "OverlayModal.h"
+#include "Olm.h"
 #include "QuickSwitcher.h"
 #include "RoomList.h"
 #include "SideBarActions.h"
 #include "Splitter.h"
 #include "TextInputWidget.h"
-#include "Theme.h"
 #include "TopRoomBar.h"
 #include "TypingDisplay.h"
 #include "UserInfoWidget.h"
 #include "UserSettingsPage.h"
 #include "Utils.h"
+#include "ui/OverlayModal.h"
+#include "ui/Theme.h"
 
 #include "notifications/Manager.h"
 
diff --git a/include/ChatPage.h b/src/ChatPage.h
index 6a70acf4..6a70acf4 100644
--- a/include/ChatPage.h
+++ b/src/ChatPage.h
diff --git a/src/CommunitiesList.cc b/src/CommunitiesList.cpp
index 822ca1d2..c271be89 100644
--- a/src/CommunitiesList.cc
+++ b/src/CommunitiesList.cpp
@@ -1,6 +1,6 @@
 #include "CommunitiesList.h"
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 
 #include <QLabel>
diff --git a/include/CommunitiesList.h b/src/CommunitiesList.h
index 32a64bf2..32a64bf2 100644
--- a/include/CommunitiesList.h
+++ b/src/CommunitiesList.h
diff --git a/src/CommunitiesListItem.cc b/src/CommunitiesListItem.cpp
index df6c5393..8afaebff 100644
--- a/src/CommunitiesListItem.cc
+++ b/src/CommunitiesListItem.cpp
@@ -1,8 +1,8 @@
 #include "CommunitiesListItem.h"
-#include "Painter.h"
-#include "Ripple.h"
-#include "RippleOverlay.h"
 #include "Utils.h"
+#include "ui/Painter.h"
+#include "ui/Ripple.h"
+#include "ui/RippleOverlay.h"
 
 CommunitiesListItem::CommunitiesListItem(QString group_id, QWidget *parent)
   : QWidget(parent)
diff --git a/include/CommunitiesListItem.h b/src/CommunitiesListItem.h
index a9b6e333..a9b6e333 100644
--- a/include/CommunitiesListItem.h
+++ b/src/CommunitiesListItem.h
diff --git a/include/Config.h b/src/Config.h
index 3a3296d6..3a3296d6 100644
--- a/include/Config.h
+++ b/src/Config.h
diff --git a/src/InviteeItem.cc b/src/InviteeItem.cpp
index 5ae2a7b6..6e9be0d5 100644
--- a/src/InviteeItem.cc
+++ b/src/InviteeItem.cpp
@@ -1,8 +1,8 @@
 #include <QHBoxLayout>
 
-#include "FlatButton.h"
 #include "InviteeItem.h"
-#include "Theme.h"
+#include "ui/FlatButton.h"
+#include "ui/Theme.h"
 
 constexpr int SidePadding = 10;
 constexpr int IconSize    = 13;
diff --git a/include/InviteeItem.h b/src/InviteeItem.h
index f0bdbdf0..f0bdbdf0 100644
--- a/include/InviteeItem.h
+++ b/src/InviteeItem.h
diff --git a/src/Logging.cpp b/src/Logging.cpp
index bccbe389..1b2838f3 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -1,4 +1,4 @@
-#include "Logging.hpp"
+#include "Logging.h"
 
 #include <iostream>
 #include <spdlog/sinks/file_sinks.h>
diff --git a/include/Logging.hpp b/src/Logging.h
index 2feae60d..2feae60d 100644
--- a/include/Logging.hpp
+++ b/src/Logging.h
diff --git a/src/LoginPage.cc b/src/LoginPage.cpp
index 6a3b925c..dbf9d470 100644
--- a/src/LoginPage.cc
+++ b/src/LoginPage.cpp
@@ -20,13 +20,13 @@
 #include <mtx/identifiers.hpp>
 
 #include "Config.h"
-#include "FlatButton.h"
-#include "LoadingIndicator.h"
 #include "LoginPage.h"
 #include "MatrixClient.h"
-#include "OverlayModal.h"
-#include "RaisedButton.h"
-#include "TextField.h"
+#include "ui/FlatButton.h"
+#include "ui/LoadingIndicator.h"
+#include "ui/OverlayModal.h"
+#include "ui/RaisedButton.h"
+#include "ui/TextField.h"
 
 using namespace mtx::identifiers;
 
diff --git a/include/LoginPage.h b/src/LoginPage.h
index c52ccaa4..c52ccaa4 100644
--- a/include/LoginPage.h
+++ b/src/LoginPage.h
diff --git a/src/MainWindow.cc b/src/MainWindow.cpp
index 749e7caf..fdca98c3 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cpp
@@ -24,25 +24,25 @@
 
 #include "ChatPage.h"
 #include "Config.h"
-#include "LoadingIndicator.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "LoginPage.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "OverlayModal.h"
 #include "RegisterPage.h"
-#include "SnackBar.h"
 #include "TrayIcon.h"
 #include "UserSettingsPage.h"
 #include "WelcomePage.h"
+#include "ui/LoadingIndicator.h"
+#include "ui/OverlayModal.h"
+#include "ui/SnackBar.h"
 
 #include "dialogs/CreateRoom.h"
 #include "dialogs/InviteUsers.h"
 #include "dialogs/JoinRoom.h"
 #include "dialogs/LeaveRoom.h"
 #include "dialogs/Logout.h"
-#include "dialogs/MemberList.hpp"
-#include "dialogs/RoomSettings.hpp"
+#include "dialogs/MemberList.h"
+#include "dialogs/RoomSettings.h"
 
 MainWindow *MainWindow::instance_ = nullptr;
 
diff --git a/include/MainWindow.h b/src/MainWindow.h
index 92040191..92040191 100644
--- a/include/MainWindow.h
+++ b/src/MainWindow.h
diff --git a/src/MatrixClient.cc b/src/MatrixClient.cpp
index e41c66c1..e41c66c1 100644
--- a/src/MatrixClient.cc
+++ b/src/MatrixClient.cpp
diff --git a/include/MatrixClient.h b/src/MatrixClient.h
index 12bba889..12bba889 100644
--- a/include/MatrixClient.h
+++ b/src/MatrixClient.h
diff --git a/src/Olm.cpp b/src/Olm.cpp
index b3bb4316..fe4265d7 100644
--- a/src/Olm.cpp
+++ b/src/Olm.cpp
@@ -1,7 +1,7 @@
-#include "Olm.hpp"
+#include "Olm.h"
 
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 
 using namespace mtx::crypto;
diff --git a/include/Olm.hpp b/src/Olm.h
index ae4e0659..ae4e0659 100644
--- a/include/Olm.hpp
+++ b/src/Olm.h
diff --git a/src/QuickSwitcher.cc b/src/QuickSwitcher.cpp
index 3c9725d1..07460efb 100644
--- a/src/QuickSwitcher.cc
+++ b/src/QuickSwitcher.cpp
@@ -23,6 +23,7 @@
 #include <QtConcurrent>
 
 #include "QuickSwitcher.h"
+#include "SuggestionsPopup.h"
 
 RoomSearchInput::RoomSearchInput(QWidget *parent)
   : TextField(parent)
diff --git a/include/QuickSwitcher.h b/src/QuickSwitcher.h
index 254d7a16..24b9adfa 100644
--- a/include/QuickSwitcher.h
+++ b/src/QuickSwitcher.h
@@ -22,8 +22,8 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "SuggestionsPopup.hpp"
-#include "TextField.h"
+#include "SuggestionsPopup.h"
+#include "ui/TextField.h"
 
 Q_DECLARE_METATYPE(std::vector<RoomSearchResult>)
 
diff --git a/src/RegisterPage.cc b/src/RegisterPage.cpp
index 4894d122..5a02713a 100644
--- a/src/RegisterPage.cc
+++ b/src/RegisterPage.cpp
@@ -19,15 +19,15 @@
 #include <QTimer>
 
 #include "Config.h"
-#include "FlatButton.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "RaisedButton.h"
 #include "RegisterPage.h"
-#include "TextField.h"
+#include "ui/FlatButton.h"
+#include "ui/RaisedButton.h"
+#include "ui/TextField.h"
 
-#include "dialogs/ReCaptcha.hpp"
+#include "dialogs/ReCaptcha.h"
 
 RegisterPage::RegisterPage(QWidget *parent)
   : QWidget(parent)
diff --git a/include/RegisterPage.h b/src/RegisterPage.h
index d02de7c4..d02de7c4 100644
--- a/include/RegisterPage.h
+++ b/src/RegisterPage.h
diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cpp
index 7027115f..172cdb90 100644
--- a/src/RoomInfoListItem.cc
+++ b/src/RoomInfoListItem.cpp
@@ -24,12 +24,12 @@
 
 #include "Cache.h"
 #include "Config.h"
-#include "Menu.h"
-#include "Ripple.h"
-#include "RippleOverlay.h"
 #include "RoomInfoListItem.h"
-#include "Theme.h"
 #include "Utils.h"
+#include "ui/Menu.h"
+#include "ui/Ripple.h"
+#include "ui/RippleOverlay.h"
+#include "ui/Theme.h"
 
 constexpr int MaxUnreadCountDisplayed = 99;
 
diff --git a/include/RoomInfoListItem.h b/src/RoomInfoListItem.h
index 95db1d75..95db1d75 100644
--- a/include/RoomInfoListItem.h
+++ b/src/RoomInfoListItem.h
diff --git a/src/RoomList.cc b/src/RoomList.cpp
index 418a5d6f..a9328984 100644
--- a/src/RoomList.cc
+++ b/src/RoomList.cpp
@@ -21,14 +21,14 @@
 #include <QTimer>
 
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "OverlayModal.h"
 #include "RoomInfoListItem.h"
 #include "RoomList.h"
 #include "UserSettingsPage.h"
 #include "Utils.h"
+#include "ui/OverlayModal.h"
 
 RoomList::RoomList(QSharedPointer<UserSettings> userSettings, QWidget *parent)
   : QWidget(parent)
diff --git a/include/RoomList.h b/src/RoomList.h
index 59b0e865..59b0e865 100644
--- a/include/RoomList.h
+++ b/src/RoomList.h
diff --git a/src/RunGuard.cc b/src/RunGuard.cpp
index 75833eb7..75833eb7 100644
--- a/src/RunGuard.cc
+++ b/src/RunGuard.cpp
diff --git a/include/RunGuard.h b/src/RunGuard.h
index f9a9641a..f9a9641a 100644
--- a/include/RunGuard.h
+++ b/src/RunGuard.h
diff --git a/src/SideBarActions.cc b/src/SideBarActions.cpp
index d65900b3..b2a01e3e 100644
--- a/src/SideBarActions.cc
+++ b/src/SideBarActions.cpp
@@ -5,9 +5,11 @@
 
 #include "Config.h"
 #include "MainWindow.h"
-#include "OverlayModal.h"
 #include "SideBarActions.h"
-#include "Theme.h"
+#include "ui/FlatButton.h"
+#include "ui/Menu.h"
+#include "ui/OverlayModal.h"
+#include "ui/Theme.h"
 
 SideBarActions::SideBarActions(QWidget *parent)
   : QWidget{parent}
diff --git a/include/SideBarActions.h b/src/SideBarActions.h
index a29757dd..f97c72de 100644
--- a/include/SideBarActions.h
+++ b/src/SideBarActions.h
@@ -5,15 +5,15 @@
 #include <QResizeEvent>
 #include <QWidget>
 
-#include "FlatButton.h"
-#include "Menu.h"
-
 namespace mtx {
 namespace requests {
 struct CreateRoom;
 }
 }
 
+class Menu;
+class FlatButton;
+
 class SideBarActions : public QWidget
 {
         Q_OBJECT
diff --git a/src/Splitter.cc b/src/Splitter.cpp
index 7b6c9573..f5bbf367 100644
--- a/src/Splitter.cc
+++ b/src/Splitter.cpp
@@ -23,7 +23,7 @@
 
 #include "Config.h"
 #include "Splitter.h"
-#include "Theme.h"
+#include "ui/Theme.h"
 
 constexpr auto MaxWidth = (1 << 24) - 1;
 
diff --git a/include/Splitter.h b/src/Splitter.h
index 99e02eed..99e02eed 100644
--- a/include/Splitter.h
+++ b/src/Splitter.h
diff --git a/src/SuggestionsPopup.cpp b/src/SuggestionsPopup.cpp
index bcfcb233..5ea78460 100644
--- a/src/SuggestionsPopup.cpp
+++ b/src/SuggestionsPopup.cpp
@@ -1,14 +1,13 @@
-#include "Avatar.h"
-#include "AvatarProvider.h"
-#include "Config.h"
-#include "DropShadow.h"
-#include "SuggestionsPopup.hpp"
-#include "Utils.h"
-
 #include <QPaintEvent>
 #include <QPainter>
 #include <QStyleOption>
 
+#include "Config.h"
+#include "SuggestionsPopup.h"
+#include "Utils.h"
+#include "ui/Avatar.h"
+#include "ui/DropShadow.h"
+
 constexpr int PopupHMargin    = 4;
 constexpr int PopupItemMargin = 3;
 
diff --git a/include/SuggestionsPopup.hpp b/src/SuggestionsPopup.h
index 4a8dd00c..72d6c7eb 100644
--- a/include/SuggestionsPopup.hpp
+++ b/src/SuggestionsPopup.h
@@ -5,7 +5,6 @@
 #include <QPoint>
 #include <QWidget>
 
-#include "Avatar.h"
 #include "AvatarProvider.h"
 #include "Cache.h"
 #include "ChatPage.h"
diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cpp
index bb72c533..a419ed84 100644
--- a/src/TextInputWidget.cc
+++ b/src/TextInputWidget.cpp
@@ -36,6 +36,8 @@
 #include "Config.h"
 #include "TextInputWidget.h"
 #include "Utils.h"
+#include "ui/FlatButton.h"
+#include "ui/LoadingIndicator.h"
 
 static constexpr size_t INPUT_HISTORY_SIZE = 127;
 static constexpr int MAX_TEXTINPUT_HEIGHT  = 120;
diff --git a/include/TextInputWidget.h b/src/TextInputWidget.h
index 2dcb178f..e7d5f948 100644
--- a/include/TextInputWidget.h
+++ b/src/TextInputWidget.h
@@ -28,12 +28,8 @@
 #include <QTextEdit>
 #include <QWidget>
 
-#include "FlatButton.h"
-#include "LoadingIndicator.h"
-#include "SuggestionsPopup.hpp"
-
+#include "SuggestionsPopup.h"
 #include "dialogs/PreviewUploadOverlay.h"
-
 #include "emoji/PickButton.h"
 
 namespace dialogs {
@@ -42,6 +38,9 @@ class PreviewUploadOverlay;
 
 struct SearchResult;
 
+class FlatButton;
+class LoadingIndicator;
+
 class FilteredTextEdit : public QTextEdit
 {
         Q_OBJECT
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cpp
index 7b2814b9..c9609788 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cpp
@@ -18,14 +18,14 @@
 #include <QDebug>
 #include <QStyleOption>
 
-#include "Avatar.h"
 #include "Config.h"
-#include "FlatButton.h"
 #include "MainWindow.h"
-#include "Menu.h"
-#include "OverlayModal.h"
 #include "TopRoomBar.h"
 #include "Utils.h"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
+#include "ui/Menu.h"
+#include "ui/OverlayModal.h"
 
 TopRoomBar::TopRoomBar(QWidget *parent)
   : QWidget(parent)
diff --git a/include/TopRoomBar.h b/src/TopRoomBar.h
index 1c42e25f..1c42e25f 100644
--- a/include/TopRoomBar.h
+++ b/src/TopRoomBar.h
diff --git a/src/TrayIcon.cc b/src/TrayIcon.cpp
index ac84aaca..ac84aaca 100644
--- a/src/TrayIcon.cc
+++ b/src/TrayIcon.cpp
diff --git a/include/TrayIcon.h b/src/TrayIcon.h
index a3536cc3..a3536cc3 100644
--- a/include/TrayIcon.h
+++ b/src/TrayIcon.h
diff --git a/src/TypingDisplay.cc b/src/TypingDisplay.cpp
index da9c1679..da9c1679 100644
--- a/src/TypingDisplay.cc
+++ b/src/TypingDisplay.cpp
diff --git a/include/TypingDisplay.h b/src/TypingDisplay.h
index db8a9519..db8a9519 100644
--- a/include/TypingDisplay.h
+++ b/src/TypingDisplay.h
diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cpp
index 092184f7..1470fc25 100644
--- a/src/UserInfoWidget.cc
+++ b/src/UserInfoWidget.cpp
@@ -17,12 +17,12 @@
 
 #include <QTimer>
 
-#include "Avatar.h"
 #include "Config.h"
-#include "FlatButton.h"
 #include "MainWindow.h"
-#include "OverlayModal.h"
 #include "UserInfoWidget.h"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
+#include "ui/OverlayModal.h"
 
 UserInfoWidget::UserInfoWidget(QWidget *parent)
   : QWidget(parent)
diff --git a/include/UserInfoWidget.h b/src/UserInfoWidget.h
index ea2d5400..ea2d5400 100644
--- a/include/UserInfoWidget.h
+++ b/src/UserInfoWidget.h
diff --git a/src/UserSettingsPage.cc b/src/UserSettingsPage.cpp
index 7354e413..4c249369 100644
--- a/src/UserSettingsPage.cc
+++ b/src/UserSettingsPage.cpp
@@ -24,11 +24,11 @@
 #include <QSettings>
 
 #include "Config.h"
-#include "FlatButton.h"
 #include "UserSettingsPage.h"
-#include <ToggleButton.h>
+#include "ui/FlatButton.h"
+#include "ui/ToggleButton.h"
 
-#include "version.hpp"
+#include "version.h"
 
 UserSettings::UserSettings() { load(); }
 
diff --git a/include/UserSettingsPage.h b/src/UserSettingsPage.h
index 177f1921..177f1921 100644
--- a/include/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
diff --git a/src/Utils.cc b/src/Utils.cpp
index 2247c2b7..2247c2b7 100644
--- a/src/Utils.cc
+++ b/src/Utils.cpp
diff --git a/include/Utils.h b/src/Utils.h
index 8f9b7cff..8f9b7cff 100644
--- a/include/Utils.h
+++ b/src/Utils.h
diff --git a/src/WelcomePage.cc b/src/WelcomePage.cpp
index b21da92a..0560222e 100644
--- a/src/WelcomePage.cc
+++ b/src/WelcomePage.cpp
@@ -20,8 +20,8 @@
 #include <QStyleOption>
 
 #include "Config.h"
-#include "RaisedButton.h"
 #include "WelcomePage.h"
+#include "ui/RaisedButton.h"
 
 WelcomePage::WelcomePage(QWidget *parent)
   : QWidget(parent)
diff --git a/include/WelcomePage.h b/src/WelcomePage.h
index b33ca669..b33ca669 100644
--- a/include/WelcomePage.h
+++ b/src/WelcomePage.h
diff --git a/src/dialogs/CreateRoom.cc b/src/dialogs/CreateRoom.cpp
index 8c2cc641..3c538b49 100644
--- a/src/dialogs/CreateRoom.cc
+++ b/src/dialogs/CreateRoom.cpp
@@ -3,14 +3,14 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "TextField.h"
-#include "Theme.h"
-#include "ToggleButton.h"
-
 #include "dialogs/CreateRoom.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/TextField.h"
+#include "ui/Theme.h"
+#include "ui/ToggleButton.h"
+
 using namespace dialogs;
 
 CreateRoom::CreateRoom(QWidget *parent)
diff --git a/include/dialogs/CreateRoom.h b/src/dialogs/CreateRoom.h
index 46edebdc..46edebdc 100644
--- a/include/dialogs/CreateRoom.h
+++ b/src/dialogs/CreateRoom.h
diff --git a/src/dialogs/ImageOverlay.cc b/src/dialogs/ImageOverlay.cpp
index 0e4d9d71..7773f97c 100644
--- a/src/dialogs/ImageOverlay.cc
+++ b/src/dialogs/ImageOverlay.cpp
@@ -19,9 +19,10 @@
 #include <QDesktopWidget>
 #include <QPainter>
 
-#include "Utils.h"
 #include "dialogs/ImageOverlay.h"
 
+#include "Utils.h"
+
 using namespace dialogs;
 
 ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent)
diff --git a/include/dialogs/ImageOverlay.h b/src/dialogs/ImageOverlay.h
index b4d42acb..b4d42acb 100644
--- a/include/dialogs/ImageOverlay.h
+++ b/src/dialogs/ImageOverlay.h
diff --git a/src/dialogs/InviteUsers.cc b/src/dialogs/InviteUsers.cpp
index 71cfdf20..bcd163b0 100644
--- a/src/dialogs/InviteUsers.cc
+++ b/src/dialogs/InviteUsers.cpp
@@ -6,12 +6,12 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "TextField.h"
+#include "dialogs/InviteUsers.h"
 
+#include "Config.h"
 #include "InviteeItem.h"
-#include "dialogs/InviteUsers.h"
+#include "ui/FlatButton.h"
+#include "ui/TextField.h"
 
 #include "mtx.hpp"
 
diff --git a/include/dialogs/InviteUsers.h b/src/dialogs/InviteUsers.h
index 41e6236a..41e6236a 100644
--- a/include/dialogs/InviteUsers.h
+++ b/src/dialogs/InviteUsers.h
diff --git a/src/dialogs/JoinRoom.cc b/src/dialogs/JoinRoom.cpp
index d6e83014..05c0f455 100644
--- a/src/dialogs/JoinRoom.cc
+++ b/src/dialogs/JoinRoom.cpp
@@ -2,13 +2,13 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "TextField.h"
-#include "Theme.h"
-
 #include "dialogs/JoinRoom.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/TextField.h"
+#include "ui/Theme.h"
+
 using namespace dialogs;
 
 JoinRoom::JoinRoom(QWidget *parent)
diff --git a/include/dialogs/JoinRoom.h b/src/dialogs/JoinRoom.h
index 5919f08f..5919f08f 100644
--- a/include/dialogs/JoinRoom.h
+++ b/src/dialogs/JoinRoom.h
diff --git a/src/dialogs/LeaveRoom.cc b/src/dialogs/LeaveRoom.cpp
index 508353c6..9647d19f 100644
--- a/src/dialogs/LeaveRoom.cc
+++ b/src/dialogs/LeaveRoom.cpp
@@ -2,12 +2,12 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "Theme.h"
-
 #include "dialogs/LeaveRoom.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/Theme.h"
+
 using namespace dialogs;
 
 LeaveRoom::LeaveRoom(QWidget *parent)
diff --git a/include/dialogs/LeaveRoom.h b/src/dialogs/LeaveRoom.h
index 98e4938d..98e4938d 100644
--- a/include/dialogs/LeaveRoom.h
+++ b/src/dialogs/LeaveRoom.h
diff --git a/src/dialogs/Logout.cc b/src/dialogs/Logout.cpp
index 99913b04..e2449817 100644
--- a/src/dialogs/Logout.cc
+++ b/src/dialogs/Logout.cpp
@@ -20,12 +20,12 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
-#include "Config.h"
-#include "FlatButton.h"
-#include "Theme.h"
-
 #include "dialogs/Logout.h"
 
+#include "Config.h"
+#include "ui/FlatButton.h"
+#include "ui/Theme.h"
+
 using namespace dialogs;
 
 Logout::Logout(QWidget *parent)
diff --git a/include/dialogs/Logout.h b/src/dialogs/Logout.h
index cfefb970..cfefb970 100644
--- a/include/dialogs/Logout.h
+++ b/src/dialogs/Logout.h
diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp
index f0f61686..60c2eb0a 100644
--- a/src/dialogs/MemberList.cpp
+++ b/src/dialogs/MemberList.cpp
@@ -3,15 +3,15 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
+#include "dialogs/MemberList.h"
+
 #include "AvatarProvider.h"
+#include "Cache.h"
 #include "ChatPage.h"
 #include "Config.h"
-#include "FlatButton.h"
 #include "Utils.h"
-
-#include "Avatar.h"
-#include "Cache.h"
-#include "dialogs/MemberList.hpp"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
 
 using namespace dialogs;
 
diff --git a/include/dialogs/MemberList.hpp b/src/dialogs/MemberList.h
index 9c3dc5dc..9c3dc5dc 100644
--- a/include/dialogs/MemberList.hpp
+++ b/src/dialogs/MemberList.h
diff --git a/src/dialogs/PreviewUploadOverlay.cc b/src/dialogs/PreviewUploadOverlay.cpp
index a3fe4228..7e54ba4e 100644
--- a/src/dialogs/PreviewUploadOverlay.cc
+++ b/src/dialogs/PreviewUploadOverlay.cpp
@@ -23,13 +23,13 @@
 #include <QMimeDatabase>
 #include <QVBoxLayout>
 
+#include "dialogs/PreviewUploadOverlay.h"
+
 #include "Config.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "Utils.h"
 
-#include "dialogs/PreviewUploadOverlay.h"
-
 using namespace dialogs;
 
 constexpr const char *DEFAULT = "Upload %1?";
diff --git a/include/dialogs/PreviewUploadOverlay.h b/src/dialogs/PreviewUploadOverlay.h
index 48795ca0..8d093c7f 100644
--- a/include/dialogs/PreviewUploadOverlay.h
+++ b/src/dialogs/PreviewUploadOverlay.h
@@ -22,7 +22,7 @@
 #include <QPixmap>
 #include <QWidget>
 
-#include "FlatButton.h"
+#include "ui/FlatButton.h"
 
 class QMimeData;
 
diff --git a/src/dialogs/ReCaptcha.cpp b/src/dialogs/ReCaptcha.cpp
index ba54268c..9181d588 100644
--- a/src/dialogs/ReCaptcha.cpp
+++ b/src/dialogs/ReCaptcha.cpp
@@ -4,13 +4,13 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
+#include "dialogs/ReCaptcha.h"
+
 #include "Config.h"
-#include "FlatButton.h"
 #include "MatrixClient.h"
-#include "RaisedButton.h"
-#include "Theme.h"
-
-#include "dialogs/ReCaptcha.hpp"
+#include "ui/FlatButton.h"
+#include "ui/RaisedButton.h"
+#include "ui/Theme.h"
 
 using namespace dialogs;
 
diff --git a/include/dialogs/ReCaptcha.hpp b/src/dialogs/ReCaptcha.h
index 5f47b0eb..5f47b0eb 100644
--- a/include/dialogs/ReCaptcha.hpp
+++ b/src/dialogs/ReCaptcha.h
diff --git a/src/dialogs/ReadReceipts.cc b/src/dialogs/ReadReceipts.cpp
index a2e1faf2..c27146ac 100644
--- a/src/dialogs/ReadReceipts.cc
+++ b/src/dialogs/ReadReceipts.cpp
@@ -6,14 +6,14 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "ChatPage.h"
-#include "Config.h"
-#include "Utils.h"
+#include "dialogs/ReadReceipts.h"
 
-#include "Avatar.h"
 #include "AvatarProvider.h"
 #include "Cache.h"
-#include "dialogs/ReadReceipts.h"
+#include "ChatPage.h"
+#include "Config.h"
+#include "Utils.h"
+#include "ui/Avatar.h"
 
 using namespace dialogs;
 
diff --git a/include/dialogs/ReadReceipts.h b/src/dialogs/ReadReceipts.h
index 5e5615df..5e5615df 100644
--- a/include/dialogs/ReadReceipts.h
+++ b/src/dialogs/ReadReceipts.h
diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp
index 3f40ae89..cfb25997 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -1,16 +1,3 @@
-#include "Avatar.h"
-#include "ChatPage.h"
-#include "Config.h"
-#include "FlatButton.h"
-#include "Logging.hpp"
-#include "MatrixClient.h"
-#include "Painter.h"
-#include "TextField.h"
-#include "Theme.h"
-#include "Utils.h"
-#include "dialogs/RoomSettings.hpp"
-#include "ui/ToggleButton.h"
-
 #include <QApplication>
 #include <QComboBox>
 #include <QLabel>
@@ -22,6 +9,20 @@
 #include <QStyleOption>
 #include <QVBoxLayout>
 
+#include "dialogs/RoomSettings.h"
+
+#include "ChatPage.h"
+#include "Config.h"
+#include "Logging.h"
+#include "MatrixClient.h"
+#include "Utils.h"
+#include "ui/Avatar.h"
+#include "ui/FlatButton.h"
+#include "ui/Painter.h"
+#include "ui/TextField.h"
+#include "ui/Theme.h"
+#include "ui/ToggleButton.h"
+
 using namespace dialogs;
 using namespace mtx::events;
 
diff --git a/include/dialogs/RoomSettings.hpp b/src/dialogs/RoomSettings.h
index 6cab03b7..6cab03b7 100644
--- a/include/dialogs/RoomSettings.hpp
+++ b/src/dialogs/RoomSettings.h
diff --git a/src/emoji/Category.cc b/src/emoji/Category.cpp
index c1b526f2..c1b526f2 100644
--- a/src/emoji/Category.cc
+++ b/src/emoji/Category.cpp
diff --git a/include/emoji/Category.h b/src/emoji/Category.h
index a14029c8..a14029c8 100644
--- a/include/emoji/Category.h
+++ b/src/emoji/Category.h
diff --git a/src/emoji/ItemDelegate.cc b/src/emoji/ItemDelegate.cpp
index 2cc838e3..2cc838e3 100644
--- a/src/emoji/ItemDelegate.cc
+++ b/src/emoji/ItemDelegate.cpp
diff --git a/include/emoji/ItemDelegate.h b/src/emoji/ItemDelegate.h
index e0456308..e0456308 100644
--- a/include/emoji/ItemDelegate.h
+++ b/src/emoji/ItemDelegate.h
diff --git a/src/emoji/Panel.cc b/src/emoji/Panel.cpp
index 89c3f823..710b501e 100644
--- a/src/emoji/Panel.cc
+++ b/src/emoji/Panel.cpp
@@ -19,8 +19,8 @@
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-#include "DropShadow.h"
-#include "FlatButton.h"
+#include "ui/DropShadow.h"
+#include "ui/FlatButton.h"
 
 #include "emoji/Category.h"
 #include "emoji/Panel.h"
diff --git a/include/emoji/Panel.h b/src/emoji/Panel.h
index ad233c27..ad233c27 100644
--- a/include/emoji/Panel.h
+++ b/src/emoji/Panel.h
diff --git a/src/emoji/PickButton.cc b/src/emoji/PickButton.cpp
index d2b4e9fd..d2b4e9fd 100644
--- a/src/emoji/PickButton.cc
+++ b/src/emoji/PickButton.cpp
diff --git a/include/emoji/PickButton.h b/src/emoji/PickButton.h
index 9117e61f..d14067c6 100644
--- a/include/emoji/PickButton.h
+++ b/src/emoji/PickButton.h
@@ -21,7 +21,7 @@
 #include <QTimer>
 #include <QWidget>
 
-#include "FlatButton.h"
+#include "ui/FlatButton.h"
 
 namespace emoji {
 
diff --git a/src/emoji/Provider.cc b/src/emoji/Provider.cpp
index f7b8dab9..f7b8dab9 100644
--- a/src/emoji/Provider.cc
+++ b/src/emoji/Provider.cpp
diff --git a/include/emoji/Provider.h b/src/emoji/Provider.h
index 5cc3ced4..5cc3ced4 100644
--- a/include/emoji/Provider.h
+++ b/src/emoji/Provider.h
diff --git a/src/main.cc b/src/main.cpp
index b776e902..d8bf30ce 100644
--- a/src/main.cc
+++ b/src/main.cpp
@@ -32,12 +32,12 @@
 #include <QTranslator>
 
 #include "Config.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
-#include "RaisedButton.h"
 #include "RunGuard.h"
-#include "version.hpp"
+#include "ui/RaisedButton.h"
+#include "version.h"
 
 #if defined(Q_OS_LINUX)
 #include <boost/stacktrace.hpp>
diff --git a/include/notifications/Manager.h b/src/notifications/Manager.h
index 4ac60097..4ac60097 100644
--- a/include/notifications/Manager.h
+++ b/src/notifications/Manager.h
diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cpp
index d756ca26..88ab1963 100644
--- a/src/timeline/TimelineItem.cc
+++ b/src/timeline/TimelineItem.cpp
@@ -20,12 +20,12 @@
 #include <QMenu>
 #include <QTimer>
 
-#include "Avatar.h"
 #include "ChatPage.h"
 #include "Config.h"
-#include "Logging.hpp"
-#include "Olm.hpp"
-#include "Painter.h"
+#include "Logging.h"
+#include "Olm.h"
+#include "ui/Avatar.h"
+#include "ui/Painter.h"
 
 #include "timeline/TimelineItem.h"
 #include "timeline/widgets/AudioItem.h"
diff --git a/include/timeline/TimelineItem.h b/src/timeline/TimelineItem.h
index d3cab0a0..d3cab0a0 100644
--- a/include/timeline/TimelineItem.h
+++ b/src/timeline/TimelineItem.h
diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cpp
index 207844e4..a8c04807 100644
--- a/src/timeline/TimelineView.cc
+++ b/src/timeline/TimelineView.cpp
@@ -22,12 +22,12 @@
 #include "Cache.h"
 #include "ChatPage.h"
 #include "Config.h"
-#include "FloatingButton.h"
-#include "InfoMessage.hpp"
-#include "Logging.hpp"
-#include "Olm.hpp"
+#include "Logging.h"
+#include "Olm.h"
 #include "UserSettingsPage.h"
 #include "Utils.h"
+#include "ui/FloatingButton.h"
+#include "ui/InfoMessage.h"
 
 #include "timeline/TimelineView.h"
 #include "timeline/widgets/AudioItem.h"
diff --git a/include/timeline/TimelineView.h b/src/timeline/TimelineView.h
index e6b80637..7b269063 100644
--- a/include/timeline/TimelineView.h
+++ b/src/timeline/TimelineView.h
@@ -30,8 +30,8 @@
 #include <mtx/responses/messages.hpp>
 
 #include "MatrixClient.h"
-#include "ScrollBar.h"
-#include "TimelineItem.h"
+#include "timeline/TimelineItem.h"
+#include "ui/ScrollBar.h"
 
 class StateKeeper
 {
diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cpp
index c8e00b66..1decab35 100644
--- a/src/timeline/TimelineViewManager.cc
+++ b/src/timeline/TimelineViewManager.cpp
@@ -22,7 +22,7 @@
 #include <QSettings>
 
 #include "Cache.h"
-#include "Logging.hpp"
+#include "Logging.h"
 #include "timeline/TimelineView.h"
 #include "timeline/TimelineViewManager.h"
 #include "timeline/widgets/AudioItem.h"
diff --git a/include/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index f3c099c1..f3c099c1 100644
--- a/include/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
diff --git a/src/timeline/widgets/AudioItem.cc b/src/timeline/widgets/AudioItem.cpp
index 2ed4f4c0..1e3eb0f0 100644
--- a/src/timeline/widgets/AudioItem.cc
+++ b/src/timeline/widgets/AudioItem.cpp
@@ -22,7 +22,7 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 #include "Utils.h"
 
diff --git a/include/timeline/widgets/AudioItem.h b/src/timeline/widgets/AudioItem.h
index 7b0781a2..7b0781a2 100644
--- a/include/timeline/widgets/AudioItem.h
+++ b/src/timeline/widgets/AudioItem.h
diff --git a/src/timeline/widgets/FileItem.cc b/src/timeline/widgets/FileItem.cpp
index b4555b2f..f8d3272d 100644
--- a/src/timeline/widgets/FileItem.cc
+++ b/src/timeline/widgets/FileItem.cpp
@@ -22,7 +22,7 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "Logging.hpp"
+#include "Logging.h"
 #include "MatrixClient.h"
 #include "Utils.h"
 
diff --git a/include/timeline/widgets/FileItem.h b/src/timeline/widgets/FileItem.h
index 66543e79..66543e79 100644
--- a/include/timeline/widgets/FileItem.h
+++ b/src/timeline/widgets/FileItem.h
diff --git a/src/timeline/widgets/ImageItem.cc b/src/timeline/widgets/ImageItem.cpp
index b7adb0fa..19b445db 100644
--- a/src/timeline/widgets/ImageItem.cc
+++ b/src/timeline/widgets/ImageItem.cpp
@@ -24,11 +24,11 @@
 #include <QUuid>
 
 #include "Config.h"
-#include "Logging.hpp"
+#include "ImageItem.h"
+#include "Logging.h"
 #include "MatrixClient.h"
 #include "Utils.h"
 #include "dialogs/ImageOverlay.h"
-#include "timeline/widgets/ImageItem.h"
 
 void
 ImageItem::downloadMedia(const QUrl &url)
diff --git a/include/timeline/widgets/ImageItem.h b/src/timeline/widgets/ImageItem.h
index e9d823f4..e9d823f4 100644
--- a/include/timeline/widgets/ImageItem.h
+++ b/src/timeline/widgets/ImageItem.h
diff --git a/src/timeline/widgets/VideoItem.cc b/src/timeline/widgets/VideoItem.cpp
index daf181b2..daf181b2 100644
--- a/src/timeline/widgets/VideoItem.cc
+++ b/src/timeline/widgets/VideoItem.cpp
diff --git a/include/timeline/widgets/VideoItem.h b/src/timeline/widgets/VideoItem.h
index 26fa1c35..26fa1c35 100644
--- a/include/timeline/widgets/VideoItem.h
+++ b/src/timeline/widgets/VideoItem.h
diff --git a/src/ui/Avatar.cc b/src/ui/Avatar.cpp
index 2f10db39..4b4cd272 100644
--- a/src/ui/Avatar.cc
+++ b/src/ui/Avatar.cpp
@@ -1,7 +1,7 @@
 #include <QPainter>
 
-#include "Avatar.h"
 #include "Utils.h"
+#include "ui/Avatar.h"
 
 Avatar::Avatar(QWidget *parent)
   : QWidget(parent)
diff --git a/include/ui/Avatar.h b/src/ui/Avatar.h
index 41967af5..41967af5 100644
--- a/include/ui/Avatar.h
+++ b/src/ui/Avatar.h
diff --git a/src/ui/Badge.cc b/src/ui/Badge.cpp
index 6701f9b7..6701f9b7 100644
--- a/src/ui/Badge.cc
+++ b/src/ui/Badge.cpp
diff --git a/include/ui/Badge.h b/src/ui/Badge.h
index fd73ad30..fd73ad30 100644
--- a/include/ui/Badge.h
+++ b/src/ui/Badge.h
diff --git a/include/ui/DropShadow.h b/src/ui/DropShadow.h
index b7ba1985..b7ba1985 100644
--- a/include/ui/DropShadow.h
+++ b/src/ui/DropShadow.h
diff --git a/src/ui/FlatButton.cc b/src/ui/FlatButton.cpp
index 45a7683e..45a7683e 100644
--- a/src/ui/FlatButton.cc
+++ b/src/ui/FlatButton.cpp
diff --git a/include/ui/FlatButton.h b/src/ui/FlatButton.h
index 9c2bf425..9c2bf425 100644
--- a/include/ui/FlatButton.h
+++ b/src/ui/FlatButton.h
diff --git a/src/ui/FloatingButton.cc b/src/ui/FloatingButton.cpp
index 74dcd482..74dcd482 100644
--- a/src/ui/FloatingButton.cc
+++ b/src/ui/FloatingButton.cpp
diff --git a/include/ui/FloatingButton.h b/src/ui/FloatingButton.h
index 91e99ebb..91e99ebb 100644
--- a/include/ui/FloatingButton.h
+++ b/src/ui/FloatingButton.h
diff --git a/src/ui/InfoMessage.cpp b/src/ui/InfoMessage.cpp
index b150e61b..3151bedf 100644
--- a/src/ui/InfoMessage.cpp
+++ b/src/ui/InfoMessage.cpp
@@ -1,5 +1,5 @@
+#include "InfoMessage.h"
 #include "Config.h"
-#include "InfoMessage.hpp"
 
 #include <QDateTime>
 #include <QPainter>
diff --git a/include/ui/InfoMessage.hpp b/src/ui/InfoMessage.h
index 58f98b0c..58f98b0c 100644
--- a/include/ui/InfoMessage.hpp
+++ b/src/ui/InfoMessage.h
diff --git a/src/ui/Label.cc b/src/ui/Label.cpp
index 8bd8c54e..8bd8c54e 100644
--- a/src/ui/Label.cc
+++ b/src/ui/Label.cpp
diff --git a/include/ui/Label.h b/src/ui/Label.h
index 09cf27d7..09cf27d7 100644
--- a/include/ui/Label.h
+++ b/src/ui/Label.h
diff --git a/src/ui/LoadingIndicator.cc b/src/ui/LoadingIndicator.cpp
index f64151ce..f64151ce 100644
--- a/src/ui/LoadingIndicator.cc
+++ b/src/ui/LoadingIndicator.cpp
diff --git a/include/ui/LoadingIndicator.h b/src/ui/LoadingIndicator.h
index bb33fe6c..bb33fe6c 100644
--- a/include/ui/LoadingIndicator.h
+++ b/src/ui/LoadingIndicator.h
diff --git a/include/ui/Menu.h b/src/ui/Menu.h
index 4c2a3c68..4c2a3c68 100644
--- a/include/ui/Menu.h
+++ b/src/ui/Menu.h
diff --git a/src/ui/OverlayModal.cc b/src/ui/OverlayModal.cpp
index 6aa16b07..6aa16b07 100644
--- a/src/ui/OverlayModal.cc
+++ b/src/ui/OverlayModal.cpp
diff --git a/include/ui/OverlayModal.h b/src/ui/OverlayModal.h
index a761e3ed..a761e3ed 100644
--- a/include/ui/OverlayModal.h
+++ b/src/ui/OverlayModal.h
diff --git a/src/ui/OverlayWidget.cc b/src/ui/OverlayWidget.cpp
index ccac0116..ccac0116 100644
--- a/src/ui/OverlayWidget.cc
+++ b/src/ui/OverlayWidget.cpp
diff --git a/include/ui/OverlayWidget.h b/src/ui/OverlayWidget.h
index 6662479d..6662479d 100644
--- a/include/ui/OverlayWidget.h
+++ b/src/ui/OverlayWidget.h
diff --git a/include/ui/Painter.h b/src/ui/Painter.h
index 8de39651..8de39651 100644
--- a/include/ui/Painter.h
+++ b/src/ui/Painter.h
diff --git a/src/ui/RaisedButton.cc b/src/ui/RaisedButton.cpp
index c519f84f..c519f84f 100644
--- a/src/ui/RaisedButton.cc
+++ b/src/ui/RaisedButton.cpp
diff --git a/include/ui/RaisedButton.h b/src/ui/RaisedButton.h
index edd5ee4a..edd5ee4a 100644
--- a/include/ui/RaisedButton.h
+++ b/src/ui/RaisedButton.h
diff --git a/src/ui/Ripple.cc b/src/ui/Ripple.cpp
index e22c4a62..e22c4a62 100644
--- a/src/ui/Ripple.cc
+++ b/src/ui/Ripple.cpp
diff --git a/include/ui/Ripple.h b/src/ui/Ripple.h
index 9184f061..9184f061 100644
--- a/include/ui/Ripple.h
+++ b/src/ui/Ripple.h
diff --git a/src/ui/RippleOverlay.cc b/src/ui/RippleOverlay.cpp
index 20e98c0f..20e98c0f 100644
--- a/src/ui/RippleOverlay.cc
+++ b/src/ui/RippleOverlay.cpp
diff --git a/include/ui/RippleOverlay.h b/src/ui/RippleOverlay.h
index 9ef91fbf..9ef91fbf 100644
--- a/include/ui/RippleOverlay.h
+++ b/src/ui/RippleOverlay.h
diff --git a/src/ui/ScrollBar.cc b/src/ui/ScrollBar.cpp
index 37218a13..37218a13 100644
--- a/src/ui/ScrollBar.cc
+++ b/src/ui/ScrollBar.cpp
diff --git a/include/ui/ScrollBar.h b/src/ui/ScrollBar.h
index 2b5382aa..2b5382aa 100644
--- a/include/ui/ScrollBar.h
+++ b/src/ui/ScrollBar.h
diff --git a/src/ui/SnackBar.cc b/src/ui/SnackBar.cpp
index 43a4c85d..43a4c85d 100644
--- a/src/ui/SnackBar.cc
+++ b/src/ui/SnackBar.cpp
diff --git a/include/ui/SnackBar.h b/src/ui/SnackBar.h
index eed59c87..eed59c87 100644
--- a/include/ui/SnackBar.h
+++ b/src/ui/SnackBar.h
diff --git a/src/ui/TextField.cc b/src/ui/TextField.cpp
index 0c936e69..0c936e69 100644
--- a/src/ui/TextField.cc
+++ b/src/ui/TextField.cpp
diff --git a/include/ui/TextField.h b/src/ui/TextField.h
index 1675a2e0..1675a2e0 100644
--- a/include/ui/TextField.h
+++ b/src/ui/TextField.h
diff --git a/src/ui/Theme.cc b/src/ui/Theme.cpp
index 7209864a..7209864a 100644
--- a/src/ui/Theme.cc
+++ b/src/ui/Theme.cpp
diff --git a/include/ui/Theme.h b/src/ui/Theme.h
index 7a0bdcb7..7a0bdcb7 100644
--- a/include/ui/Theme.h
+++ b/src/ui/Theme.h
diff --git a/src/ui/ThemeManager.cc b/src/ui/ThemeManager.cpp
index 7baed1f3..7baed1f3 100644
--- a/src/ui/ThemeManager.cc
+++ b/src/ui/ThemeManager.cpp
diff --git a/include/ui/ThemeManager.h b/src/ui/ThemeManager.h
index d35ff754..d35ff754 100644
--- a/include/ui/ThemeManager.h
+++ b/src/ui/ThemeManager.h
diff --git a/src/ui/ToggleButton.cc b/src/ui/ToggleButton.cpp
index 755f528f..755f528f 100644
--- a/src/ui/ToggleButton.cc
+++ b/src/ui/ToggleButton.cpp
diff --git a/include/ui/ToggleButton.h b/src/ui/ToggleButton.h
index 14c3450b..14c3450b 100644
--- a/include/ui/ToggleButton.h
+++ b/src/ui/ToggleButton.h