diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -723,7 +723,6 @@
 install( FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 add_subdirectory(qml)
-add_subdirectory(packageplugins)
 
 if (BUILD_TESTING)
     add_subdirectory(autotests)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -4,6 +4,7 @@
 add_subdirectory(platforms)
 add_subdirectory(scenes)
 add_subdirectory(windowsystem)
+add_subdirectory(kpackage)
 
 if(KWIN_BUILD_DECORATIONS)
     add_subdirectory(kdecorations)
diff --git a/packageplugins/CMakeLists.txt b/plugins/kpackage/CMakeLists.txt
rename from packageplugins/CMakeLists.txt
rename to plugins/kpackage/CMakeLists.txt
diff --git a/packageplugins/aurorae/CMakeLists.txt b/plugins/kpackage/aurorae/CMakeLists.txt
rename from packageplugins/aurorae/CMakeLists.txt
rename to plugins/kpackage/aurorae/CMakeLists.txt
diff --git a/packageplugins/aurorae/aurorae.h b/plugins/kpackage/aurorae/aurorae.h
rename from packageplugins/aurorae/aurorae.h
rename to plugins/kpackage/aurorae/aurorae.h
diff --git a/packageplugins/aurorae/aurorae.cpp b/plugins/kpackage/aurorae/aurorae.cpp
rename from packageplugins/aurorae/aurorae.cpp
rename to plugins/kpackage/aurorae/aurorae.cpp
diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.desktop
rename from packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
rename to plugins/kpackage/aurorae/kwin-packagestructure-aurorae.desktop
diff --git a/packageplugins/decoration/CMakeLists.txt b/plugins/kpackage/decoration/CMakeLists.txt
rename from packageplugins/decoration/CMakeLists.txt
rename to plugins/kpackage/decoration/CMakeLists.txt
diff --git a/packageplugins/decoration/decoration.h b/plugins/kpackage/decoration/decoration.h
rename from packageplugins/decoration/decoration.h
rename to plugins/kpackage/decoration/decoration.h
diff --git a/packageplugins/decoration/decoration.cpp b/plugins/kpackage/decoration/decoration.cpp
rename from packageplugins/decoration/decoration.cpp
rename to plugins/kpackage/decoration/decoration.cpp
diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/plugins/kpackage/decoration/kwin-packagestructure-decoration.desktop
rename from packageplugins/decoration/kwin-packagestructure-decoration.desktop
rename to plugins/kpackage/decoration/kwin-packagestructure-decoration.desktop
diff --git a/packageplugins/effect/CMakeLists.txt b/plugins/kpackage/effect/CMakeLists.txt
rename from packageplugins/effect/CMakeLists.txt
rename to plugins/kpackage/effect/CMakeLists.txt
diff --git a/packageplugins/effect/effect.h b/plugins/kpackage/effect/effect.h
rename from packageplugins/effect/effect.h
rename to plugins/kpackage/effect/effect.h
diff --git a/packageplugins/effect/effect.cpp b/plugins/kpackage/effect/effect.cpp
rename from packageplugins/effect/effect.cpp
rename to plugins/kpackage/effect/effect.cpp
diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/plugins/kpackage/effect/kwin-packagestructure-effect.desktop
rename from packageplugins/effect/kwin-packagestructure-effect.desktop
rename to plugins/kpackage/effect/kwin-packagestructure-effect.desktop
diff --git a/packageplugins/scripts/CMakeLists.txt b/plugins/kpackage/scripts/CMakeLists.txt
rename from packageplugins/scripts/CMakeLists.txt
rename to plugins/kpackage/scripts/CMakeLists.txt
diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop
rename from packageplugins/scripts/kwin-packagestructure-scripts.desktop
rename to plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop
diff --git a/packageplugins/scripts/scripts.h b/plugins/kpackage/scripts/scripts.h
rename from packageplugins/scripts/scripts.h
rename to plugins/kpackage/scripts/scripts.h
diff --git a/packageplugins/scripts/scripts.cpp b/plugins/kpackage/scripts/scripts.cpp
rename from packageplugins/scripts/scripts.cpp
rename to plugins/kpackage/scripts/scripts.cpp
diff --git a/packageplugins/windowswitcher/CMakeLists.txt b/plugins/kpackage/windowswitcher/CMakeLists.txt
rename from packageplugins/windowswitcher/CMakeLists.txt
rename to plugins/kpackage/windowswitcher/CMakeLists.txt
diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.desktop
rename from packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
rename to plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.desktop
diff --git a/packageplugins/windowswitcher/windowswitcher.h b/plugins/kpackage/windowswitcher/windowswitcher.h
rename from packageplugins/windowswitcher/windowswitcher.h
rename to plugins/kpackage/windowswitcher/windowswitcher.h
diff --git a/packageplugins/windowswitcher/windowswitcher.cpp b/plugins/kpackage/windowswitcher/windowswitcher.cpp
rename from packageplugins/windowswitcher/windowswitcher.cpp
rename to plugins/kpackage/windowswitcher/windowswitcher.cpp