diff --git a/kcms/access/CMakeLists.txt b/kcms/access/CMakeLists.txt
--- a/kcms/access/CMakeLists.txt
+++ b/kcms/access/CMakeLists.txt
@@ -20,7 +20,7 @@
     ${X11_LIBRARIES}
 )
 
-install(TARGETS kcm_access DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kcm_access DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 
 ########### install files ###############
 
diff --git a/kcms/autostart/CMakeLists.txt b/kcms/autostart/CMakeLists.txt
--- a/kcms/autostart/CMakeLists.txt
+++ b/kcms/autostart/CMakeLists.txt
@@ -15,5 +15,5 @@
 
 ########### install files ###############
 
-install(TARGETS kcm_autostart  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_autostart  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 install( FILES autostart.desktop   DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kcms/componentchooser/CMakeLists.txt b/kcms/componentchooser/CMakeLists.txt
--- a/kcms/componentchooser/CMakeLists.txt
+++ b/kcms/componentchooser/CMakeLists.txt
@@ -40,7 +40,7 @@
                       Qt5::X11Extras
                       )
 
-install(TARGETS kcm_componentchooser  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_componentchooser  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/dateandtime/CMakeLists.txt b/kcms/dateandtime/CMakeLists.txt
--- a/kcms/dateandtime/CMakeLists.txt
+++ b/kcms/dateandtime/CMakeLists.txt
@@ -22,7 +22,7 @@
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_clock  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_clock  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### next target ###############
 #This is only needed when not using timedated and can be removed in future
diff --git a/kcms/desktoppaths/CMakeLists.txt b/kcms/desktoppaths/CMakeLists.txt
--- a/kcms/desktoppaths/CMakeLists.txt
+++ b/kcms/desktoppaths/CMakeLists.txt
@@ -15,6 +15,6 @@
     KF5::KDELibs4Support # kglobalsettings
 )
 
-install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 install(FILES desktoppath.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
diff --git a/kcms/emoticons/CMakeLists.txt b/kcms/emoticons/CMakeLists.txt
--- a/kcms/emoticons/CMakeLists.txt
+++ b/kcms/emoticons/CMakeLists.txt
@@ -11,7 +11,7 @@
                       KF5::KDELibs4Support
                       KF5::Emoticons)
 
-install(TARGETS kcm_emoticons  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_emoticons  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### install files ###############
 install( FILES emoticons.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kcms/formats/CMakeLists.txt b/kcms/formats/CMakeLists.txt
--- a/kcms/formats/CMakeLists.txt
+++ b/kcms/formats/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 target_link_libraries(kcm_formats Qt5::Core Qt5::DBus Qt5::Widgets KF5::I18n KF5::ConfigCore KF5::KCMUtils)
 
-install(TARGETS kcm_formats  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_formats  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/hardware/joystick/CMakeLists.txt b/kcms/hardware/joystick/CMakeLists.txt
--- a/kcms/hardware/joystick/CMakeLists.txt
+++ b/kcms/hardware/joystick/CMakeLists.txt
@@ -23,7 +23,7 @@
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_joystick  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_joystick  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/kded/CMakeLists.txt b/kcms/kded/CMakeLists.txt
--- a/kcms/kded/CMakeLists.txt
+++ b/kcms/kded/CMakeLists.txt
@@ -4,7 +4,7 @@
 add_library(kcm_kded MODULE kcmkded.cpp)
 target_link_libraries(kcm_kded KF5::ConfigWidgets KF5::Service KF5::I18n Qt5::DBus)
 
-install(TARGETS kcm_kded  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_kded  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### install files ###############
 
diff --git a/kcms/keyboard/CMakeLists.txt b/kcms/keyboard/CMakeLists.txt
--- a/kcms/keyboard/CMakeLists.txt
+++ b/kcms/keyboard/CMakeLists.txt
@@ -127,7 +127,7 @@
     ${text_paint_LIB}
 )
 
-install(TARGETS kcm_keyboard DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_keyboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 install( FILES kcm_keyboard.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
 
diff --git a/kcms/keys/CMakeLists.txt b/kcms/keys/CMakeLists.txt
--- a/kcms/keys/CMakeLists.txt
+++ b/kcms/keys/CMakeLists.txt
@@ -38,7 +38,7 @@
     KF5::ItemViews
 )
 
-install(TARGETS kcm_keys  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_keys  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/kfontinst/kcmfontinst/CMakeLists.txt b/kcms/kfontinst/kcmfontinst/CMakeLists.txt
--- a/kcms/kfontinst/kcmfontinst/CMakeLists.txt
+++ b/kcms/kfontinst/kcmfontinst/CMakeLists.txt
@@ -18,7 +18,7 @@
     ${X11_LIBRARIES}
 )
 
-install(TARGETS kcm_fontinst  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_fontinst  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 install( FILES fontinst.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES kfontinst.knsrc DESTINATION  ${KDE_INSTALL_KNSRCDIR} )
 
diff --git a/kcms/ksmserver/CMakeLists.txt b/kcms/ksmserver/CMakeLists.txt
--- a/kcms/ksmserver/CMakeLists.txt
+++ b/kcms/ksmserver/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 target_link_libraries(kcm_smserver Qt5::Core Qt5::DBus Qt5::Widgets KF5::I18n KF5::ConfigCore KF5::KCMUtils PW::KWorkspace)
 
-install(TARGETS kcm_smserver  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_smserver  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
--- a/kcms/mouse/CMakeLists.txt
+++ b/kcms/mouse/CMakeLists.txt
@@ -81,7 +81,7 @@
     Qt5::QuickWidgets
 )
 
-install(TARGETS kcm_mouse  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_mouse  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### install files ###############
 
diff --git a/kcms/runners/CMakeLists.txt b/kcms/runners/CMakeLists.txt
--- a/kcms/runners/CMakeLists.txt
+++ b/kcms/runners/CMakeLists.txt
@@ -20,4 +20,4 @@
 
 
 install(FILES kcm_plasmasearch.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-install(TARGETS kcm_plasmasearch DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kcm_plasmasearch DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
diff --git a/kcms/solid_actions/CMakeLists.txt b/kcms/solid_actions/CMakeLists.txt
--- a/kcms/solid_actions/CMakeLists.txt
+++ b/kcms/solid_actions/CMakeLists.txt
@@ -30,7 +30,7 @@
 
 ########### install files ###############
 
-install( TARGETS kcm_solid_actions DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install( TARGETS kcm_solid_actions DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 install( TARGETS solid-action-desktop-gen ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES solid-actions.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES solid-action-template.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kcmsolidactions )
diff --git a/kcms/spellchecking/CMakeLists.txt b/kcms/spellchecking/CMakeLists.txt
--- a/kcms/spellchecking/CMakeLists.txt
+++ b/kcms/spellchecking/CMakeLists.txt
@@ -9,5 +9,5 @@
                       KF5::SonnetUi
                      )
 
-install(TARGETS kcmspellchecking   DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcmspellchecking   DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 install( FILES spellchecking.desktop   DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kcms/standard_actions/CMakeLists.txt b/kcms/standard_actions/CMakeLists.txt
--- a/kcms/standard_actions/CMakeLists.txt
+++ b/kcms/standard_actions/CMakeLists.txt
@@ -11,6 +11,6 @@
     KF5::XmlGui
 )
 
-install(TARGETS kcm_standard_actions DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kcm_standard_actions DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 install(FILES standard_actions.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
diff --git a/solid-device-automounter/kcm/CMakeLists.txt b/solid-device-automounter/kcm/CMakeLists.txt
--- a/solid-device-automounter/kcm/CMakeLists.txt
+++ b/solid-device-automounter/kcm/CMakeLists.txt
@@ -19,6 +19,6 @@
                       KF5::I18n
                       KF5::Solid)
 
-install(TARGETS kcm_device_automounter DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kcm_device_automounter DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 
 install(FILES device_automounter_kcm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})