diff --git a/CMakeLists.txt b/CMakeLists.txt
index d97aa20aad..3de7d8d9ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,9 +322,6 @@ if(KWIN_BUILD_KCMS)
     add_subdirectory( kcmkwin )
 endif()
 
-if( KWIN_BUILD_DECORATIONS )
-    add_subdirectory( clients )
-endif()
 add_subdirectory( data )
 
 add_subdirectory( effects )
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 14567046fd..3a06fa63fb 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -2,3 +2,7 @@ add_subdirectory(kglobalaccel)
 add_subdirectory(qpa)
 add_subdirectory(idletime)
 add_subdirectory(platforms)
+
+if(KWIN_BUILD_DECORATIONS)
+    add_subdirectory(kdecorations)
+endif()
diff --git a/clients/CMakeLists.txt b/plugins/kdecorations/CMakeLists.txt
similarity index 100%
rename from clients/CMakeLists.txt
rename to plugins/kdecorations/CMakeLists.txt
diff --git a/clients/Messages.sh b/plugins/kdecorations/Messages.sh
similarity index 100%
rename from clients/Messages.sh
rename to plugins/kdecorations/Messages.sh
diff --git a/clients/aurorae/AUTHORS b/plugins/kdecorations/aurorae/AUTHORS
similarity index 100%
rename from clients/aurorae/AUTHORS
rename to plugins/kdecorations/aurorae/AUTHORS
diff --git a/clients/aurorae/CMakeLists.txt b/plugins/kdecorations/aurorae/CMakeLists.txt
similarity index 100%
rename from clients/aurorae/CMakeLists.txt
rename to plugins/kdecorations/aurorae/CMakeLists.txt
diff --git a/clients/aurorae/README b/plugins/kdecorations/aurorae/README
similarity index 100%
rename from clients/aurorae/README
rename to plugins/kdecorations/aurorae/README
diff --git a/clients/aurorae/TODO b/plugins/kdecorations/aurorae/TODO
similarity index 100%
rename from clients/aurorae/TODO
rename to plugins/kdecorations/aurorae/TODO
diff --git a/clients/aurorae/src/CMakeLists.txt b/plugins/kdecorations/aurorae/src/CMakeLists.txt
similarity index 100%
rename from clients/aurorae/src/CMakeLists.txt
rename to plugins/kdecorations/aurorae/src/CMakeLists.txt
diff --git a/clients/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
similarity index 100%
rename from clients/aurorae/src/aurorae.cpp
rename to plugins/kdecorations/aurorae/src/aurorae.cpp
diff --git a/clients/aurorae/src/aurorae.h b/plugins/kdecorations/aurorae/src/aurorae.h
similarity index 100%
rename from clients/aurorae/src/aurorae.h
rename to plugins/kdecorations/aurorae/src/aurorae.h
diff --git a/clients/aurorae/src/aurorae.json b/plugins/kdecorations/aurorae/src/aurorae.json
similarity index 100%
rename from clients/aurorae/src/aurorae.json
rename to plugins/kdecorations/aurorae/src/aurorae.json
diff --git a/clients/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
similarity index 100%
rename from clients/aurorae/src/aurorae.knsrc
rename to plugins/kdecorations/aurorae/src/aurorae.knsrc
diff --git a/clients/aurorae/src/colorhelper.cpp b/plugins/kdecorations/aurorae/src/colorhelper.cpp
similarity index 100%
rename from clients/aurorae/src/colorhelper.cpp
rename to plugins/kdecorations/aurorae/src/colorhelper.cpp
diff --git a/clients/aurorae/src/colorhelper.h b/plugins/kdecorations/aurorae/src/colorhelper.h
similarity index 100%
rename from clients/aurorae/src/colorhelper.h
rename to plugins/kdecorations/aurorae/src/colorhelper.h
diff --git a/clients/aurorae/src/decorationoptions.cpp b/plugins/kdecorations/aurorae/src/decorationoptions.cpp
similarity index 100%
rename from clients/aurorae/src/decorationoptions.cpp
rename to plugins/kdecorations/aurorae/src/decorationoptions.cpp
diff --git a/clients/aurorae/src/decorationoptions.h b/plugins/kdecorations/aurorae/src/decorationoptions.h
similarity index 100%
rename from clients/aurorae/src/decorationoptions.h
rename to plugins/kdecorations/aurorae/src/decorationoptions.h
diff --git a/clients/aurorae/src/decorationplugin.cpp b/plugins/kdecorations/aurorae/src/decorationplugin.cpp
similarity index 100%
rename from clients/aurorae/src/decorationplugin.cpp
rename to plugins/kdecorations/aurorae/src/decorationplugin.cpp
diff --git a/clients/aurorae/src/decorationplugin.h b/plugins/kdecorations/aurorae/src/decorationplugin.h
similarity index 100%
rename from clients/aurorae/src/decorationplugin.h
rename to plugins/kdecorations/aurorae/src/decorationplugin.h
diff --git a/clients/aurorae/src/kwindecoration.desktop b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
similarity index 100%
rename from clients/aurorae/src/kwindecoration.desktop
rename to plugins/kdecorations/aurorae/src/kwindecoration.desktop
diff --git a/clients/aurorae/src/lib/auroraetheme.cpp b/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp
similarity index 100%
rename from clients/aurorae/src/lib/auroraetheme.cpp
rename to plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp
diff --git a/clients/aurorae/src/lib/auroraetheme.h b/plugins/kdecorations/aurorae/src/lib/auroraetheme.h
similarity index 100%
rename from clients/aurorae/src/lib/auroraetheme.h
rename to plugins/kdecorations/aurorae/src/lib/auroraetheme.h
diff --git a/clients/aurorae/src/lib/themeconfig.cpp b/plugins/kdecorations/aurorae/src/lib/themeconfig.cpp
similarity index 100%
rename from clients/aurorae/src/lib/themeconfig.cpp
rename to plugins/kdecorations/aurorae/src/lib/themeconfig.cpp
diff --git a/clients/aurorae/src/lib/themeconfig.h b/plugins/kdecorations/aurorae/src/lib/themeconfig.h
similarity index 100%
rename from clients/aurorae/src/lib/themeconfig.h
rename to plugins/kdecorations/aurorae/src/lib/themeconfig.h
diff --git a/clients/aurorae/src/qml/AppMenuButton.qml b/plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml
similarity index 100%
rename from clients/aurorae/src/qml/AppMenuButton.qml
rename to plugins/kdecorations/aurorae/src/qml/AppMenuButton.qml
diff --git a/clients/aurorae/src/qml/AuroraeButton.qml b/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml
similarity index 100%
rename from clients/aurorae/src/qml/AuroraeButton.qml
rename to plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml
diff --git a/clients/aurorae/src/qml/AuroraeButtonGroup.qml b/plugins/kdecorations/aurorae/src/qml/AuroraeButtonGroup.qml
similarity index 100%
rename from clients/aurorae/src/qml/AuroraeButtonGroup.qml
rename to plugins/kdecorations/aurorae/src/qml/AuroraeButtonGroup.qml
diff --git a/clients/aurorae/src/qml/AuroraeMaximizeButton.qml b/plugins/kdecorations/aurorae/src/qml/AuroraeMaximizeButton.qml
similarity index 100%
rename from clients/aurorae/src/qml/AuroraeMaximizeButton.qml
rename to plugins/kdecorations/aurorae/src/qml/AuroraeMaximizeButton.qml
diff --git a/clients/aurorae/src/qml/ButtonGroup.qml b/plugins/kdecorations/aurorae/src/qml/ButtonGroup.qml
similarity index 100%
rename from clients/aurorae/src/qml/ButtonGroup.qml
rename to plugins/kdecorations/aurorae/src/qml/ButtonGroup.qml
diff --git a/clients/aurorae/src/qml/Decoration.qml b/plugins/kdecorations/aurorae/src/qml/Decoration.qml
similarity index 100%
rename from clients/aurorae/src/qml/Decoration.qml
rename to plugins/kdecorations/aurorae/src/qml/Decoration.qml
diff --git a/clients/aurorae/src/qml/DecorationButton.qml b/plugins/kdecorations/aurorae/src/qml/DecorationButton.qml
similarity index 100%
rename from clients/aurorae/src/qml/DecorationButton.qml
rename to plugins/kdecorations/aurorae/src/qml/DecorationButton.qml
diff --git a/clients/aurorae/src/qml/MenuButton.qml b/plugins/kdecorations/aurorae/src/qml/MenuButton.qml
similarity index 100%
rename from clients/aurorae/src/qml/MenuButton.qml
rename to plugins/kdecorations/aurorae/src/qml/MenuButton.qml
diff --git a/clients/aurorae/src/qml/aurorae.qml b/plugins/kdecorations/aurorae/src/qml/aurorae.qml
similarity index 100%
rename from clients/aurorae/src/qml/aurorae.qml
rename to plugins/kdecorations/aurorae/src/qml/aurorae.qml
diff --git a/clients/aurorae/src/qml/qmldir b/plugins/kdecorations/aurorae/src/qml/qmldir
similarity index 100%
rename from clients/aurorae/src/qml/qmldir
rename to plugins/kdecorations/aurorae/src/qml/qmldir
diff --git a/clients/aurorae/theme-description b/plugins/kdecorations/aurorae/theme-description
similarity index 100%
rename from clients/aurorae/theme-description
rename to plugins/kdecorations/aurorae/theme-description
diff --git a/clients/aurorae/themes/CMakeLists.txt b/plugins/kdecorations/aurorae/themes/CMakeLists.txt
similarity index 100%
rename from clients/aurorae/themes/CMakeLists.txt
rename to plugins/kdecorations/aurorae/themes/CMakeLists.txt
diff --git a/clients/aurorae/themes/plastik/CMakeLists.txt b/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt
similarity index 100%
rename from clients/aurorae/themes/plastik/CMakeLists.txt
rename to plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt
diff --git a/clients/aurorae/themes/plastik/code/CMakeLists.txt b/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt
similarity index 100%
rename from clients/aurorae/themes/plastik/code/CMakeLists.txt
rename to plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt
diff --git a/clients/aurorae/themes/plastik/code/plastikbutton.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikbutton.cpp
similarity index 100%
rename from clients/aurorae/themes/plastik/code/plastikbutton.cpp
rename to plugins/kdecorations/aurorae/themes/plastik/code/plastikbutton.cpp
diff --git a/clients/aurorae/themes/plastik/code/plastikbutton.h b/plugins/kdecorations/aurorae/themes/plastik/code/plastikbutton.h
similarity index 100%
rename from clients/aurorae/themes/plastik/code/plastikbutton.h
rename to plugins/kdecorations/aurorae/themes/plastik/code/plastikbutton.h
diff --git a/clients/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
similarity index 100%
rename from clients/aurorae/themes/plastik/code/plastikplugin.cpp
rename to plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
diff --git a/clients/aurorae/themes/plastik/code/plastikplugin.h b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.h
similarity index 100%
rename from clients/aurorae/themes/plastik/code/plastikplugin.h
rename to plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.h
diff --git a/clients/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
similarity index 100%
rename from clients/aurorae/themes/plastik/code/qmldir
rename to plugins/kdecorations/aurorae/themes/plastik/code/qmldir
diff --git a/clients/aurorae/themes/plastik/package/contents/config/main.xml b/plugins/kdecorations/aurorae/themes/plastik/package/contents/config/main.xml
similarity index 100%
rename from clients/aurorae/themes/plastik/package/contents/config/main.xml
rename to plugins/kdecorations/aurorae/themes/plastik/package/contents/config/main.xml
diff --git a/clients/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml
similarity index 100%
rename from clients/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml
rename to plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/PlastikButton.qml
diff --git a/clients/aurorae/themes/plastik/package/contents/ui/config.ui b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/config.ui
similarity index 100%
rename from clients/aurorae/themes/plastik/package/contents/ui/config.ui
rename to plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/config.ui
diff --git a/clients/aurorae/themes/plastik/package/contents/ui/main.qml b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml
similarity index 100%
rename from clients/aurorae/themes/plastik/package/contents/ui/main.qml
rename to plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml
diff --git a/clients/aurorae/themes/plastik/package/metadata.desktop b/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
similarity index 100%
rename from clients/aurorae/themes/plastik/package/metadata.desktop
rename to plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop