diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6c047d..f0f2c34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,6 @@ if(QTACCOUNTSSERVICE_WITH_EXAMPLES)
     add_subdirectory(examples/useraccount)
     add_subdirectory(examples/userslistview)
 endif()
-if(TARGET Liri::Qt6AccountsService)
-    add_subdirectory(src/imports/accountsservice)
-endif()
 if(BUILD_TESTING)
     add_subdirectory(tests/auto/api)
 endif()
diff --git a/src/accountsservice/CMakeLists.txt b/src/accountsservice/CMakeLists.txt
index 4f88009..60bcf86 100644
--- a/src/accountsservice/CMakeLists.txt
+++ b/src/accountsservice/CMakeLists.txt
@@ -29,3 +29,13 @@ liri_add_module(Qt6AccountsService
 )
 
 liri_finalize_module(Qt6AccountsService)
+
+if(TARGET Qt6::Qml)
+    ecm_add_qml_module(Qt6AccountsService
+        URI QtAccountsService
+        VERSION 2.0
+        GENERATE_PLUGIN_SOURCE
+    )
+
+    ecm_finalize_qml_module(Qt6AccountsService)
+endif()
diff --git a/src/imports/accountsservice/CMakeLists.txt b/src/imports/accountsservice/CMakeLists.txt
deleted file mode 100644
index ac901e2..0000000
--- a/src/imports/accountsservice/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ecm_add_qml_module(QtAccountsServiceQmlModule
-    URI
-        "QtAccountsService"
-    VERSION
-        "2.0"
-    GENERATE_PLUGIN_SOURCE
-)
-
-target_link_libraries(QtGSettingsQmlModule
-    PUBLIC
-        Qt6::Core
-        Qt6::Gui
-        Qt6::Qml
-        Qt6::Quick
-        Liri::Qt6AccountsService
-)
-
-ecm_finalize_qml_module(QtAccountsServiceQmlModule)