diff --git a/recipes/wip/libs/kf5-activities-stats/recipe.toml b/recipes/wip/libs/kde/kf5-activities-stats/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities-stats/recipe.toml
rename to recipes/wip/libs/kde/kf5-activities-stats/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/recipe.toml b/recipes/wip/libs/kde/kf5-activities/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/recipe.toml
rename to recipes/wip/libs/kde/kf5-activities/recipe.toml
diff --git a/recipes/wip/libs/kf5-apidox/recipe.toml b/recipes/wip/libs/kde/kf5-apidox/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-apidox/recipe.toml
rename to recipes/wip/libs/kde/kf5-apidox/recipe.toml
diff --git a/recipes/wip/libs/kf5-archive/recipe.toml b/recipes/wip/libs/kde/kf5-archive/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-archive/recipe.toml
rename to recipes/wip/libs/kde/kf5-archive/recipe.toml
diff --git a/recipes/wip/libs/kf5-attica/recipe.toml b/recipes/wip/libs/kde/kf5-attica/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-attica/recipe.toml
rename to recipes/wip/libs/kde/kf5-attica/recipe.toml
diff --git a/recipes/wip/libs/kf5-auth/recipe.toml b/recipes/wip/libs/kde/kf5-auth/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-auth/recipe.toml
rename to recipes/wip/libs/kde/kf5-auth/recipe.toml
diff --git a/recipes/wip/libs/kf5-baloo/recipe.toml b/recipes/wip/libs/kde/kf5-baloo/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-baloo/recipe.toml
rename to recipes/wip/libs/kde/kf5-baloo/recipe.toml
diff --git a/recipes/wip/libs/kf5-bookmarks/recipe.toml b/recipes/wip/libs/kde/kf5-bookmarks/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-bookmarks/recipe.toml
rename to recipes/wip/libs/kde/kf5-bookmarks/recipe.toml
diff --git a/recipes/wip/libs/kf5-calendarcore/recipe.toml b/recipes/wip/libs/kde/kf5-calendarcore/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-calendarcore/recipe.toml
rename to recipes/wip/libs/kde/kf5-calendarcore/recipe.toml
diff --git a/recipes/wip/libs/kf5-cmake-modules/recipe.toml b/recipes/wip/libs/kde/kf5-cmake-modules/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-cmake-modules/recipe.toml
rename to recipes/wip/libs/kde/kf5-cmake-modules/recipe.toml
diff --git a/recipes/wip/libs/kf5-cmutils/recipe.toml b/recipes/wip/libs/kde/kf5-cmutils/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-cmutils/recipe.toml
rename to recipes/wip/libs/kde/kf5-cmutils/recipe.toml
diff --git a/recipes/wip/libs/kf5-codecs/recipe.toml b/recipes/wip/libs/kde/kf5-codecs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-codecs/recipe.toml
rename to recipes/wip/libs/kde/kf5-codecs/recipe.toml
diff --git a/recipes/wip/libs/kf5-completion/recipe.toml b/recipes/wip/libs/kde/kf5-completion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-completion/recipe.toml
rename to recipes/wip/libs/kde/kf5-completion/recipe.toml
diff --git a/recipes/wip/libs/kf5-config/recipe.toml b/recipes/wip/libs/kde/kf5-config/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-config/recipe.toml
rename to recipes/wip/libs/kde/kf5-config/recipe.toml
diff --git a/recipes/wip/libs/kf5-configwidgets/recipe.toml b/recipes/wip/libs/kde/kf5-configwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-configwidgets/recipe.toml
rename to recipes/wip/libs/kde/kf5-configwidgets/recipe.toml
diff --git a/recipes/wip/libs/kf5-contacts/recipe.toml b/recipes/wip/libs/kde/kf5-contacts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-contacts/recipe.toml
rename to recipes/wip/libs/kde/kf5-contacts/recipe.toml
diff --git a/recipes/wip/libs/kf5-coreaddons/recipe.toml b/recipes/wip/libs/kde/kf5-coreaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-coreaddons/recipe.toml
rename to recipes/wip/libs/kde/kf5-coreaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-crash/recipe.toml b/recipes/wip/libs/kde/kf5-crash/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-crash/recipe.toml
rename to recipes/wip/libs/kde/kf5-crash/recipe.toml
diff --git a/recipes/wip/libs/kf5-dav/recipe.toml b/recipes/wip/libs/kde/kf5-dav/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-dav/recipe.toml
rename to recipes/wip/libs/kde/kf5-dav/recipe.toml
diff --git a/recipes/wip/libs/kf5-dbusaddons/recipe.toml b/recipes/wip/libs/kde/kf5-dbusaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-dbusaddons/recipe.toml
rename to recipes/wip/libs/kde/kf5-dbusaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-declarative/recipe.toml b/recipes/wip/libs/kde/kf5-declarative/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-declarative/recipe.toml
rename to recipes/wip/libs/kde/kf5-declarative/recipe.toml
diff --git a/recipes/wip/libs/kf5-dnssd/recipe.toml b/recipes/wip/libs/kde/kf5-dnssd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-dnssd/recipe.toml
rename to recipes/wip/libs/kde/kf5-dnssd/recipe.toml
diff --git a/recipes/wip/libs/kf5-doctools/recipe.toml b/recipes/wip/libs/kde/kf5-doctools/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-doctools/recipe.toml
rename to recipes/wip/libs/kde/kf5-doctools/recipe.toml
diff --git a/recipes/wip/libs/kf5-emoticons/recipe.toml b/recipes/wip/libs/kde/kf5-emoticons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-emoticons/recipe.toml
rename to recipes/wip/libs/kde/kf5-emoticons/recipe.toml
diff --git a/recipes/wip/libs/kf5-filemetadata/recipe.toml b/recipes/wip/libs/kde/kf5-filemetadata/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-filemetadata/recipe.toml
rename to recipes/wip/libs/kde/kf5-filemetadata/recipe.toml
diff --git a/recipes/wip/libs/kf5-frameworkintegration/recipe.toml b/recipes/wip/libs/kde/kf5-frameworkintegration/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-frameworkintegration/recipe.toml
rename to recipes/wip/libs/kde/kf5-frameworkintegration/recipe.toml
diff --git a/recipes/wip/libs/kf5-globalaccel/recipe.toml b/recipes/wip/libs/kde/kf5-globalaccel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-globalaccel/recipe.toml
rename to recipes/wip/libs/kde/kf5-globalaccel/recipe.toml
diff --git a/recipes/wip/libs/kf5-guiaddons/recipe.toml b/recipes/wip/libs/kde/kf5-guiaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-guiaddons/recipe.toml
rename to recipes/wip/libs/kde/kf5-guiaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-holidays/recipe.toml b/recipes/wip/libs/kde/kf5-holidays/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-holidays/recipe.toml
rename to recipes/wip/libs/kde/kf5-holidays/recipe.toml
diff --git a/recipes/wip/libs/kf5-i18n/recipe.toml b/recipes/wip/libs/kde/kf5-i18n/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-i18n/recipe.toml
rename to recipes/wip/libs/kde/kf5-i18n/recipe.toml
diff --git a/recipes/wip/libs/kf5-iconthemes/recipe.toml b/recipes/wip/libs/kde/kf5-iconthemes/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-iconthemes/recipe.toml
rename to recipes/wip/libs/kde/kf5-iconthemes/recipe.toml
diff --git a/recipes/wip/libs/kf5-idletime/recipe.toml b/recipes/wip/libs/kde/kf5-idletime/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-idletime/recipe.toml
rename to recipes/wip/libs/kde/kf5-idletime/recipe.toml
diff --git a/recipes/wip/libs/kf5-init/recipe.toml b/recipes/wip/libs/kde/kf5-init/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-init/recipe.toml
rename to recipes/wip/libs/kde/kf5-init/recipe.toml
diff --git a/recipes/wip/libs/kf5-io/recipe.toml b/recipes/wip/libs/kde/kf5-io/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-io/recipe.toml
rename to recipes/wip/libs/kde/kf5-io/recipe.toml
diff --git a/recipes/wip/libs/kf5-itemmodels/recipe.toml b/recipes/wip/libs/kde/kf5-itemmodels/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-itemmodels/recipe.toml
rename to recipes/wip/libs/kde/kf5-itemmodels/recipe.toml
diff --git a/recipes/wip/libs/kf5-itemviews/recipe.toml b/recipes/wip/libs/kde/kf5-itemviews/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-itemviews/recipe.toml
rename to recipes/wip/libs/kde/kf5-itemviews/recipe.toml
diff --git a/recipes/wip/libs/kf5-jobwidgets/recipe.toml b/recipes/wip/libs/kde/kf5-jobwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-jobwidgets/recipe.toml
rename to recipes/wip/libs/kde/kf5-jobwidgets/recipe.toml
diff --git a/recipes/wip/libs/kf5-kded/recipe.toml b/recipes/wip/libs/kde/kf5-kded/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-kded/recipe.toml
rename to recipes/wip/libs/kde/kf5-kded/recipe.toml
diff --git a/recipes/wip/libs/kf5-kdesu/recipe.toml b/recipes/wip/libs/kde/kf5-kdesu/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-kdesu/recipe.toml
rename to recipes/wip/libs/kde/kf5-kdesu/recipe.toml
diff --git a/recipes/wip/libs/kf5-kirigami/recipe.toml b/recipes/wip/libs/kde/kf5-kirigami/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-kirigami/recipe.toml
rename to recipes/wip/libs/kde/kf5-kirigami/recipe.toml
diff --git a/recipes/wip/libs/kf5-modem-manager/recipe.toml b/recipes/wip/libs/kde/kf5-modem-manager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-modem-manager/recipe.toml
rename to recipes/wip/libs/kde/kf5-modem-manager/recipe.toml
diff --git a/recipes/wip/libs/kf5-networkmanager/recipe.toml b/recipes/wip/libs/kde/kf5-networkmanager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-networkmanager/recipe.toml
rename to recipes/wip/libs/kde/kf5-networkmanager/recipe.toml
diff --git a/recipes/wip/libs/kf5-newstuff/recipe.toml b/recipes/wip/libs/kde/kf5-newstuff/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-newstuff/recipe.toml
rename to recipes/wip/libs/kde/kf5-newstuff/recipe.toml
diff --git a/recipes/wip/libs/kf5-notifications/recipe.toml b/recipes/wip/libs/kde/kf5-notifications/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-notifications/recipe.toml
rename to recipes/wip/libs/kde/kf5-notifications/recipe.toml
diff --git a/recipes/wip/libs/kf5-notifyconfig/recipe.toml b/recipes/wip/libs/kde/kf5-notifyconfig/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-notifyconfig/recipe.toml
rename to recipes/wip/libs/kde/kf5-notifyconfig/recipe.toml
diff --git a/recipes/wip/libs/kf5-package/recipe.toml b/recipes/wip/libs/kde/kf5-package/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-package/recipe.toml
rename to recipes/wip/libs/kde/kf5-package/recipe.toml
diff --git a/recipes/wip/libs/kf5-parts/recipe.toml b/recipes/wip/libs/kde/kf5-parts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-parts/recipe.toml
rename to recipes/wip/libs/kde/kf5-parts/recipe.toml
diff --git a/recipes/wip/libs/kf5-people/recipe.toml b/recipes/wip/libs/kde/kf5-people/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-people/recipe.toml
rename to recipes/wip/libs/kde/kf5-people/recipe.toml
diff --git a/recipes/wip/libs/kf5-plasma-framework/recipe.toml b/recipes/wip/libs/kde/kf5-plasma-framework/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-plasma-framework/recipe.toml
rename to recipes/wip/libs/kde/kf5-plasma-framework/recipe.toml
diff --git a/recipes/wip/libs/kf5-plotting/recipe.toml b/recipes/wip/libs/kde/kf5-plotting/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-plotting/recipe.toml
rename to recipes/wip/libs/kde/kf5-plotting/recipe.toml
diff --git a/recipes/wip/libs/kf5-prison/recipe.toml b/recipes/wip/libs/kde/kf5-prison/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-prison/recipe.toml
rename to recipes/wip/libs/kde/kf5-prison/recipe.toml
diff --git a/recipes/wip/libs/kf5-pty/recipe.toml b/recipes/wip/libs/kde/kf5-pty/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-pty/recipe.toml
rename to recipes/wip/libs/kde/kf5-pty/recipe.toml
diff --git a/recipes/wip/libs/kf5-purpose/recipe.toml b/recipes/wip/libs/kde/kf5-purpose/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-purpose/recipe.toml
rename to recipes/wip/libs/kde/kf5-purpose/recipe.toml
diff --git a/recipes/wip/libs/kf5-qqc2-desktop-style/recipe.toml b/recipes/wip/libs/kde/kf5-qqc2-desktop-style/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-qqc2-desktop-style/recipe.toml
rename to recipes/wip/libs/kde/kf5-qqc2-desktop-style/recipe.toml
diff --git a/recipes/wip/libs/kf5-quickcharts/recipe.toml b/recipes/wip/libs/kde/kf5-quickcharts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-quickcharts/recipe.toml
rename to recipes/wip/libs/kde/kf5-quickcharts/recipe.toml
diff --git a/recipes/wip/libs/kf5-runner/recipe.toml b/recipes/wip/libs/kde/kf5-runner/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-runner/recipe.toml
rename to recipes/wip/libs/kde/kf5-runner/recipe.toml
diff --git a/recipes/wip/libs/kf5-service/recipe.toml b/recipes/wip/libs/kde/kf5-service/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-service/recipe.toml
rename to recipes/wip/libs/kde/kf5-service/recipe.toml
diff --git a/recipes/wip/libs/kf5-solid/recipe.toml b/recipes/wip/libs/kde/kf5-solid/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-solid/recipe.toml
rename to recipes/wip/libs/kde/kf5-solid/recipe.toml
diff --git a/recipes/wip/libs/kf5-sonnet/recipe.toml b/recipes/wip/libs/kde/kf5-sonnet/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-sonnet/recipe.toml
rename to recipes/wip/libs/kde/kf5-sonnet/recipe.toml
diff --git a/recipes/wip/libs/kf5-syndication/recipe.toml b/recipes/wip/libs/kde/kf5-syndication/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-syndication/recipe.toml
rename to recipes/wip/libs/kde/kf5-syndication/recipe.toml
diff --git a/recipes/wip/libs/kf5-syntax-highlighting/recipe.toml b/recipes/wip/libs/kde/kf5-syntax-highlighting/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-syntax-highlighting/recipe.toml
rename to recipes/wip/libs/kde/kf5-syntax-highlighting/recipe.toml
diff --git a/recipes/wip/libs/kf5-sysguard/recipe.toml b/recipes/wip/libs/kde/kf5-sysguard/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-sysguard/recipe.toml
rename to recipes/wip/libs/kde/kf5-sysguard/recipe.toml
diff --git a/recipes/wip/libs/kf5-texteditor/recipe.toml b/recipes/wip/libs/kde/kf5-texteditor/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-texteditor/recipe.toml
rename to recipes/wip/libs/kde/kf5-texteditor/recipe.toml
diff --git a/recipes/wip/libs/kf5-textwidgets/recipe.toml b/recipes/wip/libs/kde/kf5-textwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-textwidgets/recipe.toml
rename to recipes/wip/libs/kde/kf5-textwidgets/recipe.toml
diff --git a/recipes/wip/libs/kf5-threadweaver/recipe.toml b/recipes/wip/libs/kde/kf5-threadweaver/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-threadweaver/recipe.toml
rename to recipes/wip/libs/kde/kf5-threadweaver/recipe.toml
diff --git a/recipes/wip/libs/kf5-unitconversion/recipe.toml b/recipes/wip/libs/kde/kf5-unitconversion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-unitconversion/recipe.toml
rename to recipes/wip/libs/kde/kf5-unitconversion/recipe.toml
diff --git a/recipes/wip/libs/kf5-wayland/recipe.toml b/recipes/wip/libs/kde/kf5-wayland/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-wayland/recipe.toml
rename to recipes/wip/libs/kde/kf5-wayland/recipe.toml
diff --git a/recipes/wip/libs/kf5-widgetaddons/recipe.toml b/recipes/wip/libs/kde/kf5-widgetaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-widgetaddons/recipe.toml
rename to recipes/wip/libs/kde/kf5-widgetaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-windowsystem/recipe.toml b/recipes/wip/libs/kde/kf5-windowsystem/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-windowsystem/recipe.toml
rename to recipes/wip/libs/kde/kf5-windowsystem/recipe.toml
diff --git a/recipes/wip/libs/kf5-xmlgui/recipe.toml b/recipes/wip/libs/kde/kf5-xmlgui/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-xmlgui/recipe.toml
rename to recipes/wip/libs/kde/kf5-xmlgui/recipe.toml
diff --git a/recipes/wip/libs/qt4/recipe.toml b/recipes/wip/libs/qt/qt4/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt4/recipe.toml
rename to recipes/wip/libs/qt/qt4/recipe.toml
diff --git a/recipes/wip/libs/qt5-3d/recipe.toml b/recipes/wip/libs/qt/qt5-3d/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-3d/recipe.toml
rename to recipes/wip/libs/qt/qt5-3d/recipe.toml
diff --git a/recipes/wip/libs/qt5-activeqt/recipe.toml b/recipes/wip/libs/qt/qt5-activeqt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-activeqt/recipe.toml
rename to recipes/wip/libs/qt/qt5-activeqt/recipe.toml
diff --git a/recipes/wip/libs/qt5-base/recipe.toml b/recipes/wip/libs/qt/qt5-base/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-base/recipe.toml
rename to recipes/wip/libs/qt/qt5-base/recipe.toml
diff --git a/recipes/wip/libs/qt5-charts/recipe.toml b/recipes/wip/libs/qt/qt5-charts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-charts/recipe.toml
rename to recipes/wip/libs/qt/qt5-charts/recipe.toml
diff --git a/recipes/wip/libs/qt5-coap/recipe.toml b/recipes/wip/libs/qt/qt5-coap/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-coap/recipe.toml
rename to recipes/wip/libs/qt/qt5-coap/recipe.toml
diff --git a/recipes/wip/libs/qt5-connectivity/recipe.toml b/recipes/wip/libs/qt/qt5-connectivity/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-connectivity/recipe.toml
rename to recipes/wip/libs/qt/qt5-connectivity/recipe.toml
diff --git a/recipes/wip/libs/qt5-datavis3d/recipe.toml b/recipes/wip/libs/qt/qt5-datavis3d/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-datavis3d/recipe.toml
rename to recipes/wip/libs/qt/qt5-datavis3d/recipe.toml
diff --git a/recipes/wip/libs/qt5-declarative/recipe.toml b/recipes/wip/libs/qt/qt5-declarative/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-declarative/recipe.toml
rename to recipes/wip/libs/qt/qt5-declarative/recipe.toml
diff --git a/recipes/wip/libs/qt5-doc/recipe.toml b/recipes/wip/libs/qt/qt5-doc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-doc/recipe.toml
rename to recipes/wip/libs/qt/qt5-doc/recipe.toml
diff --git a/recipes/wip/libs/qt5-full/recipe.toml b/recipes/wip/libs/qt/qt5-full/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-full/recipe.toml
rename to recipes/wip/libs/qt/qt5-full/recipe.toml
diff --git a/recipes/wip/libs/qt5-gamepad/recipe.toml b/recipes/wip/libs/qt/qt5-gamepad/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-gamepad/recipe.toml
rename to recipes/wip/libs/qt/qt5-gamepad/recipe.toml
diff --git a/recipes/wip/libs/qt5-graphical-effects/recipe.toml b/recipes/wip/libs/qt/qt5-graphical-effects/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-graphical-effects/recipe.toml
rename to recipes/wip/libs/qt/qt5-graphical-effects/recipe.toml
diff --git a/recipes/wip/libs/qt5-imageformats/recipe.toml b/recipes/wip/libs/qt/qt5-imageformats/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-imageformats/recipe.toml
rename to recipes/wip/libs/qt/qt5-imageformats/recipe.toml
diff --git a/recipes/wip/libs/qt5-knx/recipe.toml b/recipes/wip/libs/qt/qt5-knx/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-knx/recipe.toml
rename to recipes/wip/libs/qt/qt5-knx/recipe.toml
diff --git a/recipes/wip/libs/qt5-location/recipe.toml b/recipes/wip/libs/qt/qt5-location/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-location/recipe.toml
rename to recipes/wip/libs/qt/qt5-location/recipe.toml
diff --git a/recipes/wip/libs/qt5-lottie/recipe.toml b/recipes/wip/libs/qt/qt5-lottie/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-lottie/recipe.toml
rename to recipes/wip/libs/qt/qt5-lottie/recipe.toml
diff --git a/recipes/wip/libs/qt5-mqtt/recipe.toml b/recipes/wip/libs/qt/qt5-mqtt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-mqtt/recipe.toml
rename to recipes/wip/libs/qt/qt5-mqtt/recipe.toml
diff --git a/recipes/wip/libs/qt5-multimedia/recipe.toml b/recipes/wip/libs/qt/qt5-multimedia/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-multimedia/recipe.toml
rename to recipes/wip/libs/qt/qt5-multimedia/recipe.toml
diff --git a/recipes/wip/libs/qt5-networkauth/recipe.toml b/recipes/wip/libs/qt/qt5-networkauth/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-networkauth/recipe.toml
rename to recipes/wip/libs/qt/qt5-networkauth/recipe.toml
diff --git a/recipes/wip/libs/qt5-opcua/recipe.toml b/recipes/wip/libs/qt/qt5-opcua/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-opcua/recipe.toml
rename to recipes/wip/libs/qt/qt5-opcua/recipe.toml
diff --git a/recipes/wip/libs/qt5-purchasing/recipe.toml b/recipes/wip/libs/qt/qt5-purchasing/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-purchasing/recipe.toml
rename to recipes/wip/libs/qt/qt5-purchasing/recipe.toml
diff --git a/recipes/wip/libs/qt5-quick3d/recipe.toml b/recipes/wip/libs/qt/qt5-quick3d/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-quick3d/recipe.toml
rename to recipes/wip/libs/qt/qt5-quick3d/recipe.toml
diff --git a/recipes/wip/libs/qt5-quickcontrols/recipe.toml b/recipes/wip/libs/qt/qt5-quickcontrols/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-quickcontrols/recipe.toml
rename to recipes/wip/libs/qt/qt5-quickcontrols/recipe.toml
diff --git a/recipes/wip/libs/qt5-quickcontrols2/recipe.toml b/recipes/wip/libs/qt/qt5-quickcontrols2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-quickcontrols2/recipe.toml
rename to recipes/wip/libs/qt/qt5-quickcontrols2/recipe.toml
diff --git a/recipes/wip/libs/qt5-quicktimeline/recipe.toml b/recipes/wip/libs/qt/qt5-quicktimeline/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-quicktimeline/recipe.toml
rename to recipes/wip/libs/qt/qt5-quicktimeline/recipe.toml
diff --git a/recipes/wip/libs/qt5-remoteobjects/recipe.toml b/recipes/wip/libs/qt/qt5-remoteobjects/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-remoteobjects/recipe.toml
rename to recipes/wip/libs/qt/qt5-remoteobjects/recipe.toml
diff --git a/recipes/wip/libs/qt5-script/recipe.toml b/recipes/wip/libs/qt/qt5-script/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-script/recipe.toml
rename to recipes/wip/libs/qt/qt5-script/recipe.toml
diff --git a/recipes/wip/libs/qt5-scxml/recipe.toml b/recipes/wip/libs/qt/qt5-scxml/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-scxml/recipe.toml
rename to recipes/wip/libs/qt/qt5-scxml/recipe.toml
diff --git a/recipes/wip/libs/qt5-sensors/recipe.toml b/recipes/wip/libs/qt/qt5-sensors/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-sensors/recipe.toml
rename to recipes/wip/libs/qt/qt5-sensors/recipe.toml
diff --git a/recipes/wip/libs/qt5-serialbus/recipe.toml b/recipes/wip/libs/qt/qt5-serialbus/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-serialbus/recipe.toml
rename to recipes/wip/libs/qt/qt5-serialbus/recipe.toml
diff --git a/recipes/wip/libs/qt5-serialport/recipe.toml b/recipes/wip/libs/qt/qt5-serialport/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-serialport/recipe.toml
rename to recipes/wip/libs/qt/qt5-serialport/recipe.toml
diff --git a/recipes/wip/libs/qt5-speech/recipe.toml b/recipes/wip/libs/qt/qt5-speech/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-speech/recipe.toml
rename to recipes/wip/libs/qt/qt5-speech/recipe.toml
diff --git a/recipes/wip/libs/qt5-svg/recipe.toml b/recipes/wip/libs/qt/qt5-svg/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-svg/recipe.toml
rename to recipes/wip/libs/qt/qt5-svg/recipe.toml
diff --git a/recipes/wip/libs/qt5-tools/recipe.toml b/recipes/wip/libs/qt/qt5-tools/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-tools/recipe.toml
rename to recipes/wip/libs/qt/qt5-tools/recipe.toml
diff --git a/recipes/wip/libs/qt5-tqtc/recipe.toml b/recipes/wip/libs/qt/qt5-tqtc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-tqtc/recipe.toml
rename to recipes/wip/libs/qt/qt5-tqtc/recipe.toml
diff --git a/recipes/wip/libs/qt5-translations/recipe.toml b/recipes/wip/libs/qt/qt5-translations/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-translations/recipe.toml
rename to recipes/wip/libs/qt/qt5-translations/recipe.toml
diff --git a/recipes/wip/libs/qt5-virtualkeyboard/recipe.toml b/recipes/wip/libs/qt/qt5-virtualkeyboard/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-virtualkeyboard/recipe.toml
rename to recipes/wip/libs/qt/qt5-virtualkeyboard/recipe.toml
diff --git a/recipes/wip/libs/qt5-wayland/recipe.toml b/recipes/wip/libs/qt/qt5-wayland/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-wayland/recipe.toml
rename to recipes/wip/libs/qt/qt5-wayland/recipe.toml
diff --git a/recipes/wip/libs/qt5-webchannel/recipe.toml b/recipes/wip/libs/qt/qt5-webchannel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-webchannel/recipe.toml
rename to recipes/wip/libs/qt/qt5-webchannel/recipe.toml
diff --git a/recipes/wip/libs/qt5-webengine/recipe.toml b/recipes/wip/libs/qt/qt5-webengine/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-webengine/recipe.toml
rename to recipes/wip/libs/qt/qt5-webengine/recipe.toml
diff --git a/recipes/wip/libs/qt5-webglplugin/recipe.toml b/recipes/wip/libs/qt/qt5-webglplugin/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-webglplugin/recipe.toml
rename to recipes/wip/libs/qt/qt5-webglplugin/recipe.toml
diff --git a/recipes/wip/libs/qt5-webkit/recipe.toml b/recipes/wip/libs/qt/qt5-webkit/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-webkit/recipe.toml
rename to recipes/wip/libs/qt/qt5-webkit/recipe.toml
diff --git a/recipes/wip/libs/qt5-websockets/recipe.toml b/recipes/wip/libs/qt/qt5-websockets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-websockets/recipe.toml
rename to recipes/wip/libs/qt/qt5-websockets/recipe.toml
diff --git a/recipes/wip/libs/qt5-webview/recipe.toml b/recipes/wip/libs/qt/qt5-webview/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-webview/recipe.toml
rename to recipes/wip/libs/qt/qt5-webview/recipe.toml
diff --git a/recipes/wip/libs/qt5-x11extras/recipe.toml b/recipes/wip/libs/qt/qt5-x11extras/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-x11extras/recipe.toml
rename to recipes/wip/libs/qt/qt5-x11extras/recipe.toml
diff --git a/recipes/wip/libs/qt5-xmlpatterns/recipe.toml b/recipes/wip/libs/qt/qt5-xmlpatterns/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt5-xmlpatterns/recipe.toml
rename to recipes/wip/libs/qt/qt5-xmlpatterns/recipe.toml
diff --git a/recipes/wip/libs/qt6-3d/recipe.toml b/recipes/wip/libs/qt/qt6-3d/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-3d/recipe.toml
rename to recipes/wip/libs/qt/qt6-3d/recipe.toml
diff --git a/recipes/wip/libs/qt6-activeqt/recipe.toml b/recipes/wip/libs/qt/qt6-activeqt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-activeqt/recipe.toml
rename to recipes/wip/libs/qt/qt6-activeqt/recipe.toml
diff --git a/recipes/wip/libs/qt6-base/recipe.toml b/recipes/wip/libs/qt/qt6-base/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-base/recipe.toml
rename to recipes/wip/libs/qt/qt6-base/recipe.toml
diff --git a/recipes/wip/libs/qt6-charts/recipe.toml b/recipes/wip/libs/qt/qt6-charts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-charts/recipe.toml
rename to recipes/wip/libs/qt/qt6-charts/recipe.toml
diff --git a/recipes/wip/libs/qt6-connectivity/recipe.toml b/recipes/wip/libs/qt/qt6-connectivity/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-connectivity/recipe.toml
rename to recipes/wip/libs/qt/qt6-connectivity/recipe.toml
diff --git a/recipes/wip/libs/qt6-datavis3d/recipe.toml b/recipes/wip/libs/qt/qt6-datavis3d/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-datavis3d/recipe.toml
rename to recipes/wip/libs/qt/qt6-datavis3d/recipe.toml
diff --git a/recipes/wip/libs/qt6-declarative/recipe.toml b/recipes/wip/libs/qt/qt6-declarative/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-declarative/recipe.toml
rename to recipes/wip/libs/qt/qt6-declarative/recipe.toml
diff --git a/recipes/wip/libs/qt6-doc/recipe.toml b/recipes/wip/libs/qt/qt6-doc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-doc/recipe.toml
rename to recipes/wip/libs/qt/qt6-doc/recipe.toml
diff --git a/recipes/wip/libs/qt6-full/recipe.toml b/recipes/wip/libs/qt/qt6-full/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-full/recipe.toml
rename to recipes/wip/libs/qt/qt6-full/recipe.toml
diff --git a/recipes/wip/libs/qt6-graphs/recipe.toml b/recipes/wip/libs/qt/qt6-graphs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-graphs/recipe.toml
rename to recipes/wip/libs/qt/qt6-graphs/recipe.toml
diff --git a/recipes/wip/libs/qt6-grpc/recipe.toml b/recipes/wip/libs/qt/qt6-grpc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-grpc/recipe.toml
rename to recipes/wip/libs/qt/qt6-grpc/recipe.toml
diff --git a/recipes/wip/libs/qt6-httpserver/recipe.toml b/recipes/wip/libs/qt/qt6-httpserver/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-httpserver/recipe.toml
rename to recipes/wip/libs/qt/qt6-httpserver/recipe.toml
diff --git a/recipes/wip/libs/qt6-imageformats/recipe.toml b/recipes/wip/libs/qt/qt6-imageformats/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-imageformats/recipe.toml
rename to recipes/wip/libs/qt/qt6-imageformats/recipe.toml
diff --git a/recipes/wip/libs/qt6-languageserver/recipe.toml b/recipes/wip/libs/qt/qt6-languageserver/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-languageserver/recipe.toml
rename to recipes/wip/libs/qt/qt6-languageserver/recipe.toml
diff --git a/recipes/wip/libs/qt6-location/recipe.toml b/recipes/wip/libs/qt/qt6-location/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-location/recipe.toml
rename to recipes/wip/libs/qt/qt6-location/recipe.toml
diff --git a/recipes/wip/libs/qt6-lottie/recipe.toml b/recipes/wip/libs/qt/qt6-lottie/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-lottie/recipe.toml
rename to recipes/wip/libs/qt/qt6-lottie/recipe.toml
diff --git a/recipes/wip/libs/qt6-multimedia/recipe.toml b/recipes/wip/libs/qt/qt6-multimedia/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-multimedia/recipe.toml
rename to recipes/wip/libs/qt/qt6-multimedia/recipe.toml
diff --git a/recipes/wip/libs/qt6-networkauth/recipe.toml b/recipes/wip/libs/qt/qt6-networkauth/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-networkauth/recipe.toml
rename to recipes/wip/libs/qt/qt6-networkauth/recipe.toml
diff --git a/recipes/wip/libs/qt6-positioning/recipe.toml b/recipes/wip/libs/qt/qt6-positioning/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-positioning/recipe.toml
rename to recipes/wip/libs/qt/qt6-positioning/recipe.toml
diff --git a/recipes/wip/libs/qt6-qt5compat/recipe.toml b/recipes/wip/libs/qt/qt6-qt5compat/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-qt5compat/recipe.toml
rename to recipes/wip/libs/qt/qt6-qt5compat/recipe.toml
diff --git a/recipes/wip/libs/qt6-quick3d/recipe.toml b/recipes/wip/libs/qt/qt6-quick3d/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-quick3d/recipe.toml
rename to recipes/wip/libs/qt/qt6-quick3d/recipe.toml
diff --git a/recipes/wip/libs/qt6-quick3dphysics/recipe.toml b/recipes/wip/libs/qt/qt6-quick3dphysics/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-quick3dphysics/recipe.toml
rename to recipes/wip/libs/qt/qt6-quick3dphysics/recipe.toml
diff --git a/recipes/wip/libs/qt6-quickeffectmaker/recipe.toml b/recipes/wip/libs/qt/qt6-quickeffectmaker/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-quickeffectmaker/recipe.toml
rename to recipes/wip/libs/qt/qt6-quickeffectmaker/recipe.toml
diff --git a/recipes/wip/libs/qt6-quicktimeline/recipe.toml b/recipes/wip/libs/qt/qt6-quicktimeline/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-quicktimeline/recipe.toml
rename to recipes/wip/libs/qt/qt6-quicktimeline/recipe.toml
diff --git a/recipes/wip/libs/qt6-remoteobjects/recipe.toml b/recipes/wip/libs/qt/qt6-remoteobjects/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-remoteobjects/recipe.toml
rename to recipes/wip/libs/qt/qt6-remoteobjects/recipe.toml
diff --git a/recipes/wip/libs/qt6-scxml/recipe.toml b/recipes/wip/libs/qt/qt6-scxml/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-scxml/recipe.toml
rename to recipes/wip/libs/qt/qt6-scxml/recipe.toml
diff --git a/recipes/wip/libs/qt6-sensors/recipe.toml b/recipes/wip/libs/qt/qt6-sensors/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-sensors/recipe.toml
rename to recipes/wip/libs/qt/qt6-sensors/recipe.toml
diff --git a/recipes/wip/libs/qt6-serialbus/recipe.toml b/recipes/wip/libs/qt/qt6-serialbus/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-serialbus/recipe.toml
rename to recipes/wip/libs/qt/qt6-serialbus/recipe.toml
diff --git a/recipes/wip/libs/qt6-serialport/recipe.toml b/recipes/wip/libs/qt/qt6-serialport/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-serialport/recipe.toml
rename to recipes/wip/libs/qt/qt6-serialport/recipe.toml
diff --git a/recipes/wip/libs/qt6-shadertools/recipe.toml b/recipes/wip/libs/qt/qt6-shadertools/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-shadertools/recipe.toml
rename to recipes/wip/libs/qt/qt6-shadertools/recipe.toml
diff --git a/recipes/wip/libs/qt6-speech/recipe.toml b/recipes/wip/libs/qt/qt6-speech/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-speech/recipe.toml
rename to recipes/wip/libs/qt/qt6-speech/recipe.toml
diff --git a/recipes/wip/libs/qt6-svg/recipe.toml b/recipes/wip/libs/qt/qt6-svg/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-svg/recipe.toml
rename to recipes/wip/libs/qt/qt6-svg/recipe.toml
diff --git a/recipes/wip/libs/qt6-tools/recipe.toml b/recipes/wip/libs/qt/qt6-tools/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-tools/recipe.toml
rename to recipes/wip/libs/qt/qt6-tools/recipe.toml
diff --git a/recipes/wip/libs/qt6-translations/recipe.toml b/recipes/wip/libs/qt/qt6-translations/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-translations/recipe.toml
rename to recipes/wip/libs/qt/qt6-translations/recipe.toml
diff --git a/recipes/wip/libs/qt6-virtualkeyboard/recipe.toml b/recipes/wip/libs/qt/qt6-virtualkeyboard/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-virtualkeyboard/recipe.toml
rename to recipes/wip/libs/qt/qt6-virtualkeyboard/recipe.toml
diff --git a/recipes/wip/libs/qt6-wayland/recipe.toml b/recipes/wip/libs/qt/qt6-wayland/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-wayland/recipe.toml
rename to recipes/wip/libs/qt/qt6-wayland/recipe.toml
diff --git a/recipes/wip/libs/qt6-webchannel/recipe.toml b/recipes/wip/libs/qt/qt6-webchannel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-webchannel/recipe.toml
rename to recipes/wip/libs/qt/qt6-webchannel/recipe.toml
diff --git a/recipes/wip/libs/qt6-webengine/recipe.toml b/recipes/wip/libs/qt/qt6-webengine/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-webengine/recipe.toml
rename to recipes/wip/libs/qt/qt6-webengine/recipe.toml
diff --git a/recipes/wip/libs/qt6-websockets/recipe.toml b/recipes/wip/libs/qt/qt6-websockets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-websockets/recipe.toml
rename to recipes/wip/libs/qt/qt6-websockets/recipe.toml
diff --git a/recipes/wip/libs/qt6-webview/recipe.toml b/recipes/wip/libs/qt/qt6-webview/recipe.toml
similarity index 100%
rename from recipes/wip/libs/qt6-webview/recipe.toml
rename to recipes/wip/libs/qt/qt6-webview/recipe.toml