diff --git a/src/Cache.cpp b/src/Cache.cpp
index ea3dd525..ecfbe6c9 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -30,9 +30,9 @@
#include "EventAccessors.h"
#include "Logging.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "UserSettingsPage.h"
#include "Utils.h"
+#include "encryption/Olm.h"
//! Should be changed when a breaking change occurs in the cache format.
//! This will reset client's data.
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 673f39ee..9239e342 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -12,19 +12,19 @@
#include "AvatarProvider.h"
#include "Cache.h"
#include "Cache_p.h"
-#include "CallManager.h"
#include "ChatPage.h"
-#include "DeviceVerificationFlow.h"
#include "EventAccessors.h"
#include "Logging.h"
#include "MainWindow.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "UserSettingsPage.h"
#include "Utils.h"
+#include "encryption/DeviceVerificationFlow.h"
+#include "encryption/Olm.h"
#include "ui/OverlayModal.h"
#include "ui/Theme.h"
#include "ui/UserProfile.h"
+#include "voip/CallManager.h"
#include "notifications/Manager.h"
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index c8eb2d24..34db0d1d 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -26,11 +26,11 @@
#include "TrayIcon.h"
#include "UserSettingsPage.h"
#include "Utils.h"
-#include "WebRTCSession.h"
#include "WelcomePage.h"
#include "ui/LoadingIndicator.h"
#include "ui/OverlayModal.h"
#include "ui/SnackBar.h"
+#include "voip/WebRTCSession.h"
#include "dialogs/CreateRoom.h"
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index cc1f8206..340709a6 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -14,7 +14,6 @@
#include <QLineEdit>
#include <QMessageBox>
#include <QPainter>
-#include <QProcessEnvironment>
#include <QPushButton>
#include <QResizeEvent>
#include <QScrollArea>
@@ -26,14 +25,14 @@
#include <QtQml>
#include "Cache.h"
-#include "CallDevices.h"
#include "Config.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "UserSettingsPage.h"
#include "Utils.h"
+#include "encryption/Olm.h"
#include "ui/FlatButton.h"
#include "ui/ToggleButton.h"
+#include "voip/CallDevices.h"
#include "config/nheko.h"
diff --git a/src/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index 2481d4f9..2481d4f9 100644
--- a/src/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
diff --git a/src/DeviceVerificationFlow.h b/src/encryption/DeviceVerificationFlow.h
index f71fa337..f71fa337 100644
--- a/src/DeviceVerificationFlow.h
+++ b/src/encryption/DeviceVerificationFlow.h
diff --git a/src/Olm.cpp b/src/encryption/Olm.cpp
index 14c97984..14c97984 100644
--- a/src/Olm.cpp
+++ b/src/encryption/Olm.cpp
diff --git a/src/Olm.h b/src/encryption/Olm.h
index 44e2b8ed..44e2b8ed 100644
--- a/src/Olm.h
+++ b/src/encryption/Olm.h
diff --git a/src/SelfVerificationStatus.cpp b/src/encryption/SelfVerificationStatus.cpp
index d75a2109..d75a2109 100644
--- a/src/SelfVerificationStatus.cpp
+++ b/src/encryption/SelfVerificationStatus.cpp
diff --git a/src/SelfVerificationStatus.h b/src/encryption/SelfVerificationStatus.h
index 8cb54df6..8cb54df6 100644
--- a/src/SelfVerificationStatus.h
+++ b/src/encryption/SelfVerificationStatus.h
diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
index 7144424a..d7296a7c 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -15,7 +15,6 @@
#include "EventAccessors.h"
#include "Logging.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "Utils.h"
Q_DECLARE_METATYPE(Reaction)
diff --git a/src/timeline/EventStore.h b/src/timeline/EventStore.h
index 53dbaff4..9b857dcf 100644
--- a/src/timeline/EventStore.h
+++ b/src/timeline/EventStore.h
@@ -15,8 +15,8 @@
#include <mtx/responses/messages.hpp>
#include <mtx/responses/sync.hpp>
-#include "Olm.h"
#include "Reaction.h"
+#include "encryption/Olm.h"
class EventStore : public QObject
{
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index f33d1dfd..ed97a2ca 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -26,7 +26,6 @@
#include "Logging.h"
#include "MainWindow.h"
#include "MatrixClient.h"
-#include "Olm.h"
#include "RoomsModel.h"
#include "TimelineModel.h"
#include "TimelineViewManager.h"
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 720a78fe..0e5ce510 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -27,10 +27,10 @@
#include "MatrixClient.h"
#include "MemberList.h"
#include "MxcImageProvider.h"
-#include "Olm.h"
#include "ReadReceiptsModel.h"
#include "TimelineViewManager.h"
#include "Utils.h"
+#include "encryption/Olm.h"
Q_DECLARE_METATYPE(QModelIndex)
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index a30a145d..86f59c52 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -18,7 +18,6 @@
#include "CombinedImagePackModel.h"
#include "CompletionProxyModel.h"
#include "DelegateChooser.h"
-#include "DeviceVerificationFlow.h"
#include "EventAccessors.h"
#include "ImagePackListModel.h"
#include "InviteesModel.h"
@@ -29,13 +28,14 @@
#include "ReadReceiptsModel.h"
#include "RoomDirectoryModel.h"
#include "RoomsModel.h"
-#include "SelfVerificationStatus.h"
#include "SingleImagePackModel.h"
#include "UserSettingsPage.h"
#include "UsersModel.h"
#include "dialogs/ImageOverlay.h"
#include "emoji/EmojiModel.h"
#include "emoji/Provider.h"
+#include "encryption/DeviceVerificationFlow.h"
+#include "encryption/SelfVerificationStatus.h"
#include "ui/MxcAnimatedImage.h"
#include "ui/MxcMediaProxy.h"
#include "ui/NhekoCursorShape.h"
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index ab078aa7..723282d6 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -17,16 +17,16 @@
#include <mtx/responses/sync.hpp>
#include "Cache.h"
-#include "CallManager.h"
#include "JdenticonProvider.h"
#include "Logging.h"
#include "TimelineModel.h"
#include "Utils.h"
-#include "WebRTCSession.h"
#include "emoji/EmojiModel.h"
#include "emoji/Provider.h"
#include "timeline/CommunitiesModel.h"
#include "timeline/RoomlistModel.h"
+#include "voip/CallManager.h"
+#include "voip/WebRTCSession.h"
class MxcImageProvider;
class BlurhashProvider;
diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp
index 11fc5681..15f2a5af 100644
--- a/src/ui/NhekoGlobalObject.cpp
+++ b/src/ui/NhekoGlobalObject.cpp
@@ -14,7 +14,7 @@
#include "MainWindow.h"
#include "UserSettingsPage.h"
#include "Utils.h"
-#include "WebRTCSession.h"
+#include "voip/WebRTCSession.h"
Nheko::Nheko()
{
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index 591110af..d62e3248 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -9,10 +9,10 @@
#include "Cache_p.h"
#include "ChatPage.h"
-#include "DeviceVerificationFlow.h"
#include "Logging.h"
#include "UserProfile.h"
#include "Utils.h"
+#include "encryption/DeviceVerificationFlow.h"
#include "mtx/responses/crypto.hpp"
#include "timeline/TimelineModel.h"
#include "timeline/TimelineViewManager.h"
diff --git a/src/CallDevices.cpp b/src/voip/CallDevices.cpp
index be185470..be185470 100644
--- a/src/CallDevices.cpp
+++ b/src/voip/CallDevices.cpp
diff --git a/src/CallDevices.h b/src/voip/CallDevices.h
index d30ce644..d30ce644 100644
--- a/src/CallDevices.h
+++ b/src/voip/CallDevices.h
diff --git a/src/CallManager.cpp b/src/voip/CallManager.cpp
index 0f701b0d..0f701b0d 100644
--- a/src/CallManager.cpp
+++ b/src/voip/CallManager.cpp
diff --git a/src/CallManager.h b/src/voip/CallManager.h
index 22f31814..22f31814 100644
--- a/src/CallManager.h
+++ b/src/voip/CallManager.h
diff --git a/src/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp
index 801a365c..801a365c 100644
--- a/src/WebRTCSession.cpp
+++ b/src/voip/WebRTCSession.cpp
diff --git a/src/WebRTCSession.h b/src/voip/WebRTCSession.h
index 56c0a295..56c0a295 100644
--- a/src/WebRTCSession.h
+++ b/src/voip/WebRTCSession.h
|
