diff --git a/recipes/wip/fio/recipe.toml b/recipes/wip/benchmarks/fio/recipe.toml
similarity index 100%
rename from recipes/wip/fio/recipe.toml
rename to recipes/wip/benchmarks/fio/recipe.toml
diff --git a/recipes/wip/gobang/recipe.toml b/recipes/wip/db/gobang/recipe.toml
similarity index 100%
rename from recipes/wip/gobang/recipe.toml
rename to recipes/wip/db/gobang/recipe.toml
diff --git a/recipes/wip/flex/recipe.toml b/recipes/wip/dev/flex/recipe.toml
similarity index 100%
rename from recipes/wip/flex/recipe.toml
rename to recipes/wip/dev/flex/recipe.toml
diff --git a/recipes/wip/gem5/recipe.toml b/recipes/wip/dev/gem5/recipe.toml
similarity index 100%
rename from recipes/wip/gem5/recipe.toml
rename to recipes/wip/dev/gem5/recipe.toml
diff --git a/recipes/wip/gameroy/recipe.toml b/recipes/wip/emulators/gameroy/recipe.toml
similarity index 100%
rename from recipes/wip/gameroy/recipe.toml
rename to recipes/wip/emulators/gameroy/recipe.toml
diff --git a/recipes/wip/gupax/recipe.toml b/recipes/wip/finance/gupax/recipe.toml
similarity index 100%
rename from recipes/wip/gupax/recipe.toml
rename to recipes/wip/finance/gupax/recipe.toml
diff --git a/recipes/wip/dev/fonts/fontfor/recipe.toml b/recipes/wip/fonts/fontfor/recipe.toml
similarity index 100%
rename from recipes/wip/dev/fonts/fontfor/recipe.toml
rename to recipes/wip/fonts/fontfor/recipe.toml
diff --git a/recipes/wip/dev/fonts/fontforge/recipe.toml b/recipes/wip/fonts/fontforge/recipe.toml
similarity index 100%
rename from recipes/wip/dev/fonts/fontforge/recipe.toml
rename to recipes/wip/fonts/fontforge/recipe.toml
diff --git a/recipes/wip/gerb/recipe.toml b/recipes/wip/fonts/gerb/recipe.toml
similarity index 100%
rename from recipes/wip/gerb/recipe.toml
rename to recipes/wip/fonts/gerb/recipe.toml
diff --git a/recipes/wip/dev/fonts/nerd-fonts/recipe.toml b/recipes/wip/fonts/nerd-fonts/recipe.toml
similarity index 100%
rename from recipes/wip/dev/fonts/nerd-fonts/recipe.toml
rename to recipes/wip/fonts/nerd-fonts/recipe.toml
diff --git a/recipes/wip/glou/recipe.toml b/recipes/wip/graphics/glou/recipe.toml
similarity index 100%
rename from recipes/wip/glou/recipe.toml
rename to recipes/wip/graphics/glou/recipe.toml
diff --git a/recipes/wip/gflags/recipe.toml b/recipes/wip/libs/gflags/recipe.toml
similarity index 100%
rename from recipes/wip/gflags/recipe.toml
rename to recipes/wip/libs/gflags/recipe.toml
diff --git a/recipes/wip/gpgme/recipe.toml b/recipes/wip/libs/gpgme/recipe.toml
similarity index 100%
rename from recipes/wip/gpgme/recipe.toml
rename to recipes/wip/libs/gpgme/recipe.toml
diff --git a/recipes/wip/gromacs/recipe.toml b/recipes/wip/science/gromacs/recipe.toml
similarity index 100%
rename from recipes/wip/gromacs/recipe.toml
rename to recipes/wip/science/gromacs/recipe.toml
diff --git a/recipes/wip/hashgood/recipe.toml b/recipes/wip/security/hashgood/recipe.toml
similarity index 100%
rename from recipes/wip/hashgood/recipe.toml
rename to recipes/wip/security/hashgood/recipe.toml
diff --git a/recipes/wip/file/recipe.toml b/recipes/wip/tools/file/recipe.toml
similarity index 100%
rename from recipes/wip/file/recipe.toml
rename to recipes/wip/tools/file/recipe.toml
diff --git a/recipes/wip/gengo/recipe.toml b/recipes/wip/tools/gengo/recipe.toml
similarity index 100%
rename from recipes/wip/gengo/recipe.toml
rename to recipes/wip/tools/gengo/recipe.toml
diff --git a/recipes/wip/germ/recipe.toml b/recipes/wip/tools/germ/recipe.toml
similarity index 100%
rename from recipes/wip/germ/recipe.toml
rename to recipes/wip/tools/germ/recipe.toml
diff --git a/recipes/wip/grex/recipe.toml b/recipes/wip/tools/grex/recipe.toml
similarity index 100%
rename from recipes/wip/grex/recipe.toml
rename to recipes/wip/tools/grex/recipe.toml
diff --git a/recipes/wip/groff/recipe.toml b/recipes/wip/tools/groff/recipe.toml
similarity index 100%
rename from recipes/wip/groff/recipe.toml
rename to recipes/wip/tools/groff/recipe.toml
diff --git a/recipes/wip/finch/recipe.toml b/recipes/wip/tui/finch/recipe.toml
similarity index 100%
rename from recipes/wip/finch/recipe.toml
rename to recipes/wip/tui/finch/recipe.toml