diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d12c7645f8..d00a4480be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(qml) add_subdirectory(libkwineffects) if (KWIN_BUILD_KCMS) - add_subdirectory(kcmkwin) + add_subdirectory(kcms) endif() add_library(kwin SHARED) diff --git a/src/kcmkwin/CMakeLists.txt b/src/kcmkwin/CMakeLists.txt deleted file mode 100644 index 6694585145..0000000000 --- a/src/kcmkwin/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) - -add_subdirectory(common) -add_subdirectory(kwincompositing) -add_subdirectory(kwinoptions) -add_subdirectory(kwindecoration) -add_subdirectory(kwinrules) -add_subdirectory(kwinscreenedges) -add_subdirectory(kwinscripts) -add_subdirectory(kwindesktop) -add_subdirectory(kwineffects) -add_subdirectory(kwinvirtualkeyboard) -add_subdirectory(kwinxwayland) - -if (KWIN_BUILD_TABBOX) - add_subdirectory(kwintabbox) -endif() diff --git a/src/kcms/CMakeLists.txt b/src/kcms/CMakeLists.txt new file mode 100644 index 0000000000..9fd4f534f6 --- /dev/null +++ b/src/kcms/CMakeLists.txt @@ -0,0 +1,17 @@ +remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) + +add_subdirectory(common) +add_subdirectory(compositing) +add_subdirectory(options) +add_subdirectory(decoration) +add_subdirectory(rules) +add_subdirectory(screenedges) +add_subdirectory(scripts) +add_subdirectory(desktop) +add_subdirectory(effects) +add_subdirectory(virtualkeyboard) +add_subdirectory(xwayland) + +if (KWIN_BUILD_TABBOX) + add_subdirectory(tabbox) +endif() diff --git a/src/kcmkwin/common/CMakeLists.txt b/src/kcms/common/CMakeLists.txt similarity index 100% rename from src/kcmkwin/common/CMakeLists.txt rename to src/kcms/common/CMakeLists.txt diff --git a/src/kcmkwin/common/Messages.sh b/src/kcms/common/Messages.sh similarity index 100% rename from src/kcmkwin/common/Messages.sh rename to src/kcms/common/Messages.sh diff --git a/src/kcmkwin/common/effectsmodel.cpp b/src/kcms/common/effectsmodel.cpp similarity index 100% rename from src/kcmkwin/common/effectsmodel.cpp rename to src/kcms/common/effectsmodel.cpp diff --git a/src/kcmkwin/common/effectsmodel.h b/src/kcms/common/effectsmodel.h similarity index 100% rename from src/kcmkwin/common/effectsmodel.h rename to src/kcms/common/effectsmodel.h diff --git a/src/kcmkwin/kwincompositing/CMakeLists.txt b/src/kcms/compositing/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwincompositing/CMakeLists.txt rename to src/kcms/compositing/CMakeLists.txt diff --git a/src/kcmkwin/kwincompositing/Messages.sh b/src/kcms/compositing/Messages.sh similarity index 100% rename from src/kcmkwin/kwincompositing/Messages.sh rename to src/kcms/compositing/Messages.sh diff --git a/src/kcmkwin/kwincompositing/compositing.ui b/src/kcms/compositing/compositing.ui similarity index 100% rename from src/kcmkwin/kwincompositing/compositing.ui rename to src/kcms/compositing/compositing.ui diff --git a/src/kcmkwin/kwincompositing/kwincompositing.json b/src/kcms/compositing/kwincompositing.json similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositing.json rename to src/kcms/compositing/kwincompositing.json diff --git a/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg b/src/kcms/compositing/kwincompositing_setting.kcfg similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg rename to src/kcms/compositing/kwincompositing_setting.kcfg diff --git a/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfgc b/src/kcms/compositing/kwincompositing_setting.kcfgc similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositing_setting.kcfgc rename to src/kcms/compositing/kwincompositing_setting.kcfgc diff --git a/src/kcmkwin/kwincompositing/kwincompositingdata.cpp b/src/kcms/compositing/kwincompositingdata.cpp similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositingdata.cpp rename to src/kcms/compositing/kwincompositingdata.cpp diff --git a/src/kcmkwin/kwincompositing/kwincompositingdata.h b/src/kcms/compositing/kwincompositingdata.h similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositingdata.h rename to src/kcms/compositing/kwincompositingdata.h diff --git a/src/kcmkwin/kwincompositing/main.cpp b/src/kcms/compositing/main.cpp similarity index 100% rename from src/kcmkwin/kwincompositing/main.cpp rename to src/kcms/compositing/main.cpp diff --git a/src/kcmkwin/kwindecoration/CMakeLists.txt b/src/kcms/decoration/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwindecoration/CMakeLists.txt rename to src/kcms/decoration/CMakeLists.txt diff --git a/src/kcmkwin/kwindecoration/Messages.sh b/src/kcms/decoration/Messages.sh similarity index 100% rename from src/kcmkwin/kwindecoration/Messages.sh rename to src/kcms/decoration/Messages.sh diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt b/src/kcms/decoration/declarative-plugin/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt rename to src/kcms/decoration/declarative-plugin/CMakeLists.txt diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.cpp b/src/kcms/decoration/declarative-plugin/buttonsmodel.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.cpp rename to src/kcms/decoration/declarative-plugin/buttonsmodel.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h b/src/kcms/decoration/declarative-plugin/buttonsmodel.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h rename to src/kcms/decoration/declarative-plugin/buttonsmodel.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp b/src/kcms/decoration/declarative-plugin/plugin.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp rename to src/kcms/decoration/declarative-plugin/plugin.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/plugin.h b/src/kcms/decoration/declarative-plugin/plugin.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/plugin.h rename to src/kcms/decoration/declarative-plugin/plugin.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp b/src/kcms/decoration/declarative-plugin/previewbridge.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp rename to src/kcms/decoration/declarative-plugin/previewbridge.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h b/src/kcms/decoration/declarative-plugin/previewbridge.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h rename to src/kcms/decoration/declarative-plugin/previewbridge.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp b/src/kcms/decoration/declarative-plugin/previewbutton.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp rename to src/kcms/decoration/declarative-plugin/previewbutton.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.h b/src/kcms/decoration/declarative-plugin/previewbutton.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.h rename to src/kcms/decoration/declarative-plugin/previewbutton.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/src/kcms/decoration/declarative-plugin/previewclient.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp rename to src/kcms/decoration/declarative-plugin/previewclient.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h b/src/kcms/decoration/declarative-plugin/previewclient.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h rename to src/kcms/decoration/declarative-plugin/previewclient.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp b/src/kcms/decoration/declarative-plugin/previewitem.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp rename to src/kcms/decoration/declarative-plugin/previewitem.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.h b/src/kcms/decoration/declarative-plugin/previewitem.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewitem.h rename to src/kcms/decoration/declarative-plugin/previewitem.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp b/src/kcms/decoration/declarative-plugin/previewsettings.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp rename to src/kcms/decoration/declarative-plugin/previewsettings.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.h b/src/kcms/decoration/declarative-plugin/previewsettings.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.h rename to src/kcms/decoration/declarative-plugin/previewsettings.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/qmldir b/src/kcms/decoration/declarative-plugin/qmldir similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/qmldir rename to src/kcms/decoration/declarative-plugin/qmldir diff --git a/src/kcmkwin/kwindecoration/decorationmodel.cpp b/src/kcms/decoration/decorationmodel.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/decorationmodel.cpp rename to src/kcms/decoration/decorationmodel.cpp diff --git a/src/kcmkwin/kwindecoration/decorationmodel.h b/src/kcms/decoration/decorationmodel.h similarity index 100% rename from src/kcmkwin/kwindecoration/decorationmodel.h rename to src/kcms/decoration/decorationmodel.h diff --git a/src/kcmkwin/kwindecoration/kcm.cpp b/src/kcms/decoration/kcm.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/kcm.cpp rename to src/kcms/decoration/kcm.cpp diff --git a/src/kcmkwin/kwindecoration/kcm.h b/src/kcms/decoration/kcm.h similarity index 100% rename from src/kcmkwin/kwindecoration/kcm.h rename to src/kcms/decoration/kcm.h diff --git a/src/kcmkwin/kwindecoration/kcm_kwindecoration.json b/src/kcms/decoration/kcm_kwindecoration.json similarity index 100% rename from src/kcmkwin/kwindecoration/kcm_kwindecoration.json rename to src/kcms/decoration/kcm_kwindecoration.json diff --git a/src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp b/src/kcms/decoration/kwin-applywindowdecoration.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp rename to src/kcms/decoration/kwin-applywindowdecoration.cpp diff --git a/src/kcmkwin/kwindecoration/kwindecorationsettings.kcfg b/src/kcms/decoration/kwindecorationsettings.kcfg similarity index 100% rename from src/kcmkwin/kwindecoration/kwindecorationsettings.kcfg rename to src/kcms/decoration/kwindecorationsettings.kcfg diff --git a/src/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc b/src/kcms/decoration/kwindecorationsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc rename to src/kcms/decoration/kwindecorationsettings.kcfgc diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/ButtonGroup.qml b/src/kcms/decoration/package/contents/ui/ButtonGroup.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/ButtonGroup.qml rename to src/kcms/decoration/package/contents/ui/ButtonGroup.qml diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/Buttons.qml b/src/kcms/decoration/package/contents/ui/Buttons.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/Buttons.qml rename to src/kcms/decoration/package/contents/ui/Buttons.qml diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/Themes.qml b/src/kcms/decoration/package/contents/ui/Themes.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/Themes.qml rename to src/kcms/decoration/package/contents/ui/Themes.qml diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/main.qml b/src/kcms/decoration/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/main.qml rename to src/kcms/decoration/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwindecoration/utils.cpp b/src/kcms/decoration/utils.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/utils.cpp rename to src/kcms/decoration/utils.cpp diff --git a/src/kcmkwin/kwindecoration/utils.h b/src/kcms/decoration/utils.h similarity index 100% rename from src/kcmkwin/kwindecoration/utils.h rename to src/kcms/decoration/utils.h diff --git a/src/kcmkwin/kwindecoration/window-decorations.knsrc.cmake b/src/kcms/decoration/window-decorations.knsrc.cmake similarity index 100% rename from src/kcmkwin/kwindecoration/window-decorations.knsrc.cmake rename to src/kcms/decoration/window-decorations.knsrc.cmake diff --git a/src/kcmkwin/kwindesktop/CMakeLists.txt b/src/kcms/desktop/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwindesktop/CMakeLists.txt rename to src/kcms/desktop/CMakeLists.txt diff --git a/src/kcmkwin/kwindesktop/Messages.sh b/src/kcms/desktop/Messages.sh similarity index 100% rename from src/kcmkwin/kwindesktop/Messages.sh rename to src/kcms/desktop/Messages.sh diff --git a/src/kcmkwin/kwindesktop/animationsmodel.cpp b/src/kcms/desktop/animationsmodel.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/animationsmodel.cpp rename to src/kcms/desktop/animationsmodel.cpp diff --git a/src/kcmkwin/kwindesktop/animationsmodel.h b/src/kcms/desktop/animationsmodel.h similarity index 100% rename from src/kcmkwin/kwindesktop/animationsmodel.h rename to src/kcms/desktop/animationsmodel.h diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.cpp b/src/kcms/desktop/desktopsmodel.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/desktopsmodel.cpp rename to src/kcms/desktop/desktopsmodel.cpp diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.h b/src/kcms/desktop/desktopsmodel.h similarity index 100% rename from src/kcmkwin/kwindesktop/desktopsmodel.h rename to src/kcms/desktop/desktopsmodel.h diff --git a/src/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.json b/src/kcms/desktop/kcm_kwin_virtualdesktops.json similarity index 100% rename from src/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.json rename to src/kcms/desktop/kcm_kwin_virtualdesktops.json diff --git a/src/kcmkwin/kwindesktop/package/contents/ui/main.qml b/src/kcms/desktop/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwindesktop/package/contents/ui/main.qml rename to src/kcms/desktop/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwindesktop/virtualdesktops.cpp b/src/kcms/desktop/virtualdesktops.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktops.cpp rename to src/kcms/desktop/virtualdesktops.cpp diff --git a/src/kcmkwin/kwindesktop/virtualdesktops.h b/src/kcms/desktop/virtualdesktops.h similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktops.h rename to src/kcms/desktop/virtualdesktops.h diff --git a/src/kcmkwin/kwindesktop/virtualdesktopsdata.cpp b/src/kcms/desktop/virtualdesktopsdata.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopsdata.cpp rename to src/kcms/desktop/virtualdesktopsdata.cpp diff --git a/src/kcmkwin/kwindesktop/virtualdesktopsdata.h b/src/kcms/desktop/virtualdesktopsdata.h similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopsdata.h rename to src/kcms/desktop/virtualdesktopsdata.h diff --git a/src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfg b/src/kcms/desktop/virtualdesktopssettings.kcfg similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfg rename to src/kcms/desktop/virtualdesktopssettings.kcfg diff --git a/src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfgc b/src/kcms/desktop/virtualdesktopssettings.kcfgc similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfgc rename to src/kcms/desktop/virtualdesktopssettings.kcfgc diff --git a/src/kcmkwin/kwineffects/CMakeLists.txt b/src/kcms/effects/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwineffects/CMakeLists.txt rename to src/kcms/effects/CMakeLists.txt diff --git a/src/kcmkwin/kwineffects/Messages.sh b/src/kcms/effects/Messages.sh similarity index 100% rename from src/kcmkwin/kwineffects/Messages.sh rename to src/kcms/effects/Messages.sh diff --git a/src/kcmkwin/kwineffects/desktopeffectsdata.cpp b/src/kcms/effects/desktopeffectsdata.cpp similarity index 100% rename from src/kcmkwin/kwineffects/desktopeffectsdata.cpp rename to src/kcms/effects/desktopeffectsdata.cpp diff --git a/src/kcmkwin/kwineffects/desktopeffectsdata.h b/src/kcms/effects/desktopeffectsdata.h similarity index 100% rename from src/kcmkwin/kwineffects/desktopeffectsdata.h rename to src/kcms/effects/desktopeffectsdata.h diff --git a/src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp b/src/kcms/effects/effectsfilterproxymodel.cpp similarity index 100% rename from src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp rename to src/kcms/effects/effectsfilterproxymodel.cpp diff --git a/src/kcmkwin/kwineffects/effectsfilterproxymodel.h b/src/kcms/effects/effectsfilterproxymodel.h similarity index 100% rename from src/kcmkwin/kwineffects/effectsfilterproxymodel.h rename to src/kcms/effects/effectsfilterproxymodel.h diff --git a/src/kcmkwin/kwineffects/kcm.cpp b/src/kcms/effects/kcm.cpp similarity index 100% rename from src/kcmkwin/kwineffects/kcm.cpp rename to src/kcms/effects/kcm.cpp diff --git a/src/kcmkwin/kwineffects/kcm.h b/src/kcms/effects/kcm.h similarity index 100% rename from src/kcmkwin/kwineffects/kcm.h rename to src/kcms/effects/kcm.h diff --git a/src/kcmkwin/kwineffects/kcm_kwin_effects.json b/src/kcms/effects/kcm_kwin_effects.json similarity index 100% rename from src/kcmkwin/kwineffects/kcm_kwin_effects.json rename to src/kcms/effects/kcm_kwin_effects.json diff --git a/src/kcmkwin/kwineffects/kwineffect.knsrc b/src/kcms/effects/kwineffect.knsrc similarity index 100% rename from src/kcmkwin/kwineffects/kwineffect.knsrc rename to src/kcms/effects/kwineffect.knsrc diff --git a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml similarity index 100% rename from src/kcmkwin/kwineffects/package/contents/ui/Effect.qml rename to src/kcms/effects/package/contents/ui/Effect.qml diff --git a/src/kcmkwin/kwineffects/package/contents/ui/Video.qml b/src/kcms/effects/package/contents/ui/Video.qml similarity index 100% rename from src/kcmkwin/kwineffects/package/contents/ui/Video.qml rename to src/kcms/effects/package/contents/ui/Video.qml diff --git a/src/kcmkwin/kwineffects/package/contents/ui/main.qml b/src/kcms/effects/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwineffects/package/contents/ui/main.qml rename to src/kcms/effects/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwinoptions/AUTHORS b/src/kcms/options/AUTHORS similarity index 100% rename from src/kcmkwin/kwinoptions/AUTHORS rename to src/kcms/options/AUTHORS diff --git a/src/kcmkwin/kwinoptions/CMakeLists.txt b/src/kcms/options/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinoptions/CMakeLists.txt rename to src/kcms/options/CMakeLists.txt diff --git a/src/kcmkwin/kwinoptions/ChangeLog b/src/kcms/options/ChangeLog similarity index 100% rename from src/kcmkwin/kwinoptions/ChangeLog rename to src/kcms/options/ChangeLog diff --git a/src/kcmkwin/kwinoptions/Messages.sh b/src/kcms/options/Messages.sh similarity index 100% rename from src/kcmkwin/kwinoptions/Messages.sh rename to src/kcms/options/Messages.sh diff --git a/src/kcmkwin/kwinoptions/actions.ui b/src/kcms/options/actions.ui similarity index 100% rename from src/kcmkwin/kwinoptions/actions.ui rename to src/kcms/options/actions.ui diff --git a/src/kcmkwin/kwinoptions/advanced.ui b/src/kcms/options/advanced.ui similarity index 100% rename from src/kcmkwin/kwinoptions/advanced.ui rename to src/kcms/options/advanced.ui diff --git a/src/kcmkwin/kwinoptions/focus.ui b/src/kcms/options/focus.ui similarity index 100% rename from src/kcmkwin/kwinoptions/focus.ui rename to src/kcms/options/focus.ui diff --git a/src/kcmkwin/kwinoptions/kcm_kwinoptions.json b/src/kcms/options/kcm_kwinoptions.json similarity index 100% rename from src/kcmkwin/kwinoptions/kcm_kwinoptions.json rename to src/kcms/options/kcm_kwinoptions.json diff --git a/src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfg b/src/kcms/options/kwinoptions_kdeglobals_settings.kcfg similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfg rename to src/kcms/options/kwinoptions_kdeglobals_settings.kcfg diff --git a/src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfgc b/src/kcms/options/kwinoptions_kdeglobals_settings.kcfgc similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfgc rename to src/kcms/options/kwinoptions_kdeglobals_settings.kcfgc diff --git a/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg b/src/kcms/options/kwinoptions_settings.kcfg similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg rename to src/kcms/options/kwinoptions_settings.kcfg diff --git a/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc b/src/kcms/options/kwinoptions_settings.kcfgc similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc rename to src/kcms/options/kwinoptions_settings.kcfgc diff --git a/src/kcmkwin/kwinoptions/main.cpp b/src/kcms/options/main.cpp similarity index 100% rename from src/kcmkwin/kwinoptions/main.cpp rename to src/kcms/options/main.cpp diff --git a/src/kcmkwin/kwinoptions/main.h b/src/kcms/options/main.h similarity index 100% rename from src/kcmkwin/kwinoptions/main.h rename to src/kcms/options/main.h diff --git a/src/kcmkwin/kwinoptions/mouse.cpp b/src/kcms/options/mouse.cpp similarity index 100% rename from src/kcmkwin/kwinoptions/mouse.cpp rename to src/kcms/options/mouse.cpp diff --git a/src/kcmkwin/kwinoptions/mouse.h b/src/kcms/options/mouse.h similarity index 100% rename from src/kcmkwin/kwinoptions/mouse.h rename to src/kcms/options/mouse.h diff --git a/src/kcmkwin/kwinoptions/mouse.ui b/src/kcms/options/mouse.ui similarity index 100% rename from src/kcmkwin/kwinoptions/mouse.ui rename to src/kcms/options/mouse.ui diff --git a/src/kcmkwin/kwinoptions/moving.ui b/src/kcms/options/moving.ui similarity index 100% rename from src/kcmkwin/kwinoptions/moving.ui rename to src/kcms/options/moving.ui diff --git a/src/kcmkwin/kwinoptions/windows.cpp b/src/kcms/options/windows.cpp similarity index 100% rename from src/kcmkwin/kwinoptions/windows.cpp rename to src/kcms/options/windows.cpp diff --git a/src/kcmkwin/kwinoptions/windows.h b/src/kcms/options/windows.h similarity index 100% rename from src/kcmkwin/kwinoptions/windows.h rename to src/kcms/options/windows.h diff --git a/src/kcmkwin/kwinrules/CMakeLists.txt b/src/kcms/rules/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinrules/CMakeLists.txt rename to src/kcms/rules/CMakeLists.txt diff --git a/src/kcmkwin/kwinrules/Messages.sh b/src/kcms/rules/Messages.sh similarity index 100% rename from src/kcmkwin/kwinrules/Messages.sh rename to src/kcms/rules/Messages.sh diff --git a/src/kcmkwin/kwinrules/kcm_kwinrules.json b/src/kcms/rules/kcm_kwinrules.json similarity index 100% rename from src/kcmkwin/kwinrules/kcm_kwinrules.json rename to src/kcms/rules/kcm_kwinrules.json diff --git a/src/kcmkwin/kwinrules/kcmrules.cpp b/src/kcms/rules/kcmrules.cpp similarity index 100% rename from src/kcmkwin/kwinrules/kcmrules.cpp rename to src/kcms/rules/kcmrules.cpp diff --git a/src/kcmkwin/kwinrules/kcmrules.h b/src/kcms/rules/kcmrules.h similarity index 100% rename from src/kcmkwin/kwinrules/kcmrules.h rename to src/kcms/rules/kcmrules.h diff --git a/src/kcmkwin/kwinrules/kwinsrc.cpp b/src/kcms/rules/kwinsrc.cpp similarity index 100% rename from src/kcmkwin/kwinrules/kwinsrc.cpp rename to src/kcms/rules/kwinsrc.cpp diff --git a/src/kcmkwin/kwinrules/main.cpp b/src/kcms/rules/main.cpp similarity index 100% rename from src/kcmkwin/kwinrules/main.cpp rename to src/kcms/rules/main.cpp diff --git a/src/kcmkwin/kwinrules/optionsmodel.cpp b/src/kcms/rules/optionsmodel.cpp similarity index 100% rename from src/kcmkwin/kwinrules/optionsmodel.cpp rename to src/kcms/rules/optionsmodel.cpp diff --git a/src/kcmkwin/kwinrules/optionsmodel.h b/src/kcms/rules/optionsmodel.h similarity index 100% rename from src/kcmkwin/kwinrules/optionsmodel.h rename to src/kcms/rules/optionsmodel.h diff --git a/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop b/src/kcms/rules/org.kde.kwin_rules_dialog.desktop similarity index 100% rename from src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop rename to src/kcms/rules/org.kde.kwin_rules_dialog.desktop diff --git a/src/kcmkwin/kwinrules/package/contents/ui/FileDialogLoader.qml b/src/kcms/rules/package/contents/ui/FileDialogLoader.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/FileDialogLoader.qml rename to src/kcms/rules/package/contents/ui/FileDialogLoader.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/OptionsComboBox.qml b/src/kcms/rules/package/contents/ui/OptionsComboBox.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/OptionsComboBox.qml rename to src/kcms/rules/package/contents/ui/OptionsComboBox.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RuleItemDelegate.qml b/src/kcms/rules/package/contents/ui/RuleItemDelegate.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/RuleItemDelegate.qml rename to src/kcms/rules/package/contents/ui/RuleItemDelegate.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml b/src/kcms/rules/package/contents/ui/RulesEditor.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml rename to src/kcms/rules/package/contents/ui/RulesEditor.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/ValueEditor.qml b/src/kcms/rules/package/contents/ui/ValueEditor.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/ValueEditor.qml rename to src/kcms/rules/package/contents/ui/ValueEditor.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/main.qml b/src/kcms/rules/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/main.qml rename to src/kcms/rules/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwinrules/rulebookmodel.cpp b/src/kcms/rules/rulebookmodel.cpp similarity index 100% rename from src/kcmkwin/kwinrules/rulebookmodel.cpp rename to src/kcms/rules/rulebookmodel.cpp diff --git a/src/kcmkwin/kwinrules/rulebookmodel.h b/src/kcms/rules/rulebookmodel.h similarity index 100% rename from src/kcmkwin/kwinrules/rulebookmodel.h rename to src/kcms/rules/rulebookmodel.h diff --git a/src/kcmkwin/kwinrules/ruleitem.cpp b/src/kcms/rules/ruleitem.cpp similarity index 100% rename from src/kcmkwin/kwinrules/ruleitem.cpp rename to src/kcms/rules/ruleitem.cpp diff --git a/src/kcmkwin/kwinrules/ruleitem.h b/src/kcms/rules/ruleitem.h similarity index 100% rename from src/kcmkwin/kwinrules/ruleitem.h rename to src/kcms/rules/ruleitem.h diff --git a/src/kcmkwin/kwinrules/rulesmodel.cpp b/src/kcms/rules/rulesmodel.cpp similarity index 100% rename from src/kcmkwin/kwinrules/rulesmodel.cpp rename to src/kcms/rules/rulesmodel.cpp diff --git a/src/kcmkwin/kwinrules/rulesmodel.h b/src/kcms/rules/rulesmodel.h similarity index 100% rename from src/kcmkwin/kwinrules/rulesmodel.h rename to src/kcms/rules/rulesmodel.h diff --git a/src/kcmkwin/kwinscreenedges/CMakeLists.txt b/src/kcms/screenedges/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinscreenedges/CMakeLists.txt rename to src/kcms/screenedges/CMakeLists.txt diff --git a/src/kcmkwin/kwinscreenedges/Messages.sh b/src/kcms/screenedges/Messages.sh similarity index 100% rename from src/kcmkwin/kwinscreenedges/Messages.sh rename to src/kcms/screenedges/Messages.sh diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json b/src/kcms/screenedges/kcm_kwinscreenedges.json similarity index 100% rename from src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json rename to src/kcms/screenedges/kcm_kwinscreenedges.json diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json b/src/kcms/screenedges/kcm_kwintouchscreen.json similarity index 100% rename from src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json rename to src/kcms/screenedges/kcm_kwintouchscreen.json diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp b/src/kcms/screenedges/kwinscreenedge.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp rename to src/kcms/screenedges/kwinscreenedge.cpp diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedge.h b/src/kcms/screenedges/kwinscreenedge.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedge.h rename to src/kcms/screenedges/kwinscreenedge.h diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.cpp b/src/kcms/screenedges/kwinscreenedgeconfigform.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.cpp rename to src/kcms/screenedges/kwinscreenedgeconfigform.cpp diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.h b/src/kcms/screenedges/kwinscreenedgeconfigform.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.h rename to src/kcms/screenedges/kwinscreenedgeconfigform.h diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfg b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfg rename to src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfgc rename to src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfg b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfg rename to src/kcms/screenedges/kwinscreenedgescriptsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfgc rename to src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfg b/src/kcms/screenedges/kwinscreenedgesettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfg rename to src/kcms/screenedges/kwinscreenedgesettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfgc b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfgc rename to src/kcms/screenedges/kwinscreenedgesettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.cpp b/src/kcms/screenedges/kwintouchscreenedgeconfigform.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.cpp rename to src/kcms/screenedges/kwintouchscreenedgeconfigform.cpp diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.h b/src/kcms/screenedges/kwintouchscreenedgeconfigform.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.h rename to src/kcms/screenedges/kwintouchscreenedgeconfigform.h diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfg b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfg rename to src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfgc rename to src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfg b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfg rename to src/kcms/screenedges/kwintouchscreenscriptsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfgc rename to src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfg b/src/kcms/screenedges/kwintouchscreensettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfg rename to src/kcms/screenedges/kwintouchscreensettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfgc b/src/kcms/screenedges/kwintouchscreensettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfgc rename to src/kcms/screenedges/kwintouchscreensettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/main.cpp b/src/kcms/screenedges/main.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/main.cpp rename to src/kcms/screenedges/main.cpp diff --git a/src/kcmkwin/kwinscreenedges/main.h b/src/kcms/screenedges/main.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/main.h rename to src/kcms/screenedges/main.h diff --git a/src/kcmkwin/kwinscreenedges/main.ui b/src/kcms/screenedges/main.ui similarity index 100% rename from src/kcmkwin/kwinscreenedges/main.ui rename to src/kcms/screenedges/main.ui diff --git a/src/kcmkwin/kwinscreenedges/monitor.cpp b/src/kcms/screenedges/monitor.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/monitor.cpp rename to src/kcms/screenedges/monitor.cpp diff --git a/src/kcmkwin/kwinscreenedges/monitor.h b/src/kcms/screenedges/monitor.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/monitor.h rename to src/kcms/screenedges/monitor.h diff --git a/src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp b/src/kcms/screenedges/screenpreviewwidget.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp rename to src/kcms/screenedges/screenpreviewwidget.cpp diff --git a/src/kcmkwin/kwinscreenedges/screenpreviewwidget.h b/src/kcms/screenedges/screenpreviewwidget.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/screenpreviewwidget.h rename to src/kcms/screenedges/screenpreviewwidget.h diff --git a/src/kcmkwin/kwinscreenedges/touch.cpp b/src/kcms/screenedges/touch.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/touch.cpp rename to src/kcms/screenedges/touch.cpp diff --git a/src/kcmkwin/kwinscreenedges/touch.h b/src/kcms/screenedges/touch.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/touch.h rename to src/kcms/screenedges/touch.h diff --git a/src/kcmkwin/kwinscreenedges/touch.ui b/src/kcms/screenedges/touch.ui similarity index 100% rename from src/kcmkwin/kwinscreenedges/touch.ui rename to src/kcms/screenedges/touch.ui diff --git a/src/kcmkwin/kwinscripts/CMakeLists.txt b/src/kcms/scripts/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinscripts/CMakeLists.txt rename to src/kcms/scripts/CMakeLists.txt diff --git a/src/kcmkwin/kwinscripts/Messages.sh b/src/kcms/scripts/Messages.sh similarity index 100% rename from src/kcmkwin/kwinscripts/Messages.sh rename to src/kcms/scripts/Messages.sh diff --git a/src/kcmkwin/kwinscripts/kcm_kwin_scripts.json b/src/kcms/scripts/kcm_kwin_scripts.json similarity index 100% rename from src/kcmkwin/kwinscripts/kcm_kwin_scripts.json rename to src/kcms/scripts/kcm_kwin_scripts.json diff --git a/src/kcmkwin/kwinscripts/kwinscripts.knsrc b/src/kcms/scripts/kwinscripts.knsrc similarity index 100% rename from src/kcmkwin/kwinscripts/kwinscripts.knsrc rename to src/kcms/scripts/kwinscripts.knsrc diff --git a/src/kcmkwin/kwinscripts/kwinscriptsdata.cpp b/src/kcms/scripts/kwinscriptsdata.cpp similarity index 100% rename from src/kcmkwin/kwinscripts/kwinscriptsdata.cpp rename to src/kcms/scripts/kwinscriptsdata.cpp diff --git a/src/kcmkwin/kwinscripts/kwinscriptsdata.h b/src/kcms/scripts/kwinscriptsdata.h similarity index 100% rename from src/kcmkwin/kwinscripts/kwinscriptsdata.h rename to src/kcms/scripts/kwinscriptsdata.h diff --git a/src/kcmkwin/kwinscripts/module.cpp b/src/kcms/scripts/module.cpp similarity index 100% rename from src/kcmkwin/kwinscripts/module.cpp rename to src/kcms/scripts/module.cpp diff --git a/src/kcmkwin/kwinscripts/module.h b/src/kcms/scripts/module.h similarity index 100% rename from src/kcmkwin/kwinscripts/module.h rename to src/kcms/scripts/module.h diff --git a/src/kcmkwin/kwinscripts/package/contents/ui/main.qml b/src/kcms/scripts/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinscripts/package/contents/ui/main.qml rename to src/kcms/scripts/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwintabbox/CMakeLists.txt b/src/kcms/tabbox/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwintabbox/CMakeLists.txt rename to src/kcms/tabbox/CMakeLists.txt diff --git a/src/kcmkwin/kwintabbox/Messages.sh b/src/kcms/tabbox/Messages.sh similarity index 100% rename from src/kcmkwin/kwintabbox/Messages.sh rename to src/kcms/tabbox/Messages.sh diff --git a/src/kcmkwin/kwintabbox/kcm_kwintabbox.json b/src/kcms/tabbox/kcm_kwintabbox.json similarity index 100% rename from src/kcmkwin/kwintabbox/kcm_kwintabbox.json rename to src/kcms/tabbox/kcm_kwintabbox.json diff --git a/src/kcmkwin/kwintabbox/kwinpluginssettings.kcfg b/src/kcms/tabbox/kwinpluginssettings.kcfg similarity index 100% rename from src/kcmkwin/kwintabbox/kwinpluginssettings.kcfg rename to src/kcms/tabbox/kwinpluginssettings.kcfg diff --git a/src/kcmkwin/kwintabbox/kwinpluginssettings.kcfgc b/src/kcms/tabbox/kwinpluginssettings.kcfgc similarity index 100% rename from src/kcmkwin/kwintabbox/kwinpluginssettings.kcfgc rename to src/kcms/tabbox/kwinpluginssettings.kcfgc diff --git a/src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfg b/src/kcms/tabbox/kwinswitcheffectsettings.kcfg similarity index 100% rename from src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfg rename to src/kcms/tabbox/kwinswitcheffectsettings.kcfg diff --git a/src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfgc b/src/kcms/tabbox/kwinswitcheffectsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfgc rename to src/kcms/tabbox/kwinswitcheffectsettings.kcfgc diff --git a/src/kcmkwin/kwintabbox/kwinswitcher.knsrc b/src/kcms/tabbox/kwinswitcher.knsrc similarity index 100% rename from src/kcmkwin/kwintabbox/kwinswitcher.knsrc rename to src/kcms/tabbox/kwinswitcher.knsrc diff --git a/src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp b/src/kcms/tabbox/kwintabboxconfigform.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp rename to src/kcms/tabbox/kwintabboxconfigform.cpp diff --git a/src/kcmkwin/kwintabbox/kwintabboxconfigform.h b/src/kcms/tabbox/kwintabboxconfigform.h similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxconfigform.h rename to src/kcms/tabbox/kwintabboxconfigform.h diff --git a/src/kcmkwin/kwintabbox/kwintabboxdata.cpp b/src/kcms/tabbox/kwintabboxdata.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxdata.cpp rename to src/kcms/tabbox/kwintabboxdata.cpp diff --git a/src/kcmkwin/kwintabbox/kwintabboxdata.h b/src/kcms/tabbox/kwintabboxdata.h similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxdata.h rename to src/kcms/tabbox/kwintabboxdata.h diff --git a/src/kcmkwin/kwintabbox/kwintabboxsettings.kcfg b/src/kcms/tabbox/kwintabboxsettings.kcfg similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxsettings.kcfg rename to src/kcms/tabbox/kwintabboxsettings.kcfg diff --git a/src/kcmkwin/kwintabbox/kwintabboxsettings.kcfgc b/src/kcms/tabbox/kwintabboxsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxsettings.kcfgc rename to src/kcms/tabbox/kwintabboxsettings.kcfgc diff --git a/src/kcmkwin/kwintabbox/layoutpreview.cpp b/src/kcms/tabbox/layoutpreview.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/layoutpreview.cpp rename to src/kcms/tabbox/layoutpreview.cpp diff --git a/src/kcmkwin/kwintabbox/layoutpreview.h b/src/kcms/tabbox/layoutpreview.h similarity index 100% rename from src/kcmkwin/kwintabbox/layoutpreview.h rename to src/kcms/tabbox/layoutpreview.h diff --git a/src/kcmkwin/kwintabbox/main.cpp b/src/kcms/tabbox/main.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/main.cpp rename to src/kcms/tabbox/main.cpp diff --git a/src/kcmkwin/kwintabbox/main.h b/src/kcms/tabbox/main.h similarity index 100% rename from src/kcmkwin/kwintabbox/main.h rename to src/kcms/tabbox/main.h diff --git a/src/kcmkwin/kwintabbox/main.ui b/src/kcms/tabbox/main.ui similarity index 100% rename from src/kcmkwin/kwintabbox/main.ui rename to src/kcms/tabbox/main.ui diff --git a/src/kcmkwin/kwintabbox/thumbnailitem.cpp b/src/kcms/tabbox/thumbnailitem.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnailitem.cpp rename to src/kcms/tabbox/thumbnailitem.cpp diff --git a/src/kcmkwin/kwintabbox/thumbnailitem.h b/src/kcms/tabbox/thumbnailitem.h similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnailitem.h rename to src/kcms/tabbox/thumbnailitem.h diff --git a/src/kcmkwin/kwintabbox/thumbnails/desktop.png b/src/kcms/tabbox/thumbnails/desktop.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/desktop.png rename to src/kcms/tabbox/thumbnails/desktop.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/dolphin.png b/src/kcms/tabbox/thumbnails/dolphin.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/dolphin.png rename to src/kcms/tabbox/thumbnails/dolphin.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/kmail.png b/src/kcms/tabbox/thumbnails/kmail.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/kmail.png rename to src/kcms/tabbox/thumbnails/kmail.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/konqueror.png b/src/kcms/tabbox/thumbnails/konqueror.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/konqueror.png rename to src/kcms/tabbox/thumbnails/konqueror.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/systemsettings.png b/src/kcms/tabbox/thumbnails/systemsettings.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/systemsettings.png rename to src/kcms/tabbox/thumbnails/systemsettings.png diff --git a/src/kcmkwin/kwinvirtualkeyboard/CMakeLists.txt b/src/kcms/virtualkeyboard/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/CMakeLists.txt rename to src/kcms/virtualkeyboard/CMakeLists.txt diff --git a/src/kcmkwin/kwinvirtualkeyboard/Messages.sh b/src/kcms/virtualkeyboard/Messages.sh similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/Messages.sh rename to src/kcms/virtualkeyboard/Messages.sh diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json b/src/kcms/virtualkeyboard/kcm_virtualkeyboard.json similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json rename to src/kcms/virtualkeyboard/kcm_virtualkeyboard.json diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp b/src/kcms/virtualkeyboard/kcmvirtualkeyboard.cpp similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp rename to src/kcms/virtualkeyboard/kcmvirtualkeyboard.cpp diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.h b/src/kcms/virtualkeyboard/kcmvirtualkeyboard.h similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.h rename to src/kcms/virtualkeyboard/kcmvirtualkeyboard.h diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/contents/ui/main.qml b/src/kcms/virtualkeyboard/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/package/contents/ui/main.qml rename to src/kcms/virtualkeyboard/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfg b/src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfg rename to src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfg diff --git a/src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfgc b/src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfgc rename to src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfgc diff --git a/src/kcmkwin/kwinxwayland/CMakeLists.txt b/src/kcms/xwayland/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinxwayland/CMakeLists.txt rename to src/kcms/xwayland/CMakeLists.txt diff --git a/src/kcmkwin/kwinxwayland/Messages.sh b/src/kcms/xwayland/Messages.sh similarity index 100% rename from src/kcmkwin/kwinxwayland/Messages.sh rename to src/kcms/xwayland/Messages.sh diff --git a/src/kcmkwin/kwinxwayland/kcm_kwinxwayland.json b/src/kcms/xwayland/kcm_kwinxwayland.json similarity index 100% rename from src/kcmkwin/kwinxwayland/kcm_kwinxwayland.json rename to src/kcms/xwayland/kcm_kwinxwayland.json diff --git a/src/kcmkwin/kwinxwayland/kcmkwinxwayland.cpp b/src/kcms/xwayland/kcmkwinxwayland.cpp similarity index 100% rename from src/kcmkwin/kwinxwayland/kcmkwinxwayland.cpp rename to src/kcms/xwayland/kcmkwinxwayland.cpp diff --git a/src/kcmkwin/kwinxwayland/kcmkwinxwayland.h b/src/kcms/xwayland/kcmkwinxwayland.h similarity index 100% rename from src/kcmkwin/kwinxwayland/kcmkwinxwayland.h rename to src/kcms/xwayland/kcmkwinxwayland.h diff --git a/src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfg b/src/kcms/xwayland/kwinxwaylandsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfg rename to src/kcms/xwayland/kwinxwaylandsettings.kcfg diff --git a/src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfgc b/src/kcms/xwayland/kwinxwaylandsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfgc rename to src/kcms/xwayland/kwinxwaylandsettings.kcfgc diff --git a/src/kcmkwin/kwinxwayland/package/contents/ui/main.qml b/src/kcms/xwayland/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinxwayland/package/contents/ui/main.qml rename to src/kcms/xwayland/package/contents/ui/main.qml