diff --git a/containments/panel/CMakeLists.txt b/containments/panel/CMakeLists.txt
index f70f6f5f..f292eeeb 100644
--- a/containments/panel/CMakeLists.txt
+++ b/containments/panel/CMakeLists.txt
@@ -3,22 +3,17 @@
 # SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@kde.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(phonepanel_SRCS
-    phonepanel.cpp
+plasma_add_applet(org.kde.plasma.mobile.panel
+    QML_SOURCES
+        qml/main.qml
+    CPP_SOURCES
+        phonepanel.cpp
 )
 
-add_library(org.kde.plasma.mobile.panel MODULE ${phonepanel_SRCS})
-
-target_link_libraries(org.kde.plasma.mobile.panel
+target_link_libraries(org.kde.plasma.mobile.panel PRIVATE
                       Qt::Gui
                       Qt::DBus
                       Plasma::Plasma
                       KF6::I18n
                       KF6::Service
                      )
-
-install(TARGETS org.kde.plasma.mobile.panel DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
-#install(FILES plasma-phonepanel-default.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-
-plasma_install_package(package org.kde.plasma.mobile.panel)
-
diff --git a/containments/panel/package/metadata.json b/containments/panel/metadata.json
similarity index 98%
rename from containments/panel/package/metadata.json
rename to containments/panel/metadata.json
index 0c147c93..ee16ebe2 100644
--- a/containments/panel/package/metadata.json
+++ b/containments/panel/metadata.json
@@ -1,5 +1,4 @@
 {
-    "KPackageStructure": "Plasma/Applet",
     "KPlugin": {
         "Authors": [
             {
@@ -83,7 +82,6 @@
         "Description[x-test]": "xxTop panel for Plasma Mobilexx",
         "Description[zh_CN]": "Plasma Mobile 的顶部面板",
         "Description[zh_TW]": "Plasma 行動的頂部面板",
-        "Id": "org.kde.plasma.mobile.panel",
         "License": "GPLv2+",
         "Name": "Phone Panel",
         "Name[ar]": "لوحة الهاتف",
diff --git a/containments/panel/phonepanel.cpp b/containments/panel/phonepanel.cpp
index d0f8120d..6b2e0b3a 100644
--- a/containments/panel/phonepanel.cpp
+++ b/containments/panel/phonepanel.cpp
@@ -7,6 +7,8 @@
 
 #include "phonepanel.h"
 
+K_PLUGIN_CLASS_WITH_JSON(PhonePanel, "metadata.json")
+
 PhonePanel::PhonePanel(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
     : Plasma::Containment(parent, data, args)
 {
@@ -14,6 +16,4 @@ PhonePanel::PhonePanel(QObject *parent, const KPluginMetaData &data, const QVari
 
 PhonePanel::~PhonePanel() = default;
 
-K_PLUGIN_CLASS(PhonePanel)
-
 #include "phonepanel.moc"
diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/qml/main.qml
similarity index 100%
rename from containments/panel/package/contents/ui/main.qml
rename to containments/panel/qml/main.qml
diff --git a/containments/taskpanel/CMakeLists.txt b/containments/taskpanel/CMakeLists.txt
index 5990f446..ef297d92 100644
--- a/containments/taskpanel/CMakeLists.txt
+++ b/containments/taskpanel/CMakeLists.txt
@@ -3,9 +3,15 @@
 # SPDX-FileCopyrightText: 2021 Nicolas Fella <nicolas.fella@kde.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-add_library(org.kde.plasma.mobile.taskpanel MODULE taskpanel.cpp ${DBUS_SRCS})
+plasma_add_applet(org.kde.plasma.mobile.taskpanel
+    QML_SOURCES
+        qml/main.qml
+        qml/NavigationPanelComponent.qml
+    CPP_SOURCES
+        taskpanel.cpp
+)
 
-target_link_libraries(org.kde.plasma.mobile.taskpanel
+target_link_libraries(org.kde.plasma.mobile.taskpanel PRIVATE
                       Qt::Gui
                       Qt::DBus
                       Qt::Qml
@@ -13,10 +19,4 @@ target_link_libraries(org.kde.plasma.mobile.taskpanel
                       Qt::Sensors
                       Plasma::Plasma
                       KF6::Screen
-                     )
-
-
-install(TARGETS org.kde.plasma.mobile.taskpanel DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
-
-plasma_install_package(package org.kde.plasma.mobile.taskpanel)
-
+                    )
diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/metadata.json
similarity index 98%
rename from containments/taskpanel/package/metadata.json
rename to containments/taskpanel/metadata.json
index 99f627e7..308823e9 100644
--- a/containments/taskpanel/package/metadata.json
+++ b/containments/taskpanel/metadata.json
@@ -1,5 +1,4 @@
 {
-    "KPackageStructure": "Plasma/Applet",
     "KPlugin": {
         "Authors": [
             {
@@ -83,7 +82,6 @@
         "Description[x-test]": "xxNavigation panel for Plasma Mobilexx",
         "Description[zh_CN]": "Plasma 移动版导航面板",
         "Description[zh_TW]": "Plasma 行動的導覽面板",
-        "Id": "org.kde.plasma.mobile.taskpanel",
         "License": "GPLv2+",
         "Name": "Phone Task panel",
         "Name[ar]": "لوحة مهمة الهاتف",
diff --git a/containments/taskpanel/package/contents/ui/NavigationPanelComponent.qml b/containments/taskpanel/qml/NavigationPanelComponent.qml
similarity index 100%
rename from containments/taskpanel/package/contents/ui/NavigationPanelComponent.qml
rename to containments/taskpanel/qml/NavigationPanelComponent.qml
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/qml/main.qml
similarity index 100%
rename from containments/taskpanel/package/contents/ui/main.qml
rename to containments/taskpanel/qml/main.qml
diff --git a/containments/taskpanel/taskpanel.cpp b/containments/taskpanel/taskpanel.cpp
index dc88d042..385a4e3a 100644
--- a/containments/taskpanel/taskpanel.cpp
+++ b/containments/taskpanel/taskpanel.cpp
@@ -11,6 +11,8 @@
 #include <QDebug>
 #include <QGuiApplication>
 
+K_PLUGIN_CLASS_WITH_JSON(TaskPanel, "metadata.json")
+
 // register type for Keyboards.KWinVirtualKeyboard.forceActivate();
 Q_DECLARE_METATYPE(QDBusPendingReply<>)
 
@@ -29,6 +31,4 @@ void TaskPanel::triggerTaskSwitcher() const
     QDBusConnection::sessionBus().send(message);
 }
 
-K_PLUGIN_CLASS(TaskPanel)
-
 #include "taskpanel.moc"