diff --git a/recipes/wip/tools/stress-ng/recipe.toml b/recipes/wip/benchmarks/stress-ng/recipe.toml
similarity index 100%
rename from recipes/wip/tools/stress-ng/recipe.toml
rename to recipes/wip/benchmarks/stress-ng/recipe.toml
diff --git a/recipes/wip/tools/qrrs/recipe.toml b/recipes/wip/crypto/qrrs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/qrrs/recipe.toml
rename to recipes/wip/crypto/qrrs/recipe.toml
diff --git a/recipes/wip/tools/qrtool/recipe.toml b/recipes/wip/crypto/qrtool/recipe.toml
similarity index 100%
rename from recipes/wip/tools/qrtool/recipe.toml
rename to recipes/wip/crypto/qrtool/recipe.toml
diff --git a/recipes/wip/tools/just/recipe.toml b/recipes/wip/dev/build-system/just/recipe.toml
similarity index 100%
rename from recipes/wip/tools/just/recipe.toml
rename to recipes/wip/dev/build-system/just/recipe.toml
diff --git a/recipes/wip/tools/rustlings/recipe.toml b/recipes/wip/edu/rustlings/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rustlings/recipe.toml
rename to recipes/wip/edu/rustlings/recipe.toml
diff --git a/recipes/wip/tools/oxipng/recipe.toml b/recipes/wip/graphics/other/oxipng/recipe.toml
similarity index 100%
rename from recipes/wip/tools/oxipng/recipe.toml
rename to recipes/wip/graphics/other/oxipng/recipe.toml
diff --git a/recipes/wip/tools/vulkan-tools/recipe.toml b/recipes/wip/graphics/other/vulkan-tools/recipe.toml
similarity index 100%
rename from recipes/wip/tools/vulkan-tools/recipe.toml
rename to recipes/wip/graphics/other/vulkan-tools/recipe.toml
diff --git a/recipes/wip/graphics/editors/gimp/recipe.toml b/recipes/wip/image/editors/gimp/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/editors/gimp/recipe.toml
rename to recipes/wip/image/editors/gimp/recipe.toml
diff --git a/recipes/wip/graphics/editors/inkscape/recipe.toml b/recipes/wip/image/editors/inkscape/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/editors/inkscape/recipe.toml
rename to recipes/wip/image/editors/inkscape/recipe.toml
diff --git a/recipes/wip/graphics/editors/krita/recipe.toml b/recipes/wip/image/editors/krita/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/editors/krita/recipe.toml
rename to recipes/wip/image/editors/krita/recipe.toml
diff --git a/recipes/wip/graphics/editors/rx/recipe.toml b/recipes/wip/image/editors/rx/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/editors/rx/recipe.toml
rename to recipes/wip/image/editors/rx/recipe.toml
diff --git a/recipes/wip/graphics/converters/converseen/recipe.toml b/recipes/wip/image/other/converseen/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/converters/converseen/recipe.toml
rename to recipes/wip/image/other/converseen/recipe.toml
diff --git a/recipes/wip/graphics/other/dominant-colours/recipe.toml b/recipes/wip/image/other/dominant-colours/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/dominant-colours/recipe.toml
rename to recipes/wip/image/other/dominant-colours/recipe.toml
diff --git a/recipes/wip/graphics/other/graphicsmagick/recipe.toml b/recipes/wip/image/other/graphicsmagick/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/graphicsmagick/recipe.toml
rename to recipes/wip/image/other/graphicsmagick/recipe.toml
diff --git a/recipes/wip/graphics/other/imageflow/recipe.toml b/recipes/wip/image/other/imageflow/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/imageflow/recipe.toml
rename to recipes/wip/image/other/imageflow/recipe.toml
diff --git a/recipes/wip/graphics/other/imagemagick/recipe.toml b/recipes/wip/image/other/imagemagick/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/imagemagick/recipe.toml
rename to recipes/wip/image/other/imagemagick/recipe.toml
diff --git a/recipes/wip/graphics/other/jxl-oxide/recipe.toml b/recipes/wip/image/other/jxl-oxide/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/jxl-oxide/recipe.toml
rename to recipes/wip/image/other/jxl-oxide/recipe.toml
diff --git a/recipes/wip/tools/lsix/recipe.toml b/recipes/wip/image/other/lsix/recipe.toml
similarity index 100%
rename from recipes/wip/tools/lsix/recipe.toml
rename to recipes/wip/image/other/lsix/recipe.toml
diff --git a/recipes/wip/graphics/other/upscaling/rscale2x/recipe.toml b/recipes/wip/image/upscaling/rscale2x/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/upscaling/rscale2x/recipe.toml
rename to recipes/wip/image/upscaling/rscale2x/recipe.toml
diff --git a/recipes/wip/graphics/other/upscaling/upscaler-rs/recipe.toml b/recipes/wip/image/upscaling/upscaler-rs/recipe.toml
similarity index 100%
rename from recipes/wip/graphics/other/upscaling/upscaler-rs/recipe.toml
rename to recipes/wip/image/upscaling/upscaler-rs/recipe.toml
diff --git a/recipes/wip/tools/upscaler/recipe.toml b/recipes/wip/image/upscaling/upscaler/recipe.toml
similarity index 100%
rename from recipes/wip/tools/upscaler/recipe.toml
rename to recipes/wip/image/upscaling/upscaler/recipe.toml
diff --git a/recipes/wip/tools/qalculate-gtk/recipe.toml b/recipes/wip/math/qalculate-gtk/recipe.toml
similarity index 100%
rename from recipes/wip/tools/qalculate-gtk/recipe.toml
rename to recipes/wip/math/qalculate-gtk/recipe.toml
diff --git a/recipes/wip/tools/rtorrent/recipe.toml b/recipes/wip/net/bittorrent/rtorrent/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rtorrent/recipe.toml
rename to recipes/wip/net/bittorrent/rtorrent/recipe.toml
diff --git a/recipes/wip/tools/pidgin/recipe.toml b/recipes/wip/net/chat/pidgin/recipe.toml
similarity index 100%
rename from recipes/wip/tools/pidgin/recipe.toml
rename to recipes/wip/net/chat/pidgin/recipe.toml
diff --git a/recipes/wip/tools/rusty-psn-cli/recipe.toml b/recipes/wip/net/download/rusty-psn-cli/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rusty-psn-cli/recipe.toml
rename to recipes/wip/net/download/rusty-psn-cli/recipe.toml
diff --git a/recipes/wip/tools/rusty-psn-gui/recipe.toml b/recipes/wip/net/download/rusty-psn-gui/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rusty-psn-gui/recipe.toml
rename to recipes/wip/net/download/rusty-psn-gui/recipe.toml
diff --git a/recipes/wip/tools/uget/recipe.toml b/recipes/wip/net/download/uget/recipe.toml
similarity index 100%
rename from recipes/wip/tools/uget/recipe.toml
rename to recipes/wip/net/download/uget/recipe.toml
diff --git a/recipes/wip/tools/rsync/recipe.toml b/recipes/wip/net/other/rsync/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rsync/recipe.toml
rename to recipes/wip/net/other/rsync/recipe.toml
diff --git a/recipes/wip/tools/remmina/recipe.toml b/recipes/wip/net/remote/remmina/recipe.toml
similarity index 100%
rename from recipes/wip/tools/remmina/recipe.toml
rename to recipes/wip/net/remote/remmina/recipe.toml
diff --git a/recipes/wip/tools/news-rs/recipe.toml b/recipes/wip/news/news-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/news-rs/recipe.toml
rename to recipes/wip/news/news-rs/recipe.toml
diff --git a/recipes/wip/terminal/asciinema/recipe.toml b/recipes/wip/recorders/asciinema/recipe.toml
similarity index 100%
rename from recipes/wip/terminal/asciinema/recipe.toml
rename to recipes/wip/recorders/asciinema/recipe.toml
diff --git a/recipes/wip/tools/obs-studio/recipe.toml b/recipes/wip/recorders/obs-studio/recipe.toml
similarity index 100%
rename from recipes/wip/tools/obs-studio/recipe.toml
rename to recipes/wip/recorders/obs-studio/recipe.toml
diff --git a/recipes/wip/tools/stellarium/recipe.toml b/recipes/wip/science/stellarium/recipe.toml
similarity index 100%
rename from recipes/wip/tools/stellarium/recipe.toml
rename to recipes/wip/science/stellarium/recipe.toml
diff --git a/recipes/wip/tools/keepassxc/recipe.toml b/recipes/wip/security/keepassxc/recipe.toml
similarity index 100%
rename from recipes/wip/tools/keepassxc/recipe.toml
rename to recipes/wip/security/keepassxc/recipe.toml
diff --git a/recipes/wip/tools/please/recipe.toml b/recipes/wip/security/please/recipe.toml
similarity index 100%
rename from recipes/wip/tools/please/recipe.toml
rename to recipes/wip/security/please/recipe.toml
diff --git a/recipes/wip/tools/rage/recipe.toml b/recipes/wip/security/rage/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rage/recipe.toml
rename to recipes/wip/security/rage/recipe.toml
diff --git a/recipes/wip/tools/sudo-rs/recipe.toml b/recipes/wip/security/sudo-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/sudo-rs/recipe.toml
rename to recipes/wip/security/sudo-rs/recipe.toml
diff --git a/recipes/wip/players/asak/recipe.toml b/recipes/wip/sound/asak/recipe.toml
similarity index 100%
rename from recipes/wip/players/asak/recipe.toml
rename to recipes/wip/sound/asak/recipe.toml
diff --git a/recipes/wip/tools/miniaudicle/recipe.toml b/recipes/wip/sound/miniaudicle/recipe.toml
similarity index 100%
rename from recipes/wip/tools/miniaudicle/recipe.toml
rename to recipes/wip/sound/miniaudicle/recipe.toml
diff --git a/recipes/wip/tools/neofetch/recipe.toml b/recipes/wip/sys-info/neofetch/recipe.toml
similarity index 100%
rename from recipes/wip/tools/neofetch/recipe.toml
rename to recipes/wip/sys-info/neofetch/recipe.toml
diff --git a/recipes/wip/tools/pciutils/recipe.toml b/recipes/wip/sys-info/pciutils/recipe.toml
similarity index 100%
rename from recipes/wip/tools/pciutils/recipe.toml
rename to recipes/wip/sys-info/pciutils/recipe.toml
diff --git a/recipes/wip/tools/pfetch-rs/recipe.toml b/recipes/wip/sys-info/pfetch-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/pfetch-rs/recipe.toml
rename to recipes/wip/sys-info/pfetch-rs/recipe.toml
diff --git a/recipes/wip/tools/process-viewer/recipe.toml b/recipes/wip/sys-info/process-viewer/recipe.toml
similarity index 100%
rename from recipes/wip/tools/process-viewer/recipe.toml
rename to recipes/wip/sys-info/process-viewer/recipe.toml
diff --git a/recipes/wip/tools/procs/recipe.toml b/recipes/wip/sys-info/procs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/procs/recipe.toml
rename to recipes/wip/sys-info/procs/recipe.toml
diff --git a/recipes/wip/tools/rfetch/recipe.toml b/recipes/wip/sys-info/rfetch/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rfetch/recipe.toml
rename to recipes/wip/sys-info/rfetch/recipe.toml
diff --git a/recipes/wip/tools/rsftch/recipe.toml b/recipes/wip/sys-info/rsftch/recipe.toml
similarity index 100%
rename from recipes/wip/tools/rsftch/recipe.toml
rename to recipes/wip/sys-info/rsftch/recipe.toml
diff --git a/recipes/wip/tools/usbutils/recipe.toml b/recipes/wip/sys-info/usbutils/recipe.toml
similarity index 100%
rename from recipes/wip/tools/usbutils/recipe.toml
rename to recipes/wip/sys-info/usbutils/recipe.toml
diff --git a/recipes/wip/tools/zeitfetch/recipe.toml b/recipes/wip/sys-info/zeitfetch/recipe.toml
similarity index 100%
rename from recipes/wip/tools/zeitfetch/recipe.toml
rename to recipes/wip/sys-info/zeitfetch/recipe.toml
diff --git a/recipes/wip/tools/topgrade/recipe.toml b/recipes/wip/system/topgrade/recipe.toml
similarity index 100%
rename from recipes/wip/tools/topgrade/recipe.toml
rename to recipes/wip/system/topgrade/recipe.toml
diff --git a/recipes/wip/tools/starship/recipe.toml b/recipes/wip/terminal/starship/recipe.toml
similarity index 100%
rename from recipes/wip/tools/starship/recipe.toml
rename to recipes/wip/terminal/starship/recipe.toml
diff --git a/recipes/wip/tools/termimage/recipe.toml b/recipes/wip/terminal/termimage/recipe.toml
similarity index 100%
rename from recipes/wip/tools/termimage/recipe.toml
rename to recipes/wip/terminal/termimage/recipe.toml
diff --git a/recipes/wip/tools/repgrep/recipe.toml b/recipes/wip/text/repgrep/recipe.toml
similarity index 100%
rename from recipes/wip/tools/repgrep/recipe.toml
rename to recipes/wip/text/repgrep/recipe.toml
diff --git a/recipes/wip/tools/ripgrep-all/recipe.toml b/recipes/wip/text/ripgrep-all/recipe.toml
similarity index 100%
rename from recipes/wip/tools/ripgrep-all/recipe.toml
rename to recipes/wip/text/ripgrep-all/recipe.toml
diff --git a/recipes/wip/tools/other/pastel/recipe.sh b/recipes/wip/tools/pastel/recipe.sh
similarity index 100%
rename from recipes/wip/tools/other/pastel/recipe.sh
rename to recipes/wip/tools/pastel/recipe.sh