diff --git a/recipes/wip/tools/hgrep/recipe.toml b/recipes/wip/dev/analysis/hgrep/recipe.toml
similarity index 100%
rename from recipes/wip/tools/hgrep/recipe.toml
rename to recipes/wip/dev/analysis/hgrep/recipe.toml
diff --git a/recipes/wip/tools/hl/recipe.toml b/recipes/wip/dev/analysis/hl/recipe.toml
similarity index 100%
rename from recipes/wip/tools/hl/recipe.toml
rename to recipes/wip/dev/analysis/hl/recipe.toml
diff --git a/recipes/wip/tools/hx/recipe.toml b/recipes/wip/dev/analysis/hx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/hx/recipe.toml
rename to recipes/wip/dev/analysis/hx/recipe.toml
diff --git a/recipes/wip/tools/elfutils/recipe.toml b/recipes/wip/dev/other/elfutils/recipe.toml
similarity index 100%
rename from recipes/wip/tools/elfutils/recipe.toml
rename to recipes/wip/dev/other/elfutils/recipe.toml
diff --git a/recipes/wip/tools/bacon/recipe.toml b/recipes/wip/dev/rust-tools/bacon/recipe.toml
similarity index 100%
rename from recipes/wip/tools/bacon/recipe.toml
rename to recipes/wip/dev/rust-tools/bacon/recipe.toml
diff --git a/recipes/wip/tools/mercurial/recipe.toml b/recipes/wip/dev/vcs/mercurial/recipe.toml
similarity index 100%
rename from recipes/wip/tools/mercurial/recipe.toml
rename to recipes/wip/dev/vcs/mercurial/recipe.toml
diff --git a/recipes/wip/tools/mdbook/recipe.toml b/recipes/wip/doc/mdbook/recipe.toml
similarity index 100%
rename from recipes/wip/tools/mdbook/recipe.toml
rename to recipes/wip/doc/mdbook/recipe.toml
diff --git a/recipes/wip/tools/converseen/recipe.toml b/recipes/wip/graphics/converters/converseen/recipe.toml
similarity index 100%
rename from recipes/wip/tools/converseen/recipe.toml
rename to recipes/wip/graphics/converters/converseen/recipe.toml
diff --git a/recipes/wip/tools/glsl-viewer/recipe.toml b/recipes/wip/graphics/shaders/glsl-viewer/recipe.toml
similarity index 100%
rename from recipes/wip/tools/glsl-viewer/recipe.toml
rename to recipes/wip/graphics/shaders/glsl-viewer/recipe.toml
diff --git a/recipes/wip/tools/bandwhich/recipe.toml b/recipes/wip/monitors/bandwhich/recipe.toml
similarity index 100%
rename from recipes/wip/tools/bandwhich/recipe.toml
rename to recipes/wip/monitors/bandwhich/recipe.toml
diff --git a/recipes/wip/tools/conky/recipe.toml b/recipes/wip/monitors/conky/recipe.toml
similarity index 100%
rename from recipes/wip/tools/conky/recipe.toml
rename to recipes/wip/monitors/conky/recipe.toml
diff --git a/recipes/wip/tools/iamb/recipe.toml b/recipes/wip/net/chat/iamb/recipe.toml
similarity index 100%
rename from recipes/wip/tools/iamb/recipe.toml
rename to recipes/wip/net/chat/iamb/recipe.toml
diff --git a/recipes/wip/tools/aria2/recipe.toml b/recipes/wip/net/download/aria2/recipe.toml
similarity index 100%
rename from recipes/wip/tools/aria2/recipe.toml
rename to recipes/wip/net/download/aria2/recipe.toml
diff --git a/recipes/wip/tools/lan-mouse/recipe.toml b/recipes/wip/net/sharing/lan-mouse/recipe.toml
similarity index 100%
rename from recipes/wip/tools/lan-mouse/recipe.toml
rename to recipes/wip/net/sharing/lan-mouse/recipe.toml
diff --git a/recipes/wip/tools/cosmic-player/manifest b/recipes/wip/players/cosmic-player/manifest
similarity index 100%
rename from recipes/wip/tools/cosmic-player/manifest
rename to recipes/wip/players/cosmic-player/manifest
diff --git a/recipes/wip/tools/cosmic-player/recipe.toml b/recipes/wip/players/cosmic-player/recipe.toml
similarity index 100%
rename from recipes/wip/tools/cosmic-player/recipe.toml
rename to recipes/wip/players/cosmic-player/recipe.toml
diff --git a/recipes/wip/tools/gnupg-lts/recipe.toml b/recipes/wip/security/gnupg-lts/recipe.toml
similarity index 100%
rename from recipes/wip/tools/gnupg-lts/recipe.toml
rename to recipes/wip/security/gnupg-lts/recipe.toml
diff --git a/recipes/wip/tools/gnupg/recipe.toml b/recipes/wip/security/gnupg/recipe.toml
similarity index 100%
rename from recipes/wip/tools/gnupg/recipe.toml
rename to recipes/wip/security/gnupg/recipe.toml
diff --git a/recipes/wip/tools/cava/recipe.toml b/recipes/wip/sound/cava/recipe.toml
similarity index 100%
rename from recipes/wip/tools/cava/recipe.toml
rename to recipes/wip/sound/cava/recipe.toml
diff --git a/recipes/wip/tools/chuck/recipe.toml b/recipes/wip/sound/chuck/recipe.toml
similarity index 100%
rename from recipes/wip/tools/chuck/recipe.toml
rename to recipes/wip/sound/chuck/recipe.toml
diff --git a/recipes/wip/tools/cpu-x/recipe.toml b/recipes/wip/sys-info/cpu-x/recipe.toml
similarity index 100%
rename from recipes/wip/tools/cpu-x/recipe.toml
rename to recipes/wip/sys-info/cpu-x/recipe.toml
diff --git a/recipes/wip/tools/cyme/recipe.toml b/recipes/wip/sys-info/cyme/recipe.toml
similarity index 100%
rename from recipes/wip/tools/cyme/recipe.toml
rename to recipes/wip/sys-info/cyme/recipe.toml
diff --git a/recipes/wip/tools/freshfetch/recipe.toml b/recipes/wip/sys-info/freshfetch/recipe.toml
similarity index 100%
rename from recipes/wip/tools/freshfetch/recipe.toml
rename to recipes/wip/sys-info/freshfetch/recipe.toml
diff --git a/recipes/wip/tools/macchina/recipe.toml b/recipes/wip/sys-info/macchina/recipe.toml
similarity index 100%
rename from recipes/wip/tools/macchina/recipe.toml
rename to recipes/wip/sys-info/macchina/recipe.toml
diff --git a/recipes/wip/tools/chafa/recipe.toml b/recipes/wip/terminal/chafa/recipe.toml
similarity index 100%
rename from recipes/wip/tools/chafa/recipe.toml
rename to recipes/wip/terminal/chafa/recipe.toml
diff --git a/recipes/wip/tools/mosh/recipe.toml b/recipes/wip/terminal/mosh/recipe.toml
similarity index 100%
rename from recipes/wip/tools/mosh/recipe.toml
rename to recipes/wip/terminal/mosh/recipe.toml
diff --git a/recipes/wip/tools/amp/recipe.toml b/recipes/wip/text/amp/recipe.toml
similarity index 100%
rename from recipes/wip/tools/amp/recipe.toml
rename to recipes/wip/text/amp/recipe.toml
diff --git a/recipes/wip/tools/bat/recipe.toml b/recipes/wip/text/bat/recipe.toml
similarity index 100%
rename from recipes/wip/tools/bat/recipe.toml
rename to recipes/wip/text/bat/recipe.toml
diff --git a/recipes/wip/tools/csvlens/recipe.toml b/recipes/wip/text/csvlens/recipe.toml
similarity index 100%
rename from recipes/wip/tools/csvlens/recipe.toml
rename to recipes/wip/text/csvlens/recipe.toml
diff --git a/recipes/wip/tools/emacs-nox/recipe.toml b/recipes/wip/text/emacs-nox/recipe.toml
similarity index 100%
rename from recipes/wip/tools/emacs-nox/recipe.toml
rename to recipes/wip/text/emacs-nox/recipe.toml
diff --git a/recipes/wip/tools/emacs-pgtk/recipe.toml b/recipes/wip/text/emacs-pgtk/recipe.toml
similarity index 100%
rename from recipes/wip/tools/emacs-pgtk/recipe.toml
rename to recipes/wip/text/emacs-pgtk/recipe.toml
diff --git a/recipes/wip/tools/helix-gpui/recipe.toml b/recipes/wip/text/helix-gpui/recipe.toml
similarity index 100%
rename from recipes/wip/tools/helix-gpui/recipe.toml
rename to recipes/wip/text/helix-gpui/recipe.toml
diff --git a/recipes/wip/tools/igrep/recipe.toml b/recipes/wip/text/igrep/recipe.toml
similarity index 100%
rename from recipes/wip/tools/igrep/recipe.toml
rename to recipes/wip/text/igrep/recipe.toml
diff --git a/recipes/wip/tools/kibi/recipe.toml b/recipes/wip/text/kibi/recipe.toml
similarity index 100%
rename from recipes/wip/tools/kibi/recipe.toml
rename to recipes/wip/text/kibi/recipe.toml
diff --git a/recipes/wip/tools/neovide/recipe.toml b/recipes/wip/text/neovide/recipe.toml
similarity index 100%
rename from recipes/wip/tools/neovide/recipe.toml
rename to recipes/wip/text/neovide/recipe.toml
diff --git a/recipes/wip/tools/neovim/recipe.toml b/recipes/wip/text/neovim/recipe.toml
similarity index 100%
rename from recipes/wip/tools/neovim/recipe.toml
rename to recipes/wip/text/neovim/recipe.toml