diff --git a/recipes/wip/dev/ant/recipe.toml b/recipes/wip/dev/build-system/ant/recipe.toml
similarity index 100%
rename from recipes/wip/dev/ant/recipe.toml
rename to recipes/wip/dev/build-system/ant/recipe.toml
diff --git a/recipes/wip/dev/meson/recipe.toml b/recipes/wip/dev/build-system/meson/recipe.toml
similarity index 100%
rename from recipes/wip/dev/meson/recipe.toml
rename to recipes/wip/dev/build-system/meson/recipe.toml
diff --git a/recipes/wip/dev/ninja-build/recipe.toml b/recipes/wip/dev/build-system/ninja-build/recipe.toml
similarity index 100%
rename from recipes/wip/dev/ninja-build/recipe.toml
rename to recipes/wip/dev/build-system/ninja-build/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-about/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-about/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-about/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-about/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-all-features/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-all-features/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-all-features/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-all-features/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-attribution/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-attribution/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-attribution/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-attribution/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-audit/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-audit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-audit/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-audit/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-auditable/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-auditable/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-auditable/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-auditable/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-auto/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-auto/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-auto/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-auto/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-binutils/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-binutils/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-binutils/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-binutils/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-bloat/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-bloat/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-bloat/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-bloat/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-c/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-c/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-c/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-c/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-cache/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-cache/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-cache/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-cache/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-careful/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-careful/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-careful/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-careful/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-check-deadlock/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-check-deadlock/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-check-deadlock/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-check-deadlock/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-checkmate/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-checkmate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-checkmate/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-checkmate/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-clone-crate/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-clone-crate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-clone-crate/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-clone-crate/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-clone/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-clone/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-clone/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-clone/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-compete/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-compete/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-compete/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-compete/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-component/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-component/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-component/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-component/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-crev/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-crev/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-crev/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-crev/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-deny/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-deny/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-deny/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-deny/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-depsize/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-depsize/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-depsize/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-depsize/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-derivefmt/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-derivefmt/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-derivefmt/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-derivefmt/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-diet/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-diet/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-diet/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-diet/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-dist/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-dist/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-dist/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-dist/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-docs-rs/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-docs-rs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-docs-rs/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-docs-rs/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-docs/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-docs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-docs/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-docs/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-duplicates/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-duplicates/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-duplicates/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-duplicates/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-edit/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-edit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-edit/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-edit/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-equip/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-equip/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-equip/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-equip/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-expand/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-expand/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-expand/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-expand/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-featalign/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-featalign/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-featalign/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-featalign/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-feature-combinations/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-feature-combinations/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-feature-combinations/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-feature-combinations/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-feature/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-feature/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-feature/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-feature/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-files/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-files/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-files/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-files/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-fixture/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-fixture/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-fixture/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-fixture/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-ft/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-ft/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-ft/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-ft/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-fuzz/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-fuzz/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-fuzz/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-fuzz/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-gc/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-gc/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-gc/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-gc/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-geiger/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-geiger/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-geiger/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-geiger/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-generate/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-generate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-generate/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-generate/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-get/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-get/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-get/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-get/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-goggles/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-goggles/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-goggles/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-goggles/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-guppy/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-guppy/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-guppy/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-guppy/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-hack/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-hack/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-hack/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-hack/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-hackerman/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-hackerman/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-hackerman/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-hackerman/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-hakari/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-hakari/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-hakari/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-hakari/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-http-registry/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-http-registry/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-http-registry/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-http-registry/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-info/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-info/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-info/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-info/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-lambda/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-lambda/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-lambda/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-lambda/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-leet/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-leet/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-leet/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-leet/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-leptos/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-leptos/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-leptos/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-leptos/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-license/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-license/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-license/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-license/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-limit/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-limit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-limit/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-limit/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-list/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-list/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-list/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-list/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-llvm-cov/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-llvm-cov/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-llvm-cov/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-llvm-cov/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-llvm-lines/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-llvm-lines/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-llvm-lines/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-llvm-lines/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-loc/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-loc/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-loc/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-loc/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-lockup/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-lockup/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-lockup/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-lockup/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-machete/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-machete/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-machete/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-machete/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-make/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-make/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-make/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-make/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-modules/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-modules/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-modules/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-modules/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-msrv/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-msrv/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-msrv/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-msrv/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-multivers/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-multivers/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-multivers/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-multivers/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-mutants/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-mutants/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-mutants/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-mutants/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-nextest/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-nextest/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-nextest/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-nextest/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-outofdate/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-outofdate/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-outofdate/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-outofdate/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-packager/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-packager/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-packager/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-packager/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-patch/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-patch/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-patch/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-patch/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-public-api/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-public-api/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-public-api/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-public-api/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-px/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-px/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-px/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-px/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-qtest/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-qtest/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-qtest/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-qtest/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-rdme/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-rdme/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-rdme/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-rdme/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-release/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-release/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-release/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-release/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-remark/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-remark/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-remark/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-remark/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-run-bin/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-run-bin/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-run-bin/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-run-bin/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-scaffold/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-scaffold/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-scaffold/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-scaffold/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-selector/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-selector/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-selector/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-selector/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-semver-checks/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-semver-checks/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-semver-checks/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-semver-checks/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-shear/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-shear/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-shear/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-shear/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-show-asm/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-show-asm/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-show-asm/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-show-asm/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-single-line/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-single-line/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-single-line/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-single-line/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-smart-release/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-smart-release/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-smart-release/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-smart-release/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-spellcheck/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-spellcheck/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-spellcheck/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-spellcheck/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-supply-chain/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-supply-chain/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-supply-chain/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-supply-chain/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-sweep/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-sweep/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-sweep/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-sweep/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-sync-rdme/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-sync-rdme/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-sync-rdme/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-sync-rdme/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-tally/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-tally/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-tally/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-tally/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-tarpaulin/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-tarpaulin/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-tarpaulin/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-tarpaulin/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-temp/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-temp/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-temp/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-temp/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-trend/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-trend/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-trend/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-trend/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-trim/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-trim/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-trim/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-trim/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-udeps/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-udeps/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-udeps/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-udeps/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-ui/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-ui/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-ui/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-ui/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-unfmt/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-unfmt/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-unfmt/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-unfmt/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-unmaintained/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-unmaintained/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-unmaintained/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-unmaintained/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-update/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-update/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-update/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-update/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-vendor-filterer/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-vendor-filterer/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-vendor-filterer/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-vendor-filterer/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-vet/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-vet/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-vet/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-vet/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-wasi/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-wasi/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-wasi/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-wasi/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-wasix/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-wasix/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-wasix/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-wasix/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-watch/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-watch/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-watch/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-watch/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-whatfeatures/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-whatfeatures/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-whatfeatures/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-whatfeatures/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-wizard/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-wizard/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-wizard/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-wizard/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-workspace-version/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-workspace-version/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-workspace-version/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-workspace-version/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-workspaces/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-workspaces/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-workspaces/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-workspaces/recipe.toml
diff --git a/recipes/wip/dev/cargo/cargo-zigbuild/recipe.toml b/recipes/wip/dev/cargo-tools/cargo-zigbuild/recipe.toml
similarity index 100%
rename from recipes/wip/dev/cargo/cargo-zigbuild/recipe.toml
rename to recipes/wip/dev/cargo-tools/cargo-zigbuild/recipe.toml