diff --git a/recipes/wip/cockroachdb/recipe.toml b/recipes/wip/db/cockroachdb/recipe.toml
similarity index 100%
rename from recipes/wip/cockroachdb/recipe.toml
rename to recipes/wip/db/cockroachdb/recipe.toml
diff --git a/recipes/wip/influxdb/recipe.toml b/recipes/wip/db/influxdb/recipe.toml
similarity index 100%
rename from recipes/wip/influxdb/recipe.toml
rename to recipes/wip/db/influxdb/recipe.toml
diff --git a/recipes/wip/mariadb-lts/recipe.toml b/recipes/wip/db/mariadb-lts/recipe.toml
similarity index 100%
rename from recipes/wip/mariadb-lts/recipe.toml
rename to recipes/wip/db/mariadb-lts/recipe.toml
diff --git a/recipes/wip/mariadb/recipe.toml b/recipes/wip/db/mariadb/recipe.toml
similarity index 100%
rename from recipes/wip/mariadb/recipe.toml
rename to recipes/wip/db/mariadb/recipe.toml
diff --git a/recipes/wip/mongodb6/recipe.toml b/recipes/wip/db/mongodb6/recipe.toml
similarity index 100%
rename from recipes/wip/mongodb6/recipe.toml
rename to recipes/wip/db/mongodb6/recipe.toml
diff --git a/recipes/wip/mongodb7/recipe.toml b/recipes/wip/db/mongodb7/recipe.toml
similarity index 100%
rename from recipes/wip/mongodb7/recipe.toml
rename to recipes/wip/db/mongodb7/recipe.toml
diff --git a/recipes/wip/mysql-server/recipe.toml b/recipes/wip/db/mysql-server/recipe.toml
similarity index 100%
rename from recipes/wip/mysql-server/recipe.toml
rename to recipes/wip/db/mysql-server/recipe.toml
diff --git a/recipes/wip/mysql-shell/recipe.toml b/recipes/wip/db/mysql-shell/recipe.toml
similarity index 100%
rename from recipes/wip/mysql-shell/recipe.toml
rename to recipes/wip/db/mysql-shell/recipe.toml
diff --git a/recipes/wip/postgresql16/recipe.toml b/recipes/wip/db/postgresql16/recipe.toml
similarity index 100%
rename from recipes/wip/postgresql16/recipe.toml
rename to recipes/wip/db/postgresql16/recipe.toml
diff --git a/recipes/wip/defold-engine/recipe.toml b/recipes/wip/dev/defold-engine/recipe.toml
similarity index 100%
rename from recipes/wip/defold-engine/recipe.toml
rename to recipes/wip/dev/defold-engine/recipe.toml
diff --git a/recipes/wip/cvmfs/recipe.toml b/recipes/wip/fuse/cvmfs/recipe.toml
similarity index 100%
rename from recipes/wip/cvmfs/recipe.toml
rename to recipes/wip/fuse/cvmfs/recipe.toml
diff --git a/recipes/wip/boost/recipe.toml b/recipes/wip/libs/boost/recipe.toml
similarity index 100%
rename from recipes/wip/boost/recipe.toml
rename to recipes/wip/libs/boost/recipe.toml
diff --git a/recipes/wip/transmission/recipe.toml b/recipes/wip/net/transmission/recipe.toml
similarity index 100%
rename from recipes/wip/transmission/recipe.toml
rename to recipes/wip/net/transmission/recipe.toml
diff --git a/recipes/wip/hyprland/recipe.toml b/recipes/wip/wayland/hyprland/recipe.toml
similarity index 100%
rename from recipes/wip/hyprland/recipe.toml
rename to recipes/wip/wayland/hyprland/recipe.toml
diff --git a/recipes/wip/gui/niri/recipe.toml b/recipes/wip/wayland/niri/recipe.toml
similarity index 100%
rename from recipes/wip/gui/niri/recipe.toml
rename to recipes/wip/wayland/niri/recipe.toml