diff --git a/containments/CMakeLists.txt b/containments/CMakeLists.txt
index 966c3fd954..0266227ffb 100644
--- a/containments/CMakeLists.txt
+++ b/containments/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(desktop)
+add_subdirectory(panel)
 plasma_install_package(folder org.kde.plasma.folder plasmoids containment)
-plasma_install_package(panel org.kde.panel plasmoids containment)
diff --git a/containments/panel/CMakeLists.txt b/containments/panel/CMakeLists.txt
new file mode 100644
index 0000000000..904b88c906
--- /dev/null
+++ b/containments/panel/CMakeLists.txt
@@ -0,0 +1,9 @@
+plasma_add_applet(org.kde.panel
+    QML_SOURCES
+        ConfigOverlay.qml
+        main.qml
+        LayoutManager.js
+    RESOURCES
+        main.xml
+    GENERATE_CONTAINMENT_CLASS
+)
diff --git a/containments/panel/contents/ui/ConfigOverlay.qml b/containments/panel/ConfigOverlay.qml
similarity index 100%
rename from containments/panel/contents/ui/ConfigOverlay.qml
rename to containments/panel/ConfigOverlay.qml
diff --git a/containments/panel/contents/ui/LayoutManager.js b/containments/panel/LayoutManager.js
similarity index 100%
rename from containments/panel/contents/ui/LayoutManager.js
rename to containments/panel/LayoutManager.js
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/main.qml
similarity index 100%
rename from containments/panel/contents/ui/main.qml
rename to containments/panel/main.qml
diff --git a/containments/panel/contents/config/main.xml b/containments/panel/main.xml
similarity index 100%
rename from containments/panel/contents/config/main.xml
rename to containments/panel/main.xml
diff --git a/containments/panel/metadata.json b/containments/panel/metadata.json
index 7c10c67da7..97c7ee030c 100644
--- a/containments/panel/metadata.json
+++ b/containments/panel/metadata.json
@@ -1,5 +1,4 @@
 {
-    "KPackageStructure": "Plasma/Applet",
     "KPlugin": {
         "Authors": [
             {
@@ -59,7 +58,6 @@
         ],
         "BugReportUrl": "https://bugs.kde.org/enter_bug.cgi?product=plasmashell&component=Panel",
         "Category": "",
-        "Id": "org.kde.panel",
         "License": "GPL-2.0+",
         "Name": "Panel",
         "Name[ar]": "لوحة",