diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0153cb22..501cda605 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(login)
 add_subdirectory(rooms)
 add_subdirectory(timeline)
 add_subdirectory(spaces)
+add_subdirectory(settings)
 add_subdirectory(devtools)
 
 add_library(neochat STATIC
@@ -50,8 +51,6 @@ add_library(neochat STATIC
     foreigntypes.h
     identityserverhelper.cpp
     identityserverhelper.h
-    models/roomsortparametermodel.cpp
-    models/roomsortparametermodel.h
     models/commonroomsmodel.cpp
     models/commonroomsmodel.h
 )
@@ -93,15 +92,12 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
-        qml/PowerLevelDialog.qml
         qml/VerificationMessage.qml
         qml/EmojiItem.qml
         qml/EmojiRow.qml
         qml/EmojiSas.qml
-        qml/ConfirmDeactivateAccountDialog.qml
         qml/VerificationCanceled.qml
         qml/MessageSourceSheet.qml
-        qml/ConfirmEncryptionDialog.qml
         qml/RoomSearchPage.qml
         qml/RoomPinnedMessagesPage.qml
         qml/LocationChooser.qml
@@ -120,9 +116,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/RoomMedia.qml
         qml/ChooseRoomDialog.qml
         qml/RemoveChildDialog.qml
-        qml/SelectParentDialog.qml
         qml/QrCodeMaximizeComponent.qml
-        qml/SelectSpacesDialog.qml
         qml/NotificationsView.qml
         qml/SearchPage.qml
         qml/ServerComboBox.qml
@@ -158,7 +152,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         org.kde.neochat.chatbar
 )
 
-add_subdirectory(settings)
 add_subdirectory(chatbar)
 
 if(NOT ANDROID AND NOT WIN32)
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 9594d3624..f41aeb69f 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -31,6 +31,8 @@ ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
         RoomGeneralPage.qml
         RoomSecurityPage.qml
         ColorScheme.qml
+        ConfirmDeactivateAccountDialog.qml
+        ConfirmEncryptionDialog.qml
         DevicesCard.qml
         DeviceDelegate.qml
         EmoticonFormCard.qml
@@ -38,6 +40,9 @@ ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
         IgnoredUsersDialog.qml
         NotificationRuleItem.qml
         PasswordSheet.qml
+        PowerLevelDialog.qml
+        SelectParentDialog.qml
+        SelectSpacesDialog.qml
         ThemeRadioButton.qml
         ThreePIdCard.qml
         ImportKeysDialog.qml
@@ -54,6 +59,7 @@ ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
         models/emoticonfiltermodel.cpp
         models/permissionsmodel.cpp
         models/pushrulemodel.cpp
+        models/roomsortparametermodel.cpp
         models/threepidmodel.cpp
 )
 
diff --git a/src/qml/ConfirmDeactivateAccountDialog.qml b/src/settings/ConfirmDeactivateAccountDialog.qml
similarity index 100%
rename from src/qml/ConfirmDeactivateAccountDialog.qml
rename to src/settings/ConfirmDeactivateAccountDialog.qml
diff --git a/src/qml/ConfirmEncryptionDialog.qml b/src/settings/ConfirmEncryptionDialog.qml
similarity index 100%
rename from src/qml/ConfirmEncryptionDialog.qml
rename to src/settings/ConfirmEncryptionDialog.qml
diff --git a/src/qml/PowerLevelDialog.qml b/src/settings/PowerLevelDialog.qml
similarity index 100%
rename from src/qml/PowerLevelDialog.qml
rename to src/settings/PowerLevelDialog.qml
diff --git a/src/qml/SelectParentDialog.qml b/src/settings/SelectParentDialog.qml
similarity index 100%
rename from src/qml/SelectParentDialog.qml
rename to src/settings/SelectParentDialog.qml
diff --git a/src/qml/SelectSpacesDialog.qml b/src/settings/SelectSpacesDialog.qml
similarity index 100%
rename from src/qml/SelectSpacesDialog.qml
rename to src/settings/SelectSpacesDialog.qml
diff --git a/src/models/roomsortparametermodel.cpp b/src/settings/models/roomsortparametermodel.cpp
similarity index 100%
rename from src/models/roomsortparametermodel.cpp
rename to src/settings/models/roomsortparametermodel.cpp
diff --git a/src/models/roomsortparametermodel.h b/src/settings/models/roomsortparametermodel.h
similarity index 100%
rename from src/models/roomsortparametermodel.h
rename to src/settings/models/roomsortparametermodel.h