diff --git a/recipes/wip/net/spadesx/recipe.toml b/recipes/wip/net/server/spadesx/recipe.toml similarity index 100% rename from recipes/wip/net/spadesx/recipe.toml rename to recipes/wip/net/server/spadesx/recipe.toml diff --git a/recipes/wip/tools/other/magic-wormhole-rs/recipe.toml b/recipes/wip/net/sharing/magic-wormhole-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/magic-wormhole-rs/recipe.toml rename to recipes/wip/net/sharing/magic-wormhole-rs/recipe.toml diff --git a/recipes/wip/tools/other/aeruginous/recipe.toml b/recipes/wip/tools/aeruginous/recipe.toml similarity index 100% rename from recipes/wip/tools/other/aeruginous/recipe.toml rename to recipes/wip/tools/aeruginous/recipe.toml diff --git a/recipes/wip/tools/other/amp/recipe.toml b/recipes/wip/tools/amp/recipe.toml similarity index 100% rename from recipes/wip/tools/other/amp/recipe.toml rename to recipes/wip/tools/amp/recipe.toml diff --git a/recipes/wip/tools/other/ani-cli/recipe.toml b/recipes/wip/tools/ani-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ani-cli/recipe.toml rename to recipes/wip/tools/ani-cli/recipe.toml diff --git a/recipes/wip/tools/other/ani-skip/recipe.toml b/recipes/wip/tools/ani-skip/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ani-skip/recipe.toml rename to recipes/wip/tools/ani-skip/recipe.toml diff --git a/recipes/wip/tools/other/aria2/recipe.toml b/recipes/wip/tools/aria2/recipe.toml similarity index 100% rename from recipes/wip/tools/other/aria2/recipe.toml rename to recipes/wip/tools/aria2/recipe.toml diff --git a/recipes/wip/tools/other/arrow-tools/recipe.toml b/recipes/wip/tools/arrow-tools/recipe.toml similarity index 100% rename from recipes/wip/tools/other/arrow-tools/recipe.toml rename to recipes/wip/tools/arrow-tools/recipe.toml diff --git a/recipes/wip/tools/other/artem/recipe.toml b/recipes/wip/tools/artem/recipe.toml similarity index 100% rename from recipes/wip/tools/other/artem/recipe.toml rename to recipes/wip/tools/artem/recipe.toml diff --git a/recipes/wip/tools/other/ascii-gen/recipe.toml b/recipes/wip/tools/ascii-gen/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ascii-gen/recipe.toml rename to recipes/wip/tools/ascii-gen/recipe.toml diff --git a/recipes/wip/tools/other/asciinema-rs/recipe.toml b/recipes/wip/tools/asciinema-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/asciinema-rs/recipe.toml rename to recipes/wip/tools/asciinema-rs/recipe.toml diff --git a/recipes/wip/tools/other/ast-grep/recipe.toml b/recipes/wip/tools/ast-grep/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ast-grep/recipe.toml rename to recipes/wip/tools/ast-grep/recipe.toml diff --git a/recipes/wip/tools/other/astc-encoder/recipe.toml b/recipes/wip/tools/astc-encoder/recipe.toml similarity index 100% rename from recipes/wip/tools/other/astc-encoder/recipe.toml rename to recipes/wip/tools/astc-encoder/recipe.toml diff --git a/recipes/wip/tools/other/astyle/recipe.toml b/recipes/wip/tools/astyle/recipe.toml similarity index 100% rename from recipes/wip/tools/other/astyle/recipe.toml rename to recipes/wip/tools/astyle/recipe.toml diff --git a/recipes/wip/tools/other/atm-cli/recipe.toml b/recipes/wip/tools/atm-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/atm-cli/recipe.toml rename to recipes/wip/tools/atm-cli/recipe.toml diff --git a/recipes/wip/tools/other/atuin/recipe.toml b/recipes/wip/tools/atuin/recipe.toml similarity index 100% rename from recipes/wip/tools/other/atuin/recipe.toml rename to recipes/wip/tools/atuin/recipe.toml diff --git a/recipes/wip/tools/other/backhand/recipe.toml b/recipes/wip/tools/backhand/recipe.toml similarity index 100% rename from recipes/wip/tools/other/backhand/recipe.toml rename to recipes/wip/tools/backhand/recipe.toml diff --git a/recipes/wip/tools/other/bacon/recipe.toml b/recipes/wip/tools/bacon/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bacon/recipe.toml rename to recipes/wip/tools/bacon/recipe.toml diff --git a/recipes/wip/tools/other/bacup/recipe.toml b/recipes/wip/tools/bacup/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bacup/recipe.toml rename to recipes/wip/tools/bacup/recipe.toml diff --git a/recipes/wip/tools/other/bandwhich/recipe.toml b/recipes/wip/tools/bandwhich/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bandwhich/recipe.toml rename to recipes/wip/tools/bandwhich/recipe.toml diff --git a/recipes/wip/tools/other/bartib/recipe.toml b/recipes/wip/tools/bartib/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bartib/recipe.toml rename to recipes/wip/tools/bartib/recipe.toml diff --git a/recipes/wip/tools/other/bat/recipe.toml b/recipes/wip/tools/bat/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bat/recipe.toml rename to recipes/wip/tools/bat/recipe.toml diff --git a/recipes/wip/tools/other/battop/recipe.toml b/recipes/wip/tools/battop/recipe.toml similarity index 100% rename from recipes/wip/tools/other/battop/recipe.toml rename to recipes/wip/tools/battop/recipe.toml diff --git a/recipes/wip/tools/other/bdt/recipe.toml b/recipes/wip/tools/bdt/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bdt/recipe.toml rename to recipes/wip/tools/bdt/recipe.toml diff --git a/recipes/wip/tools/other/binserve/recipe.toml b/recipes/wip/tools/binserve/recipe.toml similarity index 100% rename from recipes/wip/tools/other/binserve/recipe.toml rename to recipes/wip/tools/binserve/recipe.toml diff --git a/recipes/wip/tools/other/birdy/recipe.toml b/recipes/wip/tools/birdy/recipe.toml similarity index 100% rename from recipes/wip/tools/other/birdy/recipe.toml rename to recipes/wip/tools/birdy/recipe.toml diff --git a/recipes/wip/tools/other/blockish-caca/recipe.toml b/recipes/wip/tools/blockish-caca/recipe.toml similarity index 100% rename from recipes/wip/tools/other/blockish-caca/recipe.toml rename to recipes/wip/tools/blockish-caca/recipe.toml diff --git a/recipes/wip/tools/other/bottles/recipe.toml b/recipes/wip/tools/bottles/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bottles/recipe.toml rename to recipes/wip/tools/bottles/recipe.toml diff --git a/recipes/wip/tools/other/bottom/recipe.toml b/recipes/wip/tools/bottom/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bottom/recipe.toml rename to recipes/wip/tools/bottom/recipe.toml diff --git a/recipes/wip/tools/other/broot/recipe.toml b/recipes/wip/tools/broot/recipe.toml similarity index 100% rename from recipes/wip/tools/other/broot/recipe.toml rename to recipes/wip/tools/broot/recipe.toml diff --git a/recipes/wip/tools/other/busybox/recipe.toml b/recipes/wip/tools/busybox/recipe.toml similarity index 100% rename from recipes/wip/tools/other/busybox/recipe.toml rename to recipes/wip/tools/busybox/recipe.toml diff --git a/recipes/wip/tools/other/bvr/recipe.toml b/recipes/wip/tools/bvr/recipe.toml similarity index 100% rename from recipes/wip/tools/other/bvr/recipe.toml rename to recipes/wip/tools/bvr/recipe.toml diff --git a/recipes/wip/tools/other/byteblitz/recipe.toml b/recipes/wip/tools/byteblitz/recipe.toml similarity index 100% rename from recipes/wip/tools/other/byteblitz/recipe.toml rename to recipes/wip/tools/byteblitz/recipe.toml diff --git a/recipes/wip/tools/other/caesium/recipe.toml b/recipes/wip/tools/caesium/recipe.toml similarity index 100% rename from recipes/wip/tools/other/caesium/recipe.toml rename to recipes/wip/tools/caesium/recipe.toml diff --git a/recipes/wip/tools/other/caligula/recipe.toml b/recipes/wip/tools/caligula/recipe.toml similarity index 100% rename from recipes/wip/tools/other/caligula/recipe.toml rename to recipes/wip/tools/caligula/recipe.toml diff --git a/recipes/wip/tools/other/carbonyl/recipe.toml b/recipes/wip/tools/carbonyl/recipe.toml similarity index 100% rename from recipes/wip/tools/other/carbonyl/recipe.toml rename to recipes/wip/tools/carbonyl/recipe.toml diff --git a/recipes/wip/tools/other/cava/recipe.toml b/recipes/wip/tools/cava/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cava/recipe.toml rename to recipes/wip/tools/cava/recipe.toml diff --git a/recipes/wip/tools/other/cb/recipe.toml b/recipes/wip/tools/cb/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cb/recipe.toml rename to recipes/wip/tools/cb/recipe.toml diff --git a/recipes/wip/tools/other/chafa/recipe.toml b/recipes/wip/tools/chafa/recipe.toml similarity index 100% rename from recipes/wip/tools/other/chafa/recipe.toml rename to recipes/wip/tools/chafa/recipe.toml diff --git a/recipes/wip/tools/other/checkpwn/recipe.toml b/recipes/wip/tools/checkpwn/recipe.toml similarity index 100% rename from recipes/wip/tools/other/checkpwn/recipe.toml rename to recipes/wip/tools/checkpwn/recipe.toml diff --git a/recipes/wip/tools/other/choose/recipe.toml b/recipes/wip/tools/choose/recipe.toml similarity index 100% rename from recipes/wip/tools/other/choose/recipe.toml rename to recipes/wip/tools/choose/recipe.toml diff --git a/recipes/wip/tools/other/chromazone/recipe.toml b/recipes/wip/tools/chromazone/recipe.toml similarity index 100% rename from recipes/wip/tools/other/chromazone/recipe.toml rename to recipes/wip/tools/chromazone/recipe.toml diff --git a/recipes/wip/tools/other/chuck/recipe.toml b/recipes/wip/tools/chuck/recipe.toml similarity index 100% rename from recipes/wip/tools/other/chuck/recipe.toml rename to recipes/wip/tools/chuck/recipe.toml diff --git a/recipes/wip/tools/other/clipcat/recipe.toml b/recipes/wip/tools/clipcat/recipe.toml similarity index 100% rename from recipes/wip/tools/other/clipcat/recipe.toml rename to recipes/wip/tools/clipcat/recipe.toml diff --git a/recipes/wip/tools/other/clipshare-desktop/recipe.toml b/recipes/wip/tools/clipshare-desktop/recipe.toml similarity index 100% rename from recipes/wip/tools/other/clipshare-desktop/recipe.toml rename to recipes/wip/tools/clipshare-desktop/recipe.toml diff --git a/recipes/wip/tools/other/clipshare-server/recipe.toml b/recipes/wip/tools/clipshare-server/recipe.toml similarity index 100% rename from recipes/wip/tools/other/clipshare-server/recipe.toml rename to recipes/wip/tools/clipshare-server/recipe.toml diff --git a/recipes/wip/tools/other/clog-cli/recipe.toml b/recipes/wip/tools/clog-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/clog-cli/recipe.toml rename to recipes/wip/tools/clog-cli/recipe.toml diff --git a/recipes/wip/tools/other/conceal/recipe.toml b/recipes/wip/tools/conceal/recipe.toml similarity index 100% rename from recipes/wip/tools/other/conceal/recipe.toml rename to recipes/wip/tools/conceal/recipe.toml diff --git a/recipes/wip/tools/other/conky/recipe.toml b/recipes/wip/tools/conky/recipe.toml similarity index 100% rename from recipes/wip/tools/other/conky/recipe.toml rename to recipes/wip/tools/conky/recipe.toml diff --git a/recipes/wip/tools/other/conserve/recipe.toml b/recipes/wip/tools/conserve/recipe.toml similarity index 100% rename from recipes/wip/tools/other/conserve/recipe.toml rename to recipes/wip/tools/conserve/recipe.toml diff --git a/recipes/wip/tools/other/converseen/recipe.toml b/recipes/wip/tools/converseen/recipe.toml similarity index 100% rename from recipes/wip/tools/other/converseen/recipe.toml rename to recipes/wip/tools/converseen/recipe.toml diff --git a/recipes/wip/tools/other/cosmic-player/manifest b/recipes/wip/tools/cosmic-player/manifest similarity index 100% rename from recipes/wip/tools/other/cosmic-player/manifest rename to recipes/wip/tools/cosmic-player/manifest diff --git a/recipes/wip/tools/other/cosmic-player/recipe.toml b/recipes/wip/tools/cosmic-player/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cosmic-player/recipe.toml rename to recipes/wip/tools/cosmic-player/recipe.toml diff --git a/recipes/wip/tools/other/counts/recipe.toml b/recipes/wip/tools/counts/recipe.toml similarity index 100% rename from recipes/wip/tools/other/counts/recipe.toml rename to recipes/wip/tools/counts/recipe.toml diff --git a/recipes/wip/tools/other/cpu-x/recipe.toml b/recipes/wip/tools/cpu-x/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cpu-x/recipe.toml rename to recipes/wip/tools/cpu-x/recipe.toml diff --git a/recipes/wip/tools/other/cpuminer-opt/recipe.toml b/recipes/wip/tools/cpuminer-opt/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cpuminer-opt/recipe.toml rename to recipes/wip/tools/cpuminer-opt/recipe.toml diff --git a/recipes/wip/tools/other/crunchy-cli/recipe.toml b/recipes/wip/tools/crunchy-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/crunchy-cli/recipe.toml rename to recipes/wip/tools/crunchy-cli/recipe.toml diff --git a/recipes/wip/tools/other/csvlens/recipe.toml b/recipes/wip/tools/csvlens/recipe.toml similarity index 100% rename from recipes/wip/tools/other/csvlens/recipe.toml rename to recipes/wip/tools/csvlens/recipe.toml diff --git a/recipes/wip/tools/other/cube-timer/recipe.toml b/recipes/wip/tools/cube-timer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cube-timer/recipe.toml rename to recipes/wip/tools/cube-timer/recipe.toml diff --git a/recipes/wip/tools/other/cute/recipe.toml b/recipes/wip/tools/cute/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cute/recipe.toml rename to recipes/wip/tools/cute/recipe.toml diff --git a/recipes/wip/tools/other/cyme/recipe.toml b/recipes/wip/tools/cyme/recipe.toml similarity index 100% rename from recipes/wip/tools/other/cyme/recipe.toml rename to recipes/wip/tools/cyme/recipe.toml diff --git a/recipes/wip/tools/other/czkawka/recipe.toml b/recipes/wip/tools/czkawka/recipe.toml similarity index 100% rename from recipes/wip/tools/other/czkawka/recipe.toml rename to recipes/wip/tools/czkawka/recipe.toml diff --git a/recipes/wip/tools/other/daktilo/recipe.toml b/recipes/wip/tools/daktilo/recipe.toml similarity index 100% rename from recipes/wip/tools/other/daktilo/recipe.toml rename to recipes/wip/tools/daktilo/recipe.toml diff --git a/recipes/wip/tools/other/dead-ringer/recipe.toml b/recipes/wip/tools/dead-ringer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dead-ringer/recipe.toml rename to recipes/wip/tools/dead-ringer/recipe.toml diff --git a/recipes/wip/tools/other/delta/recipe.toml b/recipes/wip/tools/delta/recipe.toml similarity index 100% rename from recipes/wip/tools/other/delta/recipe.toml rename to recipes/wip/tools/delta/recipe.toml diff --git a/recipes/wip/tools/other/desed/recipe.toml b/recipes/wip/tools/desed/recipe.toml similarity index 100% rename from recipes/wip/tools/other/desed/recipe.toml rename to recipes/wip/tools/desed/recipe.toml diff --git a/recipes/wip/tools/other/dfm/recipe.toml b/recipes/wip/tools/dfm/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dfm/recipe.toml rename to recipes/wip/tools/dfm/recipe.toml diff --git a/recipes/wip/tools/other/diffr/recipe.toml b/recipes/wip/tools/diffr/recipe.toml similarity index 100% rename from recipes/wip/tools/other/diffr/recipe.toml rename to recipes/wip/tools/diffr/recipe.toml diff --git a/recipes/wip/tools/other/diffy/recipe.toml b/recipes/wip/tools/diffy/recipe.toml similarity index 100% rename from recipes/wip/tools/other/diffy/recipe.toml rename to recipes/wip/tools/diffy/recipe.toml diff --git a/recipes/wip/tools/other/dim/recipe.toml b/recipes/wip/tools/dim/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dim/recipe.toml rename to recipes/wip/tools/dim/recipe.toml diff --git a/recipes/wip/tools/other/diskonaut/recipe.toml b/recipes/wip/tools/diskonaut/recipe.toml similarity index 100% rename from recipes/wip/tools/other/diskonaut/recipe.toml rename to recipes/wip/tools/diskonaut/recipe.toml diff --git a/recipes/wip/tools/other/dispatch/recipe.toml b/recipes/wip/tools/dispatch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dispatch/recipe.toml rename to recipes/wip/tools/dispatch/recipe.toml diff --git a/recipes/wip/tools/other/dog/recipe.toml b/recipes/wip/tools/dog/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dog/recipe.toml rename to recipes/wip/tools/dog/recipe.toml diff --git a/recipes/wip/tools/other/dotr/recipe.toml b/recipes/wip/tools/dotr/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dotr/recipe.toml rename to recipes/wip/tools/dotr/recipe.toml diff --git a/recipes/wip/tools/other/dply/recipe.toml b/recipes/wip/tools/dply/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dply/recipe.toml rename to recipes/wip/tools/dply/recipe.toml diff --git a/recipes/wip/tools/other/dprint/recipe.toml b/recipes/wip/tools/dprint/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dprint/recipe.toml rename to recipes/wip/tools/dprint/recipe.toml diff --git a/recipes/wip/tools/other/dra-cla/recipe.toml b/recipes/wip/tools/dra-cla/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dra-cla/recipe.toml rename to recipes/wip/tools/dra-cla/recipe.toml diff --git a/recipes/wip/tools/other/dua/recipe.toml b/recipes/wip/tools/dua/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dua/recipe.toml rename to recipes/wip/tools/dua/recipe.toml diff --git a/recipes/wip/tools/other/dui/recipe.toml b/recipes/wip/tools/dui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dui/recipe.toml rename to recipes/wip/tools/dui/recipe.toml diff --git a/recipes/wip/tools/other/dura/recipe.toml b/recipes/wip/tools/dura/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dura/recipe.toml rename to recipes/wip/tools/dura/recipe.toml diff --git a/recipes/wip/tools/other/dust/recipe.toml b/recipes/wip/tools/dust/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dust/recipe.toml rename to recipes/wip/tools/dust/recipe.toml diff --git a/recipes/wip/tools/other/dutree/recipe.toml b/recipes/wip/tools/dutree/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dutree/recipe.toml rename to recipes/wip/tools/dutree/recipe.toml diff --git a/recipes/wip/tools/other/dysk/recipe.toml b/recipes/wip/tools/dysk/recipe.toml similarity index 100% rename from recipes/wip/tools/other/dysk/recipe.toml rename to recipes/wip/tools/dysk/recipe.toml diff --git a/recipes/wip/tools/other/elfutils/recipe.toml b/recipes/wip/tools/elfutils/recipe.toml similarity index 100% rename from recipes/wip/tools/other/elfutils/recipe.toml rename to recipes/wip/tools/elfutils/recipe.toml diff --git a/recipes/wip/tools/other/emacs-nox/recipe.toml b/recipes/wip/tools/emacs-nox/recipe.toml similarity index 100% rename from recipes/wip/tools/other/emacs-nox/recipe.toml rename to recipes/wip/tools/emacs-nox/recipe.toml diff --git a/recipes/wip/tools/other/emacs-pgtk/recipe.toml b/recipes/wip/tools/emacs-pgtk/recipe.toml similarity index 100% rename from recipes/wip/tools/other/emacs-pgtk/recipe.toml rename to recipes/wip/tools/emacs-pgtk/recipe.toml diff --git a/recipes/wip/tools/other/emplace/recipe.toml b/recipes/wip/tools/emplace/recipe.toml similarity index 100% rename from recipes/wip/tools/other/emplace/recipe.toml rename to recipes/wip/tools/emplace/recipe.toml diff --git a/recipes/wip/tools/other/enchant/recipe.toml b/recipes/wip/tools/enchant/recipe.toml similarity index 100% rename from recipes/wip/tools/other/enchant/recipe.toml rename to recipes/wip/tools/enchant/recipe.toml diff --git a/recipes/wip/tools/other/envio/recipe.toml b/recipes/wip/tools/envio/recipe.toml similarity index 100% rename from recipes/wip/tools/other/envio/recipe.toml rename to recipes/wip/tools/envio/recipe.toml diff --git a/recipes/wip/tools/other/epub2txt/recipe.toml b/recipes/wip/tools/epub2txt/recipe.toml similarity index 100% rename from recipes/wip/tools/other/epub2txt/recipe.toml rename to recipes/wip/tools/epub2txt/recipe.toml diff --git a/recipes/wip/tools/other/erdtree/recipe.toml b/recipes/wip/tools/erdtree/recipe.toml similarity index 100% rename from recipes/wip/tools/other/erdtree/recipe.toml rename to recipes/wip/tools/erdtree/recipe.toml diff --git a/recipes/wip/tools/other/espanso/recipe.toml b/recipes/wip/tools/espanso/recipe.toml similarity index 100% rename from recipes/wip/tools/other/espanso/recipe.toml rename to recipes/wip/tools/espanso/recipe.toml diff --git a/recipes/wip/tools/other/eureka/recipe.toml b/recipes/wip/tools/eureka/recipe.toml similarity index 100% rename from recipes/wip/tools/other/eureka/recipe.toml rename to recipes/wip/tools/eureka/recipe.toml diff --git a/recipes/wip/tools/other/eva/recipe.toml b/recipes/wip/tools/eva/recipe.toml similarity index 100% rename from recipes/wip/tools/other/eva/recipe.toml rename to recipes/wip/tools/eva/recipe.toml diff --git a/recipes/wip/tools/other/exa/recipe.toml b/recipes/wip/tools/exa/recipe.toml similarity index 100% rename from recipes/wip/tools/other/exa/recipe.toml rename to recipes/wip/tools/exa/recipe.toml diff --git a/recipes/wip/tools/other/exhaust/recipe.toml b/recipes/wip/tools/exhaust/recipe.toml similarity index 100% rename from recipes/wip/tools/other/exhaust/recipe.toml rename to recipes/wip/tools/exhaust/recipe.toml diff --git a/recipes/wip/tools/other/exuberant-ctags/recipe.toml b/recipes/wip/tools/exuberant-ctags/recipe.toml similarity index 100% rename from recipes/wip/tools/other/exuberant-ctags/recipe.toml rename to recipes/wip/tools/exuberant-ctags/recipe.toml diff --git a/recipes/wip/tools/other/eza/recipe.toml b/recipes/wip/tools/eza/recipe.toml similarity index 100% rename from recipes/wip/tools/other/eza/recipe.toml rename to recipes/wip/tools/eza/recipe.toml diff --git a/recipes/wip/tools/other/fclones/recipe.toml b/recipes/wip/tools/fclones/recipe.toml similarity index 100% rename from recipes/wip/tools/other/fclones/recipe.toml rename to recipes/wip/tools/fclones/recipe.toml diff --git a/recipes/wip/tools/other/felix/recipe.toml b/recipes/wip/tools/felix/recipe.toml similarity index 100% rename from recipes/wip/tools/other/felix/recipe.toml rename to recipes/wip/tools/felix/recipe.toml diff --git a/recipes/wip/tools/other/fennec/recipe.toml b/recipes/wip/tools/fennec/recipe.toml similarity index 100% rename from recipes/wip/tools/other/fennec/recipe.toml rename to recipes/wip/tools/fennec/recipe.toml diff --git a/recipes/wip/tools/other/ffizer/recipe.toml b/recipes/wip/tools/ffizer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ffizer/recipe.toml rename to recipes/wip/tools/ffizer/recipe.toml diff --git a/recipes/wip/tools/other/file/recipe.toml b/recipes/wip/tools/file/recipe.toml similarity index 100% rename from recipes/wip/tools/other/file/recipe.toml rename to recipes/wip/tools/file/recipe.toml diff --git a/recipes/wip/tools/other/flameshot/recipe.toml b/recipes/wip/tools/flameshot/recipe.toml similarity index 100% rename from recipes/wip/tools/other/flameshot/recipe.toml rename to recipes/wip/tools/flameshot/recipe.toml diff --git a/recipes/wip/tools/other/flowtime/recipe.toml b/recipes/wip/tools/flowtime/recipe.toml similarity index 100% rename from recipes/wip/tools/other/flowtime/recipe.toml rename to recipes/wip/tools/flowtime/recipe.toml diff --git a/recipes/wip/tools/other/freshfetch/recipe.toml b/recipes/wip/tools/freshfetch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/freshfetch/recipe.toml rename to recipes/wip/tools/freshfetch/recipe.toml diff --git a/recipes/wip/tools/other/fselect/recipe.toml b/recipes/wip/tools/fselect/recipe.toml similarity index 100% rename from recipes/wip/tools/other/fselect/recipe.toml rename to recipes/wip/tools/fselect/recipe.toml diff --git a/recipes/wip/tools/other/fuga/recipe.toml b/recipes/wip/tools/fuga/recipe.toml similarity index 100% rename from recipes/wip/tools/other/fuga/recipe.toml rename to recipes/wip/tools/fuga/recipe.toml diff --git a/recipes/wip/tools/other/funzzy/recipe.toml b/recipes/wip/tools/funzzy/recipe.toml similarity index 100% rename from recipes/wip/tools/other/funzzy/recipe.toml rename to recipes/wip/tools/funzzy/recipe.toml diff --git a/recipes/wip/tools/other/fzf-make/recipe.toml b/recipes/wip/tools/fzf-make/recipe.toml similarity index 100% rename from recipes/wip/tools/other/fzf-make/recipe.toml rename to recipes/wip/tools/fzf-make/recipe.toml diff --git a/recipes/wip/tools/other/gengo/recipe.toml b/recipes/wip/tools/gengo/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gengo/recipe.toml rename to recipes/wip/tools/gengo/recipe.toml diff --git a/recipes/wip/tools/other/germ/recipe.toml b/recipes/wip/tools/germ/recipe.toml similarity index 100% rename from recipes/wip/tools/other/germ/recipe.toml rename to recipes/wip/tools/germ/recipe.toml diff --git a/recipes/wip/tools/other/gifski/recipe.toml b/recipes/wip/tools/gifski/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gifski/recipe.toml rename to recipes/wip/tools/gifski/recipe.toml diff --git a/recipes/wip/tools/other/glicol-cli/recipe.toml b/recipes/wip/tools/glicol-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/glicol-cli/recipe.toml rename to recipes/wip/tools/glicol-cli/recipe.toml diff --git a/recipes/wip/tools/other/glsl-viewer/recipe.toml b/recipes/wip/tools/glsl-viewer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/glsl-viewer/recipe.toml rename to recipes/wip/tools/glsl-viewer/recipe.toml diff --git a/recipes/wip/tools/other/gnu-radio/recipe.toml b/recipes/wip/tools/gnu-radio/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gnu-radio/recipe.toml rename to recipes/wip/tools/gnu-radio/recipe.toml diff --git a/recipes/wip/tools/other/gnupg-lts/recipe.toml b/recipes/wip/tools/gnupg-lts/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gnupg-lts/recipe.toml rename to recipes/wip/tools/gnupg-lts/recipe.toml diff --git a/recipes/wip/tools/other/gnupg/recipe.toml b/recipes/wip/tools/gnupg/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gnupg/recipe.toml rename to recipes/wip/tools/gnupg/recipe.toml diff --git a/recipes/wip/tools/other/gnuplot/recipe.toml b/recipes/wip/tools/gnuplot/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gnuplot/recipe.toml rename to recipes/wip/tools/gnuplot/recipe.toml diff --git a/recipes/wip/tools/other/goldboot/recipe.toml b/recipes/wip/tools/goldboot/recipe.toml similarity index 100% rename from recipes/wip/tools/other/goldboot/recipe.toml rename to recipes/wip/tools/goldboot/recipe.toml diff --git a/recipes/wip/tools/other/goxel/recipe.toml b/recipes/wip/tools/goxel/recipe.toml similarity index 100% rename from recipes/wip/tools/other/goxel/recipe.toml rename to recipes/wip/tools/goxel/recipe.toml diff --git a/recipes/wip/tools/other/gpg-tui/recipe.toml b/recipes/wip/tools/gpg-tui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gpg-tui/recipe.toml rename to recipes/wip/tools/gpg-tui/recipe.toml diff --git a/recipes/wip/tools/other/gphoto2/recipe.toml b/recipes/wip/tools/gphoto2/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gphoto2/recipe.toml rename to recipes/wip/tools/gphoto2/recipe.toml diff --git a/recipes/wip/tools/other/gping/recipe.toml b/recipes/wip/tools/gping/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gping/recipe.toml rename to recipes/wip/tools/gping/recipe.toml diff --git a/recipes/wip/tools/other/gptman/recipe.toml b/recipes/wip/tools/gptman/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gptman/recipe.toml rename to recipes/wip/tools/gptman/recipe.toml diff --git a/recipes/wip/tools/other/gptube-cli/recipe.toml b/recipes/wip/tools/gptube-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/gptube-cli/recipe.toml rename to recipes/wip/tools/gptube-cli/recipe.toml diff --git a/recipes/wip/tools/other/grex/recipe.toml b/recipes/wip/tools/grex/recipe.toml similarity index 100% rename from recipes/wip/tools/other/grex/recipe.toml rename to recipes/wip/tools/grex/recipe.toml diff --git a/recipes/wip/tools/other/groff/recipe.toml b/recipes/wip/tools/groff/recipe.toml similarity index 100% rename from recipes/wip/tools/other/groff/recipe.toml rename to recipes/wip/tools/groff/recipe.toml diff --git a/recipes/wip/tools/other/guix/recipe.toml b/recipes/wip/tools/guix/recipe.toml similarity index 100% rename from recipes/wip/tools/other/guix/recipe.toml rename to recipes/wip/tools/guix/recipe.toml diff --git a/recipes/wip/tools/other/halp/recipe.toml b/recipes/wip/tools/halp/recipe.toml similarity index 100% rename from recipes/wip/tools/other/halp/recipe.toml rename to recipes/wip/tools/halp/recipe.toml diff --git a/recipes/wip/tools/other/hawkeye/recipe.toml b/recipes/wip/tools/hawkeye/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hawkeye/recipe.toml rename to recipes/wip/tools/hawkeye/recipe.toml diff --git a/recipes/wip/tools/other/haylxon/recipe.toml b/recipes/wip/tools/haylxon/recipe.toml similarity index 100% rename from recipes/wip/tools/other/haylxon/recipe.toml rename to recipes/wip/tools/haylxon/recipe.toml diff --git a/recipes/wip/tools/other/helix-gpui/recipe.toml b/recipes/wip/tools/helix-gpui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/helix-gpui/recipe.toml rename to recipes/wip/tools/helix-gpui/recipe.toml diff --git a/recipes/wip/tools/other/hgrep/recipe.toml b/recipes/wip/tools/hgrep/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hgrep/recipe.toml rename to recipes/wip/tools/hgrep/recipe.toml diff --git a/recipes/wip/tools/other/himalaya/recipe.toml b/recipes/wip/tools/himalaya/recipe.toml similarity index 100% rename from recipes/wip/tools/other/himalaya/recipe.toml rename to recipes/wip/tools/himalaya/recipe.toml diff --git a/recipes/wip/tools/other/hired/recipe.toml b/recipes/wip/tools/hired/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hired/recipe.toml rename to recipes/wip/tools/hired/recipe.toml diff --git a/recipes/wip/tools/other/hl/recipe.toml b/recipes/wip/tools/hl/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hl/recipe.toml rename to recipes/wip/tools/hl/recipe.toml diff --git a/recipes/wip/tools/other/hoard/recipe.toml b/recipes/wip/tools/hoard/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hoard/recipe.toml rename to recipes/wip/tools/hoard/recipe.toml diff --git a/recipes/wip/tools/other/horsetab/recipe.toml b/recipes/wip/tools/horsetab/recipe.toml similarity index 100% rename from recipes/wip/tools/other/horsetab/recipe.toml rename to recipes/wip/tools/horsetab/recipe.toml diff --git a/recipes/wip/tools/other/humphrey/recipe.toml b/recipes/wip/tools/humphrey/recipe.toml similarity index 100% rename from recipes/wip/tools/other/humphrey/recipe.toml rename to recipes/wip/tools/humphrey/recipe.toml diff --git a/recipes/wip/tools/other/hwatch/recipe.toml b/recipes/wip/tools/hwatch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hwatch/recipe.toml rename to recipes/wip/tools/hwatch/recipe.toml diff --git a/recipes/wip/tools/other/hx/recipe.toml b/recipes/wip/tools/hx/recipe.toml similarity index 100% rename from recipes/wip/tools/other/hx/recipe.toml rename to recipes/wip/tools/hx/recipe.toml diff --git a/recipes/wip/tools/other/iamb/recipe.toml b/recipes/wip/tools/iamb/recipe.toml similarity index 100% rename from recipes/wip/tools/other/iamb/recipe.toml rename to recipes/wip/tools/iamb/recipe.toml diff --git a/recipes/wip/tools/other/igrep/recipe.toml b/recipes/wip/tools/igrep/recipe.toml similarity index 100% rename from recipes/wip/tools/other/igrep/recipe.toml rename to recipes/wip/tools/igrep/recipe.toml diff --git a/recipes/wip/tools/other/imager/recipe.toml b/recipes/wip/tools/imager/recipe.toml similarity index 100% rename from recipes/wip/tools/other/imager/recipe.toml rename to recipes/wip/tools/imager/recipe.toml diff --git a/recipes/wip/tools/other/inlyne/recipe.toml b/recipes/wip/tools/inlyne/recipe.toml similarity index 100% rename from recipes/wip/tools/other/inlyne/recipe.toml rename to recipes/wip/tools/inlyne/recipe.toml diff --git a/recipes/wip/tools/other/innernet-cli/recipe.toml b/recipes/wip/tools/innernet-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/innernet-cli/recipe.toml rename to recipes/wip/tools/innernet-cli/recipe.toml diff --git a/recipes/wip/tools/other/innernet-server/recipe.toml b/recipes/wip/tools/innernet-server/recipe.toml similarity index 100% rename from recipes/wip/tools/other/innernet-server/recipe.toml rename to recipes/wip/tools/innernet-server/recipe.toml diff --git a/recipes/wip/tools/other/intelli-shell/recipe.toml b/recipes/wip/tools/intelli-shell/recipe.toml similarity index 100% rename from recipes/wip/tools/other/intelli-shell/recipe.toml rename to recipes/wip/tools/intelli-shell/recipe.toml diff --git a/recipes/wip/tools/other/interaction-calculus/recipe.toml b/recipes/wip/tools/interaction-calculus/recipe.toml similarity index 100% rename from recipes/wip/tools/other/interaction-calculus/recipe.toml rename to recipes/wip/tools/interaction-calculus/recipe.toml diff --git a/recipes/wip/tools/other/intermodal/recipe.toml b/recipes/wip/tools/intermodal/recipe.toml similarity index 100% rename from recipes/wip/tools/other/intermodal/recipe.toml rename to recipes/wip/tools/intermodal/recipe.toml diff --git a/recipes/wip/tools/other/itstool/recipe.toml b/recipes/wip/tools/itstool/recipe.toml similarity index 100% rename from recipes/wip/tools/other/itstool/recipe.toml rename to recipes/wip/tools/itstool/recipe.toml diff --git a/recipes/wip/tools/other/jirust/recipe.toml b/recipes/wip/tools/jirust/recipe.toml similarity index 100% rename from recipes/wip/tools/other/jirust/recipe.toml rename to recipes/wip/tools/jirust/recipe.toml diff --git a/recipes/wip/tools/other/jless/recipe.toml b/recipes/wip/tools/jless/recipe.toml similarity index 100% rename from recipes/wip/tools/other/jless/recipe.toml rename to recipes/wip/tools/jless/recipe.toml diff --git a/recipes/wip/tools/other/joshuto/recipe.toml b/recipes/wip/tools/joshuto/recipe.toml similarity index 100% rename from recipes/wip/tools/other/joshuto/recipe.toml rename to recipes/wip/tools/joshuto/recipe.toml diff --git a/recipes/wip/tools/other/jql/recipe.toml b/recipes/wip/tools/jql/recipe.toml similarity index 100% rename from recipes/wip/tools/other/jql/recipe.toml rename to recipes/wip/tools/jql/recipe.toml diff --git a/recipes/wip/tools/other/just/recipe.toml b/recipes/wip/tools/just/recipe.toml similarity index 100% rename from recipes/wip/tools/other/just/recipe.toml rename to recipes/wip/tools/just/recipe.toml diff --git a/recipes/wip/tools/other/kami/recipe.toml b/recipes/wip/tools/kami/recipe.toml similarity index 100% rename from recipes/wip/tools/other/kami/recipe.toml rename to recipes/wip/tools/kami/recipe.toml diff --git a/recipes/wip/tools/other/kanata/recipe.toml b/recipes/wip/tools/kanata/recipe.toml similarity index 100% rename from recipes/wip/tools/other/kanata/recipe.toml rename to recipes/wip/tools/kanata/recipe.toml diff --git a/recipes/wip/tools/other/kbt/recipe.toml b/recipes/wip/tools/kbt/recipe.toml similarity index 100% rename from recipes/wip/tools/other/kbt/recipe.toml rename to recipes/wip/tools/kbt/recipe.toml diff --git a/recipes/wip/tools/other/keepassxc/recipe.toml b/recipes/wip/tools/keepassxc/recipe.toml similarity index 100% rename from recipes/wip/tools/other/keepassxc/recipe.toml rename to recipes/wip/tools/keepassxc/recipe.toml diff --git a/recipes/wip/tools/other/kibi/recipe.toml b/recipes/wip/tools/kibi/recipe.toml similarity index 100% rename from recipes/wip/tools/other/kibi/recipe.toml rename to recipes/wip/tools/kibi/recipe.toml diff --git a/recipes/wip/tools/other/kodi/recipe.toml b/recipes/wip/tools/kodi/recipe.toml similarity index 100% rename from recipes/wip/tools/other/kodi/recipe.toml rename to recipes/wip/tools/kodi/recipe.toml diff --git a/recipes/wip/tools/other/lan-mouse/recipe.toml b/recipes/wip/tools/lan-mouse/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lan-mouse/recipe.toml rename to recipes/wip/tools/lan-mouse/recipe.toml diff --git a/recipes/wip/tools/other/lapce/recipe.toml b/recipes/wip/tools/lapce/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lapce/recipe.toml rename to recipes/wip/tools/lapce/recipe.toml diff --git a/recipes/wip/tools/other/lazy-etherscan/recipe.toml b/recipes/wip/tools/lazy-etherscan/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lazy-etherscan/recipe.toml rename to recipes/wip/tools/lazy-etherscan/recipe.toml diff --git a/recipes/wip/tools/other/lcs-image-diff/recipe.toml b/recipes/wip/tools/lcs-image-diff/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lcs-image-diff/recipe.toml rename to recipes/wip/tools/lcs-image-diff/recipe.toml diff --git a/recipes/wip/tools/other/lddtree-rs/recipe.toml b/recipes/wip/tools/lddtree-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lddtree-rs/recipe.toml rename to recipes/wip/tools/lddtree-rs/recipe.toml diff --git a/recipes/wip/tools/other/legdur/recipe.toml b/recipes/wip/tools/legdur/recipe.toml similarity index 100% rename from recipes/wip/tools/other/legdur/recipe.toml rename to recipes/wip/tools/legdur/recipe.toml diff --git a/recipes/wip/tools/other/lemmeknow/recipe.toml b/recipes/wip/tools/lemmeknow/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lemmeknow/recipe.toml rename to recipes/wip/tools/lemmeknow/recipe.toml diff --git a/recipes/wip/tools/other/less/recipe.toml b/recipes/wip/tools/less/recipe.toml similarity index 100% rename from recipes/wip/tools/other/less/recipe.toml rename to recipes/wip/tools/less/recipe.toml diff --git a/recipes/wip/tools/other/lines-rs/recipe.toml b/recipes/wip/tools/lines-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lines-rs/recipe.toml rename to recipes/wip/tools/lines-rs/recipe.toml diff --git a/recipes/wip/tools/other/lineselect/recipe.toml b/recipes/wip/tools/lineselect/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lineselect/recipe.toml rename to recipes/wip/tools/lineselect/recipe.toml diff --git a/recipes/wip/tools/other/logss/recipe.toml b/recipes/wip/tools/logss/recipe.toml similarity index 100% rename from recipes/wip/tools/other/logss/recipe.toml rename to recipes/wip/tools/logss/recipe.toml diff --git a/recipes/wip/tools/other/lowcharts/recipe.toml b/recipes/wip/tools/lowcharts/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lowcharts/recipe.toml rename to recipes/wip/tools/lowcharts/recipe.toml diff --git a/recipes/wip/tools/other/lsd/recipe.toml b/recipes/wip/tools/lsd/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lsd/recipe.toml rename to recipes/wip/tools/lsd/recipe.toml diff --git a/recipes/wip/tools/other/lsix/recipe.toml b/recipes/wip/tools/lsix/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lsix/recipe.toml rename to recipes/wip/tools/lsix/recipe.toml diff --git a/recipes/wip/tools/other/lucid/recipe.toml b/recipes/wip/tools/lucid/recipe.toml similarity index 100% rename from recipes/wip/tools/other/lucid/recipe.toml rename to recipes/wip/tools/lucid/recipe.toml diff --git a/recipes/wip/tools/other/macchina/recipe.toml b/recipes/wip/tools/macchina/recipe.toml similarity index 100% rename from recipes/wip/tools/other/macchina/recipe.toml rename to recipes/wip/tools/macchina/recipe.toml diff --git a/recipes/wip/tools/other/mandy/recipe.toml b/recipes/wip/tools/mandy/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mandy/recipe.toml rename to recipes/wip/tools/mandy/recipe.toml diff --git a/recipes/wip/tools/other/mangohud/recipe.toml b/recipes/wip/tools/mangohud/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mangohud/recipe.toml rename to recipes/wip/tools/mangohud/recipe.toml diff --git a/recipes/wip/tools/other/mask/recipe.toml b/recipes/wip/tools/mask/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mask/recipe.toml rename to recipes/wip/tools/mask/recipe.toml diff --git a/recipes/wip/tools/other/matui/recipe.toml b/recipes/wip/tools/matui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/matui/recipe.toml rename to recipes/wip/tools/matui/recipe.toml diff --git a/recipes/wip/tools/other/maze-tui/recipe.toml b/recipes/wip/tools/maze-tui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/maze-tui/recipe.toml rename to recipes/wip/tools/maze-tui/recipe.toml diff --git a/recipes/wip/tools/other/mcfly/recipe.toml b/recipes/wip/tools/mcfly/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mcfly/recipe.toml rename to recipes/wip/tools/mcfly/recipe.toml diff --git a/recipes/wip/tools/other/mdbook/recipe.toml b/recipes/wip/tools/mdbook/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mdbook/recipe.toml rename to recipes/wip/tools/mdbook/recipe.toml diff --git a/recipes/wip/tools/other/menyoki/recipe.toml b/recipes/wip/tools/menyoki/recipe.toml similarity index 100% rename from recipes/wip/tools/other/menyoki/recipe.toml rename to recipes/wip/tools/menyoki/recipe.toml diff --git a/recipes/wip/tools/other/mercurial/recipe.toml b/recipes/wip/tools/mercurial/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mercurial/recipe.toml rename to recipes/wip/tools/mercurial/recipe.toml diff --git a/recipes/wip/tools/other/mhv/recipe.toml b/recipes/wip/tools/mhv/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mhv/recipe.toml rename to recipes/wip/tools/mhv/recipe.toml diff --git a/recipes/wip/tools/other/miniaudicle/recipe.toml b/recipes/wip/tools/miniaudicle/recipe.toml similarity index 100% rename from recipes/wip/tools/other/miniaudicle/recipe.toml rename to recipes/wip/tools/miniaudicle/recipe.toml diff --git a/recipes/wip/tools/other/minmon/recipe.toml b/recipes/wip/tools/minmon/recipe.toml similarity index 100% rename from recipes/wip/tools/other/minmon/recipe.toml rename to recipes/wip/tools/minmon/recipe.toml diff --git a/recipes/wip/tools/other/mkisofs-rs/recipe.toml b/recipes/wip/tools/mkisofs-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mkisofs-rs/recipe.toml rename to recipes/wip/tools/mkisofs-rs/recipe.toml diff --git a/recipes/wip/tools/other/mosh/recipe.toml b/recipes/wip/tools/mosh/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mosh/recipe.toml rename to recipes/wip/tools/mosh/recipe.toml diff --git a/recipes/wip/tools/other/mprocs/recipe.toml b/recipes/wip/tools/mprocs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/mprocs/recipe.toml rename to recipes/wip/tools/mprocs/recipe.toml diff --git a/recipes/wip/tools/other/navi/recipe.toml b/recipes/wip/tools/navi/recipe.toml similarity index 100% rename from recipes/wip/tools/other/navi/recipe.toml rename to recipes/wip/tools/navi/recipe.toml diff --git a/recipes/wip/tools/other/neofetch/recipe.toml b/recipes/wip/tools/neofetch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/neofetch/recipe.toml rename to recipes/wip/tools/neofetch/recipe.toml diff --git a/recipes/wip/tools/other/neovide/recipe.toml b/recipes/wip/tools/neovide/recipe.toml similarity index 100% rename from recipes/wip/tools/other/neovide/recipe.toml rename to recipes/wip/tools/neovide/recipe.toml diff --git a/recipes/wip/tools/other/neovim/recipe.toml b/recipes/wip/tools/neovim/recipe.toml similarity index 100% rename from recipes/wip/tools/other/neovim/recipe.toml rename to recipes/wip/tools/neovim/recipe.toml diff --git a/recipes/wip/tools/other/news-rs/recipe.toml b/recipes/wip/tools/news-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/news-rs/recipe.toml rename to recipes/wip/tools/news-rs/recipe.toml diff --git a/recipes/wip/tools/other/nickel/recipe.toml b/recipes/wip/tools/nickel/recipe.toml similarity index 100% rename from recipes/wip/tools/other/nickel/recipe.toml rename to recipes/wip/tools/nickel/recipe.toml diff --git a/recipes/wip/tools/other/nix/recipe.toml b/recipes/wip/tools/nix/recipe.toml similarity index 100% rename from recipes/wip/tools/other/nix/recipe.toml rename to recipes/wip/tools/nix/recipe.toml diff --git a/recipes/wip/tools/other/nomad/recipe.toml b/recipes/wip/tools/nomad/recipe.toml similarity index 100% rename from recipes/wip/tools/other/nomad/recipe.toml rename to recipes/wip/tools/nomad/recipe.toml diff --git a/recipes/wip/tools/other/notnow/recipe.toml b/recipes/wip/tools/notnow/recipe.toml similarity index 100% rename from recipes/wip/tools/other/notnow/recipe.toml rename to recipes/wip/tools/notnow/recipe.toml diff --git a/recipes/wip/tools/other/objdiff/recipe.toml b/recipes/wip/tools/objdiff/recipe.toml similarity index 100% rename from recipes/wip/tools/other/objdiff/recipe.toml rename to recipes/wip/tools/objdiff/recipe.toml diff --git a/recipes/wip/tools/other/obs-studio/recipe.toml b/recipes/wip/tools/obs-studio/recipe.toml similarity index 100% rename from recipes/wip/tools/other/obs-studio/recipe.toml rename to recipes/wip/tools/obs-studio/recipe.toml diff --git a/recipes/wip/tools/other/odilia/recipe.toml b/recipes/wip/tools/odilia/recipe.toml similarity index 100% rename from recipes/wip/tools/other/odilia/recipe.toml rename to recipes/wip/tools/odilia/recipe.toml diff --git a/recipes/wip/tools/other/okteta/recipe.toml b/recipes/wip/tools/okteta/recipe.toml similarity index 100% rename from recipes/wip/tools/other/okteta/recipe.toml rename to recipes/wip/tools/okteta/recipe.toml diff --git a/recipes/wip/tools/other/omega/recipe.toml b/recipes/wip/tools/omega/recipe.toml similarity index 100% rename from recipes/wip/tools/other/omega/recipe.toml rename to recipes/wip/tools/omega/recipe.toml diff --git a/recipes/wip/tools/other/onefetch/recipe.toml b/recipes/wip/tools/onefetch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/onefetch/recipe.toml rename to recipes/wip/tools/onefetch/recipe.toml diff --git a/recipes/wip/tools/other/oranda/recipe.toml b/recipes/wip/tools/oranda/recipe.toml similarity index 100% rename from recipes/wip/tools/other/oranda/recipe.toml rename to recipes/wip/tools/oranda/recipe.toml diff --git a/recipes/wip/tools/other/orchaldir-texture-generator/recipe.toml b/recipes/wip/tools/orchaldir-texture-generator/recipe.toml similarity index 100% rename from recipes/wip/tools/other/orchaldir-texture-generator/recipe.toml rename to recipes/wip/tools/orchaldir-texture-generator/recipe.toml diff --git a/recipes/wip/tools/other/oxipng/recipe.toml b/recipes/wip/tools/oxipng/recipe.toml similarity index 100% rename from recipes/wip/tools/other/oxipng/recipe.toml rename to recipes/wip/tools/oxipng/recipe.toml diff --git a/recipes/wip/tools/other/parabolic/recipe.toml b/recipes/wip/tools/parabolic/recipe.toml similarity index 100% rename from recipes/wip/tools/other/parabolic/recipe.toml rename to recipes/wip/tools/parabolic/recipe.toml diff --git a/recipes/wip/tools/other/patchelf/recipe.toml b/recipes/wip/tools/patchelf/recipe.toml similarity index 100% rename from recipes/wip/tools/other/patchelf/recipe.toml rename to recipes/wip/tools/patchelf/recipe.toml diff --git a/recipes/wip/tools/other/pciutils/recipe.toml b/recipes/wip/tools/pciutils/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pciutils/recipe.toml rename to recipes/wip/tools/pciutils/recipe.toml diff --git a/recipes/wip/tools/other/pdbview/recipe.toml b/recipes/wip/tools/pdbview/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pdbview/recipe.toml rename to recipes/wip/tools/pdbview/recipe.toml diff --git a/recipes/wip/tools/other/pdu/recipe.toml b/recipes/wip/tools/pdu/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pdu/recipe.toml rename to recipes/wip/tools/pdu/recipe.toml diff --git a/recipes/wip/tools/other/pfetch-rs/recipe.toml b/recipes/wip/tools/pfetch-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pfetch-rs/recipe.toml rename to recipes/wip/tools/pfetch-rs/recipe.toml diff --git a/recipes/wip/tools/other/pidgin/recipe.toml b/recipes/wip/tools/pidgin/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pidgin/recipe.toml rename to recipes/wip/tools/pidgin/recipe.toml diff --git a/recipes/wip/tools/other/pipr/recipe.toml b/recipes/wip/tools/pipr/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pipr/recipe.toml rename to recipes/wip/tools/pipr/recipe.toml diff --git a/recipes/wip/tools/other/pixcil/recipe.toml b/recipes/wip/tools/pixcil/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pixcil/recipe.toml rename to recipes/wip/tools/pixcil/recipe.toml diff --git a/recipes/wip/tools/other/pixelsort/recipe.toml b/recipes/wip/tools/pixelsort/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pixelsort/recipe.toml rename to recipes/wip/tools/pixelsort/recipe.toml diff --git a/recipes/wip/tools/other/please/recipe.toml b/recipes/wip/tools/please/recipe.toml similarity index 100% rename from recipes/wip/tools/other/please/recipe.toml rename to recipes/wip/tools/please/recipe.toml diff --git a/recipes/wip/tools/other/pomky/recipe.toml b/recipes/wip/tools/pomky/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pomky/recipe.toml rename to recipes/wip/tools/pomky/recipe.toml diff --git a/recipes/wip/tools/other/porsmo/recipe.toml b/recipes/wip/tools/porsmo/recipe.toml similarity index 100% rename from recipes/wip/tools/other/porsmo/recipe.toml rename to recipes/wip/tools/porsmo/recipe.toml diff --git a/recipes/wip/tools/other/posixutils-rs/recipe.toml b/recipes/wip/tools/posixutils-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/posixutils-rs/recipe.toml rename to recipes/wip/tools/posixutils-rs/recipe.toml diff --git a/recipes/wip/tools/other/potrace/recipe.toml b/recipes/wip/tools/potrace/recipe.toml similarity index 100% rename from recipes/wip/tools/other/potrace/recipe.toml rename to recipes/wip/tools/potrace/recipe.toml diff --git a/recipes/wip/tools/other/presenterm/recipe.toml b/recipes/wip/tools/presenterm/recipe.toml similarity index 100% rename from recipes/wip/tools/other/presenterm/recipe.toml rename to recipes/wip/tools/presenterm/recipe.toml diff --git a/recipes/wip/tools/other/process-viewer/recipe.toml b/recipes/wip/tools/process-viewer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/process-viewer/recipe.toml rename to recipes/wip/tools/process-viewer/recipe.toml diff --git a/recipes/wip/tools/other/procs/recipe.toml b/recipes/wip/tools/procs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/procs/recipe.toml rename to recipes/wip/tools/procs/recipe.toml diff --git a/recipes/wip/tools/other/pueue/recipe.toml b/recipes/wip/tools/pueue/recipe.toml similarity index 100% rename from recipes/wip/tools/other/pueue/recipe.toml rename to recipes/wip/tools/pueue/recipe.toml diff --git a/recipes/wip/tools/other/qalculate-gtk/recipe.toml b/recipes/wip/tools/qalculate-gtk/recipe.toml similarity index 100% rename from recipes/wip/tools/other/qalculate-gtk/recipe.toml rename to recipes/wip/tools/qalculate-gtk/recipe.toml diff --git a/recipes/wip/tools/other/qrrs/recipe.toml b/recipes/wip/tools/qrrs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/qrrs/recipe.toml rename to recipes/wip/tools/qrrs/recipe.toml diff --git a/recipes/wip/tools/other/qrtool/recipe.toml b/recipes/wip/tools/qrtool/recipe.toml similarity index 100% rename from recipes/wip/tools/other/qrtool/recipe.toml rename to recipes/wip/tools/qrtool/recipe.toml diff --git a/recipes/wip/tools/other/qv/recipe.toml b/recipes/wip/tools/qv/recipe.toml similarity index 100% rename from recipes/wip/tools/other/qv/recipe.toml rename to recipes/wip/tools/qv/recipe.toml diff --git a/recipes/wip/tools/other/rage/recipe.toml b/recipes/wip/tools/rage/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rage/recipe.toml rename to recipes/wip/tools/rage/recipe.toml diff --git a/recipes/wip/tools/other/rana/recipe.toml b/recipes/wip/tools/rana/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rana/recipe.toml rename to recipes/wip/tools/rana/recipe.toml diff --git a/recipes/wip/tools/other/rargs/recipe.toml b/recipes/wip/tools/rargs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rargs/recipe.toml rename to recipes/wip/tools/rargs/recipe.toml diff --git a/recipes/wip/tools/other/rclone/recipe.toml b/recipes/wip/tools/rclone/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rclone/recipe.toml rename to recipes/wip/tools/rclone/recipe.toml diff --git a/recipes/wip/tools/other/remmina/recipe.toml b/recipes/wip/tools/remmina/recipe.toml similarity index 100% rename from recipes/wip/tools/other/remmina/recipe.toml rename to recipes/wip/tools/remmina/recipe.toml diff --git a/recipes/wip/tools/other/repgrep/recipe.toml b/recipes/wip/tools/repgrep/recipe.toml similarity index 100% rename from recipes/wip/tools/other/repgrep/recipe.toml rename to recipes/wip/tools/repgrep/recipe.toml diff --git a/recipes/wip/tools/other/restic/recipe.toml b/recipes/wip/tools/restic/recipe.toml similarity index 100% rename from recipes/wip/tools/other/restic/recipe.toml rename to recipes/wip/tools/restic/recipe.toml diff --git a/recipes/wip/tools/other/rfetch/recipe.toml b/recipes/wip/tools/rfetch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rfetch/recipe.toml rename to recipes/wip/tools/rfetch/recipe.toml diff --git a/recipes/wip/tools/other/rfz/recipe.toml b/recipes/wip/tools/rfz/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rfz/recipe.toml rename to recipes/wip/tools/rfz/recipe.toml diff --git a/recipes/wip/tools/other/rip/recipe.toml b/recipes/wip/tools/rip/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rip/recipe.toml rename to recipes/wip/tools/rip/recipe.toml diff --git a/recipes/wip/tools/other/ripasso/recipe.toml b/recipes/wip/tools/ripasso/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ripasso/recipe.toml rename to recipes/wip/tools/ripasso/recipe.toml diff --git a/recipes/wip/tools/other/ripgrep-all/recipe.toml b/recipes/wip/tools/ripgrep-all/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ripgrep-all/recipe.toml rename to recipes/wip/tools/ripgrep-all/recipe.toml diff --git a/recipes/wip/tools/other/ripsecrets/recipe.toml b/recipes/wip/tools/ripsecrets/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ripsecrets/recipe.toml rename to recipes/wip/tools/ripsecrets/recipe.toml diff --git a/recipes/wip/tools/other/rix/recipe.toml b/recipes/wip/tools/rix/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rix/recipe.toml rename to recipes/wip/tools/rix/recipe.toml diff --git a/recipes/wip/tools/other/rnr/recipe.toml b/recipes/wip/tools/rnr/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rnr/recipe.toml rename to recipes/wip/tools/rnr/recipe.toml diff --git a/recipes/wip/tools/other/rq/recipe.toml b/recipes/wip/tools/rq/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rq/recipe.toml rename to recipes/wip/tools/rq/recipe.toml diff --git a/recipes/wip/tools/other/rsftch/recipe.toml b/recipes/wip/tools/rsftch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rsftch/recipe.toml rename to recipes/wip/tools/rsftch/recipe.toml diff --git a/recipes/wip/tools/other/rsync/recipe.toml b/recipes/wip/tools/rsync/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rsync/recipe.toml rename to recipes/wip/tools/rsync/recipe.toml diff --git a/recipes/wip/tools/other/rtorrent/recipe.toml b/recipes/wip/tools/rtorrent/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rtorrent/recipe.toml rename to recipes/wip/tools/rtorrent/recipe.toml diff --git a/recipes/wip/tools/other/ruke/recipe.toml b/recipes/wip/tools/ruke/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ruke/recipe.toml rename to recipes/wip/tools/ruke/recipe.toml diff --git a/recipes/wip/tools/other/run/recipe.toml b/recipes/wip/tools/run/recipe.toml similarity index 100% rename from recipes/wip/tools/other/run/recipe.toml rename to recipes/wip/tools/run/recipe.toml diff --git a/recipes/wip/tools/other/ruplacer/recipe.toml b/recipes/wip/tools/ruplacer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ruplacer/recipe.toml rename to recipes/wip/tools/ruplacer/recipe.toml diff --git a/recipes/wip/tools/other/rustlings/recipe.toml b/recipes/wip/tools/rustlings/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rustlings/recipe.toml rename to recipes/wip/tools/rustlings/recipe.toml diff --git a/recipes/wip/tools/other/rusty-krab-manager/recipe.toml b/recipes/wip/tools/rusty-krab-manager/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rusty-krab-manager/recipe.toml rename to recipes/wip/tools/rusty-krab-manager/recipe.toml diff --git a/recipes/wip/tools/other/rusty-psn-cli/recipe.toml b/recipes/wip/tools/rusty-psn-cli/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rusty-psn-cli/recipe.toml rename to recipes/wip/tools/rusty-psn-cli/recipe.toml diff --git a/recipes/wip/tools/other/rusty-psn-gui/recipe.toml b/recipes/wip/tools/rusty-psn-gui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rusty-psn-gui/recipe.toml rename to recipes/wip/tools/rusty-psn-gui/recipe.toml diff --git a/recipes/wip/tools/other/rusty/recipe.toml b/recipes/wip/tools/rusty/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rusty/recipe.toml rename to recipes/wip/tools/rusty/recipe.toml diff --git a/recipes/wip/tools/other/rusync/recipe.toml b/recipes/wip/tools/rusync/recipe.toml similarity index 100% rename from recipes/wip/tools/other/rusync/recipe.toml rename to recipes/wip/tools/rusync/recipe.toml diff --git a/recipes/wip/tools/other/sad/recipe.toml b/recipes/wip/tools/sad/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sad/recipe.toml rename to recipes/wip/tools/sad/recipe.toml diff --git a/recipes/wip/tools/other/sam/recipe.toml b/recipes/wip/tools/sam/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sam/recipe.toml rename to recipes/wip/tools/sam/recipe.toml diff --git a/recipes/wip/tools/other/scribus/recipe.toml b/recipes/wip/tools/scribus/recipe.toml similarity index 100% rename from recipes/wip/tools/other/scribus/recipe.toml rename to recipes/wip/tools/scribus/recipe.toml diff --git a/recipes/wip/tools/other/scrying/recipe.toml b/recipes/wip/tools/scrying/recipe.toml similarity index 100% rename from recipes/wip/tools/other/scrying/recipe.toml rename to recipes/wip/tools/scrying/recipe.toml diff --git a/recipes/wip/tools/other/sd/recipe.toml b/recipes/wip/tools/sd/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sd/recipe.toml rename to recipes/wip/tools/sd/recipe.toml diff --git a/recipes/wip/tools/other/shd/recipe.toml b/recipes/wip/tools/shd/recipe.toml similarity index 100% rename from recipes/wip/tools/other/shd/recipe.toml rename to recipes/wip/tools/shd/recipe.toml diff --git a/recipes/wip/tools/other/shellfirm/recipe.toml b/recipes/wip/tools/shellfirm/recipe.toml similarity index 100% rename from recipes/wip/tools/other/shellfirm/recipe.toml rename to recipes/wip/tools/shellfirm/recipe.toml diff --git a/recipes/wip/tools/other/shokunin/recipe.toml b/recipes/wip/tools/shokunin/recipe.toml similarity index 100% rename from recipes/wip/tools/other/shokunin/recipe.toml rename to recipes/wip/tools/shokunin/recipe.toml diff --git a/recipes/wip/tools/other/sig/recipe.toml b/recipes/wip/tools/sig/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sig/recipe.toml rename to recipes/wip/tools/sig/recipe.toml diff --git a/recipes/wip/tools/other/sigi/recipe.toml b/recipes/wip/tools/sigi/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sigi/recipe.toml rename to recipes/wip/tools/sigi/recipe.toml diff --git a/recipes/wip/tools/other/simplemoji/recipe.toml b/recipes/wip/tools/simplemoji/recipe.toml similarity index 100% rename from recipes/wip/tools/other/simplemoji/recipe.toml rename to recipes/wip/tools/simplemoji/recipe.toml diff --git a/recipes/wip/tools/other/skim/recipe.toml b/recipes/wip/tools/skim/recipe.toml similarity index 100% rename from recipes/wip/tools/other/skim/recipe.toml rename to recipes/wip/tools/skim/recipe.toml diff --git a/recipes/wip/tools/other/skyspell/recipe.toml b/recipes/wip/tools/skyspell/recipe.toml similarity index 100% rename from recipes/wip/tools/other/skyspell/recipe.toml rename to recipes/wip/tools/skyspell/recipe.toml diff --git a/recipes/wip/tools/other/smartmontools/recipe.toml b/recipes/wip/tools/smartmontools/recipe.toml similarity index 100% rename from recipes/wip/tools/other/smartmontools/recipe.toml rename to recipes/wip/tools/smartmontools/recipe.toml diff --git a/recipes/wip/tools/other/snappy-rs/recipe.toml b/recipes/wip/tools/snappy-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/snappy-rs/recipe.toml rename to recipes/wip/tools/snappy-rs/recipe.toml diff --git a/recipes/wip/tools/other/spacer/recipe.toml b/recipes/wip/tools/spacer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/spacer/recipe.toml rename to recipes/wip/tools/spacer/recipe.toml diff --git a/recipes/wip/tools/other/spidey/recipe.toml b/recipes/wip/tools/spidey/recipe.toml similarity index 100% rename from recipes/wip/tools/other/spidey/recipe.toml rename to recipes/wip/tools/spidey/recipe.toml diff --git a/recipes/wip/tools/other/sprinkles/recipe.toml b/recipes/wip/tools/sprinkles/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sprinkles/recipe.toml rename to recipes/wip/tools/sprinkles/recipe.toml diff --git a/recipes/wip/tools/other/starship/recipe.toml b/recipes/wip/tools/starship/recipe.toml similarity index 100% rename from recipes/wip/tools/other/starship/recipe.toml rename to recipes/wip/tools/starship/recipe.toml diff --git a/recipes/wip/tools/other/stellarium/recipe.toml b/recipes/wip/tools/stellarium/recipe.toml similarity index 100% rename from recipes/wip/tools/other/stellarium/recipe.toml rename to recipes/wip/tools/stellarium/recipe.toml diff --git a/recipes/wip/tools/other/stress-ng/recipe.toml b/recipes/wip/tools/stress-ng/recipe.toml similarity index 100% rename from recipes/wip/tools/other/stress-ng/recipe.toml rename to recipes/wip/tools/stress-ng/recipe.toml diff --git a/recipes/wip/tools/other/succeed2ban-tui/recipe.toml b/recipes/wip/tools/succeed2ban-tui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/succeed2ban-tui/recipe.toml rename to recipes/wip/tools/succeed2ban-tui/recipe.toml diff --git a/recipes/wip/tools/other/sudo-rs/recipe.toml b/recipes/wip/tools/sudo-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sudo-rs/recipe.toml rename to recipes/wip/tools/sudo-rs/recipe.toml diff --git a/recipes/wip/tools/other/sued/recipe.toml b/recipes/wip/tools/sued/recipe.toml similarity index 100% rename from recipes/wip/tools/other/sued/recipe.toml rename to recipes/wip/tools/sued/recipe.toml diff --git a/recipes/wip/tools/other/svg2pdf/recipe.toml b/recipes/wip/tools/svg2pdf/recipe.toml similarity index 100% rename from recipes/wip/tools/other/svg2pdf/recipe.toml rename to recipes/wip/tools/svg2pdf/recipe.toml diff --git a/recipes/wip/tools/other/swc/recipe.toml b/recipes/wip/tools/swc/recipe.toml similarity index 100% rename from recipes/wip/tools/other/swc/recipe.toml rename to recipes/wip/tools/swc/recipe.toml diff --git a/recipes/wip/tools/other/t-rec/recipe.toml b/recipes/wip/tools/t-rec/recipe.toml similarity index 100% rename from recipes/wip/tools/other/t-rec/recipe.toml rename to recipes/wip/tools/t-rec/recipe.toml diff --git a/recipes/wip/tools/other/tailspin/recipe.toml b/recipes/wip/tools/tailspin/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tailspin/recipe.toml rename to recipes/wip/tools/tailspin/recipe.toml diff --git a/recipes/wip/tools/other/tarlz/recipe.toml b/recipes/wip/tools/tarlz/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tarlz/recipe.toml rename to recipes/wip/tools/tarlz/recipe.toml diff --git a/recipes/wip/tools/other/task-maker-rs/recipe.toml b/recipes/wip/tools/task-maker-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/task-maker-rs/recipe.toml rename to recipes/wip/tools/task-maker-rs/recipe.toml diff --git a/recipes/wip/tools/other/taskserver/recipe.toml b/recipes/wip/tools/taskserver/recipe.toml similarity index 100% rename from recipes/wip/tools/other/taskserver/recipe.toml rename to recipes/wip/tools/taskserver/recipe.toml diff --git a/recipes/wip/tools/other/taskwarrior-tui/recipe.toml b/recipes/wip/tools/taskwarrior-tui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/taskwarrior-tui/recipe.toml rename to recipes/wip/tools/taskwarrior-tui/recipe.toml diff --git a/recipes/wip/tools/other/taskwarrior/recipe.toml b/recipes/wip/tools/taskwarrior/recipe.toml similarity index 100% rename from recipes/wip/tools/other/taskwarrior/recipe.toml rename to recipes/wip/tools/taskwarrior/recipe.toml diff --git a/recipes/wip/tools/other/tauro-monitor/recipe.toml b/recipes/wip/tools/tauro-monitor/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tauro-monitor/recipe.toml rename to recipes/wip/tools/tauro-monitor/recipe.toml diff --git a/recipes/wip/tools/other/tealdeer/recipe.toml b/recipes/wip/tools/tealdeer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tealdeer/recipe.toml rename to recipes/wip/tools/tealdeer/recipe.toml diff --git a/recipes/wip/tools/other/teip/recipe.toml b/recipes/wip/tools/teip/recipe.toml similarity index 100% rename from recipes/wip/tools/other/teip/recipe.toml rename to recipes/wip/tools/teip/recipe.toml diff --git a/recipes/wip/tools/other/termimage/recipe.toml b/recipes/wip/tools/termimage/recipe.toml similarity index 100% rename from recipes/wip/tools/other/termimage/recipe.toml rename to recipes/wip/tools/termimage/recipe.toml diff --git a/recipes/wip/tools/other/thwack/recipe.toml b/recipes/wip/tools/thwack/recipe.toml similarity index 100% rename from recipes/wip/tools/other/thwack/recipe.toml rename to recipes/wip/tools/thwack/recipe.toml diff --git a/recipes/wip/tools/other/tin-summer/recipe.toml b/recipes/wip/tools/tin-summer/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tin-summer/recipe.toml rename to recipes/wip/tools/tin-summer/recipe.toml diff --git a/recipes/wip/tools/other/tinywasm/recipe.toml b/recipes/wip/tools/tinywasm/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tinywasm/recipe.toml rename to recipes/wip/tools/tinywasm/recipe.toml diff --git a/recipes/wip/tools/other/tl-rs/recipe.toml b/recipes/wip/tools/tl-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tl-rs/recipe.toml rename to recipes/wip/tools/tl-rs/recipe.toml diff --git a/recipes/wip/tools/other/tock/recipe.toml b/recipes/wip/tools/tock/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tock/recipe.toml rename to recipes/wip/tools/tock/recipe.toml diff --git a/recipes/wip/tools/other/toipe/recipe.toml b/recipes/wip/tools/toipe/recipe.toml similarity index 100% rename from recipes/wip/tools/other/toipe/recipe.toml rename to recipes/wip/tools/toipe/recipe.toml diff --git a/recipes/wip/tools/other/topgrade/recipe.toml b/recipes/wip/tools/topgrade/recipe.toml similarity index 100% rename from recipes/wip/tools/other/topgrade/recipe.toml rename to recipes/wip/tools/topgrade/recipe.toml diff --git a/recipes/wip/tools/other/torrust-tracker/recipe.toml b/recipes/wip/tools/torrust-tracker/recipe.toml similarity index 100% rename from recipes/wip/tools/other/torrust-tracker/recipe.toml rename to recipes/wip/tools/torrust-tracker/recipe.toml diff --git a/recipes/wip/tools/other/toybox/recipe.toml b/recipes/wip/tools/toybox/recipe.toml similarity index 100% rename from recipes/wip/tools/other/toybox/recipe.toml rename to recipes/wip/tools/toybox/recipe.toml diff --git a/recipes/wip/tools/other/tp-note/recipe.toml b/recipes/wip/tools/tp-note/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tp-note/recipe.toml rename to recipes/wip/tools/tp-note/recipe.toml diff --git a/recipes/wip/tools/other/tq/recipe.toml b/recipes/wip/tools/tq/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tq/recipe.toml rename to recipes/wip/tools/tq/recipe.toml diff --git a/recipes/wip/tools/other/treq/recipe.toml b/recipes/wip/tools/treq/recipe.toml similarity index 100% rename from recipes/wip/tools/other/treq/recipe.toml rename to recipes/wip/tools/treq/recipe.toml diff --git a/recipes/wip/tools/other/tsuchita/recipe.toml b/recipes/wip/tools/tsuchita/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tsuchita/recipe.toml rename to recipes/wip/tools/tsuchita/recipe.toml diff --git a/recipes/wip/tools/other/tts-tui/recipe.toml b/recipes/wip/tools/tts-tui/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tts-tui/recipe.toml rename to recipes/wip/tools/tts-tui/recipe.toml diff --git a/recipes/wip/tools/other/ttyper/recipe.toml b/recipes/wip/tools/ttyper/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ttyper/recipe.toml rename to recipes/wip/tools/ttyper/recipe.toml diff --git a/recipes/wip/tools/other/tui-journal/recipe.toml b/recipes/wip/tools/tui-journal/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tui-journal/recipe.toml rename to recipes/wip/tools/tui-journal/recipe.toml diff --git a/recipes/wip/tools/other/tvix/recipe.toml b/recipes/wip/tools/tvix/recipe.toml similarity index 100% rename from recipes/wip/tools/other/tvix/recipe.toml rename to recipes/wip/tools/tvix/recipe.toml diff --git a/recipes/wip/tools/other/typst/recipe.toml b/recipes/wip/tools/typst/recipe.toml similarity index 100% rename from recipes/wip/tools/other/typst/recipe.toml rename to recipes/wip/tools/typst/recipe.toml diff --git a/recipes/wip/tools/other/uget/recipe.toml b/recipes/wip/tools/uget/recipe.toml similarity index 100% rename from recipes/wip/tools/other/uget/recipe.toml rename to recipes/wip/tools/uget/recipe.toml diff --git a/recipes/wip/tools/other/upscaler/recipe.toml b/recipes/wip/tools/upscaler/recipe.toml similarity index 100% rename from recipes/wip/tools/other/upscaler/recipe.toml rename to recipes/wip/tools/upscaler/recipe.toml diff --git a/recipes/wip/tools/other/upx/recipe.toml b/recipes/wip/tools/upx/recipe.toml similarity index 100% rename from recipes/wip/tools/other/upx/recipe.toml rename to recipes/wip/tools/upx/recipe.toml diff --git a/recipes/wip/tools/other/usbutils/recipe.toml b/recipes/wip/tools/usbutils/recipe.toml similarity index 100% rename from recipes/wip/tools/other/usbutils/recipe.toml rename to recipes/wip/tools/usbutils/recipe.toml diff --git a/recipes/wip/tools/other/util-linux/recipe.toml b/recipes/wip/tools/util-linux/recipe.toml similarity index 100% rename from recipes/wip/tools/other/util-linux/recipe.toml rename to recipes/wip/tools/util-linux/recipe.toml diff --git a/recipes/wip/tools/other/vector/recipe.toml b/recipes/wip/tools/vector/recipe.toml similarity index 100% rename from recipes/wip/tools/other/vector/recipe.toml rename to recipes/wip/tools/vector/recipe.toml diff --git a/recipes/wip/tools/other/ventoy/recipe.toml b/recipes/wip/tools/ventoy/recipe.toml similarity index 100% rename from recipes/wip/tools/other/ventoy/recipe.toml rename to recipes/wip/tools/ventoy/recipe.toml diff --git a/recipes/wip/tools/other/vincenzo/recipe.toml b/recipes/wip/tools/vincenzo/recipe.toml similarity index 100% rename from recipes/wip/tools/other/vincenzo/recipe.toml rename to recipes/wip/tools/vincenzo/recipe.toml diff --git a/recipes/wip/tools/other/vlc/recipe.toml b/recipes/wip/tools/vlc/recipe.toml similarity index 100% rename from recipes/wip/tools/other/vlc/recipe.toml rename to recipes/wip/tools/vlc/recipe.toml diff --git a/recipes/wip/tools/other/vulkan-tools/recipe.toml b/recipes/wip/tools/vulkan-tools/recipe.toml similarity index 100% rename from recipes/wip/tools/other/vulkan-tools/recipe.toml rename to recipes/wip/tools/vulkan-tools/recipe.toml diff --git a/recipes/wip/tools/other/watchexec/recipe.toml b/recipes/wip/tools/watchexec/recipe.toml similarity index 100% rename from recipes/wip/tools/other/watchexec/recipe.toml rename to recipes/wip/tools/watchexec/recipe.toml diff --git a/recipes/wip/tools/other/watchmen/recipe.toml b/recipes/wip/tools/watchmen/recipe.toml similarity index 100% rename from recipes/wip/tools/other/watchmen/recipe.toml rename to recipes/wip/tools/watchmen/recipe.toml diff --git a/recipes/wip/tools/other/wayback-rs/recipe.toml b/recipes/wip/tools/wayback-rs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/wayback-rs/recipe.toml rename to recipes/wip/tools/wayback-rs/recipe.toml diff --git a/recipes/wip/tools/other/wayshot/recipe.toml b/recipes/wip/tools/wayshot/recipe.toml similarity index 100% rename from recipes/wip/tools/other/wayshot/recipe.toml rename to recipes/wip/tools/wayshot/recipe.toml diff --git a/recipes/wip/tools/other/wethr/recipe.toml b/recipes/wip/tools/wethr/recipe.toml similarity index 100% rename from recipes/wip/tools/other/wethr/recipe.toml rename to recipes/wip/tools/wethr/recipe.toml diff --git a/recipes/wip/tools/other/weylus/recipe.toml b/recipes/wip/tools/weylus/recipe.toml similarity index 100% rename from recipes/wip/tools/other/weylus/recipe.toml rename to recipes/wip/tools/weylus/recipe.toml diff --git a/recipes/wip/tools/other/wick/recipe.toml b/recipes/wip/tools/wick/recipe.toml similarity index 100% rename from recipes/wip/tools/other/wick/recipe.toml rename to recipes/wip/tools/wick/recipe.toml diff --git a/recipes/wip/tools/other/wpaperd/recipe.toml b/recipes/wip/tools/wpaperd/recipe.toml similarity index 100% rename from recipes/wip/tools/other/wpaperd/recipe.toml rename to recipes/wip/tools/wpaperd/recipe.toml diff --git a/recipes/wip/tools/other/xcp/recipe.toml b/recipes/wip/tools/xcp/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xcp/recipe.toml rename to recipes/wip/tools/xcp/recipe.toml diff --git a/recipes/wip/tools/other/xdg-utils/recipe.toml b/recipes/wip/tools/xdg-utils/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xdg-utils/recipe.toml rename to recipes/wip/tools/xdg-utils/recipe.toml diff --git a/recipes/wip/tools/other/xdotool/recipe.toml b/recipes/wip/tools/xdotool/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xdotool/recipe.toml rename to recipes/wip/tools/xdotool/recipe.toml diff --git a/recipes/wip/tools/other/xdvdfs/recipe.toml b/recipes/wip/tools/xdvdfs/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xdvdfs/recipe.toml rename to recipes/wip/tools/xdvdfs/recipe.toml diff --git a/recipes/wip/tools/other/xh/recipe.toml b/recipes/wip/tools/xh/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xh/recipe.toml rename to recipes/wip/tools/xh/recipe.toml diff --git a/recipes/wip/tools/other/xiu/recipe.toml b/recipes/wip/tools/xiu/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xiu/recipe.toml rename to recipes/wip/tools/xiu/recipe.toml diff --git a/recipes/wip/tools/other/xorriso/recipe.toml b/recipes/wip/tools/xorriso/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xorriso/recipe.toml rename to recipes/wip/tools/xorriso/recipe.toml diff --git a/recipes/wip/tools/other/xsv/recipe.toml b/recipes/wip/tools/xsv/recipe.toml similarity index 100% rename from recipes/wip/tools/other/xsv/recipe.toml rename to recipes/wip/tools/xsv/recipe.toml diff --git a/recipes/wip/tools/other/zeitfetch/recipe.toml b/recipes/wip/tools/zeitfetch/recipe.toml similarity index 100% rename from recipes/wip/tools/other/zeitfetch/recipe.toml rename to recipes/wip/tools/zeitfetch/recipe.toml diff --git a/recipes/wip/tools/other/zet/recipe.toml b/recipes/wip/tools/zet/recipe.toml similarity index 100% rename from recipes/wip/tools/other/zet/recipe.toml rename to recipes/wip/tools/zet/recipe.toml