diff --git a/recipes/wip/dev/irust/gawk/recipe.toml b/recipes/wip/dev/gawk/recipe.toml
similarity index 100%
rename from recipes/wip/dev/irust/gawk/recipe.toml
rename to recipes/wip/dev/gawk/recipe.toml
diff --git a/recipes/wip/dev/irust/intltool/recipe.toml b/recipes/wip/dev/intltool/recipe.toml
similarity index 100%
rename from recipes/wip/dev/irust/intltool/recipe.toml
rename to recipes/wip/dev/intltool/recipe.toml
diff --git a/recipes/wip/games/ship-of-harkinian/assaultcube/recipe.toml b/recipes/wip/games/assaultcube/recipe.toml
similarity index 100%
rename from recipes/wip/games/ship-of-harkinian/assaultcube/recipe.toml
rename to recipes/wip/games/assaultcube/recipe.toml
diff --git a/recipes/wip/games/ship-of-harkinian/shockolate/recipe.toml b/recipes/wip/games/shockolate/recipe.toml
similarity index 100%
rename from recipes/wip/games/ship-of-harkinian/shockolate/recipe.toml
rename to recipes/wip/games/shockolate/recipe.toml
diff --git a/recipes/wip/games/ship-of-harkinian/smokin-guns/recipe.toml b/recipes/wip/games/smokin-guns/recipe.toml
similarity index 100%
rename from recipes/wip/games/ship-of-harkinian/smokin-guns/recipe.toml
rename to recipes/wip/games/smokin-guns/recipe.toml
diff --git a/recipes/wip/games/ship-of-harkinian/xonotic/recipe.toml b/recipes/wip/games/xonotic/recipe.toml
similarity index 100%
rename from recipes/wip/games/ship-of-harkinian/xonotic/recipe.toml
rename to recipes/wip/games/xonotic/recipe.toml
diff --git a/recipes/wip/libs/gtk-engines/gtk2mm/recipe.toml b/recipes/wip/libs/gtk2mm/recipe.toml
similarity index 100%
rename from recipes/wip/libs/gtk-engines/gtk2mm/recipe.toml
rename to recipes/wip/libs/gtk2mm/recipe.toml
diff --git a/recipes/wip/libs/gtk-engines/gtk3mm/recipe.toml b/recipes/wip/libs/gtk3mm/recipe.toml
similarity index 100%
rename from recipes/wip/libs/gtk-engines/gtk3mm/recipe.toml
rename to recipes/wip/libs/gtk3mm/recipe.toml
diff --git a/recipes/wip/libs/gtk-engines/gtk4mm/recipe.toml b/recipes/wip/libs/gtk4mm/recipe.toml
similarity index 100%
rename from recipes/wip/libs/gtk-engines/gtk4mm/recipe.toml
rename to recipes/wip/libs/gtk4mm/recipe.toml
diff --git a/recipes/wip/libs/gtk-engines/gtkglext/recipe.toml b/recipes/wip/libs/gtkglext/recipe.toml
similarity index 100%
rename from recipes/wip/libs/gtk-engines/gtkglext/recipe.toml
rename to recipes/wip/libs/gtkglext/recipe.toml
diff --git a/recipes/wip/libs/gtk-engines/gtksourceview/recipe.toml b/recipes/wip/libs/gtksourceview/recipe.toml
similarity index 100%
rename from recipes/wip/libs/gtk-engines/gtksourceview/recipe.toml
rename to recipes/wip/libs/gtksourceview/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-activities-stats/recipe.toml b/recipes/wip/libs/kf5-activities-stats/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-activities-stats/recipe.toml
rename to recipes/wip/libs/kf5-activities-stats/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-apidox/recipe.toml b/recipes/wip/libs/kf5-apidox/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-apidox/recipe.toml
rename to recipes/wip/libs/kf5-apidox/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-archive/recipe.toml b/recipes/wip/libs/kf5-archive/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-archive/recipe.toml
rename to recipes/wip/libs/kf5-archive/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-attica/recipe.toml b/recipes/wip/libs/kf5-attica/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-attica/recipe.toml
rename to recipes/wip/libs/kf5-attica/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-auth/recipe.toml b/recipes/wip/libs/kf5-auth/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-auth/recipe.toml
rename to recipes/wip/libs/kf5-auth/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-baloo/recipe.toml b/recipes/wip/libs/kf5-baloo/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-baloo/recipe.toml
rename to recipes/wip/libs/kf5-baloo/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-bookmarks/recipe.toml b/recipes/wip/libs/kf5-bookmarks/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-bookmarks/recipe.toml
rename to recipes/wip/libs/kf5-bookmarks/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-calendarcore/recipe.toml b/recipes/wip/libs/kf5-calendarcore/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-calendarcore/recipe.toml
rename to recipes/wip/libs/kf5-calendarcore/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-cmake-modules/recipe.toml b/recipes/wip/libs/kf5-cmake-modules/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-cmake-modules/recipe.toml
rename to recipes/wip/libs/kf5-cmake-modules/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-cmutils/recipe.toml b/recipes/wip/libs/kf5-cmutils/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-cmutils/recipe.toml
rename to recipes/wip/libs/kf5-cmutils/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-codecs/recipe.toml b/recipes/wip/libs/kf5-codecs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-codecs/recipe.toml
rename to recipes/wip/libs/kf5-codecs/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-completion/recipe.toml b/recipes/wip/libs/kf5-completion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-completion/recipe.toml
rename to recipes/wip/libs/kf5-completion/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-config/recipe.toml b/recipes/wip/libs/kf5-config/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-config/recipe.toml
rename to recipes/wip/libs/kf5-config/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-configwidgets/recipe.toml b/recipes/wip/libs/kf5-configwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-configwidgets/recipe.toml
rename to recipes/wip/libs/kf5-configwidgets/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-contacts/recipe.toml b/recipes/wip/libs/kf5-contacts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-contacts/recipe.toml
rename to recipes/wip/libs/kf5-contacts/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-coreaddons/recipe.toml b/recipes/wip/libs/kf5-coreaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-coreaddons/recipe.toml
rename to recipes/wip/libs/kf5-coreaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-crash/recipe.toml b/recipes/wip/libs/kf5-crash/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-crash/recipe.toml
rename to recipes/wip/libs/kf5-crash/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-dav/recipe.toml b/recipes/wip/libs/kf5-dav/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-dav/recipe.toml
rename to recipes/wip/libs/kf5-dav/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-dbusaddons/recipe.toml b/recipes/wip/libs/kf5-dbusaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-dbusaddons/recipe.toml
rename to recipes/wip/libs/kf5-dbusaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-declarative/recipe.toml b/recipes/wip/libs/kf5-declarative/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-declarative/recipe.toml
rename to recipes/wip/libs/kf5-declarative/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-dnssd/recipe.toml b/recipes/wip/libs/kf5-dnssd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-dnssd/recipe.toml
rename to recipes/wip/libs/kf5-dnssd/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-doctools/recipe.toml b/recipes/wip/libs/kf5-doctools/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-doctools/recipe.toml
rename to recipes/wip/libs/kf5-doctools/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-emoticons/recipe.toml b/recipes/wip/libs/kf5-emoticons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-emoticons/recipe.toml
rename to recipes/wip/libs/kf5-emoticons/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-filemetadata/recipe.toml b/recipes/wip/libs/kf5-filemetadata/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-filemetadata/recipe.toml
rename to recipes/wip/libs/kf5-filemetadata/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-frameworkintegration/recipe.toml b/recipes/wip/libs/kf5-frameworkintegration/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-frameworkintegration/recipe.toml
rename to recipes/wip/libs/kf5-frameworkintegration/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-globalaccel/recipe.toml b/recipes/wip/libs/kf5-globalaccel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-globalaccel/recipe.toml
rename to recipes/wip/libs/kf5-globalaccel/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-guiaddons/recipe.toml b/recipes/wip/libs/kf5-guiaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-guiaddons/recipe.toml
rename to recipes/wip/libs/kf5-guiaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-holidays/recipe.toml b/recipes/wip/libs/kf5-holidays/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-holidays/recipe.toml
rename to recipes/wip/libs/kf5-holidays/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-i18n/recipe.toml b/recipes/wip/libs/kf5-i18n/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-i18n/recipe.toml
rename to recipes/wip/libs/kf5-i18n/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-iconthemes/recipe.toml b/recipes/wip/libs/kf5-iconthemes/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-iconthemes/recipe.toml
rename to recipes/wip/libs/kf5-iconthemes/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-idletime/recipe.toml b/recipes/wip/libs/kf5-idletime/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-idletime/recipe.toml
rename to recipes/wip/libs/kf5-idletime/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-init/recipe.toml b/recipes/wip/libs/kf5-init/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-init/recipe.toml
rename to recipes/wip/libs/kf5-init/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-io/recipe.toml b/recipes/wip/libs/kf5-io/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-io/recipe.toml
rename to recipes/wip/libs/kf5-io/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-itemmodels/recipe.toml b/recipes/wip/libs/kf5-itemmodels/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-itemmodels/recipe.toml
rename to recipes/wip/libs/kf5-itemmodels/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-itemviews/recipe.toml b/recipes/wip/libs/kf5-itemviews/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-itemviews/recipe.toml
rename to recipes/wip/libs/kf5-itemviews/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-jobwidgets/recipe.toml b/recipes/wip/libs/kf5-jobwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-jobwidgets/recipe.toml
rename to recipes/wip/libs/kf5-jobwidgets/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-kded/recipe.toml b/recipes/wip/libs/kf5-kded/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-kded/recipe.toml
rename to recipes/wip/libs/kf5-kded/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-kdesu/recipe.toml b/recipes/wip/libs/kf5-kdesu/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-kdesu/recipe.toml
rename to recipes/wip/libs/kf5-kdesu/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-kirigami/recipe.toml b/recipes/wip/libs/kf5-kirigami/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-kirigami/recipe.toml
rename to recipes/wip/libs/kf5-kirigami/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-modem-manager/recipe.toml b/recipes/wip/libs/kf5-modem-manager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-modem-manager/recipe.toml
rename to recipes/wip/libs/kf5-modem-manager/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-networkmanager/recipe.toml b/recipes/wip/libs/kf5-networkmanager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-networkmanager/recipe.toml
rename to recipes/wip/libs/kf5-networkmanager/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-newstuff/recipe.toml b/recipes/wip/libs/kf5-newstuff/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-newstuff/recipe.toml
rename to recipes/wip/libs/kf5-newstuff/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-notifications/recipe.toml b/recipes/wip/libs/kf5-notifications/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-notifications/recipe.toml
rename to recipes/wip/libs/kf5-notifications/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-notifyconfig/recipe.toml b/recipes/wip/libs/kf5-notifyconfig/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-notifyconfig/recipe.toml
rename to recipes/wip/libs/kf5-notifyconfig/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-package/recipe.toml b/recipes/wip/libs/kf5-package/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-package/recipe.toml
rename to recipes/wip/libs/kf5-package/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-parts/recipe.toml b/recipes/wip/libs/kf5-parts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-parts/recipe.toml
rename to recipes/wip/libs/kf5-parts/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-people/recipe.toml b/recipes/wip/libs/kf5-people/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-people/recipe.toml
rename to recipes/wip/libs/kf5-people/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-plasma-framework/recipe.toml b/recipes/wip/libs/kf5-plasma-framework/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-plasma-framework/recipe.toml
rename to recipes/wip/libs/kf5-plasma-framework/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-plotting/recipe.toml b/recipes/wip/libs/kf5-plotting/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-plotting/recipe.toml
rename to recipes/wip/libs/kf5-plotting/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-prison/recipe.toml b/recipes/wip/libs/kf5-prison/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-prison/recipe.toml
rename to recipes/wip/libs/kf5-prison/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-pty/recipe.toml b/recipes/wip/libs/kf5-pty/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-pty/recipe.toml
rename to recipes/wip/libs/kf5-pty/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-purpose/recipe.toml b/recipes/wip/libs/kf5-purpose/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-purpose/recipe.toml
rename to recipes/wip/libs/kf5-purpose/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-qqc2-desktop-style/recipe.toml b/recipes/wip/libs/kf5-qqc2-desktop-style/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-qqc2-desktop-style/recipe.toml
rename to recipes/wip/libs/kf5-qqc2-desktop-style/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-quickcharts/recipe.toml b/recipes/wip/libs/kf5-quickcharts/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-quickcharts/recipe.toml
rename to recipes/wip/libs/kf5-quickcharts/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-runner/recipe.toml b/recipes/wip/libs/kf5-runner/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-runner/recipe.toml
rename to recipes/wip/libs/kf5-runner/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-service/recipe.toml b/recipes/wip/libs/kf5-service/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-service/recipe.toml
rename to recipes/wip/libs/kf5-service/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-solid/recipe.toml b/recipes/wip/libs/kf5-solid/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-solid/recipe.toml
rename to recipes/wip/libs/kf5-solid/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-sonnet/recipe.toml b/recipes/wip/libs/kf5-sonnet/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-sonnet/recipe.toml
rename to recipes/wip/libs/kf5-sonnet/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-syndication/recipe.toml b/recipes/wip/libs/kf5-syndication/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-syndication/recipe.toml
rename to recipes/wip/libs/kf5-syndication/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-syntax-highlighting/recipe.toml b/recipes/wip/libs/kf5-syntax-highlighting/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-syntax-highlighting/recipe.toml
rename to recipes/wip/libs/kf5-syntax-highlighting/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-sysguard/recipe.toml b/recipes/wip/libs/kf5-sysguard/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-sysguard/recipe.toml
rename to recipes/wip/libs/kf5-sysguard/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-texteditor/recipe.toml b/recipes/wip/libs/kf5-texteditor/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-texteditor/recipe.toml
rename to recipes/wip/libs/kf5-texteditor/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-textwidgets/recipe.toml b/recipes/wip/libs/kf5-textwidgets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-textwidgets/recipe.toml
rename to recipes/wip/libs/kf5-textwidgets/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-threadweaver/recipe.toml b/recipes/wip/libs/kf5-threadweaver/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-threadweaver/recipe.toml
rename to recipes/wip/libs/kf5-threadweaver/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-unitconversion/recipe.toml b/recipes/wip/libs/kf5-unitconversion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-unitconversion/recipe.toml
rename to recipes/wip/libs/kf5-unitconversion/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-wayland/recipe.toml b/recipes/wip/libs/kf5-wayland/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-wayland/recipe.toml
rename to recipes/wip/libs/kf5-wayland/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-widgetaddons/recipe.toml b/recipes/wip/libs/kf5-widgetaddons/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-widgetaddons/recipe.toml
rename to recipes/wip/libs/kf5-widgetaddons/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-windowsystem/recipe.toml b/recipes/wip/libs/kf5-windowsystem/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-windowsystem/recipe.toml
rename to recipes/wip/libs/kf5-windowsystem/recipe.toml
diff --git a/recipes/wip/libs/kf5-activities/kf5-xmlgui/recipe.toml b/recipes/wip/libs/kf5-xmlgui/recipe.toml
similarity index 100%
rename from recipes/wip/libs/kf5-activities/kf5-xmlgui/recipe.toml
rename to recipes/wip/libs/kf5-xmlgui/recipe.toml
diff --git a/recipes/wip/libs/librdf/lib2geom/recipe.toml b/recipes/wip/libs/lib2geom/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/lib2geom/recipe.toml
rename to recipes/wip/libs/lib2geom/recipe.toml
diff --git a/recipes/wip/libs/librdf/liba52/recipe.toml b/recipes/wip/libs/liba52/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/liba52/recipe.toml
rename to recipes/wip/libs/liba52/recipe.toml
diff --git a/recipes/wip/libs/librdf/libadwaita/recipe.toml b/recipes/wip/libs/libadwaita/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libadwaita/recipe.toml
rename to recipes/wip/libs/libadwaita/recipe.toml
diff --git a/recipes/wip/libs/librdf/libaio/recipe.toml b/recipes/wip/libs/libaio/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libaio/recipe.toml
rename to recipes/wip/libs/libaio/recipe.toml
diff --git a/recipes/wip/libs/librdf/libaom/recipe.toml b/recipes/wip/libs/libaom/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libaom/recipe.toml
rename to recipes/wip/libs/libaom/recipe.toml
diff --git a/recipes/wip/libs/librdf/libargon2/recipe.toml b/recipes/wip/libs/libargon2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libargon2/recipe.toml
rename to recipes/wip/libs/libargon2/recipe.toml
diff --git a/recipes/wip/libs/librdf/libart/recipe.toml b/recipes/wip/libs/libart/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libart/recipe.toml
rename to recipes/wip/libs/libart/recipe.toml
diff --git a/recipes/wip/libs/librdf/libaspell/recipe.toml b/recipes/wip/libs/libaspell/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libaspell/recipe.toml
rename to recipes/wip/libs/libaspell/recipe.toml
diff --git a/recipes/wip/libs/librdf/libass/recipe.toml b/recipes/wip/libs/libass/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libass/recipe.toml
rename to recipes/wip/libs/libass/recipe.toml
diff --git a/recipes/wip/libs/librdf/libatomic_ops/recipe.toml b/recipes/wip/libs/libatomic_ops/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libatomic_ops/recipe.toml
rename to recipes/wip/libs/libatomic_ops/recipe.toml
diff --git a/recipes/wip/libs/librdf/libavif/recipe.toml b/recipes/wip/libs/libavif/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libavif/recipe.toml
rename to recipes/wip/libs/libavif/recipe.toml
diff --git a/recipes/wip/libs/librdf/libbluray/recipe.toml b/recipes/wip/libs/libbluray/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libbluray/recipe.toml
rename to recipes/wip/libs/libbluray/recipe.toml
diff --git a/recipes/wip/libs/librdf/libbotan/recipe.toml b/recipes/wip/libs/libbotan/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libbotan/recipe.toml
rename to recipes/wip/libs/libbotan/recipe.toml
diff --git a/recipes/wip/libs/librdf/libbrotli/recipe.toml b/recipes/wip/libs/libbrotli/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libbrotli/recipe.toml
rename to recipes/wip/libs/libbrotli/recipe.toml
diff --git a/recipes/wip/libs/librdf/libbsd/recipe.toml b/recipes/wip/libs/libbsd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libbsd/recipe.toml
rename to recipes/wip/libs/libbsd/recipe.toml
diff --git a/recipes/wip/libs/librdf/libburn/recipe.toml b/recipes/wip/libs/libburn/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libburn/recipe.toml
rename to recipes/wip/libs/libburn/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcaca/recipe.toml b/recipes/wip/libs/libcaca/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcaca/recipe.toml
rename to recipes/wip/libs/libcaca/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcamera/recipe.toml b/recipes/wip/libs/libcamera/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcamera/recipe.toml
rename to recipes/wip/libs/libcamera/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcap/recipe.toml b/recipes/wip/libs/libcap/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcap/recipe.toml
rename to recipes/wip/libs/libcap/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcdio-paranoia/recipe.toml b/recipes/wip/libs/libcdio-paranoia/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcdio-paranoia/recipe.toml
rename to recipes/wip/libs/libcdio-paranoia/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcdio/recipe.toml b/recipes/wip/libs/libcdio/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcdio/recipe.toml
rename to recipes/wip/libs/libcdio/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcdr/recipe.toml b/recipes/wip/libs/libcdr/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcdr/recipe.toml
rename to recipes/wip/libs/libcdr/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcpuid/recipe.toml b/recipes/wip/libs/libcpuid/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcpuid/recipe.toml
rename to recipes/wip/libs/libcpuid/recipe.toml
diff --git a/recipes/wip/libs/librdf/libcups/recipe.toml b/recipes/wip/libs/libcups/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libcups/recipe.toml
rename to recipes/wip/libs/libcups/recipe.toml
diff --git a/recipes/wip/libs/librdf/libde265/recipe.toml b/recipes/wip/libs/libde265/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libde265/recipe.toml
rename to recipes/wip/libs/libde265/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdecor/recipe.toml b/recipes/wip/libs/libdecor/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdecor/recipe.toml
rename to recipes/wip/libs/libdecor/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdeflate/recipe.toml b/recipes/wip/libs/libdeflate/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdeflate/recipe.toml
rename to recipes/wip/libs/libdeflate/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdex/recipe.toml b/recipes/wip/libs/libdex/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdex/recipe.toml
rename to recipes/wip/libs/libdex/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdmx/recipe.toml b/recipes/wip/libs/libdmx/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdmx/recipe.toml
rename to recipes/wip/libs/libdmx/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdotconf/recipe.toml b/recipes/wip/libs/libdotconf/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdotconf/recipe.toml
rename to recipes/wip/libs/libdotconf/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdouble-conversion/recipe.toml b/recipes/wip/libs/libdouble-conversion/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdouble-conversion/recipe.toml
rename to recipes/wip/libs/libdouble-conversion/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdvbpsi/recipe.toml b/recipes/wip/libs/libdvbpsi/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdvbpsi/recipe.toml
rename to recipes/wip/libs/libdvbpsi/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdvdcss/recipe.toml b/recipes/wip/libs/libdvdcss/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdvdcss/recipe.toml
rename to recipes/wip/libs/libdvdcss/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdvdnav/recipe.toml b/recipes/wip/libs/libdvdnav/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdvdnav/recipe.toml
rename to recipes/wip/libs/libdvdnav/recipe.toml
diff --git a/recipes/wip/libs/librdf/libdvdread/recipe.toml b/recipes/wip/libs/libdvdread/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libdvdread/recipe.toml
rename to recipes/wip/libs/libdvdread/recipe.toml
diff --git a/recipes/wip/libs/librdf/libebml/recipe.toml b/recipes/wip/libs/libebml/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libebml/recipe.toml
rename to recipes/wip/libs/libebml/recipe.toml
diff --git a/recipes/wip/libs/librdf/libedit/recipe.toml b/recipes/wip/libs/libedit/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libedit/recipe.toml
rename to recipes/wip/libs/libedit/recipe.toml
diff --git a/recipes/wip/libs/librdf/libeditline/recipe.toml b/recipes/wip/libs/libeditline/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libeditline/recipe.toml
rename to recipes/wip/libs/libeditline/recipe.toml
diff --git a/recipes/wip/libs/librdf/libeigen/recipe.toml b/recipes/wip/libs/libeigen/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libeigen/recipe.toml
rename to recipes/wip/libs/libeigen/recipe.toml
diff --git a/recipes/wip/libs/librdf/libenet/recipe.toml b/recipes/wip/libs/libenet/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libenet/recipe.toml
rename to recipes/wip/libs/libenet/recipe.toml
diff --git a/recipes/wip/libs/librdf/libepoxy/recipe.toml b/recipes/wip/libs/libepoxy/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libepoxy/recipe.toml
rename to recipes/wip/libs/libepoxy/recipe.toml
diff --git a/recipes/wip/libs/librdf/liberty-eiffel/recipe.toml b/recipes/wip/libs/liberty-eiffel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/liberty-eiffel/recipe.toml
rename to recipes/wip/libs/liberty-eiffel/recipe.toml
diff --git a/recipes/wip/libs/librdf/libevdev/recipe.toml b/recipes/wip/libs/libevdev/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libevdev/recipe.toml
rename to recipes/wip/libs/libevdev/recipe.toml
diff --git a/recipes/wip/libs/librdf/libevent/recipe.toml b/recipes/wip/libs/libevent/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libevent/recipe.toml
rename to recipes/wip/libs/libevent/recipe.toml
diff --git a/recipes/wip/libs/librdf/libfmt/recipe.toml b/recipes/wip/libs/libfmt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libfmt/recipe.toml
rename to recipes/wip/libs/libfmt/recipe.toml
diff --git a/recipes/wip/libs/librdf/libfontenc/recipe.toml b/recipes/wip/libs/libfontenc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libfontenc/recipe.toml
rename to recipes/wip/libs/libfontenc/recipe.toml
diff --git a/recipes/wip/libs/librdf/libfs/recipe.toml b/recipes/wip/libs/libfs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libfs/recipe.toml
rename to recipes/wip/libs/libfs/recipe.toml
diff --git a/recipes/wip/libs/librdf/libfuse2/recipe.toml b/recipes/wip/libs/libfuse2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libfuse2/recipe.toml
rename to recipes/wip/libs/libfuse2/recipe.toml
diff --git a/recipes/wip/libs/librdf/libfuse3/recipe.toml b/recipes/wip/libs/libfuse3/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libfuse3/recipe.toml
rename to recipes/wip/libs/libfuse3/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgav1/recipe.toml b/recipes/wip/libs/libgav1/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgav1/recipe.toml
rename to recipes/wip/libs/libgav1/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgc/recipe.toml b/recipes/wip/libs/libgc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgc/recipe.toml
rename to recipes/wip/libs/libgc/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgcrypt/recipe.toml b/recipes/wip/libs/libgcrypt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgcrypt/recipe.toml
rename to recipes/wip/libs/libgcrypt/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgif/recipe.toml b/recipes/wip/libs/libgif/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgif/recipe.toml
rename to recipes/wip/libs/libgif/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgit2/recipe.toml b/recipes/wip/libs/libgit2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgit2/recipe.toml
rename to recipes/wip/libs/libgit2/recipe.toml
diff --git a/recipes/wip/libs/librdf/libglm/recipe.toml b/recipes/wip/libs/libglm/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libglm/recipe.toml
rename to recipes/wip/libs/libglm/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgloox/recipe.toml b/recipes/wip/libs/libgloox/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgloox/recipe.toml
rename to recipes/wip/libs/libgloox/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgpg-error/recipe.toml b/recipes/wip/libs/libgpg-error/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgpg-error/recipe.toml
rename to recipes/wip/libs/libgpg-error/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgphoto2/recipe.toml b/recipes/wip/libs/libgphoto2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgphoto2/recipe.toml
rename to recipes/wip/libs/libgphoto2/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgpm/recipe.toml b/recipes/wip/libs/libgpm/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgpm/recipe.toml
rename to recipes/wip/libs/libgpm/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgrantlee/recipe.toml b/recipes/wip/libs/libgrantlee/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgrantlee/recipe.toml
rename to recipes/wip/libs/libgrantlee/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgsl/recipe.toml b/recipes/wip/libs/libgsl/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgsl/recipe.toml
rename to recipes/wip/libs/libgsl/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgspell-gtk3/recipe.toml b/recipes/wip/libs/libgspell-gtk3/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgspell-gtk3/recipe.toml
rename to recipes/wip/libs/libgspell-gtk3/recipe.toml
diff --git a/recipes/wip/libs/librdf/libgspell-gtk4/recipe.toml b/recipes/wip/libs/libgspell-gtk4/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libgspell-gtk4/recipe.toml
rename to recipes/wip/libs/libgspell-gtk4/recipe.toml
diff --git a/recipes/wip/libs/librdf/libharu/recipe.toml b/recipes/wip/libs/libharu/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libharu/recipe.toml
rename to recipes/wip/libs/libharu/recipe.toml
diff --git a/recipes/wip/libs/librdf/libheif/recipe.toml b/recipes/wip/libs/libheif/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libheif/recipe.toml
rename to recipes/wip/libs/libheif/recipe.toml
diff --git a/recipes/wip/libs/librdf/libhyphen/recipe.toml b/recipes/wip/libs/libhyphen/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libhyphen/recipe.toml
rename to recipes/wip/libs/libhyphen/recipe.toml
diff --git a/recipes/wip/libs/librdf/libice/recipe.toml b/recipes/wip/libs/libice/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libice/recipe.toml
rename to recipes/wip/libs/libice/recipe.toml
diff --git a/recipes/wip/libs/librdf/libicu/recipe.toml b/recipes/wip/libs/libicu/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libicu/recipe.toml
rename to recipes/wip/libs/libicu/recipe.toml
diff --git a/recipes/wip/libs/librdf/libimath/recipe.toml b/recipes/wip/libs/libimath/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libimath/recipe.toml
rename to recipes/wip/libs/libimath/recipe.toml
diff --git a/recipes/wip/libs/librdf/libimmer/recipe.toml b/recipes/wip/libs/libimmer/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libimmer/recipe.toml
rename to recipes/wip/libs/libimmer/recipe.toml
diff --git a/recipes/wip/libs/librdf/libinput/recipe.toml b/recipes/wip/libs/libinput/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libinput/recipe.toml
rename to recipes/wip/libs/libinput/recipe.toml
diff --git a/recipes/wip/libs/librdf/libisoburn/recipe.toml b/recipes/wip/libs/libisoburn/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libisoburn/recipe.toml
rename to recipes/wip/libs/libisoburn/recipe.toml
diff --git a/recipes/wip/libs/librdf/libisofs/recipe.toml b/recipes/wip/libs/libisofs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libisofs/recipe.toml
rename to recipes/wip/libs/libisofs/recipe.toml
diff --git a/recipes/wip/libs/librdf/libjasper/recipe.toml b/recipes/wip/libs/libjasper/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libjasper/recipe.toml
rename to recipes/wip/libs/libjasper/recipe.toml
diff --git a/recipes/wip/libs/librdf/libjpeg-turbo/recipe.toml b/recipes/wip/libs/libjpeg-turbo/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libjpeg-turbo/recipe.toml
rename to recipes/wip/libs/libjpeg-turbo/recipe.toml
diff --git a/recipes/wip/libs/librdf/libjxl/recipe.toml b/recipes/wip/libs/libjxl/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libjxl/recipe.toml
rename to recipes/wip/libs/libjxl/recipe.toml
diff --git a/recipes/wip/libs/librdf/libkdcraw/recipe.toml b/recipes/wip/libs/libkdcraw/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libkdcraw/recipe.toml
rename to recipes/wip/libs/libkdcraw/recipe.toml
diff --git a/recipes/wip/libs/librdf/libkomparediff2/recipe.toml b/recipes/wip/libs/libkomparediff2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libkomparediff2/recipe.toml
rename to recipes/wip/libs/libkomparediff2/recipe.toml
diff --git a/recipes/wip/libs/librdf/liblager/recipe.toml b/recipes/wip/libs/liblager/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/liblager/recipe.toml
rename to recipes/wip/libs/liblager/recipe.toml
diff --git a/recipes/wip/libs/librdf/liblapack/recipe.toml b/recipes/wip/libs/liblapack/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/liblapack/recipe.toml
rename to recipes/wip/libs/liblapack/recipe.toml
diff --git a/recipes/wip/libs/librdf/liblcms/recipe.toml b/recipes/wip/libs/liblcms/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/liblcms/recipe.toml
rename to recipes/wip/libs/liblcms/recipe.toml
diff --git a/recipes/wip/libs/librdf/liblo/recipe.toml b/recipes/wip/libs/liblo/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/liblo/recipe.toml
rename to recipes/wip/libs/liblo/recipe.toml
diff --git a/recipes/wip/libs/librdf/libm17n/recipe.toml b/recipes/wip/libs/libm17n/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libm17n/recipe.toml
rename to recipes/wip/libs/libm17n/recipe.toml
diff --git a/recipes/wip/libs/librdf/libmad/recipe.toml b/recipes/wip/libs/libmad/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libmad/recipe.toml
rename to recipes/wip/libs/libmad/recipe.toml
diff --git a/recipes/wip/libs/librdf/libmatroska/recipe.toml b/recipes/wip/libs/libmatroska/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libmatroska/recipe.toml
rename to recipes/wip/libs/libmatroska/recipe.toml
diff --git a/recipes/wip/libs/librdf/libmd/recipe.toml b/recipes/wip/libs/libmd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libmd/recipe.toml
rename to recipes/wip/libs/libmd/recipe.toml
diff --git a/recipes/wip/libs/librdf/libmpeg2/recipe.toml b/recipes/wip/libs/libmpeg2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libmpeg2/recipe.toml
rename to recipes/wip/libs/libmpeg2/recipe.toml
diff --git a/recipes/wip/libs/librdf/libmypaint/recipe.toml b/recipes/wip/libs/libmypaint/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libmypaint/recipe.toml
rename to recipes/wip/libs/libmypaint/recipe.toml
diff --git a/recipes/wip/libs/librdf/libnlopt/recipe.toml b/recipes/wip/libs/libnlopt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libnlopt/recipe.toml
rename to recipes/wip/libs/libnlopt/recipe.toml
diff --git a/recipes/wip/libs/librdf/libnotify/recipe.toml b/recipes/wip/libs/libnotify/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libnotify/recipe.toml
rename to recipes/wip/libs/libnotify/recipe.toml
diff --git a/recipes/wip/libs/librdf/libnsl/recipe.toml b/recipes/wip/libs/libnsl/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libnsl/recipe.toml
rename to recipes/wip/libs/libnsl/recipe.toml
diff --git a/recipes/wip/libs/librdf/libotf/recipe.toml b/recipes/wip/libs/libotf/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libotf/recipe.toml
rename to recipes/wip/libs/libotf/recipe.toml
diff --git a/recipes/wip/libs/librdf/libpanel/recipe.toml b/recipes/wip/libs/libpanel/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libpanel/recipe.toml
rename to recipes/wip/libs/libpanel/recipe.toml
diff --git a/recipes/wip/libs/librdf/libpcap/recipe.toml b/recipes/wip/libs/libpcap/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libpcap/recipe.toml
rename to recipes/wip/libs/libpcap/recipe.toml
diff --git a/recipes/wip/libs/librdf/libpeas/recipe.toml b/recipes/wip/libs/libpeas/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libpeas/recipe.toml
rename to recipes/wip/libs/libpeas/recipe.toml
diff --git a/recipes/wip/libs/librdf/libpoppler/recipe.toml b/recipes/wip/libs/libpoppler/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libpoppler/recipe.toml
rename to recipes/wip/libs/libpoppler/recipe.toml
diff --git a/recipes/wip/libs/librdf/libportaudio/recipe.toml b/recipes/wip/libs/libportaudio/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libportaudio/recipe.toml
rename to recipes/wip/libs/libportaudio/recipe.toml
diff --git a/recipes/wip/libs/librdf/libpthread-stubs/recipe.toml b/recipes/wip/libs/libpthread-stubs/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libpthread-stubs/recipe.toml
rename to recipes/wip/libs/libpthread-stubs/recipe.toml
diff --git a/recipes/wip/libs/librdf/libpugixml/recipe.toml b/recipes/wip/libs/libpugixml/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libpugixml/recipe.toml
rename to recipes/wip/libs/libpugixml/recipe.toml
diff --git a/recipes/wip/libs/librdf/libqalculate/recipe.toml b/recipes/wip/libs/libqalculate/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libqalculate/recipe.toml
rename to recipes/wip/libs/libqalculate/recipe.toml
diff --git a/recipes/wip/libs/librdf/libqrcodegenc/recipe.toml b/recipes/wip/libs/libqrcodegenc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libqrcodegenc/recipe.toml
rename to recipes/wip/libs/libqrcodegenc/recipe.toml
diff --git a/recipes/wip/libs/librdf/libraptor2/recipe.toml b/recipes/wip/libs/libraptor2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libraptor2/recipe.toml
rename to recipes/wip/libs/libraptor2/recipe.toml
diff --git a/recipes/wip/libs/librdf/librasqal/recipe.toml b/recipes/wip/libs/librasqal/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/librasqal/recipe.toml
rename to recipes/wip/libs/librasqal/recipe.toml
diff --git a/recipes/wip/libs/librdf/libraw/recipe.toml b/recipes/wip/libs/libraw/recipe.toml
similarity index 100%
rename from recipes/wip/libs/librdf/libraw/recipe.toml
rename to recipes/wip/libs/libraw/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwayland/recipe.toml b/recipes/wip/libs/libwayland/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwayland/recipe.toml
rename to recipes/wip/libs/libwayland/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwebp/recipe.toml b/recipes/wip/libs/libwebp/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwebp/recipe.toml
rename to recipes/wip/libs/libwebp/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwebp2/recipe.toml b/recipes/wip/libs/libwebp2/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwebp2/recipe.toml
rename to recipes/wip/libs/libwebp2/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwebsocket++/recipe.toml b/recipes/wip/libs/libwebsocket++/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwebsocket++/recipe.toml
rename to recipes/wip/libs/libwebsocket++/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwebsockets/recipe.toml b/recipes/wip/libs/libwebsockets/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwebsockets/recipe.toml
rename to recipes/wip/libs/libwebsockets/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwmf/recipe.toml b/recipes/wip/libs/libwmf/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwmf/recipe.toml
rename to recipes/wip/libs/libwmf/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libwpd/recipe.toml b/recipes/wip/libs/libwpd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libwpd/recipe.toml
rename to recipes/wip/libs/libwpd/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libx11/recipe.toml b/recipes/wip/libs/libx11/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libx11/recipe.toml
rename to recipes/wip/libs/libx11/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxau/recipe.toml b/recipes/wip/libs/libxau/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxau/recipe.toml
rename to recipes/wip/libs/libxau/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxaw/recipe.toml b/recipes/wip/libs/libxaw/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxaw/recipe.toml
rename to recipes/wip/libs/libxaw/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxcb/recipe.toml b/recipes/wip/libs/libxcb/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxcb/recipe.toml
rename to recipes/wip/libs/libxcb/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxcomposite/recipe.toml b/recipes/wip/libs/libxcomposite/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxcomposite/recipe.toml
rename to recipes/wip/libs/libxcomposite/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxcursor/recipe.toml b/recipes/wip/libs/libxcursor/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxcursor/recipe.toml
rename to recipes/wip/libs/libxcursor/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxdamage/recipe.toml b/recipes/wip/libs/libxdamage/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxdamage/recipe.toml
rename to recipes/wip/libs/libxdamage/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxdmcp/recipe.toml b/recipes/wip/libs/libxdmcp/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxdmcp/recipe.toml
rename to recipes/wip/libs/libxdmcp/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxext/recipe.toml b/recipes/wip/libs/libxext/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxext/recipe.toml
rename to recipes/wip/libs/libxext/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxfixes/recipe.toml b/recipes/wip/libs/libxfixes/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxfixes/recipe.toml
rename to recipes/wip/libs/libxfixes/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxft/recipe.toml b/recipes/wip/libs/libxft/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxft/recipe.toml
rename to recipes/wip/libs/libxft/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxi/recipe.toml b/recipes/wip/libs/libxi/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxi/recipe.toml
rename to recipes/wip/libs/libxi/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxinerama/recipe.toml b/recipes/wip/libs/libxinerama/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxinerama/recipe.toml
rename to recipes/wip/libs/libxinerama/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxkbcommon/recipe.toml b/recipes/wip/libs/libxkbcommon/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxkbcommon/recipe.toml
rename to recipes/wip/libs/libxkbcommon/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxkbfile/recipe.toml b/recipes/wip/libs/libxkbfile/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxkbfile/recipe.toml
rename to recipes/wip/libs/libxkbfile/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxmu/recipe.toml b/recipes/wip/libs/libxmu/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxmu/recipe.toml
rename to recipes/wip/libs/libxmu/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxpm/recipe.toml b/recipes/wip/libs/libxpm/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxpm/recipe.toml
rename to recipes/wip/libs/libxpm/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxrandr/recipe.toml b/recipes/wip/libs/libxrandr/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxrandr/recipe.toml
rename to recipes/wip/libs/libxrandr/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxrender/recipe.toml b/recipes/wip/libs/libxrender/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxrender/recipe.toml
rename to recipes/wip/libs/libxrender/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxres/recipe.toml b/recipes/wip/libs/libxres/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxres/recipe.toml
rename to recipes/wip/libs/libxres/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxsimd/recipe.toml b/recipes/wip/libs/libxsimd/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxsimd/recipe.toml
rename to recipes/wip/libs/libxsimd/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxslt/recipe.toml b/recipes/wip/libs/libxslt/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxslt/recipe.toml
rename to recipes/wip/libs/libxslt/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxss/recipe.toml b/recipes/wip/libs/libxss/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxss/recipe.toml
rename to recipes/wip/libs/libxss/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxtl/recipe.toml b/recipes/wip/libs/libxtl/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxtl/recipe.toml
rename to recipes/wip/libs/libxtl/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxtrans/recipe.toml b/recipes/wip/libs/libxtrans/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxtrans/recipe.toml
rename to recipes/wip/libs/libxtrans/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxtst/recipe.toml b/recipes/wip/libs/libxtst/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxtst/recipe.toml
rename to recipes/wip/libs/libxtst/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxv/recipe.toml b/recipes/wip/libs/libxv/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxv/recipe.toml
rename to recipes/wip/libs/libxv/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libxvmc/recipe.toml b/recipes/wip/libs/libxvmc/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libxvmc/recipe.toml
rename to recipes/wip/libs/libxvmc/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libyaml/recipe.toml b/recipes/wip/libs/libyaml/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libyaml/recipe.toml
rename to recipes/wip/libs/libyaml/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libzug/recipe.toml b/recipes/wip/libs/libzug/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libzug/recipe.toml
rename to recipes/wip/libs/libzug/recipe.toml
diff --git a/recipes/wip/libs/libvulkan/libzvbi/recipe.toml b/recipes/wip/libs/libzvbi/recipe.toml
similarity index 100%
rename from recipes/wip/libs/libvulkan/libzvbi/recipe.toml
rename to recipes/wip/libs/libzvbi/recipe.toml
diff --git a/recipes/wip/libs/openal/openblas/recipe.toml b/recipes/wip/libs/openblas/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/openblas/recipe.toml
rename to recipes/wip/libs/openblas/recipe.toml
diff --git a/recipes/wip/libs/openal/opencv4/recipe.toml b/recipes/wip/libs/opencv4/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/opencv4/recipe.toml
rename to recipes/wip/libs/opencv4/recipe.toml
diff --git a/recipes/wip/libs/openal/openjpeg/recipe.toml b/recipes/wip/libs/openjpeg/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/openjpeg/recipe.toml
rename to recipes/wip/libs/openjpeg/recipe.toml
diff --git a/recipes/wip/libs/openal/opus/recipe.toml b/recipes/wip/libs/opus/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/opus/recipe.toml
rename to recipes/wip/libs/opus/recipe.toml
diff --git a/recipes/wip/libs/openal/opusfile/recipe.toml b/recipes/wip/libs/opusfile/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/opusfile/recipe.toml
rename to recipes/wip/libs/opusfile/recipe.toml
diff --git a/recipes/wip/libs/openal/raylib/recipe.toml b/recipes/wip/libs/raylib/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/raylib/recipe.toml
rename to recipes/wip/libs/raylib/recipe.toml
diff --git a/recipes/wip/libs/openal/rdflib/recipe.toml b/recipes/wip/libs/rdflib/recipe.toml
similarity index 100%
rename from recipes/wip/libs/openal/rdflib/recipe.toml
rename to recipes/wip/libs/rdflib/recipe.toml