diff --git a/recipes/wip/libs/kde/kf5-activities-stats/recipe.toml b/recipes/wip/libs/kde5/kf5-activities-stats/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-activities-stats/recipe.toml
rename to recipes/wip/libs/kde5/kf5-activities-stats/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-activities/recipe.toml b/recipes/wip/libs/kde5/kf5-activities/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-activities/recipe.toml
rename to recipes/wip/libs/kde5/kf5-activities/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-apidox/recipe.toml b/recipes/wip/libs/kde5/kf5-apidox/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-apidox/recipe.toml
rename to recipes/wip/libs/kde5/kf5-apidox/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-archive/recipe.toml b/recipes/wip/libs/kde5/kf5-archive/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-archive/recipe.toml
rename to recipes/wip/libs/kde5/kf5-archive/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-attica/recipe.toml b/recipes/wip/libs/kde5/kf5-attica/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-attica/recipe.toml
rename to recipes/wip/libs/kde5/kf5-attica/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-auth/recipe.toml b/recipes/wip/libs/kde5/kf5-auth/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-auth/recipe.toml
rename to recipes/wip/libs/kde5/kf5-auth/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-baloo/recipe.toml b/recipes/wip/libs/kde5/kf5-baloo/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-baloo/recipe.toml
rename to recipes/wip/libs/kde5/kf5-baloo/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-bookmarks/recipe.toml b/recipes/wip/libs/kde5/kf5-bookmarks/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-bookmarks/recipe.toml
rename to recipes/wip/libs/kde5/kf5-bookmarks/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-calendarcore/recipe.toml b/recipes/wip/libs/kde5/kf5-calendarcore/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-calendarcore/recipe.toml
rename to recipes/wip/libs/kde5/kf5-calendarcore/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-cmake-modules/recipe.toml b/recipes/wip/libs/kde5/kf5-cmake-modules/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-cmake-modules/recipe.toml
rename to recipes/wip/libs/kde5/kf5-cmake-modules/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-cmutils/recipe.toml b/recipes/wip/libs/kde5/kf5-cmutils/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-cmutils/recipe.toml
rename to recipes/wip/libs/kde5/kf5-cmutils/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-codecs/recipe.toml b/recipes/wip/libs/kde5/kf5-codecs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-codecs/recipe.toml
rename to recipes/wip/libs/kde5/kf5-codecs/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-completion/recipe.toml b/recipes/wip/libs/kde5/kf5-completion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-completion/recipe.toml
rename to recipes/wip/libs/kde5/kf5-completion/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-config/recipe.toml b/recipes/wip/libs/kde5/kf5-config/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-config/recipe.toml
rename to recipes/wip/libs/kde5/kf5-config/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-configwidgets/recipe.toml b/recipes/wip/libs/kde5/kf5-configwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-configwidgets/recipe.toml
rename to recipes/wip/libs/kde5/kf5-configwidgets/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-contacts/recipe.toml b/recipes/wip/libs/kde5/kf5-contacts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-contacts/recipe.toml
rename to recipes/wip/libs/kde5/kf5-contacts/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-coreaddons/recipe.toml b/recipes/wip/libs/kde5/kf5-coreaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-coreaddons/recipe.toml
rename to recipes/wip/libs/kde5/kf5-coreaddons/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-crash/recipe.toml b/recipes/wip/libs/kde5/kf5-crash/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-crash/recipe.toml
rename to recipes/wip/libs/kde5/kf5-crash/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-dav/recipe.toml b/recipes/wip/libs/kde5/kf5-dav/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-dav/recipe.toml
rename to recipes/wip/libs/kde5/kf5-dav/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-dbusaddons/recipe.toml b/recipes/wip/libs/kde5/kf5-dbusaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-dbusaddons/recipe.toml
rename to recipes/wip/libs/kde5/kf5-dbusaddons/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-declarative/recipe.toml b/recipes/wip/libs/kde5/kf5-declarative/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-declarative/recipe.toml
rename to recipes/wip/libs/kde5/kf5-declarative/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-dnssd/recipe.toml b/recipes/wip/libs/kde5/kf5-dnssd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-dnssd/recipe.toml
rename to recipes/wip/libs/kde5/kf5-dnssd/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-doctools/recipe.toml b/recipes/wip/libs/kde5/kf5-doctools/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-doctools/recipe.toml
rename to recipes/wip/libs/kde5/kf5-doctools/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-emoticons/recipe.toml b/recipes/wip/libs/kde5/kf5-emoticons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-emoticons/recipe.toml
rename to recipes/wip/libs/kde5/kf5-emoticons/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-filemetadata/recipe.toml b/recipes/wip/libs/kde5/kf5-filemetadata/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-filemetadata/recipe.toml
rename to recipes/wip/libs/kde5/kf5-filemetadata/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-frameworkintegration/recipe.toml b/recipes/wip/libs/kde5/kf5-frameworkintegration/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-frameworkintegration/recipe.toml
rename to recipes/wip/libs/kde5/kf5-frameworkintegration/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-globalaccel/recipe.toml b/recipes/wip/libs/kde5/kf5-globalaccel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-globalaccel/recipe.toml
rename to recipes/wip/libs/kde5/kf5-globalaccel/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-guiaddons/recipe.toml b/recipes/wip/libs/kde5/kf5-guiaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-guiaddons/recipe.toml
rename to recipes/wip/libs/kde5/kf5-guiaddons/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-holidays/recipe.toml b/recipes/wip/libs/kde5/kf5-holidays/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-holidays/recipe.toml
rename to recipes/wip/libs/kde5/kf5-holidays/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-i18n/recipe.toml b/recipes/wip/libs/kde5/kf5-i18n/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-i18n/recipe.toml
rename to recipes/wip/libs/kde5/kf5-i18n/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-iconthemes/recipe.toml b/recipes/wip/libs/kde5/kf5-iconthemes/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-iconthemes/recipe.toml
rename to recipes/wip/libs/kde5/kf5-iconthemes/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-idletime/recipe.toml b/recipes/wip/libs/kde5/kf5-idletime/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-idletime/recipe.toml
rename to recipes/wip/libs/kde5/kf5-idletime/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-init/recipe.toml b/recipes/wip/libs/kde5/kf5-init/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-init/recipe.toml
rename to recipes/wip/libs/kde5/kf5-init/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-io/recipe.toml b/recipes/wip/libs/kde5/kf5-io/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-io/recipe.toml
rename to recipes/wip/libs/kde5/kf5-io/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-itemmodels/recipe.toml b/recipes/wip/libs/kde5/kf5-itemmodels/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-itemmodels/recipe.toml
rename to recipes/wip/libs/kde5/kf5-itemmodels/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-itemviews/recipe.toml b/recipes/wip/libs/kde5/kf5-itemviews/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-itemviews/recipe.toml
rename to recipes/wip/libs/kde5/kf5-itemviews/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-jobwidgets/recipe.toml b/recipes/wip/libs/kde5/kf5-jobwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-jobwidgets/recipe.toml
rename to recipes/wip/libs/kde5/kf5-jobwidgets/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-kded/recipe.toml b/recipes/wip/libs/kde5/kf5-kded/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-kded/recipe.toml
rename to recipes/wip/libs/kde5/kf5-kded/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-kdesu/recipe.toml b/recipes/wip/libs/kde5/kf5-kdesu/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-kdesu/recipe.toml
rename to recipes/wip/libs/kde5/kf5-kdesu/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-kirigami/recipe.toml b/recipes/wip/libs/kde5/kf5-kirigami/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-kirigami/recipe.toml
rename to recipes/wip/libs/kde5/kf5-kirigami/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-modem-manager/recipe.toml b/recipes/wip/libs/kde5/kf5-modem-manager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-modem-manager/recipe.toml
rename to recipes/wip/libs/kde5/kf5-modem-manager/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-networkmanager/recipe.toml b/recipes/wip/libs/kde5/kf5-networkmanager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-networkmanager/recipe.toml
rename to recipes/wip/libs/kde5/kf5-networkmanager/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-newstuff/recipe.toml b/recipes/wip/libs/kde5/kf5-newstuff/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-newstuff/recipe.toml
rename to recipes/wip/libs/kde5/kf5-newstuff/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-notifications/recipe.toml b/recipes/wip/libs/kde5/kf5-notifications/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-notifications/recipe.toml
rename to recipes/wip/libs/kde5/kf5-notifications/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-notifyconfig/recipe.toml b/recipes/wip/libs/kde5/kf5-notifyconfig/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-notifyconfig/recipe.toml
rename to recipes/wip/libs/kde5/kf5-notifyconfig/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-package/recipe.toml b/recipes/wip/libs/kde5/kf5-package/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-package/recipe.toml
rename to recipes/wip/libs/kde5/kf5-package/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-parts/recipe.toml b/recipes/wip/libs/kde5/kf5-parts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-parts/recipe.toml
rename to recipes/wip/libs/kde5/kf5-parts/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-people/recipe.toml b/recipes/wip/libs/kde5/kf5-people/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-people/recipe.toml
rename to recipes/wip/libs/kde5/kf5-people/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-plasma-framework/recipe.toml b/recipes/wip/libs/kde5/kf5-plasma-framework/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-plasma-framework/recipe.toml
rename to recipes/wip/libs/kde5/kf5-plasma-framework/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-plotting/recipe.toml b/recipes/wip/libs/kde5/kf5-plotting/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-plotting/recipe.toml
rename to recipes/wip/libs/kde5/kf5-plotting/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-prison/recipe.toml b/recipes/wip/libs/kde5/kf5-prison/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-prison/recipe.toml
rename to recipes/wip/libs/kde5/kf5-prison/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-pty/recipe.toml b/recipes/wip/libs/kde5/kf5-pty/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-pty/recipe.toml
rename to recipes/wip/libs/kde5/kf5-pty/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-purpose/recipe.toml b/recipes/wip/libs/kde5/kf5-purpose/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-purpose/recipe.toml
rename to recipes/wip/libs/kde5/kf5-purpose/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-qqc2-desktop-style/recipe.toml b/recipes/wip/libs/kde5/kf5-qqc2-desktop-style/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-qqc2-desktop-style/recipe.toml
rename to recipes/wip/libs/kde5/kf5-qqc2-desktop-style/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-quickcharts/recipe.toml b/recipes/wip/libs/kde5/kf5-quickcharts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-quickcharts/recipe.toml
rename to recipes/wip/libs/kde5/kf5-quickcharts/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-runner/recipe.toml b/recipes/wip/libs/kde5/kf5-runner/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-runner/recipe.toml
rename to recipes/wip/libs/kde5/kf5-runner/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-service/recipe.toml b/recipes/wip/libs/kde5/kf5-service/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-service/recipe.toml
rename to recipes/wip/libs/kde5/kf5-service/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-solid/recipe.toml b/recipes/wip/libs/kde5/kf5-solid/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-solid/recipe.toml
rename to recipes/wip/libs/kde5/kf5-solid/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-sonnet/recipe.toml b/recipes/wip/libs/kde5/kf5-sonnet/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-sonnet/recipe.toml
rename to recipes/wip/libs/kde5/kf5-sonnet/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-syndication/recipe.toml b/recipes/wip/libs/kde5/kf5-syndication/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-syndication/recipe.toml
rename to recipes/wip/libs/kde5/kf5-syndication/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-syntax-highlighting/recipe.toml b/recipes/wip/libs/kde5/kf5-syntax-highlighting/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-syntax-highlighting/recipe.toml
rename to recipes/wip/libs/kde5/kf5-syntax-highlighting/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-sysguard/recipe.toml b/recipes/wip/libs/kde5/kf5-sysguard/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-sysguard/recipe.toml
rename to recipes/wip/libs/kde5/kf5-sysguard/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-texteditor/recipe.toml b/recipes/wip/libs/kde5/kf5-texteditor/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-texteditor/recipe.toml
rename to recipes/wip/libs/kde5/kf5-texteditor/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-textwidgets/recipe.toml b/recipes/wip/libs/kde5/kf5-textwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-textwidgets/recipe.toml
rename to recipes/wip/libs/kde5/kf5-textwidgets/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-threadweaver/recipe.toml b/recipes/wip/libs/kde5/kf5-threadweaver/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-threadweaver/recipe.toml
rename to recipes/wip/libs/kde5/kf5-threadweaver/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-unitconversion/recipe.toml b/recipes/wip/libs/kde5/kf5-unitconversion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-unitconversion/recipe.toml
rename to recipes/wip/libs/kde5/kf5-unitconversion/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-wayland/recipe.toml b/recipes/wip/libs/kde5/kf5-wayland/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-wayland/recipe.toml
rename to recipes/wip/libs/kde5/kf5-wayland/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-widgetaddons/recipe.toml b/recipes/wip/libs/kde5/kf5-widgetaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-widgetaddons/recipe.toml
rename to recipes/wip/libs/kde5/kf5-widgetaddons/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-windowsystem/recipe.toml b/recipes/wip/libs/kde5/kf5-windowsystem/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-windowsystem/recipe.toml
rename to recipes/wip/libs/kde5/kf5-windowsystem/recipe.toml
diff --git a/recipes/wip/libs/kde/kf5-xmlgui/recipe.toml b/recipes/wip/libs/kde5/kf5-xmlgui/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kde/kf5-xmlgui/recipe.toml
rename to recipes/wip/libs/kde5/kf5-xmlgui/recipe.toml