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,9 @@
     ${X11_LIBRARIES}
 )
 
-install(TARGETS kcm_access DESTINATION ${KDE_INSTALL_PLUGINDIR})
+kcoreaddons_desktop_to_json(kcm_access "kcmaccess.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_access DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 
 ########### install files ###############
 
diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp
--- a/kcms/access/kcmaccess.cpp
+++ b/kcms/access/kcmaccess.cpp
@@ -43,7 +43,7 @@
 #define XK_XKB_KEYS
 #include <X11/keysymdef.h>
 
-K_PLUGIN_FACTORY(KAccessConfigFactory, registerPlugin<KAccessConfig>();)
+K_PLUGIN_FACTORY_WITH_JSON(KAccessConfigFactory, "kcmaccess.json", registerPlugin<KAccessConfig>();)
 
 QString mouseKeysShortcut(Display *display)
 {
diff --git a/kcms/autostart/CMakeLists.txt b/kcms/autostart/CMakeLists.txt
--- a/kcms/autostart/CMakeLists.txt
+++ b/kcms/autostart/CMakeLists.txt
@@ -13,7 +13,9 @@
 
 target_link_libraries(kcm_autostart KF5::KCMUtils KF5::I18n KF5::KIOCore KF5::KIOWidgets)
 
+kcoreaddons_desktop_to_json(kcm_autostart "autostart.desktop" SERVICE_TYPES kcmodule.desktop)
+
 ########### 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/autostart/autostart.cpp b/kcms/autostart/autostart.cpp
--- a/kcms/autostart/autostart.cpp
+++ b/kcms/autostart/autostart.cpp
@@ -41,7 +41,7 @@
 #include <KIO/CopyJob>
 #include <QDebug>
 
-K_PLUGIN_FACTORY(AutostartFactory, registerPlugin<Autostart>();)
+K_PLUGIN_FACTORY_WITH_JSON(AutostartFactory, "autostart.json" registerPlugin<Autostart>();)
 
 Autostart::Autostart( QWidget* parent, const QVariantList& )
     : KCModule(parent )
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,9 @@
                       Qt5::X11Extras
                       )
 
-install(TARGETS kcm_componentchooser  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_componentchooser "componentchooser.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_componentchooser  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/componentchooser/kcm_componentchooser.cpp b/kcms/componentchooser/kcm_componentchooser.cpp
--- a/kcms/componentchooser/kcm_componentchooser.cpp
+++ b/kcms/componentchooser/kcm_componentchooser.cpp
@@ -24,7 +24,8 @@
 #include <KLocalizedString>
 
 
-K_PLUGIN_FACTORY(KCMComponentChooserFactory,
+K_PLUGIN_FACTORY_WITH_JSON(KCMComponentChooserFactory,
+        "componentchooser.json",
         registerPlugin<KCMComponentChooser>();
         )
 
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,9 @@
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_clock  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_clock "clock.desktop" SERVICE_TYPES kcmodule.desktop)
+
+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/dateandtime/main.cpp b/kcms/dateandtime/main.cpp
--- a/kcms/dateandtime/main.cpp
+++ b/kcms/dateandtime/main.cpp
@@ -42,7 +42,7 @@
 
 #include "timedated_interface.h"
 
-K_PLUGIN_FACTORY(KlockModuleFactory, registerPlugin<KclockModule>();)
+K_PLUGIN_FACTORY_WITH_JSON(KlockModuleFactory, "clock.json", registerPlugin<KclockModule>();)
 
 
 
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,8 @@
     KF5::KDELibs4Support # kglobalsettings
 )
 
-install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR})
+kcoreaddons_desktop_to_json(kcm_desktoppaths "desktoppath.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 install(FILES desktoppath.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
diff --git a/kcms/desktoppaths/globalpaths.cpp b/kcms/desktoppaths/globalpaths.cpp
--- a/kcms/desktoppaths/globalpaths.cpp
+++ b/kcms/desktoppaths/globalpaths.cpp
@@ -66,7 +66,7 @@
 
 Q_LOGGING_CATEGORY(KCM_DESKTOPPATH, "kcm_desktoppath")
 
-K_PLUGIN_FACTORY(KcmDesktopPathsFactory, registerPlugin<DesktopPathConfig>();)
+K_PLUGIN_FACTORY_WITH_JSON(KcmDesktopPathsFactory, "desktoppath.json", registerPlugin<DesktopPathConfig>();)
 
 //-----------------------------------------------------------------------------
 
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,9 @@
                       KF5::KDELibs4Support
                       KF5::Emoticons)
 
-install(TARGETS kcm_emoticons  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_emoticons "emoticons.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_emoticons  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### install files ###############
 install( FILES emoticons.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kcms/emoticons/emoticonslist.cpp b/kcms/emoticons/emoticonslist.cpp
--- a/kcms/emoticons/emoticonslist.cpp
+++ b/kcms/emoticons/emoticonslist.cpp
@@ -103,7 +103,7 @@
     enableButtonOk(!leText->text().isEmpty() && !emoticon.isEmpty());
 }
 
-K_PLUGIN_FACTORY(EmoticonsFactory, registerPlugin<EmoticonList>();)
+K_PLUGIN_FACTORY_WITH_JSON(EmoticonsFactory, "emoticons.json", registerPlugin<EmoticonList>();)
 
 EmoticonList::EmoticonList(QWidget *parent, const QVariantList &args)
         : KCModule(parent, args)
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,9 @@
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_joystick  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_joystick "joystick.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_joystick  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/hardware/joystick/joystick.cpp b/kcms/hardware/joystick/joystick.cpp
--- a/kcms/hardware/joystick/joystick.cpp
+++ b/kcms/hardware/joystick/joystick.cpp
@@ -36,7 +36,7 @@
 
 //---------------------------------------------------------------------------------------------
 
-K_PLUGIN_FACTORY(JoystickFactory, registerPlugin<Joystick>();)
+K_PLUGIN_FACTORY_WITH_JSON(JoystickFactory, "joystick.json", registerPlugin<Joystick>();)
 
 //---------------------------------------------------------------------------------------------
 
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,9 @@
 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} )
+kcoreaddons_desktop_to_json(kcm_kded "kcmkded.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_kded  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### install files ###############
 
diff --git a/kcms/kded/kcmkded.cpp b/kcms/kded/kcmkded.cpp
--- a/kcms/kded/kcmkded.cpp
+++ b/kcms/kded/kcmkded.cpp
@@ -45,7 +45,8 @@
 #include <KPluginMetaData>
 #include <KLocalizedString>
 
-K_PLUGIN_FACTORY(KDEDFactory,
+K_PLUGIN_FACTORY_WITH_JSON(KDEDFactory,
+        "kcmkded.json",
         registerPlugin<KDEDConfig>();
         )
 K_EXPORT_PLUGIN(KDEDFactory("kcmkded"))
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,9 @@
     ${text_paint_LIB}
 )
 
-install(TARGETS kcm_keyboard DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_keyboard "kcm_keyboard.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_keyboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 install( FILES kcm_keyboard.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
 
diff --git a/kcms/keyboard/kcm_keyboard.cpp b/kcms/keyboard/kcm_keyboard.cpp
--- a/kcms/keyboard/kcm_keyboard.cpp
+++ b/kcms/keyboard/kcm_keyboard.cpp
@@ -39,7 +39,7 @@
 #include "kcmmisc.h"
 
 
-K_PLUGIN_FACTORY(KeyboardModuleFactory, registerPlugin<KCMKeyboard>();)
+K_PLUGIN_FACTORY_WITH_JSON(KeyboardModuleFactory, "kcm_keyboard.json", registerPlugin<KCMKeyboard>();)
 
 KCMKeyboard::KCMKeyboard(QWidget *parent, const QVariantList &args)
   : KCModule(parent)
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,9 @@
     KF5::ItemViews
 )
 
-install(TARGETS kcm_keys  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_keys "keys.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_keys  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/keys/globalshortcuts.cpp b/kcms/keys/globalshortcuts.cpp
--- a/kcms/keys/globalshortcuts.cpp
+++ b/kcms/keys/globalshortcuts.cpp
@@ -29,7 +29,7 @@
 #include <QLayout>
 
 
-K_PLUGIN_FACTORY(GlobalShortcutsModuleFactory, registerPlugin<GlobalShortcutsModule>();)
+K_PLUGIN_FACTORY_WITH_JSON(GlobalShortcutsModuleFactory, "keys.json", registerPlugin<GlobalShortcutsModule>();)
 
 GlobalShortcutsModule::GlobalShortcutsModule(QWidget *parent, const QVariantList &args)
  : KCModule(parent, args),
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,9 @@
     ${X11_LIBRARIES}
 )
 
-install(TARGETS kcm_fontinst  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_fontinst "fontinst.desktop" SERVICE_TYPES kcmodule.desktop)
+
+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/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
--- a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -74,7 +74,8 @@
 #define CFG_GROUP_SPLITTER_SIZES   "GroupSplitterSizes"
 #define CFG_FONT_SIZE              "FontSize"
 
-K_PLUGIN_FACTORY(FontInstallFactory,
+K_PLUGIN_FACTORY_WITH_JSON(FontInstallFactory,
+        "fontinst.json",
         registerPlugin<KFI::CKCmFontInst>();
         )
 
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,9 @@
 
 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} )
+kcoreaddons_desktop_to_json(kcm_smserver "kcmsmserver.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_smserver  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 
 ########### install files ###############
diff --git a/kcms/ksmserver/kcmsmserver.cpp b/kcms/ksmserver/kcmsmserver.cpp
--- a/kcms/ksmserver/kcmsmserver.cpp
+++ b/kcms/ksmserver/kcmsmserver.cpp
@@ -51,7 +51,7 @@
 
 #include "login1_manager.h"
 
-K_PLUGIN_FACTORY(SMSFactory, registerPlugin<SMServerConfig>();)
+K_PLUGIN_FACTORY_WITH_JSON(SMSFactory, "kcmsmserver.json", registerPlugin<SMServerConfig>();)
 
 SMServerConfig::SMServerConfig(QWidget *parent, const QVariantList &args)
   : KCModule(parent, args)
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,9 @@
     Qt5::QuickWidgets
 )
 
-install(TARGETS kcm_mouse  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcm_mouse "mouse.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_mouse  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 ########### install files ###############
 
diff --git a/kcms/mouse/plugin.cpp b/kcms/mouse/plugin.cpp
--- a/kcms/mouse/plugin.cpp
+++ b/kcms/mouse/plugin.cpp
@@ -19,8 +19,9 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY(MousePluginFactory,
-                 registerPlugin<ConfigContainer>();
+K_PLUGIN_FACTORY_WITH_JSON(MousePluginFactory,
+                           "mouse.json",
+                           registerPlugin<ConfigContainer>();
 )
 
 #include <plugin.moc>
diff --git a/kcms/runners/CMakeLists.txt b/kcms/runners/CMakeLists.txt
--- a/kcms/runners/CMakeLists.txt
+++ b/kcms/runners/CMakeLists.txt
@@ -18,6 +18,7 @@
   Qt5::Widgets
 )
 
+kcoreaddons_desktop_to_json(kcm_plasmasearch "kcm_plasmasearch.desktop" SERVICE_TYPES kcmodule.desktop)
 
 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/runners/kcm.cpp b/kcms/runners/kcm.cpp
--- a/kcms/runners/kcm.cpp
+++ b/kcms/runners/kcm.cpp
@@ -38,7 +38,7 @@
 #include <QPainter>
 #include <QPushButton>
 
-K_PLUGIN_FACTORY(SearchConfigModuleFactory, registerPlugin<SearchConfigModule>();)
+K_PLUGIN_FACTORY_WITH_JSON(SearchConfigModuleFactory, "kcm_plasmasearch.json", registerPlugin<SearchConfigModule>();)
 
 
 SearchConfigModule::SearchConfigModule(QWidget* parent, const QVariantList& args)
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
@@ -28,9 +28,11 @@
 target_link_libraries(kcm_solid_actions KF5::KIOCore KF5::KIOWidgets KF5::Solid KF5::I18n KF5::IconThemes KF5::ConfigWidgets KF5::CoreAddons)
 target_link_libraries(solid-action-desktop-gen KF5::Solid KF5::KIOCore KF5::I18n KF5::KIOWidgets)
 
+kcoreaddons_desktop_to_json(kcm_solid_actions "solid-actions.desktop" SERVICE_TYPES kcmodule.desktop)
+
 ########### 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/solid_actions/SolidActions.cpp b/kcms/solid_actions/SolidActions.cpp
--- a/kcms/solid_actions/SolidActions.cpp
+++ b/kcms/solid_actions/SolidActions.cpp
@@ -37,7 +37,7 @@
 #include <Solid/DeviceInterface>
 #include <Solid/Predicate>
 
-K_PLUGIN_FACTORY( SolidActionsFactory, registerPlugin<SolidActions>(); )
+K_PLUGIN_FACTORY_WITH_JSON( SolidActionsFactory, "solid-actions.json", registerPlugin<SolidActions>(); )
 
 SolidActions::SolidActions(QWidget* parent, const QVariantList&)
     : KCModule(parent)
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,7 @@
                       KF5::SonnetUi
                      )
 
-install(TARGETS kcmspellchecking   DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+kcoreaddons_desktop_to_json(kcmspellchecking "spellchecking.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcmspellchecking   DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 install( FILES spellchecking.desktop   DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kcms/spellchecking/spellchecking.cpp b/kcms/spellchecking/spellchecking.cpp
--- a/kcms/spellchecking/spellchecking.cpp
+++ b/kcms/spellchecking/spellchecking.cpp
@@ -27,7 +27,7 @@
 #include <KConfig>
 #include <QBoxLayout>
 
-K_PLUGIN_FACTORY(SpellFactory, registerPlugin<SonnetSpellCheckingModule>();)
+K_PLUGIN_FACTORY_WITH_JSON(SpellFactory, "spellchecking.json", registerPlugin<SonnetSpellCheckingModule>();)
 
 SonnetSpellCheckingModule::SonnetSpellCheckingModule(QWidget* parent, const QVariantList&):
     KCModule(parent)
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,8 @@
     KF5::XmlGui
 )
 
-install(TARGETS kcm_standard_actions DESTINATION ${KDE_INSTALL_PLUGINDIR})
+kcoreaddons_desktop_to_json(kcm_standard_actions "standard_actions.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_standard_actions DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 install(FILES standard_actions.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
diff --git a/kcms/standard_actions/standard_actions_module.cpp b/kcms/standard_actions/standard_actions_module.cpp
--- a/kcms/standard_actions/standard_actions_module.cpp
+++ b/kcms/standard_actions/standard_actions_module.cpp
@@ -33,7 +33,7 @@
 #include <QVBoxLayout>
 #include <QSet>
 
-K_PLUGIN_FACTORY(StandardActionsModuleFactory, registerPlugin<StandardActionsModule>();)
+K_PLUGIN_FACTORY_WITH_JSON(StandardActionsModuleFactory, "standard_actions.json", registerPlugin<StandardActionsModule>();)
 
 static void dressUpAction(QAction *action, KStandardShortcut::StandardShortcut shortcutId)
     {
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,8 @@
                       KF5::I18n
                       KF5::Solid)
 
-install(TARGETS kcm_device_automounter DESTINATION ${KDE_INSTALL_PLUGINDIR})
+kcoreaddons_desktop_to_json(kcm_device_automounter "device_automounter_kcm.desktop" SERVICE_TYPES kcmodule.desktop)
+
+install(TARGETS kcm_device_automounter DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 
 install(FILES device_automounter_kcm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
diff --git a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
--- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
+++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
@@ -37,7 +37,7 @@
 #include "LayoutSettings.h"
 #include "DeviceModel.h"
 
-K_PLUGIN_FACTORY(DeviceAutomounterKCMFactory, registerPlugin<DeviceAutomounterKCM>();)
+K_PLUGIN_FACTORY_WITH_JSON(DeviceAutomounterKCMFactory, "device_automounter_kcm.json", registerPlugin<DeviceAutomounterKCM>();)
 
 DeviceAutomounterKCM::DeviceAutomounterKCM(QWidget *parent, const QVariantList &args)
     : KCModule(parent, args)//DeviceAutomounterKCMFactory::componentData(), parent)