diff --git a/recipes/wip/finance/btc-vanity/recipe.toml b/recipes/wip/finance/bitcoin/btc-vanity/recipe.toml
similarity index 100%
rename from recipes/wip/finance/btc-vanity/recipe.toml
rename to recipes/wip/finance/bitcoin/btc-vanity/recipe.toml
diff --git a/recipes/wip/finance/liana/recipe.toml b/recipes/wip/finance/bitcoin/liana/recipe.toml
similarity index 100%
rename from recipes/wip/finance/liana/recipe.toml
rename to recipes/wip/finance/bitcoin/liana/recipe.toml
diff --git a/recipes/wip/finance/nakamoto-wallet/recipe.toml b/recipes/wip/finance/bitcoin/nakamoto-wallet/recipe.toml
similarity index 100%
rename from recipes/wip/finance/nakamoto-wallet/recipe.toml
rename to recipes/wip/finance/bitcoin/nakamoto-wallet/recipe.toml
diff --git a/recipes/wip/finance/nakatoshi/recipe.toml b/recipes/wip/finance/bitcoin/nakatoshi/recipe.toml
similarity index 100%
rename from recipes/wip/finance/nakatoshi/recipe.toml
rename to recipes/wip/finance/bitcoin/nakatoshi/recipe.toml
diff --git a/recipes/wip/finance/ord/recipe.toml b/recipes/wip/finance/bitcoin/ord/recipe.toml
similarity index 100%
rename from recipes/wip/finance/ord/recipe.toml
rename to recipes/wip/finance/bitcoin/ord/recipe.toml
diff --git a/recipes/wip/finance/pushtx/recipe.toml b/recipes/wip/finance/bitcoin/pushtx/recipe.toml
similarity index 100%
rename from recipes/wip/finance/pushtx/recipe.toml
rename to recipes/wip/finance/bitcoin/pushtx/recipe.toml
diff --git a/recipes/wip/finance/rusty-blockparser/recipe.toml b/recipes/wip/finance/bitcoin/rusty-blockparser/recipe.toml
similarity index 100%
rename from recipes/wip/finance/rusty-blockparser/recipe.toml
rename to recipes/wip/finance/bitcoin/rusty-blockparser/recipe.toml
diff --git a/recipes/wip/finance/cargo-fund/recipe.toml b/recipes/wip/finance/donation/cargo-fund/recipe.toml
similarity index 100%
rename from recipes/wip/finance/cargo-fund/recipe.toml
rename to recipes/wip/finance/donation/cargo-fund/recipe.toml
diff --git a/recipes/wip/finance/apcacli/recipe.toml b/recipes/wip/finance/market/apcacli/recipe.toml
similarity index 100%
rename from recipes/wip/finance/apcacli/recipe.toml
rename to recipes/wip/finance/market/apcacli/recipe.toml
diff --git a/recipes/wip/finance/tick-rs/recipe.toml b/recipes/wip/finance/market/tick-rs/recipe.toml
similarity index 100%
rename from recipes/wip/finance/tick-rs/recipe.toml
rename to recipes/wip/finance/market/tick-rs/recipe.toml
diff --git a/recipes/wip/finance/gupax/recipe.toml b/recipes/wip/finance/monero/gupax/recipe.toml
similarity index 100%
rename from recipes/wip/finance/gupax/recipe.toml
rename to recipes/wip/finance/monero/gupax/recipe.toml
diff --git a/recipes/wip/finance/xmrig/recipe.toml b/recipes/wip/finance/monero/xmrig/recipe.toml
similarity index 100%
rename from recipes/wip/finance/xmrig/recipe.toml
rename to recipes/wip/finance/monero/xmrig/recipe.toml
diff --git a/recipes/wip/games/battleship-rs/recipe.toml b/recipes/wip/games/action/battleship-rs/recipe.toml
similarity index 100%
rename from recipes/wip/games/battleship-rs/recipe.toml
rename to recipes/wip/games/action/battleship-rs/recipe.toml
diff --git a/recipes/wip/games/bevy-combat/recipe.toml b/recipes/wip/games/action/bevy-combat/recipe.toml
similarity index 100%
rename from recipes/wip/games/bevy-combat/recipe.toml
rename to recipes/wip/games/action/bevy-combat/recipe.toml
diff --git a/recipes/wip/games/openlara/recipe.toml b/recipes/wip/games/action/openlara/recipe.toml
similarity index 100%
rename from recipes/wip/games/openlara/recipe.toml
rename to recipes/wip/games/action/openlara/recipe.toml
diff --git a/recipes/wip/games/opentomb/recipe.toml b/recipes/wip/games/action/opentomb/recipe.toml
similarity index 100%
rename from recipes/wip/games/opentomb/recipe.toml
rename to recipes/wip/games/action/opentomb/recipe.toml
diff --git a/recipes/wip/games/0ad-data/recipe.toml b/recipes/wip/games/data/0ad-data/recipe.toml
similarity index 100%
rename from recipes/wip/games/0ad-data/recipe.toml
rename to recipes/wip/games/data/0ad-data/recipe.toml
diff --git a/recipes/wip/games/minetest-data/recipe.toml b/recipes/wip/games/data/minetest-data/recipe.toml
similarity index 100%
rename from recipes/wip/games/minetest-data/recipe.toml
rename to recipes/wip/games/data/minetest-data/recipe.toml
diff --git a/recipes/wip/games/assaultcube/recipe.toml b/recipes/wip/games/fps/assaultcube/recipe.toml
similarity index 100%
rename from recipes/wip/games/assaultcube/recipe.toml
rename to recipes/wip/games/fps/assaultcube/recipe.toml
diff --git a/recipes/wip/games/betterspades/recipe.toml b/recipes/wip/games/fps/betterspades/recipe.toml
similarity index 100%
rename from recipes/wip/games/betterspades/recipe.toml
rename to recipes/wip/games/fps/betterspades/recipe.toml
diff --git a/recipes/wip/games/chocolate-doom/recipe.toml b/recipes/wip/games/fps/chocolate-doom/recipe.toml
similarity index 100%
rename from recipes/wip/games/chocolate-doom/recipe.toml
rename to recipes/wip/games/fps/chocolate-doom/recipe.toml
diff --git a/recipes/wip/games/crispy-doom/recipe.toml b/recipes/wip/games/fps/crispy-doom/recipe.toml
similarity index 100%
rename from recipes/wip/games/crispy-doom/recipe.toml
rename to recipes/wip/games/fps/crispy-doom/recipe.toml
diff --git a/recipes/wip/games/et-legacy/recipe.toml b/recipes/wip/games/fps/et-legacy/recipe.toml
similarity index 100%
rename from recipes/wip/games/et-legacy/recipe.toml
rename to recipes/wip/games/fps/et-legacy/recipe.toml
diff --git a/recipes/wip/games/gzdoom/recipe.toml b/recipes/wip/games/fps/gzdoom/recipe.toml
similarity index 100%
rename from recipes/wip/games/gzdoom/recipe.toml
rename to recipes/wip/games/fps/gzdoom/recipe.toml
diff --git a/recipes/wip/games/ioquake3/recipe.toml b/recipes/wip/games/fps/ioquake3/recipe.toml
similarity index 100%
rename from recipes/wip/games/ioquake3/recipe.toml
rename to recipes/wip/games/fps/ioquake3/recipe.toml
diff --git a/recipes/wip/games/openarena/recipe.toml b/recipes/wip/games/fps/openarena/recipe.toml
similarity index 100%
rename from recipes/wip/games/openarena/recipe.toml
rename to recipes/wip/games/fps/openarena/recipe.toml
diff --git a/recipes/wip/games/openspades-free/recipe.toml b/recipes/wip/games/fps/openspades-free/recipe.toml
similarity index 100%
rename from recipes/wip/games/openspades-free/recipe.toml
rename to recipes/wip/games/fps/openspades-free/recipe.toml
diff --git a/recipes/wip/games/rbdoom3-bfg/recipe.toml b/recipes/wip/games/fps/rbdoom3-bfg/recipe.toml
similarity index 100%
rename from recipes/wip/games/rbdoom3-bfg/recipe.toml
rename to recipes/wip/games/fps/rbdoom3-bfg/recipe.toml
diff --git a/recipes/wip/games/smokin-guns/recipe.toml b/recipes/wip/games/fps/smokin-guns/recipe.toml
similarity index 100%
rename from recipes/wip/games/smokin-guns/recipe.toml
rename to recipes/wip/games/fps/smokin-guns/recipe.toml
diff --git a/recipes/wip/games/unvanquished/recipe.toml b/recipes/wip/games/fps/unvanquished/recipe.toml
similarity index 100%
rename from recipes/wip/games/unvanquished/recipe.toml
rename to recipes/wip/games/fps/unvanquished/recipe.toml
diff --git a/recipes/wip/games/vkquake/recipe.toml b/recipes/wip/games/fps/vkquake/recipe.toml
similarity index 100%
rename from recipes/wip/games/vkquake/recipe.toml
rename to recipes/wip/games/fps/vkquake/recipe.toml
diff --git a/recipes/wip/games/vkquake2/recipe.toml b/recipes/wip/games/fps/vkquake2/recipe.toml
similarity index 100%
rename from recipes/wip/games/vkquake2/recipe.toml
rename to recipes/wip/games/fps/vkquake2/recipe.toml
diff --git a/recipes/wip/games/xash3d-fwgs/recipe.toml b/recipes/wip/games/fps/xash3d-fwgs/recipe.toml
similarity index 100%
rename from recipes/wip/games/xash3d-fwgs/recipe.toml
rename to recipes/wip/games/fps/xash3d-fwgs/recipe.toml
diff --git a/recipes/wip/games/xonotic/recipe.toml b/recipes/wip/games/fps/xonotic/recipe.toml
similarity index 100%
rename from recipes/wip/games/xonotic/recipe.toml
rename to recipes/wip/games/fps/xonotic/recipe.toml
diff --git a/recipes/wip/games/yquake2/recipe.toml b/recipes/wip/games/fps/yquake2/recipe.toml
similarity index 100%
rename from recipes/wip/games/yquake2/recipe.toml
rename to recipes/wip/games/fps/yquake2/recipe.toml
diff --git a/recipes/wip/games/zerospades-free/recipe.toml b/recipes/wip/games/fps/zerospades-free/recipe.toml
similarity index 100%
rename from recipes/wip/games/zerospades-free/recipe.toml
rename to recipes/wip/games/fps/zerospades-free/recipe.toml
diff --git a/recipes/wip/games/tuxmath/recipe.toml b/recipes/wip/games/math/tuxmath/recipe.toml
similarity index 100%
rename from recipes/wip/games/tuxmath/recipe.toml
rename to recipes/wip/games/math/tuxmath/recipe.toml
diff --git a/recipes/wip/games/leafish/recipe.toml b/recipes/wip/games/open-world/leafish/recipe.toml
similarity index 100%
rename from recipes/wip/games/leafish/recipe.toml
rename to recipes/wip/games/open-world/leafish/recipe.toml
diff --git a/recipes/wip/games/minetest/recipe.toml b/recipes/wip/games/open-world/minetest/recipe.toml
similarity index 100%
rename from recipes/wip/games/minetest/recipe.toml
rename to recipes/wip/games/open-world/minetest/recipe.toml
diff --git a/recipes/wip/games/veloren/recipe.toml b/recipes/wip/games/open-world/veloren/recipe.toml
similarity index 100%
rename from recipes/wip/games/veloren/recipe.toml
rename to recipes/wip/games/open-world/veloren/recipe.toml
diff --git a/recipes/wip/games/oxycards/recipe.toml b/recipes/wip/games/other/oxycards/recipe.toml
similarity index 100%
rename from recipes/wip/games/oxycards/recipe.toml
rename to recipes/wip/games/other/oxycards/recipe.toml
diff --git a/recipes/wip/games/rust-sadari-cli/recipe.toml b/recipes/wip/games/other/rust-sadari-cli/recipe.toml
similarity index 100%
rename from recipes/wip/games/rust-sadari-cli/recipe.toml
rename to recipes/wip/games/other/rust-sadari-cli/recipe.toml
diff --git a/recipes/wip/games/shockolate/recipe.toml b/recipes/wip/games/other/shockolate/recipe.toml
similarity index 100%
rename from recipes/wip/games/shockolate/recipe.toml
rename to recipes/wip/games/other/shockolate/recipe.toml
diff --git a/recipes/wip/games/sshattrick/recipe.toml b/recipes/wip/games/other/sshattrick/recipe.toml
similarity index 100%
rename from recipes/wip/games/sshattrick/recipe.toml
rename to recipes/wip/games/other/sshattrick/recipe.toml
diff --git a/recipes/wip/games/tetromino/recipe.toml b/recipes/wip/games/other/tetromino/recipe.toml
similarity index 100%
rename from recipes/wip/games/tetromino/recipe.toml
rename to recipes/wip/games/other/tetromino/recipe.toml
diff --git a/recipes/wip/games/turdle/recipe.toml b/recipes/wip/games/other/turdle/recipe.toml
similarity index 100%
rename from recipes/wip/games/turdle/recipe.toml
rename to recipes/wip/games/other/turdle/recipe.toml
diff --git a/recipes/wip/games/unvanquished-benchmarks/recipe.toml b/recipes/wip/games/other/unvanquished-benchmarks/recipe.toml
similarity index 100%
rename from recipes/wip/games/unvanquished-benchmarks/recipe.toml
rename to recipes/wip/games/other/unvanquished-benchmarks/recipe.toml
diff --git a/recipes/wip/games/uqm/recipe.toml b/recipes/wip/games/other/uqm/recipe.toml
similarity index 100%
rename from recipes/wip/games/uqm/recipe.toml
rename to recipes/wip/games/other/uqm/recipe.toml
diff --git a/recipes/wip/games/vong/recipe.toml b/recipes/wip/games/other/vong/recipe.toml
similarity index 100%
rename from recipes/wip/games/vong/recipe.toml
rename to recipes/wip/games/other/vong/recipe.toml
diff --git a/recipes/wip/games/q3rally/recipe.toml b/recipes/wip/games/racing/q3rally/recipe.toml
similarity index 100%
rename from recipes/wip/games/q3rally/recipe.toml
rename to recipes/wip/games/racing/q3rally/recipe.toml
diff --git a/recipes/wip/games/supertuxkart/recipe.toml b/recipes/wip/games/racing/supertuxkart/recipe.toml
similarity index 100%
rename from recipes/wip/games/supertuxkart/recipe.toml
rename to recipes/wip/games/racing/supertuxkart/recipe.toml
diff --git a/recipes/wip/games/dcss/recipe.toml b/recipes/wip/games/rpg/dcss/recipe.toml
similarity index 100%
rename from recipes/wip/games/dcss/recipe.toml
rename to recipes/wip/games/rpg/dcss/recipe.toml
diff --git a/recipes/wip/games/cuberite/recipe.toml b/recipes/wip/games/servers/cuberite/recipe.toml
similarity index 100%
rename from recipes/wip/games/cuberite/recipe.toml
rename to recipes/wip/games/servers/cuberite/recipe.toml
diff --git a/recipes/wip/games/call-of-ferris/recipe.toml b/recipes/wip/games/shooter/call-of-ferris/recipe.toml
similarity index 100%
rename from recipes/wip/games/call-of-ferris/recipe.toml
rename to recipes/wip/games/shooter/call-of-ferris/recipe.toml
diff --git a/recipes/wip/games/game-of-life-rs/recipe.toml b/recipes/wip/games/simulation/game-of-life-rs/recipe.toml
similarity index 100%
rename from recipes/wip/games/game-of-life-rs/recipe.toml
rename to recipes/wip/games/simulation/game-of-life-rs/recipe.toml
diff --git a/recipes/wip/games/symbiants/recipe.toml b/recipes/wip/games/simulation/symbiants/recipe.toml
similarity index 100%
rename from recipes/wip/games/symbiants/recipe.toml
rename to recipes/wip/games/simulation/symbiants/recipe.toml
diff --git a/recipes/wip/games/endless-sky/recipe.toml b/recipes/wip/games/space/endless-sky/recipe.toml
similarity index 100%
rename from recipes/wip/games/endless-sky/recipe.toml
rename to recipes/wip/games/space/endless-sky/recipe.toml
diff --git a/recipes/wip/games/naev/recipe.toml b/recipes/wip/games/space/naev/recipe.toml
similarity index 100%
rename from recipes/wip/games/naev/recipe.toml
rename to recipes/wip/games/space/naev/recipe.toml
diff --git a/recipes/wip/games/osirion/recipe.toml b/recipes/wip/games/space/osirion/recipe.toml
similarity index 100%
rename from recipes/wip/games/osirion/recipe.toml
rename to recipes/wip/games/space/osirion/recipe.toml
diff --git a/recipes/wip/games/rebels-in-the-sky/recipe.toml b/recipes/wip/games/space/rebels-in-the-sky/recipe.toml
similarity index 100%
rename from recipes/wip/games/rebels-in-the-sky/recipe.toml
rename to recipes/wip/games/space/rebels-in-the-sky/recipe.toml
diff --git a/recipes/wip/games/asmfish/recipe.toml b/recipes/wip/games/strategy/asmfish/recipe.toml
similarity index 100%
rename from recipes/wip/games/asmfish/recipe.toml
rename to recipes/wip/games/strategy/asmfish/recipe.toml
diff --git a/recipes/wip/games/chess-tui/recipe.toml b/recipes/wip/games/strategy/chess-tui/recipe.toml
similarity index 100%
rename from recipes/wip/games/chess-tui/recipe.toml
rename to recipes/wip/games/strategy/chess-tui/recipe.toml
diff --git a/recipes/wip/games/minesweep-rs/recipe.toml b/recipes/wip/games/strategy/minesweep-rs/recipe.toml
similarity index 100%
rename from recipes/wip/games/minesweep-rs/recipe.toml
rename to recipes/wip/games/strategy/minesweep-rs/recipe.toml
diff --git a/recipes/wip/games/offline-chess-puzzles/recipe.toml b/recipes/wip/games/strategy/offline-chess-puzzles/recipe.toml
similarity index 100%
rename from recipes/wip/games/offline-chess-puzzles/recipe.toml
rename to recipes/wip/games/strategy/offline-chess-puzzles/recipe.toml
diff --git a/recipes/wip/games/ship-of-harkinian/recipe.toml b/recipes/wip/games/strategy/ship-of-harkinian/recipe.toml
similarity index 100%
rename from recipes/wip/games/ship-of-harkinian/recipe.toml
rename to recipes/wip/games/strategy/ship-of-harkinian/recipe.toml
diff --git a/recipes/wip/games/stockfish/recipe.toml b/recipes/wip/games/strategy/stockfish/recipe.toml
similarity index 100%
rename from recipes/wip/games/stockfish/recipe.toml
rename to recipes/wip/games/strategy/stockfish/recipe.toml
diff --git a/recipes/wip/games/tic-tac-toe-rs/recipe.toml b/recipes/wip/games/strategy/tic-tac-toe-rs/recipe.toml
similarity index 100%
rename from recipes/wip/games/tic-tac-toe-rs/recipe.toml
rename to recipes/wip/games/strategy/tic-tac-toe-rs/recipe.toml
diff --git a/recipes/wip/games/warsow/recipe.toml b/recipes/wip/games/strategy/warsow/recipe.toml
similarity index 100%
rename from recipes/wip/games/warsow/recipe.toml
rename to recipes/wip/games/strategy/warsow/recipe.toml