diff --git a/recipes/wip/benchmarks/cargo-benchcmp/recipe.toml b/recipes/wip/benchmarks/cargo/cargo-benchcmp/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/cargo-benchcmp/recipe.toml
rename to recipes/wip/benchmarks/cargo/cargo-benchcmp/recipe.toml
diff --git a/recipes/wip/benchmarks/cargo-criterion/recipe.toml b/recipes/wip/benchmarks/cargo/cargo-criterion/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/cargo-criterion/recipe.toml
rename to recipes/wip/benchmarks/cargo/cargo-criterion/recipe.toml
diff --git a/recipes/wip/benchmarks/hpcc/recipe.toml b/recipes/wip/benchmarks/hpc/hpcc/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/hpcc/recipe.toml
rename to recipes/wip/benchmarks/hpc/hpcc/recipe.toml
diff --git a/recipes/wip/benchmarks/hpcg/recipe.toml b/recipes/wip/benchmarks/hpc/hpcg/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/hpcg/recipe.toml
rename to recipes/wip/benchmarks/hpc/hpcg/recipe.toml
diff --git a/recipes/wip/benchmarks/minibude/recipe.toml b/recipes/wip/benchmarks/hpc/minibude/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/minibude/recipe.toml
rename to recipes/wip/benchmarks/hpc/minibude/recipe.toml
diff --git a/recipes/wip/benchmarks/fio/recipe.toml b/recipes/wip/benchmarks/io/fio/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/fio/recipe.toml
rename to recipes/wip/benchmarks/io/fio/recipe.toml
diff --git a/recipes/wip/benchmarks/simple-disk-benchmark/recipe.toml b/recipes/wip/benchmarks/io/simple-disk-benchmark/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/simple-disk-benchmark/recipe.toml
rename to recipes/wip/benchmarks/io/simple-disk-benchmark/recipe.toml
diff --git a/recipes/wip/benchmarks/phoronix-test-suite/recipe.toml b/recipes/wip/benchmarks/suite/phoronix-test-suite/recipe.toml
similarity index 100%
rename from recipes/wip/benchmarks/phoronix-test-suite/recipe.toml
rename to recipes/wip/benchmarks/suite/phoronix-test-suite/recipe.toml