diff --git a/recipes/wip/dev/defold-engine/recipe.toml b/recipes/wip/dev/game-engine/defold-engine/recipe.toml
similarity index 100%
rename from recipes/wip/dev/defold-engine/recipe.toml
rename to recipes/wip/dev/game-engine/defold-engine/recipe.toml
diff --git a/recipes/wip/dev/fyrox-template/recipe.toml b/recipes/wip/dev/game-engine/fyrox-template/recipe.toml
similarity index 100%
rename from recipes/wip/dev/fyrox-template/recipe.toml
rename to recipes/wip/dev/game-engine/fyrox-template/recipe.toml
diff --git a/recipes/wip/dev/godot4/recipe.toml b/recipes/wip/dev/game-engine/godot4/recipe.toml
similarity index 100%
rename from recipes/wip/dev/godot4/recipe.toml
rename to recipes/wip/dev/game-engine/godot4/recipe.toml
diff --git a/recipes/wip/dev/git-absorb/recipe.toml b/recipes/wip/dev/git-tools/git-absorb/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-absorb/recipe.toml
rename to recipes/wip/dev/git-tools/git-absorb/recipe.toml
diff --git a/recipes/wip/dev/git-chain/recipe.toml b/recipes/wip/dev/git-tools/git-chain/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-chain/recipe.toml
rename to recipes/wip/dev/git-tools/git-chain/recipe.toml
diff --git a/recipes/wip/dev/git-cliff/recipe.toml b/recipes/wip/dev/git-tools/git-cliff/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-cliff/recipe.toml
rename to recipes/wip/dev/git-tools/git-cliff/recipe.toml
diff --git a/recipes/wip/dev/git-grab/recipe.toml b/recipes/wip/dev/git-tools/git-grab/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-grab/recipe.toml
rename to recipes/wip/dev/git-tools/git-grab/recipe.toml
diff --git a/recipes/wip/dev/git-graph/recipe.toml b/recipes/wip/dev/git-tools/git-graph/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-graph/recipe.toml
rename to recipes/wip/dev/git-tools/git-graph/recipe.toml
diff --git a/recipes/wip/dev/git-ignore-generator/recipe.toml b/recipes/wip/dev/git-tools/git-ignore-generator/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-ignore-generator/recipe.toml
rename to recipes/wip/dev/git-tools/git-ignore-generator/recipe.toml
diff --git a/recipes/wip/dev/git-interactive-rebase-tool/recipe.toml b/recipes/wip/dev/git-tools/git-interactive-rebase-tool/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-interactive-rebase-tool/recipe.toml
rename to recipes/wip/dev/git-tools/git-interactive-rebase-tool/recipe.toml
diff --git a/recipes/wip/dev/git-lfs/recipe.toml b/recipes/wip/dev/git-tools/git-lfs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-lfs/recipe.toml
rename to recipes/wip/dev/git-tools/git-lfs/recipe.toml
diff --git a/recipes/wip/dev/git-repo-manager/recipe.toml b/recipes/wip/dev/git-tools/git-repo-manager/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-repo-manager/recipe.toml
rename to recipes/wip/dev/git-tools/git-repo-manager/recipe.toml
diff --git a/recipes/wip/dev/git-subset/recipe.toml b/recipes/wip/dev/git-tools/git-subset/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-subset/recipe.toml
rename to recipes/wip/dev/git-tools/git-subset/recipe.toml
diff --git a/recipes/wip/dev/git-tool/recipe.toml b/recipes/wip/dev/git-tools/git-tool-rs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-tool/recipe.toml
rename to recipes/wip/dev/git-tools/git-tool-rs/recipe.toml
diff --git a/recipes/wip/dev/git-tools/recipe.toml b/recipes/wip/dev/git-tools/git-tools-rs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/git-tools/recipe.toml
rename to recipes/wip/dev/git-tools/git-tools-rs/recipe.toml
diff --git a/recipes/wip/dev/elixir/recipe.toml b/recipes/wip/dev/lang/elixir/recipe.toml
similarity index 100%
rename from recipes/wip/dev/elixir/recipe.toml
rename to recipes/wip/dev/lang/elixir/recipe.toml
diff --git a/recipes/wip/dev/elm/recipe.toml b/recipes/wip/dev/lang/elm/recipe.toml
similarity index 100%
rename from recipes/wip/dev/elm/recipe.toml
rename to recipes/wip/dev/lang/elm/recipe.toml
diff --git a/recipes/wip/dev/erlang/recipe.toml b/recipes/wip/dev/lang/erlang/recipe.toml
similarity index 100%
rename from recipes/wip/dev/erlang/recipe.toml
rename to recipes/wip/dev/lang/erlang/recipe.toml
diff --git a/recipes/wip/dev/gawk/recipe.toml b/recipes/wip/dev/lang/gawk/recipe.toml
similarity index 100%
rename from recipes/wip/dev/gawk/recipe.toml
rename to recipes/wip/dev/lang/gawk/recipe.toml
diff --git a/recipes/wip/dev/ghc/recipe.toml b/recipes/wip/dev/lang/ghc/recipe.toml
similarity index 100%
rename from recipes/wip/dev/ghc/recipe.toml
rename to recipes/wip/dev/lang/ghc/recipe.toml
diff --git a/recipes/wip/dev/ghostscript/recipe.toml b/recipes/wip/dev/lang/ghostscript/recipe.toml
similarity index 100%
rename from recipes/wip/dev/ghostscript/recipe.toml
rename to recipes/wip/dev/lang/ghostscript/recipe.toml
diff --git a/recipes/wip/dev/go/recipe.toml b/recipes/wip/dev/lang/go/recipe.toml
similarity index 100%
rename from recipes/wip/dev/go/recipe.toml
rename to recipes/wip/dev/lang/go/recipe.toml
diff --git a/recipes/wip/dev/openjdk11-headless/recipe.toml b/recipes/wip/dev/lang/java/openjdk11-headless/recipe.toml
similarity index 100%
rename from recipes/wip/dev/openjdk11-headless/recipe.toml
rename to recipes/wip/dev/lang/java/openjdk11-headless/recipe.toml
diff --git a/recipes/wip/dev/openjdk17-headless/recipe.toml b/recipes/wip/dev/lang/java/openjdk17-headless/recipe.toml
similarity index 100%
rename from recipes/wip/dev/openjdk17-headless/recipe.toml
rename to recipes/wip/dev/lang/java/openjdk17-headless/recipe.toml
diff --git a/recipes/wip/dev/openjdk21-headless/recipe.toml b/recipes/wip/dev/lang/java/openjdk21-headless/recipe.toml
similarity index 100%
rename from recipes/wip/dev/openjdk21-headless/recipe.toml
rename to recipes/wip/dev/lang/java/openjdk21-headless/recipe.toml
diff --git a/recipes/wip/dev/openjdk8-headless/recipe.toml b/recipes/wip/dev/lang/java/openjdk8-headless/recipe.toml
similarity index 100%
rename from recipes/wip/dev/openjdk8-headless/recipe.toml
rename to recipes/wip/dev/lang/java/openjdk8-headless/recipe.toml
diff --git a/recipes/wip/dev/julia-lts/recipe.toml b/recipes/wip/dev/lang/julia-lts/recipe.toml
similarity index 100%
rename from recipes/wip/dev/julia-lts/recipe.toml
rename to recipes/wip/dev/lang/julia-lts/recipe.toml
diff --git a/recipes/wip/dev/julia/recipe.toml b/recipes/wip/dev/lang/julia/recipe.toml
similarity index 100%
rename from recipes/wip/dev/julia/recipe.toml
rename to recipes/wip/dev/lang/julia/recipe.toml
diff --git a/recipes/wip/dev/luajit/recipe.toml b/recipes/wip/dev/lang/luajit/recipe.toml
similarity index 100%
rename from recipes/wip/dev/luajit/recipe.toml
rename to recipes/wip/dev/lang/luajit/recipe.toml
diff --git a/recipes/wip/dev/nodejs-lts/recipe.toml b/recipes/wip/dev/lang/nodejs-lts/recipe.toml
similarity index 100%
rename from recipes/wip/dev/nodejs-lts/recipe.toml
rename to recipes/wip/dev/lang/nodejs-lts/recipe.toml
diff --git a/recipes/wip/dev/nodejs/recipe.toml b/recipes/wip/dev/lang/nodejs/recipe.toml
similarity index 100%
rename from recipes/wip/dev/nodejs/recipe.toml
rename to recipes/wip/dev/lang/nodejs/recipe.toml
diff --git a/recipes/wip/dev/php/recipe.toml b/recipes/wip/dev/lang/php/recipe.toml
similarity index 100%
rename from recipes/wip/dev/php/recipe.toml
rename to recipes/wip/dev/lang/php/recipe.toml
diff --git a/recipes/wip/dev/pony-lang/recipe.toml b/recipes/wip/dev/lang/pony-lang/recipe.toml
similarity index 100%
rename from recipes/wip/dev/pony-lang/recipe.toml
rename to recipes/wip/dev/lang/pony-lang/recipe.toml
diff --git a/recipes/wip/dev/python310/recipe.toml b/recipes/wip/dev/lang/python310/recipe.toml
similarity index 100%
rename from recipes/wip/dev/python310/recipe.toml
rename to recipes/wip/dev/lang/python310/recipe.toml
diff --git a/recipes/wip/dev/python312/recipe.toml b/recipes/wip/dev/lang/python312/recipe.toml
similarity index 100%
rename from recipes/wip/dev/python312/recipe.toml
rename to recipes/wip/dev/lang/python312/recipe.toml