diff --git a/recipes/wip/benchmarks/dacapo-benchmarks/recipe.toml b/recipes/wip/benchmarks/dacapo-benchmarks/recipe.toml
index a4b2ff49a1efc381c25ef47d91a6bc1d6d56e0e8..0fc1315bacb3110fafcaf1ee4f40a0ee81f42ab7 100644
--- a/recipes/wip/benchmarks/dacapo-benchmarks/recipe.toml
+++ b/recipes/wip/benchmarks/dacapo-benchmarks/recipe.toml
@@ -1,6 +1,6 @@
-#TODO missing script for "ant", see https://github.com/dacapobench/dacapobench#building
+#TODO missing data type to download the Java bytecode
+# download link - https://download.dacapobench.org/chopin/dacapo-23.11-chopin.zip
 [source]
-git = "https://github.com/dacapobench/dacapobench"
-rev = "fd292e92f8c40495a6ca05ff3b8a77c6c4265606"
+
 [build]
 template = "custom"
diff --git a/recipes/wip/benchmarks/blogbench/recipe.toml b/recipes/wip/benchmarks/io/blogbench/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/blogbench/recipe.toml
rename to recipes/wip/benchmarks/io/blogbench/recipe.toml
diff --git a/recipes/wip/dev/cargo-about/recipe.toml b/recipes/wip/dev/cargo/cargo-about/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-about/recipe.toml
rename to recipes/wip/dev/cargo/cargo-about/recipe.toml
diff --git a/recipes/wip/dev/cargo-all-features/recipe.toml b/recipes/wip/dev/cargo/cargo-all-features/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-all-features/recipe.toml
rename to recipes/wip/dev/cargo/cargo-all-features/recipe.toml
diff --git a/recipes/wip/dev/cargo-attribution/recipe.toml b/recipes/wip/dev/cargo/cargo-attribution/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-attribution/recipe.toml
rename to recipes/wip/dev/cargo/cargo-attribution/recipe.toml
diff --git a/recipes/wip/dev/cargo-audit/recipe.toml b/recipes/wip/dev/cargo/cargo-audit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-audit/recipe.toml
rename to recipes/wip/dev/cargo/cargo-audit/recipe.toml
diff --git a/recipes/wip/dev/cargo-auditable/recipe.toml b/recipes/wip/dev/cargo/cargo-auditable/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-auditable/recipe.toml
rename to recipes/wip/dev/cargo/cargo-auditable/recipe.toml
diff --git a/recipes/wip/dev/cargo-auto/recipe.toml b/recipes/wip/dev/cargo/cargo-auto/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-auto/recipe.toml
rename to recipes/wip/dev/cargo/cargo-auto/recipe.toml
diff --git a/recipes/wip/dev/cargo-binutils/recipe.toml b/recipes/wip/dev/cargo/cargo-binutils/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-binutils/recipe.toml
rename to recipes/wip/dev/cargo/cargo-binutils/recipe.toml
diff --git a/recipes/wip/dev/cargo-bloat/recipe.toml b/recipes/wip/dev/cargo/cargo-bloat/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-bloat/recipe.toml
rename to recipes/wip/dev/cargo/cargo-bloat/recipe.toml
diff --git a/recipes/wip/dev/cargo-c/recipe.toml b/recipes/wip/dev/cargo/cargo-c/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-c/recipe.toml
rename to recipes/wip/dev/cargo/cargo-c/recipe.toml
diff --git a/recipes/wip/dev/cargo-cache/recipe.toml b/recipes/wip/dev/cargo/cargo-cache/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-cache/recipe.toml
rename to recipes/wip/dev/cargo/cargo-cache/recipe.toml
diff --git a/recipes/wip/dev/cargo-careful/recipe.toml b/recipes/wip/dev/cargo/cargo-careful/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-careful/recipe.toml
rename to recipes/wip/dev/cargo/cargo-careful/recipe.toml
diff --git a/recipes/wip/dev/cargo-check-deadlock/recipe.toml b/recipes/wip/dev/cargo/cargo-check-deadlock/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-check-deadlock/recipe.toml
rename to recipes/wip/dev/cargo/cargo-check-deadlock/recipe.toml
diff --git a/recipes/wip/dev/cargo-checkmate/recipe.toml b/recipes/wip/dev/cargo/cargo-checkmate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-checkmate/recipe.toml
rename to recipes/wip/dev/cargo/cargo-checkmate/recipe.toml
diff --git a/recipes/wip/dev/cargo-clone-crate/recipe.toml b/recipes/wip/dev/cargo/cargo-clone-crate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-clone-crate/recipe.toml
rename to recipes/wip/dev/cargo/cargo-clone-crate/recipe.toml
diff --git a/recipes/wip/dev/cargo-clone/recipe.toml b/recipes/wip/dev/cargo/cargo-clone/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-clone/recipe.toml
rename to recipes/wip/dev/cargo/cargo-clone/recipe.toml
diff --git a/recipes/wip/dev/cargo-compete/recipe.toml b/recipes/wip/dev/cargo/cargo-compete/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-compete/recipe.toml
rename to recipes/wip/dev/cargo/cargo-compete/recipe.toml
diff --git a/recipes/wip/dev/cargo-component/recipe.toml b/recipes/wip/dev/cargo/cargo-component/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-component/recipe.toml
rename to recipes/wip/dev/cargo/cargo-component/recipe.toml
diff --git a/recipes/wip/dev/cargo-crev/recipe.toml b/recipes/wip/dev/cargo/cargo-crev/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-crev/recipe.toml
rename to recipes/wip/dev/cargo/cargo-crev/recipe.toml
diff --git a/recipes/wip/dev/cargo-deny/recipe.toml b/recipes/wip/dev/cargo/cargo-deny/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-deny/recipe.toml
rename to recipes/wip/dev/cargo/cargo-deny/recipe.toml
diff --git a/recipes/wip/dev/cargo-depsize/recipe.toml b/recipes/wip/dev/cargo/cargo-depsize/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-depsize/recipe.toml
rename to recipes/wip/dev/cargo/cargo-depsize/recipe.toml
diff --git a/recipes/wip/dev/cargo-derivefmt/recipe.toml b/recipes/wip/dev/cargo/cargo-derivefmt/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-derivefmt/recipe.toml
rename to recipes/wip/dev/cargo/cargo-derivefmt/recipe.toml
diff --git a/recipes/wip/dev/cargo-diet/recipe.toml b/recipes/wip/dev/cargo/cargo-diet/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-diet/recipe.toml
rename to recipes/wip/dev/cargo/cargo-diet/recipe.toml
diff --git a/recipes/wip/dev/cargo-dist/recipe.toml b/recipes/wip/dev/cargo/cargo-dist/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-dist/recipe.toml
rename to recipes/wip/dev/cargo/cargo-dist/recipe.toml
diff --git a/recipes/wip/dev/cargo-docs-rs/recipe.toml b/recipes/wip/dev/cargo/cargo-docs-rs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-docs-rs/recipe.toml
rename to recipes/wip/dev/cargo/cargo-docs-rs/recipe.toml
diff --git a/recipes/wip/dev/cargo-docs/recipe.toml b/recipes/wip/dev/cargo/cargo-docs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-docs/recipe.toml
rename to recipes/wip/dev/cargo/cargo-docs/recipe.toml
diff --git a/recipes/wip/dev/cargo-duplicates/recipe.toml b/recipes/wip/dev/cargo/cargo-duplicates/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-duplicates/recipe.toml
rename to recipes/wip/dev/cargo/cargo-duplicates/recipe.toml
diff --git a/recipes/wip/dev/cargo-edit/recipe.toml b/recipes/wip/dev/cargo/cargo-edit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-edit/recipe.toml
rename to recipes/wip/dev/cargo/cargo-edit/recipe.toml
diff --git a/recipes/wip/dev/cargo-equip/recipe.toml b/recipes/wip/dev/cargo/cargo-equip/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-equip/recipe.toml
rename to recipes/wip/dev/cargo/cargo-equip/recipe.toml
diff --git a/recipes/wip/dev/cargo-expand/recipe.toml b/recipes/wip/dev/cargo/cargo-expand/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-expand/recipe.toml
rename to recipes/wip/dev/cargo/cargo-expand/recipe.toml
diff --git a/recipes/wip/dev/cargo-featalign/recipe.toml b/recipes/wip/dev/cargo/cargo-featalign/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-featalign/recipe.toml
rename to recipes/wip/dev/cargo/cargo-featalign/recipe.toml
diff --git a/recipes/wip/dev/cargo-feature-combinations/recipe.toml b/recipes/wip/dev/cargo/cargo-feature-combinations/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-feature-combinations/recipe.toml
rename to recipes/wip/dev/cargo/cargo-feature-combinations/recipe.toml
diff --git a/recipes/wip/dev/cargo-feature/recipe.toml b/recipes/wip/dev/cargo/cargo-feature/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-feature/recipe.toml
rename to recipes/wip/dev/cargo/cargo-feature/recipe.toml
diff --git a/recipes/wip/dev/cargo-files/recipe.toml b/recipes/wip/dev/cargo/cargo-files/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-files/recipe.toml
rename to recipes/wip/dev/cargo/cargo-files/recipe.toml
diff --git a/recipes/wip/dev/cargo-fixture/recipe.toml b/recipes/wip/dev/cargo/cargo-fixture/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-fixture/recipe.toml
rename to recipes/wip/dev/cargo/cargo-fixture/recipe.toml
diff --git a/recipes/wip/dev/cargo-ft/recipe.toml b/recipes/wip/dev/cargo/cargo-ft/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-ft/recipe.toml
rename to recipes/wip/dev/cargo/cargo-ft/recipe.toml
diff --git a/recipes/wip/dev/cargo-fuzz/recipe.toml b/recipes/wip/dev/cargo/cargo-fuzz/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-fuzz/recipe.toml
rename to recipes/wip/dev/cargo/cargo-fuzz/recipe.toml
diff --git a/recipes/wip/dev/cargo-gc/recipe.toml b/recipes/wip/dev/cargo/cargo-gc/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-gc/recipe.toml
rename to recipes/wip/dev/cargo/cargo-gc/recipe.toml
diff --git a/recipes/wip/dev/cargo-geiger/recipe.toml b/recipes/wip/dev/cargo/cargo-geiger/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-geiger/recipe.toml
rename to recipes/wip/dev/cargo/cargo-geiger/recipe.toml
diff --git a/recipes/wip/dev/cargo-generate/recipe.toml b/recipes/wip/dev/cargo/cargo-generate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-generate/recipe.toml
rename to recipes/wip/dev/cargo/cargo-generate/recipe.toml
diff --git a/recipes/wip/dev/cargo-get/recipe.toml b/recipes/wip/dev/cargo/cargo-get/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-get/recipe.toml
rename to recipes/wip/dev/cargo/cargo-get/recipe.toml
diff --git a/recipes/wip/dev/cargo-goggles/recipe.toml b/recipes/wip/dev/cargo/cargo-goggles/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-goggles/recipe.toml
rename to recipes/wip/dev/cargo/cargo-goggles/recipe.toml
diff --git a/recipes/wip/dev/cargo-guppy/recipe.toml b/recipes/wip/dev/cargo/cargo-guppy/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-guppy/recipe.toml
rename to recipes/wip/dev/cargo/cargo-guppy/recipe.toml
diff --git a/recipes/wip/dev/cargo-hack/recipe.toml b/recipes/wip/dev/cargo/cargo-hack/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-hack/recipe.toml
rename to recipes/wip/dev/cargo/cargo-hack/recipe.toml
diff --git a/recipes/wip/dev/cargo-hackerman/recipe.toml b/recipes/wip/dev/cargo/cargo-hackerman/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-hackerman/recipe.toml
rename to recipes/wip/dev/cargo/cargo-hackerman/recipe.toml
diff --git a/recipes/wip/dev/cargo-hakari/recipe.toml b/recipes/wip/dev/cargo/cargo-hakari/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-hakari/recipe.toml
rename to recipes/wip/dev/cargo/cargo-hakari/recipe.toml
diff --git a/recipes/wip/dev/cargo-http-registry/recipe.toml b/recipes/wip/dev/cargo/cargo-http-registry/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-http-registry/recipe.toml
rename to recipes/wip/dev/cargo/cargo-http-registry/recipe.toml
diff --git a/recipes/wip/dev/cargo-info/recipe.toml b/recipes/wip/dev/cargo/cargo-info/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-info/recipe.toml
rename to recipes/wip/dev/cargo/cargo-info/recipe.toml
diff --git a/recipes/wip/dev/cargo-lambda/recipe.toml b/recipes/wip/dev/cargo/cargo-lambda/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-lambda/recipe.toml
rename to recipes/wip/dev/cargo/cargo-lambda/recipe.toml
diff --git a/recipes/wip/dev/cargo-leet/recipe.toml b/recipes/wip/dev/cargo/cargo-leet/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-leet/recipe.toml
rename to recipes/wip/dev/cargo/cargo-leet/recipe.toml
diff --git a/recipes/wip/dev/cargo-leptos/recipe.toml b/recipes/wip/dev/cargo/cargo-leptos/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-leptos/recipe.toml
rename to recipes/wip/dev/cargo/cargo-leptos/recipe.toml
diff --git a/recipes/wip/dev/cargo-license/recipe.toml b/recipes/wip/dev/cargo/cargo-license/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-license/recipe.toml
rename to recipes/wip/dev/cargo/cargo-license/recipe.toml
diff --git a/recipes/wip/dev/cargo-limit/recipe.toml b/recipes/wip/dev/cargo/cargo-limit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-limit/recipe.toml
rename to recipes/wip/dev/cargo/cargo-limit/recipe.toml
diff --git a/recipes/wip/dev/cargo-list/recipe.toml b/recipes/wip/dev/cargo/cargo-list/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-list/recipe.toml
rename to recipes/wip/dev/cargo/cargo-list/recipe.toml
diff --git a/recipes/wip/dev/cargo-llvm-cov/recipe.toml b/recipes/wip/dev/cargo/cargo-llvm-cov/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-llvm-cov/recipe.toml
rename to recipes/wip/dev/cargo/cargo-llvm-cov/recipe.toml
diff --git a/recipes/wip/dev/cargo-llvm-lines/recipe.toml b/recipes/wip/dev/cargo/cargo-llvm-lines/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-llvm-lines/recipe.toml
rename to recipes/wip/dev/cargo/cargo-llvm-lines/recipe.toml
diff --git a/recipes/wip/dev/cargo-loc/recipe.toml b/recipes/wip/dev/cargo/cargo-loc/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-loc/recipe.toml
rename to recipes/wip/dev/cargo/cargo-loc/recipe.toml
diff --git a/recipes/wip/dev/cargo-lockup/recipe.toml b/recipes/wip/dev/cargo/cargo-lockup/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-lockup/recipe.toml
rename to recipes/wip/dev/cargo/cargo-lockup/recipe.toml
diff --git a/recipes/wip/dev/cargo-machete/recipe.toml b/recipes/wip/dev/cargo/cargo-machete/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-machete/recipe.toml
rename to recipes/wip/dev/cargo/cargo-machete/recipe.toml
diff --git a/recipes/wip/dev/cargo-make/recipe.toml b/recipes/wip/dev/cargo/cargo-make/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-make/recipe.toml
rename to recipes/wip/dev/cargo/cargo-make/recipe.toml
diff --git a/recipes/wip/dev/cargo-modules/recipe.toml b/recipes/wip/dev/cargo/cargo-modules/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-modules/recipe.toml
rename to recipes/wip/dev/cargo/cargo-modules/recipe.toml
diff --git a/recipes/wip/dev/cargo-msrv/recipe.toml b/recipes/wip/dev/cargo/cargo-msrv/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-msrv/recipe.toml
rename to recipes/wip/dev/cargo/cargo-msrv/recipe.toml
diff --git a/recipes/wip/dev/cargo-multivers/recipe.toml b/recipes/wip/dev/cargo/cargo-multivers/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-multivers/recipe.toml
rename to recipes/wip/dev/cargo/cargo-multivers/recipe.toml
diff --git a/recipes/wip/dev/cargo-mutants/recipe.toml b/recipes/wip/dev/cargo/cargo-mutants/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-mutants/recipe.toml
rename to recipes/wip/dev/cargo/cargo-mutants/recipe.toml
diff --git a/recipes/wip/dev/cargo-nextest/recipe.toml b/recipes/wip/dev/cargo/cargo-nextest/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-nextest/recipe.toml
rename to recipes/wip/dev/cargo/cargo-nextest/recipe.toml
diff --git a/recipes/wip/dev/cargo-outofdate/recipe.toml b/recipes/wip/dev/cargo/cargo-outofdate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-outofdate/recipe.toml
rename to recipes/wip/dev/cargo/cargo-outofdate/recipe.toml
diff --git a/recipes/wip/dev/cargo-packager/recipe.toml b/recipes/wip/dev/cargo/cargo-packager/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-packager/recipe.toml
rename to recipes/wip/dev/cargo/cargo-packager/recipe.toml
diff --git a/recipes/wip/dev/cargo-patch/recipe.toml b/recipes/wip/dev/cargo/cargo-patch/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-patch/recipe.toml
rename to recipes/wip/dev/cargo/cargo-patch/recipe.toml
diff --git a/recipes/wip/dev/cargo-public-api/recipe.toml b/recipes/wip/dev/cargo/cargo-public-api/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-public-api/recipe.toml
rename to recipes/wip/dev/cargo/cargo-public-api/recipe.toml
diff --git a/recipes/wip/dev/cargo-px/recipe.toml b/recipes/wip/dev/cargo/cargo-px/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-px/recipe.toml
rename to recipes/wip/dev/cargo/cargo-px/recipe.toml
diff --git a/recipes/wip/dev/cargo-qtest/recipe.toml b/recipes/wip/dev/cargo/cargo-qtest/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-qtest/recipe.toml
rename to recipes/wip/dev/cargo/cargo-qtest/recipe.toml
diff --git a/recipes/wip/dev/cargo-rdme/recipe.toml b/recipes/wip/dev/cargo/cargo-rdme/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-rdme/recipe.toml
rename to recipes/wip/dev/cargo/cargo-rdme/recipe.toml
diff --git a/recipes/wip/dev/cargo-release/recipe.toml b/recipes/wip/dev/cargo/cargo-release/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-release/recipe.toml
rename to recipes/wip/dev/cargo/cargo-release/recipe.toml
diff --git a/recipes/wip/dev/cargo-remark/recipe.toml b/recipes/wip/dev/cargo/cargo-remark/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-remark/recipe.toml
rename to recipes/wip/dev/cargo/cargo-remark/recipe.toml
diff --git a/recipes/wip/dev/cargo-run-bin/recipe.toml b/recipes/wip/dev/cargo/cargo-run-bin/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-run-bin/recipe.toml
rename to recipes/wip/dev/cargo/cargo-run-bin/recipe.toml
diff --git a/recipes/wip/dev/cargo-scaffold/recipe.toml b/recipes/wip/dev/cargo/cargo-scaffold/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-scaffold/recipe.toml
rename to recipes/wip/dev/cargo/cargo-scaffold/recipe.toml
diff --git a/recipes/wip/dev/cargo-selector/recipe.toml b/recipes/wip/dev/cargo/cargo-selector/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-selector/recipe.toml
rename to recipes/wip/dev/cargo/cargo-selector/recipe.toml
diff --git a/recipes/wip/dev/cargo-semver-checks/recipe.toml b/recipes/wip/dev/cargo/cargo-semver-checks/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-semver-checks/recipe.toml
rename to recipes/wip/dev/cargo/cargo-semver-checks/recipe.toml
diff --git a/recipes/wip/dev/cargo-shear/recipe.toml b/recipes/wip/dev/cargo/cargo-shear/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-shear/recipe.toml
rename to recipes/wip/dev/cargo/cargo-shear/recipe.toml
diff --git a/recipes/wip/dev/cargo-show-asm/recipe.toml b/recipes/wip/dev/cargo/cargo-show-asm/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-show-asm/recipe.toml
rename to recipes/wip/dev/cargo/cargo-show-asm/recipe.toml
diff --git a/recipes/wip/dev/cargo-single-line/recipe.toml b/recipes/wip/dev/cargo/cargo-single-line/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-single-line/recipe.toml
rename to recipes/wip/dev/cargo/cargo-single-line/recipe.toml
diff --git a/recipes/wip/dev/cargo-smart-release/recipe.toml b/recipes/wip/dev/cargo/cargo-smart-release/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-smart-release/recipe.toml
rename to recipes/wip/dev/cargo/cargo-smart-release/recipe.toml
diff --git a/recipes/wip/dev/cargo-spellcheck/recipe.toml b/recipes/wip/dev/cargo/cargo-spellcheck/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-spellcheck/recipe.toml
rename to recipes/wip/dev/cargo/cargo-spellcheck/recipe.toml
diff --git a/recipes/wip/dev/cargo-supply-chain/recipe.toml b/recipes/wip/dev/cargo/cargo-supply-chain/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-supply-chain/recipe.toml
rename to recipes/wip/dev/cargo/cargo-supply-chain/recipe.toml
diff --git a/recipes/wip/dev/cargo-sweep/recipe.toml b/recipes/wip/dev/cargo/cargo-sweep/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-sweep/recipe.toml
rename to recipes/wip/dev/cargo/cargo-sweep/recipe.toml
diff --git a/recipes/wip/dev/cargo-sync-rdme/recipe.toml b/recipes/wip/dev/cargo/cargo-sync-rdme/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-sync-rdme/recipe.toml
rename to recipes/wip/dev/cargo/cargo-sync-rdme/recipe.toml
diff --git a/recipes/wip/dev/cargo-tally/recipe.toml b/recipes/wip/dev/cargo/cargo-tally/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-tally/recipe.toml
rename to recipes/wip/dev/cargo/cargo-tally/recipe.toml
diff --git a/recipes/wip/dev/cargo-tarpaulin/recipe.toml b/recipes/wip/dev/cargo/cargo-tarpaulin/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-tarpaulin/recipe.toml
rename to recipes/wip/dev/cargo/cargo-tarpaulin/recipe.toml
diff --git a/recipes/wip/dev/cargo-temp/recipe.toml b/recipes/wip/dev/cargo/cargo-temp/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-temp/recipe.toml
rename to recipes/wip/dev/cargo/cargo-temp/recipe.toml
diff --git a/recipes/wip/dev/cargo-trend/recipe.toml b/recipes/wip/dev/cargo/cargo-trend/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-trend/recipe.toml
rename to recipes/wip/dev/cargo/cargo-trend/recipe.toml
diff --git a/recipes/wip/dev/cargo-trim/recipe.toml b/recipes/wip/dev/cargo/cargo-trim/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-trim/recipe.toml
rename to recipes/wip/dev/cargo/cargo-trim/recipe.toml
diff --git a/recipes/wip/dev/cargo-udeps/recipe.toml b/recipes/wip/dev/cargo/cargo-udeps/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-udeps/recipe.toml
rename to recipes/wip/dev/cargo/cargo-udeps/recipe.toml
diff --git a/recipes/wip/dev/cargo-ui/recipe.toml b/recipes/wip/dev/cargo/cargo-ui/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-ui/recipe.toml
rename to recipes/wip/dev/cargo/cargo-ui/recipe.toml
diff --git a/recipes/wip/dev/cargo-unfmt/recipe.toml b/recipes/wip/dev/cargo/cargo-unfmt/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-unfmt/recipe.toml
rename to recipes/wip/dev/cargo/cargo-unfmt/recipe.toml
diff --git a/recipes/wip/dev/cargo-unmaintained/recipe.toml b/recipes/wip/dev/cargo/cargo-unmaintained/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-unmaintained/recipe.toml
rename to recipes/wip/dev/cargo/cargo-unmaintained/recipe.toml
diff --git a/recipes/wip/dev/cargo-update/recipe.toml b/recipes/wip/dev/cargo/cargo-update/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-update/recipe.toml
rename to recipes/wip/dev/cargo/cargo-update/recipe.toml
diff --git a/recipes/wip/dev/cargo-vendor-filterer/recipe.toml b/recipes/wip/dev/cargo/cargo-vendor-filterer/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-vendor-filterer/recipe.toml
rename to recipes/wip/dev/cargo/cargo-vendor-filterer/recipe.toml
diff --git a/recipes/wip/dev/cargo-vet/recipe.toml b/recipes/wip/dev/cargo/cargo-vet/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-vet/recipe.toml
rename to recipes/wip/dev/cargo/cargo-vet/recipe.toml
diff --git a/recipes/wip/dev/cargo-wasi/recipe.toml b/recipes/wip/dev/cargo/cargo-wasi/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-wasi/recipe.toml
rename to recipes/wip/dev/cargo/cargo-wasi/recipe.toml
diff --git a/recipes/wip/dev/cargo-wasix/recipe.toml b/recipes/wip/dev/cargo/cargo-wasix/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-wasix/recipe.toml
rename to recipes/wip/dev/cargo/cargo-wasix/recipe.toml
diff --git a/recipes/wip/dev/cargo-watch/recipe.toml b/recipes/wip/dev/cargo/cargo-watch/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-watch/recipe.toml
rename to recipes/wip/dev/cargo/cargo-watch/recipe.toml
diff --git a/recipes/wip/dev/cargo-whatfeatures/recipe.toml b/recipes/wip/dev/cargo/cargo-whatfeatures/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-whatfeatures/recipe.toml
rename to recipes/wip/dev/cargo/cargo-whatfeatures/recipe.toml
diff --git a/recipes/wip/dev/cargo-wizard/recipe.toml b/recipes/wip/dev/cargo/cargo-wizard/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-wizard/recipe.toml
rename to recipes/wip/dev/cargo/cargo-wizard/recipe.toml
diff --git a/recipes/wip/dev/cargo-workspace-version/recipe.toml b/recipes/wip/dev/cargo/cargo-workspace-version/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-workspace-version/recipe.toml
rename to recipes/wip/dev/cargo/cargo-workspace-version/recipe.toml
diff --git a/recipes/wip/dev/cargo-workspaces/recipe.toml b/recipes/wip/dev/cargo/cargo-workspaces/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-workspaces/recipe.toml
rename to recipes/wip/dev/cargo/cargo-workspaces/recipe.toml
diff --git a/recipes/wip/dev/cargo-zigbuild/recipe.toml b/recipes/wip/dev/cargo/cargo-zigbuild/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo-zigbuild/recipe.toml
rename to recipes/wip/dev/cargo/cargo-zigbuild/recipe.toml