diff --git a/recipes/wip/rodinia/recipe.toml b/recipes/wip/benchmarks/rodinia/recipe.toml
similarity index 100%
rename from recipes/wip/rodinia/recipe.toml
rename to recipes/wip/benchmarks/rodinia/recipe.toml
diff --git a/recipes/wip/projections/recipe.toml b/recipes/wip/dev/projections/recipe.toml
similarity index 100%
rename from recipes/wip/projections/recipe.toml
rename to recipes/wip/dev/projections/recipe.toml
diff --git a/recipes/wip/ragel/recipe.toml b/recipes/wip/dev/ragel/recipe.toml
similarity index 100%
rename from recipes/wip/ragel/recipe.toml
rename to recipes/wip/dev/ragel/recipe.toml
diff --git a/recipes/wip/release-plz/recipe.toml b/recipes/wip/dev/release-plz/recipe.toml
similarity index 100%
rename from recipes/wip/release-plz/recipe.toml
rename to recipes/wip/dev/release-plz/recipe.toml
diff --git a/recipes/wip/rusty-radamsa/recipe.toml b/recipes/wip/dev/rusty-radamsa/recipe.toml
similarity index 100%
rename from recipes/wip/rusty-radamsa/recipe.toml
rename to recipes/wip/dev/rusty-radamsa/recipe.toml
diff --git a/recipes/wip/potatis/recipe.toml b/recipes/wip/emulators/potatis/recipe.toml
similarity index 100%
rename from recipes/wip/potatis/recipe.toml
rename to recipes/wip/emulators/potatis/recipe.toml
diff --git a/recipes/wip/rex/recipe.toml b/recipes/wip/finance/rex/recipe.toml
similarity index 100%
rename from recipes/wip/rex/recipe.toml
rename to recipes/wip/finance/rex/recipe.toml
diff --git a/recipes/wip/q3rally/recipe.toml b/recipes/wip/games/q3rally/recipe.toml
similarity index 100%
rename from recipes/wip/q3rally/recipe.toml
rename to recipes/wip/games/q3rally/recipe.toml
diff --git a/recipes/wip/rust-sadari-cli/recipe.toml b/recipes/wip/games/rust-sadari-cli/recipe.toml
similarity index 100%
rename from recipes/wip/rust-sadari-cli/recipe.toml
rename to recipes/wip/games/rust-sadari-cli/recipe.toml
diff --git a/recipes/wip/sandbox/recipe.toml b/recipes/wip/games/sandbox/recipe.toml
similarity index 100%
rename from recipes/wip/sandbox/recipe.toml
rename to recipes/wip/games/sandbox/recipe.toml
diff --git a/recipes/wip/rawtherapee/recipe.toml b/recipes/wip/graphics/rawtherapee/recipe.toml
similarity index 100%
rename from recipes/wip/rawtherapee/recipe.toml
rename to recipes/wip/graphics/rawtherapee/recipe.toml
diff --git a/recipes/wip/satty/recipe.toml b/recipes/wip/graphics/satty/recipe.toml
similarity index 100%
rename from recipes/wip/satty/recipe.toml
rename to recipes/wip/graphics/satty/recipe.toml
diff --git a/recipes/wip/quantlib/recipe.toml b/recipes/wip/libs/quantlib/recipe.toml
similarity index 100%
rename from recipes/wip/quantlib/recipe.toml
rename to recipes/wip/libs/quantlib/recipe.toml
diff --git a/recipes/wip/rnnoise/recipe.toml b/recipes/wip/libs/rnnoise/recipe.toml
similarity index 100%
rename from recipes/wip/rnnoise/recipe.toml
rename to recipes/wip/libs/rnnoise/recipe.toml
diff --git a/recipes/wip/rubberband/recipe.toml b/recipes/wip/libs/rubberband/recipe.toml
similarity index 100%
rename from recipes/wip/rubberband/recipe.toml
rename to recipes/wip/libs/rubberband/recipe.toml
diff --git a/recipes/wip/scotch/recipe.toml b/recipes/wip/libs/scotch/recipe.toml
similarity index 100%
rename from recipes/wip/scotch/recipe.toml
rename to recipes/wip/libs/scotch/recipe.toml
diff --git a/recipes/wip/primesieve/recipe.toml b/recipes/wip/math/primesieve/recipe.toml
similarity index 100%
rename from recipes/wip/primesieve/recipe.toml
rename to recipes/wip/math/primesieve/recipe.toml
diff --git a/recipes/wip/rqbit/recipe.toml b/recipes/wip/net/rqbit/recipe.toml
similarity index 100%
rename from recipes/wip/rqbit/recipe.toml
rename to recipes/wip/net/rqbit/recipe.toml
diff --git a/recipes/wip/rustscan/recipe.toml b/recipes/wip/net/rustscan/recipe.toml
similarity index 100%
rename from recipes/wip/rustscan/recipe.toml
rename to recipes/wip/net/rustscan/recipe.toml
diff --git a/recipes/wip/samba/answers.txt b/recipes/wip/net/samba/answers.txt
similarity index 100%
rename from recipes/wip/samba/answers.txt
rename to recipes/wip/net/samba/answers.txt
diff --git a/recipes/wip/samba/recipe.toml b/recipes/wip/net/samba/recipe.toml
similarity index 100%
rename from recipes/wip/samba/recipe.toml
rename to recipes/wip/net/samba/recipe.toml
diff --git a/recipes/wip/qmcpack/recipe.toml b/recipes/wip/science/qmcpack/recipe.toml
similarity index 100%
rename from recipes/wip/qmcpack/recipe.toml
rename to recipes/wip/science/qmcpack/recipe.toml
diff --git a/recipes/wip/recdec/recipe.toml b/recipes/wip/security/recdec/recipe.toml
similarity index 100%
rename from recipes/wip/recdec/recipe.toml
rename to recipes/wip/security/recdec/recipe.toml
diff --git a/recipes/wip/rustyvault/recipe.toml b/recipes/wip/security/rustyvault/recipe.toml
similarity index 100%
rename from recipes/wip/rustyvault/recipe.toml
rename to recipes/wip/security/rustyvault/recipe.toml
diff --git a/recipes/wip/pure/recipe.toml b/recipes/wip/shells/pure/recipe.toml
similarity index 100%
rename from recipes/wip/pure/recipe.toml
rename to recipes/wip/shells/pure/recipe.toml
diff --git a/recipes/wip/relish/recipe.toml b/recipes/wip/shells/relish/recipe.toml
similarity index 100%
rename from recipes/wip/relish/recipe.toml
rename to recipes/wip/shells/relish/recipe.toml
diff --git a/recipes/wip/rustic/recipe.toml b/recipes/wip/sound/rustic/recipe.toml
similarity index 100%
rename from recipes/wip/rustic/recipe.toml
rename to recipes/wip/sound/rustic/recipe.toml
diff --git a/recipes/wip/rustyvibes/recipe.toml b/recipes/wip/sound/rustyvibes/recipe.toml
similarity index 100%
rename from recipes/wip/rustyvibes/recipe.toml
rename to recipes/wip/sound/rustyvibes/recipe.toml
diff --git a/recipes/wip/qv/recipe.toml b/recipes/wip/tools/qv/recipe.toml
similarity index 100%
rename from recipes/wip/qv/recipe.toml
rename to recipes/wip/tools/qv/recipe.toml
diff --git a/recipes/wip/restic/recipe.toml b/recipes/wip/tools/restic/recipe.toml
similarity index 100%
rename from recipes/wip/restic/recipe.toml
rename to recipes/wip/tools/restic/recipe.toml
diff --git a/recipes/wip/russ/recipe.toml b/recipes/wip/tui/russ/recipe.toml
similarity index 100%
rename from recipes/wip/russ/recipe.toml
rename to recipes/wip/tui/russ/recipe.toml
diff --git a/recipes/wip/rust-traverse/recipe.toml b/recipes/wip/tui/rust-traverse/recipe.toml
similarity index 100%
rename from recipes/wip/rust-traverse/recipe.toml
rename to recipes/wip/tui/rust-traverse/recipe.toml
diff --git a/recipes/wip/rustyink/recipe.toml b/recipes/wip/web/rustyink/recipe.toml
similarity index 100%
rename from recipes/wip/rustyink/recipe.toml
rename to recipes/wip/web/rustyink/recipe.toml