diff --git a/CMakeLists.txt b/CMakeLists.txt
index dab0317b4..530b189d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,11 +70,9 @@ if(NOT SAILFISHOS)
     add_subdirectory(daemon)
 endif()
 
-if(NOT WIN32)
-    if (NOT SAILFISHOS)
-        add_subdirectory(kio)
-    endif()
-	add_subdirectory(plasmoid)
+if(NOT WIN32 AND NOT SAILFISHOS)
+    add_subdirectory(kio)
+    add_subdirectory(plasmoid)
 endif()
 
 add_subdirectory(icon)
@@ -86,6 +84,7 @@ if(EXPERIMENTALAPP_ENABLED)
 endif()
 add_subdirectory(plugins)
 add_subdirectory(cli)
+add_subdirectory(declarativeplugin)
 
 if (NOT SAILFISHOS)
     add_subdirectory(indicator)
diff --git a/plasmoid/declarativeplugin/CMakeLists.txt b/declarativeplugin/CMakeLists.txt
similarity index 100%
rename from plasmoid/declarativeplugin/CMakeLists.txt
rename to declarativeplugin/CMakeLists.txt
diff --git a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp b/declarativeplugin/kdeconnectdeclarativeplugin.cpp
similarity index 100%
rename from plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
rename to declarativeplugin/kdeconnectdeclarativeplugin.cpp
diff --git a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h b/declarativeplugin/kdeconnectdeclarativeplugin.h
similarity index 100%
rename from plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
rename to declarativeplugin/kdeconnectdeclarativeplugin.h
diff --git a/plasmoid/declarativeplugin/objectfactory.h b/declarativeplugin/objectfactory.h
similarity index 100%
rename from plasmoid/declarativeplugin/objectfactory.h
rename to declarativeplugin/objectfactory.h
diff --git a/plasmoid/declarativeplugin/qml/DBusProperty.qml b/declarativeplugin/qml/DBusProperty.qml
similarity index 100%
rename from plasmoid/declarativeplugin/qml/DBusProperty.qml
rename to declarativeplugin/qml/DBusProperty.qml
diff --git a/plasmoid/declarativeplugin/qml/PluginChecker.qml b/declarativeplugin/qml/PluginChecker.qml
similarity index 100%
rename from plasmoid/declarativeplugin/qml/PluginChecker.qml
rename to declarativeplugin/qml/PluginChecker.qml
diff --git a/plasmoid/declarativeplugin/qmldir b/declarativeplugin/qmldir
similarity index 100%
rename from plasmoid/declarativeplugin/qmldir
rename to declarativeplugin/qmldir
diff --git a/plasmoid/declarativeplugin/responsewaiter.cpp b/declarativeplugin/responsewaiter.cpp
similarity index 100%
rename from plasmoid/declarativeplugin/responsewaiter.cpp
rename to declarativeplugin/responsewaiter.cpp
diff --git a/plasmoid/declarativeplugin/responsewaiter.h b/declarativeplugin/responsewaiter.h
similarity index 100%
rename from plasmoid/declarativeplugin/responsewaiter.h
rename to declarativeplugin/responsewaiter.h
diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt
index 6442fb4c6..0eca35cb5 100644
--- a/plasmoid/CMakeLists.txt
+++ b/plasmoid/CMakeLists.txt
@@ -1,11 +1,6 @@
-
-add_subdirectory(declarativeplugin)
-
-if (NOT SAILFISHOS)
 install(DIRECTORY package/
         DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.kdeconnect)
 
 install(FILES package/metadata.desktop
         DESTINATION ${SERVICES_INSTALL_DIR}
         RENAME plasma-kdeconnect.desktop)
-endif()