diff --git a/applets/separator/CMakeLists.txt b/applets/separator/CMakeLists.txt
index f75d1ff7e..686e390b3 100644
--- a/applets/separator/CMakeLists.txt
+++ b/applets/separator/CMakeLists.txt
@@ -1 +1,3 @@
-plasma_install_package(plasmoid audoban.applet.separator)
+configure_file(metadata.desktop.cmake ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
+
+plasma_install_package(package audoban.applet.separator)
diff --git a/applets/separator/plasmoid/contents/ui/main.qml b/applets/separator/package/contents/ui/main.qml
similarity index 100%
rename from applets/separator/plasmoid/contents/ui/main.qml
rename to applets/separator/package/contents/ui/main.qml
diff --git a/applets/separator/plasmoid/metadata.desktop b/applets/separator/package/metadata.desktop
similarity index 100%
rename from applets/separator/plasmoid/metadata.desktop
rename to applets/separator/package/metadata.desktop
diff --git a/applets/spacer/CMakeLists.txt b/applets/spacer/CMakeLists.txt
index 1ba3065e6..0a0c97ad2 100644
--- a/applets/spacer/CMakeLists.txt
+++ b/applets/spacer/CMakeLists.txt
@@ -1 +1,3 @@
+configure_file(metadata.desktop.cmake ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
+
 plasma_install_package(plasmoid org.kde.latte.spacer)
diff --git a/applets/spacer/plasmoid/contents/config/config.qml b/applets/spacer/package/contents/config/config.qml
similarity index 100%
rename from applets/spacer/plasmoid/contents/config/config.qml
rename to applets/spacer/package/contents/config/config.qml
diff --git a/applets/spacer/plasmoid/contents/config/main.xml b/applets/spacer/package/contents/config/main.xml
similarity index 100%
rename from applets/spacer/plasmoid/contents/config/main.xml
rename to applets/spacer/package/contents/config/main.xml
diff --git a/applets/spacer/plasmoid/contents/ui/ConfigAppearance.qml b/applets/spacer/package/contents/ui/ConfigAppearance.qml
similarity index 100%
rename from applets/spacer/plasmoid/contents/ui/ConfigAppearance.qml
rename to applets/spacer/package/contents/ui/ConfigAppearance.qml
diff --git a/applets/spacer/plasmoid/contents/ui/main.qml b/applets/spacer/package/contents/ui/main.qml
similarity index 100%
rename from applets/spacer/plasmoid/contents/ui/main.qml
rename to applets/spacer/package/contents/ui/main.qml
diff --git a/applets/spacer/plasmoid/metadata.desktop b/applets/spacer/package/metadata.desktop
similarity index 100%
rename from applets/spacer/plasmoid/metadata.desktop
rename to applets/spacer/package/metadata.desktop