diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1315c7fae..8084e5c23 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -92,14 +92,8 @@ add_library(neochat STATIC
     models/roomtreeitem.cpp
     models/roomtreeitem.h
     foreigntypes.h
-    models/threepidmodel.cpp
-    models/threepidmodel.h
-    threepidaddhelper.cpp
-    threepidaddhelper.h
     identityserverhelper.cpp
     identityserverhelper.h
-    threepidbindhelper.cpp
-    threepidbindhelper.h
     enums/roomsortparameter.cpp
     enums/roomsortparameter.h
     models/roomsortparametermodel.cpp
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 9767f19eb..9594d3624 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -46,18 +46,22 @@ ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
         RoomProfile.qml
     SOURCES
         colorschemer.cpp
+        threepidaddhelper.cpp
+        threepidbindhelper.cpp
         models/accountemoticonmodel.cpp
         models/devicesmodel.cpp
         models/devicesproxymodel.cpp
         models/emoticonfiltermodel.cpp
         models/permissionsmodel.cpp
         models/pushrulemodel.cpp
+        models/threepidmodel.cpp
 )
 
 
 target_include_directories(Settings PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
 target_link_libraries(Settings PRIVATE
     KF6::ColorScheme
+    KF6::I18n
     QuotientQt6
     LibNeoChat
 )
diff --git a/src/models/threepidmodel.cpp b/src/settings/models/threepidmodel.cpp
similarity index 100%
rename from src/models/threepidmodel.cpp
rename to src/settings/models/threepidmodel.cpp
diff --git a/src/models/threepidmodel.h b/src/settings/models/threepidmodel.h
similarity index 100%
rename from src/models/threepidmodel.h
rename to src/settings/models/threepidmodel.h
diff --git a/src/threepidaddhelper.cpp b/src/settings/threepidaddhelper.cpp
similarity index 100%
rename from src/threepidaddhelper.cpp
rename to src/settings/threepidaddhelper.cpp
diff --git a/src/threepidaddhelper.h b/src/settings/threepidaddhelper.h
similarity index 100%
rename from src/threepidaddhelper.h
rename to src/settings/threepidaddhelper.h
diff --git a/src/threepidbindhelper.cpp b/src/settings/threepidbindhelper.cpp
similarity index 100%
rename from src/threepidbindhelper.cpp
rename to src/settings/threepidbindhelper.cpp
diff --git a/src/threepidbindhelper.h b/src/settings/threepidbindhelper.h
similarity index 100%
rename from src/threepidbindhelper.h
rename to src/settings/threepidbindhelper.h