diff --git a/recipes/wip/tools/archives/7-zip/recipe.toml b/recipes/wip/archives/7-zip/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/7-zip/recipe.toml
rename to recipes/wip/archives/7-zip/recipe.toml
diff --git a/recipes/wip/tools/archives/lz4/recipe.toml b/recipes/wip/archives/lz4/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/lz4/recipe.toml
rename to recipes/wip/archives/lz4/recipe.toml
diff --git a/recipes/wip/tools/archives/lzip/recipe.toml b/recipes/wip/archives/lzip/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/lzip/recipe.toml
rename to recipes/wip/archives/lzip/recipe.toml
diff --git a/recipes/wip/tools/archives/mlar/recipe.toml b/recipes/wip/archives/mlar/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/mlar/recipe.toml
rename to recipes/wip/archives/mlar/recipe.toml
diff --git a/recipes/wip/tools/archives/orz/recipe.toml b/recipes/wip/archives/orz/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/orz/recipe.toml
rename to recipes/wip/archives/orz/recipe.toml
diff --git a/recipes/wip/tools/archives/ouch/recipe.toml b/recipes/wip/archives/ouch/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/ouch/recipe.toml
rename to recipes/wip/archives/ouch/recipe.toml
diff --git a/recipes/wip/tools/archives/plzip/recipe.toml b/recipes/wip/archives/plzip/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/plzip/recipe.toml
rename to recipes/wip/archives/plzip/recipe.toml
diff --git a/recipes/wip/tools/archives/unzrip/recipe.toml b/recipes/wip/archives/unzrip/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/unzrip/recipe.toml
rename to recipes/wip/archives/unzrip/recipe.toml
diff --git a/recipes/wip/tools/archives/zstd/recipe.toml b/recipes/wip/archives/zstd/recipe.toml
similarity index 100%
rename from recipes/wip/tools/archives/zstd/recipe.toml
rename to recipes/wip/archives/zstd/recipe.toml
diff --git a/recipes/wip/tools/data-integrity/b3sum/recipe.toml b/recipes/wip/data-integrity/b3sum/recipe.toml
similarity index 100%
rename from recipes/wip/tools/data-integrity/b3sum/recipe.toml
rename to recipes/wip/data-integrity/b3sum/recipe.toml
diff --git a/recipes/wip/tools/data-integrity/hashgood/recipe.toml b/recipes/wip/data-integrity/hashgood/recipe.toml
similarity index 100%
rename from recipes/wip/tools/data-integrity/hashgood/recipe.toml
rename to recipes/wip/data-integrity/hashgood/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/btc-vanity/recipe.toml b/recipes/wip/finance/bitcoin/btc-vanity/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/btc-vanity/recipe.toml
rename to recipes/wip/finance/bitcoin/btc-vanity/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/liana/recipe.toml b/recipes/wip/finance/bitcoin/liana/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/liana/recipe.toml
rename to recipes/wip/finance/bitcoin/liana/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/nakamoto-wallet/recipe.toml b/recipes/wip/finance/bitcoin/nakamoto-wallet/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/nakamoto-wallet/recipe.toml
rename to recipes/wip/finance/bitcoin/nakamoto-wallet/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/nakatoshi/recipe.toml b/recipes/wip/finance/bitcoin/nakatoshi/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/nakatoshi/recipe.toml
rename to recipes/wip/finance/bitcoin/nakatoshi/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/ord/recipe.toml b/recipes/wip/finance/bitcoin/ord/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/ord/recipe.toml
rename to recipes/wip/finance/bitcoin/ord/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/pushtx/recipe.toml b/recipes/wip/finance/bitcoin/pushtx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/pushtx/recipe.toml
rename to recipes/wip/finance/bitcoin/pushtx/recipe.toml
diff --git a/recipes/wip/tools/finance/bitcoin/rusty-blockparser/recipe.toml b/recipes/wip/finance/bitcoin/rusty-blockparser/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/bitcoin/rusty-blockparser/recipe.toml
rename to recipes/wip/finance/bitcoin/rusty-blockparser/recipe.toml
diff --git a/recipes/wip/tools/finance/donation/cargo-fund/recipe.toml b/recipes/wip/finance/donation/cargo-fund/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/donation/cargo-fund/recipe.toml
rename to recipes/wip/finance/donation/cargo-fund/recipe.toml
diff --git a/recipes/wip/tools/finance/market/apcacli/recipe.toml b/recipes/wip/finance/market/apcacli/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/market/apcacli/recipe.toml
rename to recipes/wip/finance/market/apcacli/recipe.toml
diff --git a/recipes/wip/tools/finance/market/tick-rs/recipe.toml b/recipes/wip/finance/market/tick-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/market/tick-rs/recipe.toml
rename to recipes/wip/finance/market/tick-rs/recipe.toml
diff --git a/recipes/wip/tools/finance/monero/gupax/recipe.toml b/recipes/wip/finance/monero/gupax/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/monero/gupax/recipe.toml
rename to recipes/wip/finance/monero/gupax/recipe.toml
diff --git a/recipes/wip/tools/finance/monero/xmrig/recipe.toml b/recipes/wip/finance/monero/xmrig/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/monero/xmrig/recipe.toml
rename to recipes/wip/finance/monero/xmrig/recipe.toml
diff --git a/recipes/wip/tools/finance/rex/recipe.toml b/recipes/wip/finance/rex/recipe.toml
similarity index 100%
rename from recipes/wip/tools/finance/rex/recipe.toml
rename to recipes/wip/finance/rex/recipe.toml
diff --git a/recipes/wip/tools/graphics/editors/blender-lts/recipe.toml b/recipes/wip/graphics/editors/blender-lts/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/editors/blender-lts/recipe.toml
rename to recipes/wip/graphics/editors/blender-lts/recipe.toml
diff --git a/recipes/wip/tools/graphics/editors/blender/recipe.toml b/recipes/wip/graphics/editors/blender/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/editors/blender/recipe.toml
rename to recipes/wip/graphics/editors/blender/recipe.toml
diff --git a/recipes/wip/tools/graphics/editors/gimp/recipe.toml b/recipes/wip/graphics/editors/gimp/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/editors/gimp/recipe.toml
rename to recipes/wip/graphics/editors/gimp/recipe.toml
diff --git a/recipes/wip/tools/graphics/editors/inkscape/recipe.toml b/recipes/wip/graphics/editors/inkscape/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/editors/inkscape/recipe.toml
rename to recipes/wip/graphics/editors/inkscape/recipe.toml
diff --git a/recipes/wip/tools/graphics/editors/krita/recipe.toml b/recipes/wip/graphics/editors/krita/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/editors/krita/recipe.toml
rename to recipes/wip/graphics/editors/krita/recipe.toml
diff --git a/recipes/wip/tools/graphics/editors/opentoonz/recipe.toml b/recipes/wip/graphics/editors/opentoonz/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/editors/opentoonz/recipe.toml
rename to recipes/wip/graphics/editors/opentoonz/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/appleseed/recipe.toml b/recipes/wip/graphics/other/appleseed/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/appleseed/recipe.toml
rename to recipes/wip/graphics/other/appleseed/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/c-ray/recipe.toml b/recipes/wip/graphics/other/c-ray/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/c-ray/recipe.toml
rename to recipes/wip/graphics/other/c-ray/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/cmark/recipe.toml b/recipes/wip/graphics/other/cmark/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/cmark/recipe.toml
rename to recipes/wip/graphics/other/cmark/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/darktable/recipe.toml b/recipes/wip/graphics/other/darktable/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/darktable/recipe.toml
rename to recipes/wip/graphics/other/darktable/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/derive-rs/recipe.toml b/recipes/wip/graphics/other/derive-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/derive-rs/recipe.toml
rename to recipes/wip/graphics/other/derive-rs/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/dify/recipe.toml b/recipes/wip/graphics/other/dify/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/dify/recipe.toml
rename to recipes/wip/graphics/other/dify/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/dominant-colours/recipe.toml b/recipes/wip/graphics/other/dominant-colours/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/dominant-colours/recipe.toml
rename to recipes/wip/graphics/other/dominant-colours/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/dssim/recipe.toml b/recipes/wip/graphics/other/dssim/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/dssim/recipe.toml
rename to recipes/wip/graphics/other/dssim/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/embree/recipe.toml b/recipes/wip/graphics/other/embree/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/embree/recipe.toml
rename to recipes/wip/graphics/other/embree/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/flowbetween/recipe.toml b/recipes/wip/graphics/other/flowbetween/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/flowbetween/recipe.toml
rename to recipes/wip/graphics/other/flowbetween/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/gaffer/recipe.toml b/recipes/wip/graphics/other/gaffer/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/gaffer/recipe.toml
rename to recipes/wip/graphics/other/gaffer/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/glou/recipe.toml b/recipes/wip/graphics/other/glou/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/glou/recipe.toml
rename to recipes/wip/graphics/other/glou/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/gmic-qt/recipe.toml b/recipes/wip/graphics/other/gmic-qt/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/gmic-qt/recipe.toml
rename to recipes/wip/graphics/other/gmic-qt/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/gmic/recipe.toml b/recipes/wip/graphics/other/gmic/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/gmic/recipe.toml
rename to recipes/wip/graphics/other/gmic/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/graphicsmagick/recipe.toml b/recipes/wip/graphics/other/graphicsmagick/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/graphicsmagick/recipe.toml
rename to recipes/wip/graphics/other/graphicsmagick/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/graphviz/recipe.toml b/recipes/wip/graphics/other/graphviz/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/graphviz/recipe.toml
rename to recipes/wip/graphics/other/graphviz/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/halo/recipe.toml b/recipes/wip/graphics/other/halo/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/halo/recipe.toml
rename to recipes/wip/graphics/other/halo/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/hdr10plus-tool/recipe.toml b/recipes/wip/graphics/other/hdr10plus-tool/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/hdr10plus-tool/recipe.toml
rename to recipes/wip/graphics/other/hdr10plus-tool/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/image-sieve/recipe.toml b/recipes/wip/graphics/other/image-sieve/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/image-sieve/recipe.toml
rename to recipes/wip/graphics/other/image-sieve/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/imagemagick/recipe.toml b/recipes/wip/graphics/other/imagemagick/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/imagemagick/recipe.toml
rename to recipes/wip/graphics/other/imagemagick/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/incompact3d/recipe.toml b/recipes/wip/graphics/other/incompact3d/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/incompact3d/recipe.toml
rename to recipes/wip/graphics/other/incompact3d/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/jxl-oxide/recipe.toml b/recipes/wip/graphics/other/jxl-oxide/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/jxl-oxide/recipe.toml
rename to recipes/wip/graphics/other/jxl-oxide/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/kantig/recipe.toml b/recipes/wip/graphics/other/kantig/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/kantig/recipe.toml
rename to recipes/wip/graphics/other/kantig/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/lpl/recipe.toml b/recipes/wip/graphics/other/lpl/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/lpl/recipe.toml
rename to recipes/wip/graphics/other/lpl/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/luxcorerender/recipe.toml b/recipes/wip/graphics/other/luxcorerender/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/luxcorerender/recipe.toml
rename to recipes/wip/graphics/other/luxcorerender/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/matugen/recipe.toml b/recipes/wip/graphics/other/matugen/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/matugen/recipe.toml
rename to recipes/wip/graphics/other/matugen/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/ocrs/recipe.toml b/recipes/wip/graphics/other/ocrs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/ocrs/recipe.toml
rename to recipes/wip/graphics/other/ocrs/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/oculante/recipe.toml b/recipes/wip/graphics/other/oculante/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/oculante/recipe.toml
rename to recipes/wip/graphics/other/oculante/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/openscad/recipe.toml b/recipes/wip/graphics/other/openscad/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/openscad/recipe.toml
rename to recipes/wip/graphics/other/openscad/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/ospray-studio/recipe.toml b/recipes/wip/graphics/other/ospray-studio/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/ospray-studio/recipe.toml
rename to recipes/wip/graphics/other/ospray-studio/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/ospray/recipe.toml b/recipes/wip/graphics/other/ospray/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/ospray/recipe.toml
rename to recipes/wip/graphics/other/ospray/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/paraview-data/recipe.toml b/recipes/wip/graphics/other/paraview-data/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/paraview-data/recipe.toml
rename to recipes/wip/graphics/other/paraview-data/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/paraview/recipe.toml b/recipes/wip/graphics/other/paraview/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/paraview/recipe.toml
rename to recipes/wip/graphics/other/paraview/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/pilka/recipe.toml b/recipes/wip/graphics/other/pilka/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/pilka/recipe.toml
rename to recipes/wip/graphics/other/pilka/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/pix-image-viewer/recipe.toml b/recipes/wip/graphics/other/pix-image-viewer/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/pix-image-viewer/recipe.toml
rename to recipes/wip/graphics/other/pix-image-viewer/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/pixsort/recipe.toml b/recipes/wip/graphics/other/pixsort/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/pixsort/recipe.toml
rename to recipes/wip/graphics/other/pixsort/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/rascii/recipe.toml b/recipes/wip/graphics/other/rascii/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/rascii/recipe.toml
rename to recipes/wip/graphics/other/rascii/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/rawtherapee/recipe.toml b/recipes/wip/graphics/other/rawtherapee/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/rawtherapee/recipe.toml
rename to recipes/wip/graphics/other/rawtherapee/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/reve/recipe.toml b/recipes/wip/graphics/other/reve/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/reve/recipe.toml
rename to recipes/wip/graphics/other/reve/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/rimage/recipe.toml b/recipes/wip/graphics/other/rimage/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/rimage/recipe.toml
rename to recipes/wip/graphics/other/rimage/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/satty/recipe.toml b/recipes/wip/graphics/other/satty/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/satty/recipe.toml
rename to recipes/wip/graphics/other/satty/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/shadergarden/recipe.toml b/recipes/wip/graphics/other/shadergarden/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/shadergarden/recipe.toml
rename to recipes/wip/graphics/other/shadergarden/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/simp/recipe.toml b/recipes/wip/graphics/other/simp/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/simp/recipe.toml
rename to recipes/wip/graphics/other/simp/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/smag/recipe.toml b/recipes/wip/graphics/other/smag/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/smag/recipe.toml
rename to recipes/wip/graphics/other/smag/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/texel/recipe.toml b/recipes/wip/graphics/other/texel/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/texel/recipe.toml
rename to recipes/wip/graphics/other/texel/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/toybrot/recipe.toml b/recipes/wip/graphics/other/toybrot/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/toybrot/recipe.toml
rename to recipes/wip/graphics/other/toybrot/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/tungsten-renderer/recipe.toml b/recipes/wip/graphics/other/tungsten-renderer/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/tungsten-renderer/recipe.toml
rename to recipes/wip/graphics/other/tungsten-renderer/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/upscaling/rscale2x/recipe.toml b/recipes/wip/graphics/other/upscaling/rscale2x/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/upscaling/rscale2x/recipe.toml
rename to recipes/wip/graphics/other/upscaling/rscale2x/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/upscaling/upscaler-rs/recipe.toml b/recipes/wip/graphics/other/upscaling/upscaler-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/upscaling/upscaler-rs/recipe.toml
rename to recipes/wip/graphics/other/upscaling/upscaler-rs/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/viu/recipe.toml b/recipes/wip/graphics/other/viu/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/viu/recipe.toml
rename to recipes/wip/graphics/other/viu/recipe.toml
diff --git a/recipes/wip/tools/graphics/other/watch-stl/recipe.toml b/recipes/wip/graphics/other/watch-stl/recipe.toml
similarity index 100%
rename from recipes/wip/tools/graphics/other/watch-stl/recipe.toml
rename to recipes/wip/graphics/other/watch-stl/recipe.toml
diff --git a/recipes/wip/tools/math/fend/recipe.toml b/recipes/wip/math/fend/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/fend/recipe.toml
rename to recipes/wip/math/fend/recipe.toml
diff --git a/recipes/wip/tools/math/fractal-explorer/recipe.toml b/recipes/wip/math/fractal-explorer/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/fractal-explorer/recipe.toml
rename to recipes/wip/math/fractal-explorer/recipe.toml
diff --git a/recipes/wip/tools/math/kalc/recipe.toml b/recipes/wip/math/kalc/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/kalc/recipe.toml
rename to recipes/wip/math/kalc/recipe.toml
diff --git a/recipes/wip/tools/math/kalker/recipe.toml b/recipes/wip/math/kalker/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/kalker/recipe.toml
rename to recipes/wip/math/kalker/recipe.toml
diff --git a/recipes/wip/tools/math/numbat/recipe.toml b/recipes/wip/math/numbat/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/numbat/recipe.toml
rename to recipes/wip/math/numbat/recipe.toml
diff --git a/recipes/wip/tools/math/primesieve/recipe.toml b/recipes/wip/math/primesieve/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/primesieve/recipe.toml
rename to recipes/wip/math/primesieve/recipe.toml
diff --git a/recipes/wip/tools/math/rink/recipe.toml b/recipes/wip/math/rink/recipe.toml
similarity index 100%
rename from recipes/wip/tools/math/rink/recipe.toml
rename to recipes/wip/math/rink/recipe.toml
diff --git a/recipes/wip/tools/net/bittorrent/attractorr/recipe.toml b/recipes/wip/net/bittorrent/attractorr/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/bittorrent/attractorr/recipe.toml
rename to recipes/wip/net/bittorrent/attractorr/recipe.toml
diff --git a/recipes/wip/tools/net/bittorrent/synapse-bt/recipe.toml b/recipes/wip/net/bittorrent/synapse-bt/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/bittorrent/synapse-bt/recipe.toml
rename to recipes/wip/net/bittorrent/synapse-bt/recipe.toml
diff --git a/recipes/wip/tools/net/bittorrent/transmission/recipe.toml b/recipes/wip/net/bittorrent/transmission/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/bittorrent/transmission/recipe.toml
rename to recipes/wip/net/bittorrent/transmission/recipe.toml
diff --git a/recipes/wip/tools/net/chat/telegram-desktop/recipe.toml b/recipes/wip/net/chat/telegram-desktop/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/chat/telegram-desktop/recipe.toml
rename to recipes/wip/net/chat/telegram-desktop/recipe.toml
diff --git a/recipes/wip/tools/net/chat/termchat/recipe.toml b/recipes/wip/net/chat/termchat/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/chat/termchat/recipe.toml
rename to recipes/wip/net/chat/termchat/recipe.toml
diff --git a/recipes/wip/tools/net/download/aim/recipe.toml b/recipes/wip/net/download/aim/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/download/aim/recipe.toml
rename to recipes/wip/net/download/aim/recipe.toml
diff --git a/recipes/wip/tools/net/download/anime-downloader/recipe.toml b/recipes/wip/net/download/anime-downloader/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/download/anime-downloader/recipe.toml
rename to recipes/wip/net/download/anime-downloader/recipe.toml
diff --git a/recipes/wip/tools/net/download/wget/recipe.toml b/recipes/wip/net/download/wget/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/download/wget/recipe.toml
rename to recipes/wip/net/download/wget/recipe.toml
diff --git a/recipes/wip/tools/net/download/wget2/recipe.toml b/recipes/wip/net/download/wget2/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/download/wget2/recipe.toml
rename to recipes/wip/net/download/wget2/recipe.toml
diff --git a/recipes/wip/tools/net/download/yaydl/recipe.toml b/recipes/wip/net/download/yaydl/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/download/yaydl/recipe.toml
rename to recipes/wip/net/download/yaydl/recipe.toml
diff --git a/recipes/wip/tools/net/download/youtube-tui/recipe.toml b/recipes/wip/net/download/youtube-tui/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/download/youtube-tui/recipe.toml
rename to recipes/wip/net/download/youtube-tui/recipe.toml
diff --git a/recipes/wip/tools/net/gemini/lagrange/recipe.toml b/recipes/wip/net/gemini/lagrange/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/gemini/lagrange/recipe.toml
rename to recipes/wip/net/gemini/lagrange/recipe.toml
diff --git a/recipes/wip/tools/net/lan/zerotier/recipe.toml b/recipes/wip/net/lan/zerotier/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/lan/zerotier/recipe.toml
rename to recipes/wip/net/lan/zerotier/recipe.toml
diff --git a/recipes/wip/tools/net/onion-routing/arti/recipe.toml b/recipes/wip/net/onion-routing/arti/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/onion-routing/arti/recipe.toml
rename to recipes/wip/net/onion-routing/arti/recipe.toml
diff --git a/recipes/wip/tools/net/onion-routing/i2pd/recipe.toml b/recipes/wip/net/onion-routing/i2pd/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/onion-routing/i2pd/recipe.toml
rename to recipes/wip/net/onion-routing/i2pd/recipe.toml
diff --git a/recipes/wip/tools/net/onion-routing/lokinet/recipe.toml b/recipes/wip/net/onion-routing/lokinet/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/onion-routing/lokinet/recipe.toml
rename to recipes/wip/net/onion-routing/lokinet/recipe.toml
diff --git a/recipes/wip/tools/net/onion-routing/tor-browser/recipe.toml b/recipes/wip/net/onion-routing/tor-browser/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/onion-routing/tor-browser/recipe.toml
rename to recipes/wip/net/onion-routing/tor-browser/recipe.toml
diff --git a/recipes/wip/tools/net/onion-routing/tor/recipe.toml b/recipes/wip/net/onion-routing/tor/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/onion-routing/tor/recipe.toml
rename to recipes/wip/net/onion-routing/tor/recipe.toml
diff --git a/recipes/wip/tools/net/other/arp-scanner/recipe.toml b/recipes/wip/net/other/arp-scanner/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/arp-scanner/recipe.toml
rename to recipes/wip/net/other/arp-scanner/recipe.toml
diff --git a/recipes/wip/tools/net/other/bita/recipe.toml b/recipes/wip/net/other/bita/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/bita/recipe.toml
rename to recipes/wip/net/other/bita/recipe.toml
diff --git a/recipes/wip/tools/net/other/bore/recipe.toml b/recipes/wip/net/other/bore/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/bore/recipe.toml
rename to recipes/wip/net/other/bore/recipe.toml
diff --git a/recipes/wip/tools/net/other/boringtun/recipe.toml b/recipes/wip/net/other/boringtun/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/boringtun/recipe.toml
rename to recipes/wip/net/other/boringtun/recipe.toml
diff --git a/recipes/wip/tools/net/other/celeste/recipe.toml b/recipes/wip/net/other/celeste/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/celeste/recipe.toml
rename to recipes/wip/net/other/celeste/recipe.toml
diff --git a/recipes/wip/tools/net/other/cobalt/recipe.toml b/recipes/wip/net/other/cobalt/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/cobalt/recipe.toml
rename to recipes/wip/net/other/cobalt/recipe.toml
diff --git a/recipes/wip/tools/net/other/crab-dlna/recipe.toml b/recipes/wip/net/other/crab-dlna/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/crab-dlna/recipe.toml
rename to recipes/wip/net/other/crab-dlna/recipe.toml
diff --git a/recipes/wip/tools/net/other/dqy/recipe.toml b/recipes/wip/net/other/dqy/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/dqy/recipe.toml
rename to recipes/wip/net/other/dqy/recipe.toml
diff --git a/recipes/wip/tools/net/other/drill/recipe.toml b/recipes/wip/net/other/drill/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/drill/recipe.toml
rename to recipes/wip/net/other/drill/recipe.toml
diff --git a/recipes/wip/tools/net/other/dufs/recipe.toml b/recipes/wip/net/other/dufs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/dufs/recipe.toml
rename to recipes/wip/net/other/dufs/recipe.toml
diff --git a/recipes/wip/tools/net/other/floresta/recipe.toml b/recipes/wip/net/other/floresta/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/floresta/recipe.toml
rename to recipes/wip/net/other/floresta/recipe.toml
diff --git a/recipes/wip/tools/net/other/guacamole-client/recipe.toml b/recipes/wip/net/other/guacamole-client/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/guacamole-client/recipe.toml
rename to recipes/wip/net/other/guacamole-client/recipe.toml
diff --git a/recipes/wip/tools/net/other/halloy/recipe.toml b/recipes/wip/net/other/halloy/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/halloy/recipe.toml
rename to recipes/wip/net/other/halloy/recipe.toml
diff --git a/recipes/wip/tools/net/other/havn/recipe.toml b/recipes/wip/net/other/havn/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/havn/recipe.toml
rename to recipes/wip/net/other/havn/recipe.toml
diff --git a/recipes/wip/tools/net/other/hinoki/recipe.toml b/recipes/wip/net/other/hinoki/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/hinoki/recipe.toml
rename to recipes/wip/net/other/hinoki/recipe.toml
diff --git a/recipes/wip/tools/net/other/hurl/recipe.toml b/recipes/wip/net/other/hurl/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/hurl/recipe.toml
rename to recipes/wip/net/other/hurl/recipe.toml
diff --git a/recipes/wip/tools/net/other/impala/recipe.toml b/recipes/wip/net/other/impala/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/impala/recipe.toml
rename to recipes/wip/net/other/impala/recipe.toml
diff --git a/recipes/wip/tools/net/other/lldap/recipe.toml b/recipes/wip/net/other/lldap/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/lldap/recipe.toml
rename to recipes/wip/net/other/lldap/recipe.toml
diff --git a/recipes/wip/tools/net/other/lychee/recipe.toml b/recipes/wip/net/other/lychee/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/lychee/recipe.toml
rename to recipes/wip/net/other/lychee/recipe.toml
diff --git a/recipes/wip/tools/net/other/lynx/recipe.toml b/recipes/wip/net/other/lynx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/lynx/recipe.toml
rename to recipes/wip/net/other/lynx/recipe.toml
diff --git a/recipes/wip/tools/net/other/meli/recipe.toml b/recipes/wip/net/other/meli/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/meli/recipe.toml
rename to recipes/wip/net/other/meli/recipe.toml
diff --git a/recipes/wip/tools/net/other/miniupnpc/recipe.toml b/recipes/wip/net/other/miniupnpc/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/miniupnpc/recipe.toml
rename to recipes/wip/net/other/miniupnpc/recipe.toml
diff --git a/recipes/wip/tools/net/other/moonfire-nvr-server/recipe.toml b/recipes/wip/net/other/moonfire-nvr-server/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/moonfire-nvr-server/recipe.toml
rename to recipes/wip/net/other/moonfire-nvr-server/recipe.toml
diff --git a/recipes/wip/tools/net/other/netop/recipe.toml b/recipes/wip/net/other/netop/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/netop/recipe.toml
rename to recipes/wip/net/other/netop/recipe.toml
diff --git a/recipes/wip/tools/net/other/netscanner/recipe.toml b/recipes/wip/net/other/netscanner/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/netscanner/recipe.toml
rename to recipes/wip/net/other/netscanner/recipe.toml
diff --git a/recipes/wip/tools/net/other/nmap/recipe.toml b/recipes/wip/net/other/nmap/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/nmap/recipe.toml
rename to recipes/wip/net/other/nmap/recipe.toml
diff --git a/recipes/wip/tools/net/other/nspr/recipe.toml b/recipes/wip/net/other/nspr/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/nspr/recipe.toml
rename to recipes/wip/net/other/nspr/recipe.toml
diff --git a/recipes/wip/tools/net/other/nss-pem/recipe.toml b/recipes/wip/net/other/nss-pem/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/nss-pem/recipe.toml
rename to recipes/wip/net/other/nss-pem/recipe.toml
diff --git a/recipes/wip/tools/net/other/nss/recipe.toml b/recipes/wip/net/other/nss/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/nss/recipe.toml
rename to recipes/wip/net/other/nss/recipe.toml
diff --git a/recipes/wip/tools/net/other/oha/recipe.toml b/recipes/wip/net/other/oha/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/oha/recipe.toml
rename to recipes/wip/net/other/oha/recipe.toml
diff --git a/recipes/wip/tools/net/other/realm/recipe.toml b/recipes/wip/net/other/realm/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/realm/recipe.toml
rename to recipes/wip/net/other/realm/recipe.toml
diff --git a/recipes/wip/tools/net/other/rqbit/recipe.toml b/recipes/wip/net/other/rqbit/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/rqbit/recipe.toml
rename to recipes/wip/net/other/rqbit/recipe.toml
diff --git a/recipes/wip/tools/net/other/rustscan/recipe.toml b/recipes/wip/net/other/rustscan/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/rustscan/recipe.toml
rename to recipes/wip/net/other/rustscan/recipe.toml
diff --git a/recipes/wip/tools/net/other/samba/answers.txt b/recipes/wip/net/other/samba/answers.txt
similarity index 100%
rename from recipes/wip/tools/net/other/samba/answers.txt
rename to recipes/wip/net/other/samba/answers.txt
diff --git a/recipes/wip/tools/net/other/samba/recipe.toml b/recipes/wip/net/other/samba/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/samba/recipe.toml
rename to recipes/wip/net/other/samba/recipe.toml
diff --git a/recipes/wip/tools/net/other/slumber/recipe.toml b/recipes/wip/net/other/slumber/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/slumber/recipe.toml
rename to recipes/wip/net/other/slumber/recipe.toml
diff --git a/recipes/wip/tools/net/other/speedtest-rs/recipe.toml b/recipes/wip/net/other/speedtest-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/speedtest-rs/recipe.toml
rename to recipes/wip/net/other/speedtest-rs/recipe.toml
diff --git a/recipes/wip/tools/net/other/spis/recipe.toml b/recipes/wip/net/other/spis/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/spis/recipe.toml
rename to recipes/wip/net/other/spis/recipe.toml
diff --git a/recipes/wip/tools/net/other/srsran-4g/recipe.toml b/recipes/wip/net/other/srsran-4g/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/srsran-4g/recipe.toml
rename to recipes/wip/net/other/srsran-4g/recipe.toml
diff --git a/recipes/wip/tools/net/other/srsran-project/recipe.toml b/recipes/wip/net/other/srsran-project/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/srsran-project/recipe.toml
rename to recipes/wip/net/other/srsran-project/recipe.toml
diff --git a/recipes/wip/tools/net/other/ssh/sshx/recipe.toml b/recipes/wip/net/other/ssh/sshx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/ssh/sshx/recipe.toml
rename to recipes/wip/net/other/ssh/sshx/recipe.toml
diff --git a/recipes/wip/tools/net/other/tiny/recipe.toml b/recipes/wip/net/other/tiny/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/tiny/recipe.toml
rename to recipes/wip/net/other/tiny/recipe.toml
diff --git a/recipes/wip/tools/net/other/tobaru/recipe.toml b/recipes/wip/net/other/tobaru/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/tobaru/recipe.toml
rename to recipes/wip/net/other/tobaru/recipe.toml
diff --git a/recipes/wip/tools/net/other/trippy/recipe.toml b/recipes/wip/net/other/trippy/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/trippy/recipe.toml
rename to recipes/wip/net/other/trippy/recipe.toml
diff --git a/recipes/wip/tools/net/other/turn-rs/recipe.toml b/recipes/wip/net/other/turn-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/turn-rs/recipe.toml
rename to recipes/wip/net/other/turn-rs/recipe.toml
diff --git a/recipes/wip/tools/net/other/unbound/recipe.toml b/recipes/wip/net/other/unbound/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/unbound/recipe.toml
rename to recipes/wip/net/other/unbound/recipe.toml
diff --git a/recipes/wip/tools/net/other/updns/recipe.toml b/recipes/wip/net/other/updns/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/updns/recipe.toml
rename to recipes/wip/net/other/updns/recipe.toml
diff --git a/recipes/wip/tools/net/other/varia/recipe.toml b/recipes/wip/net/other/varia/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/varia/recipe.toml
rename to recipes/wip/net/other/varia/recipe.toml
diff --git a/recipes/wip/tools/net/other/vimini/recipe.toml b/recipes/wip/net/other/vimini/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/vimini/recipe.toml
rename to recipes/wip/net/other/vimini/recipe.toml
diff --git a/recipes/wip/tools/net/other/vopono/recipe.toml b/recipes/wip/net/other/vopono/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/vopono/recipe.toml
rename to recipes/wip/net/other/vopono/recipe.toml
diff --git a/recipes/wip/tools/net/other/vpncloud/recipe.toml b/recipes/wip/net/other/vpncloud/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/vpncloud/recipe.toml
rename to recipes/wip/net/other/vpncloud/recipe.toml
diff --git a/recipes/wip/tools/net/other/vsd/recipe.toml b/recipes/wip/net/other/vsd/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/vsd/recipe.toml
rename to recipes/wip/net/other/vsd/recipe.toml
diff --git a/recipes/wip/tools/net/other/warp/recipe.toml b/recipes/wip/net/other/warp/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/warp/recipe.toml
rename to recipes/wip/net/other/warp/recipe.toml
diff --git a/recipes/wip/tools/net/other/wireguard-rs/recipe.toml b/recipes/wip/net/other/wireguard-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/wireguard-rs/recipe.toml
rename to recipes/wip/net/other/wireguard-rs/recipe.toml
diff --git a/recipes/wip/tools/net/other/yazi/recipe.toml b/recipes/wip/net/other/yazi/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/other/yazi/recipe.toml
rename to recipes/wip/net/other/yazi/recipe.toml
diff --git a/recipes/wip/tools/net/server/apache-httpd/recipe.toml b/recipes/wip/net/server/apache-httpd/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/apache-httpd/recipe.toml
rename to recipes/wip/net/server/apache-httpd/recipe.toml
diff --git a/recipes/wip/tools/net/server/apache-httpd/redox.patch b/recipes/wip/net/server/apache-httpd/redox.patch
similarity index 100%
rename from recipes/wip/tools/net/server/apache-httpd/redox.patch
rename to recipes/wip/net/server/apache-httpd/redox.patch
diff --git a/recipes/wip/tools/net/server/bitcoin-core/recipe.toml b/recipes/wip/net/server/bitcoin-core/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/bitcoin-core/recipe.toml
rename to recipes/wip/net/server/bitcoin-core/recipe.toml
diff --git a/recipes/wip/tools/net/server/devserver/recipe.toml b/recipes/wip/net/server/devserver/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/devserver/recipe.toml
rename to recipes/wip/net/server/devserver/recipe.toml
diff --git a/recipes/wip/tools/net/server/electrs/recipe.toml b/recipes/wip/net/server/electrs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/electrs/recipe.toml
rename to recipes/wip/net/server/electrs/recipe.toml
diff --git a/recipes/wip/tools/net/server/freenginx/recipe.toml b/recipes/wip/net/server/freenginx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/freenginx/recipe.toml
rename to recipes/wip/net/server/freenginx/recipe.toml
diff --git a/recipes/wip/tools/net/server/guacamole-server/recipe.toml b/recipes/wip/net/server/guacamole-server/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/guacamole-server/recipe.toml
rename to recipes/wip/net/server/guacamole-server/recipe.toml
diff --git a/recipes/wip/tools/net/server/http-server-rs/recipe.toml b/recipes/wip/net/server/http-server-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/http-server-rs/recipe.toml
rename to recipes/wip/net/server/http-server-rs/recipe.toml
diff --git a/recipes/wip/tools/net/server/nginx/recipe.toml b/recipes/wip/net/server/nginx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/nginx/recipe.toml
rename to recipes/wip/net/server/nginx/recipe.toml
diff --git a/recipes/wip/tools/net/server/nostr-rs-relay/recipe.toml b/recipes/wip/net/server/nostr-rs-relay/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/nostr-rs-relay/recipe.toml
rename to recipes/wip/net/server/nostr-rs-relay/recipe.toml
diff --git a/recipes/wip/tools/net/server/rustdesk-server/recipe.toml b/recipes/wip/net/server/rustdesk-server/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/rustdesk-server/recipe.toml
rename to recipes/wip/net/server/rustdesk-server/recipe.toml
diff --git a/recipes/wip/tools/net/server/rustypaste/recipe.toml b/recipes/wip/net/server/rustypaste/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/rustypaste/recipe.toml
rename to recipes/wip/net/server/rustypaste/recipe.toml
diff --git a/recipes/wip/tools/net/server/simple-http-server/recipe.toml b/recipes/wip/net/server/simple-http-server/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/simple-http-server/recipe.toml
rename to recipes/wip/net/server/simple-http-server/recipe.toml
diff --git a/recipes/wip/tools/net/server/sws/recipe.toml b/recipes/wip/net/server/sws/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/server/sws/recipe.toml
rename to recipes/wip/net/server/sws/recipe.toml
diff --git a/recipes/wip/tools/net/spadesx/recipe.toml b/recipes/wip/net/spadesx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/net/spadesx/recipe.toml
rename to recipes/wip/net/spadesx/recipe.toml
diff --git a/recipes/wip/tools/ai/nnx/recipe.toml b/recipes/wip/nnx/recipe.toml
similarity index 100%
rename from recipes/wip/tools/ai/nnx/recipe.toml
rename to recipes/wip/nnx/recipe.toml
diff --git a/recipes/wip/tools/office/libreoffice-dictionaries/recipe.toml b/recipes/wip/office/libreoffice-dictionaries/recipe.toml
similarity index 100%
rename from recipes/wip/tools/office/libreoffice-dictionaries/recipe.toml
rename to recipes/wip/office/libreoffice-dictionaries/recipe.toml
diff --git a/recipes/wip/tools/office/libreoffice-translations/recipe.toml b/recipes/wip/office/libreoffice-translations/recipe.toml
similarity index 100%
rename from recipes/wip/tools/office/libreoffice-translations/recipe.toml
rename to recipes/wip/office/libreoffice-translations/recipe.toml
diff --git a/recipes/wip/tools/office/libreoffice/recipe.toml b/recipes/wip/office/libreoffice/recipe.toml
similarity index 100%
rename from recipes/wip/tools/office/libreoffice/recipe.toml
rename to recipes/wip/office/libreoffice/recipe.toml
diff --git a/recipes/wip/tools/science/alevin-fry/recipe.toml b/recipes/wip/science/alevin-fry/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/alevin-fry/recipe.toml
rename to recipes/wip/science/alevin-fry/recipe.toml
diff --git a/recipes/wip/tools/science/celestia-data/recipe.toml b/recipes/wip/science/celestia-data/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/celestia-data/recipe.toml
rename to recipes/wip/science/celestia-data/recipe.toml
diff --git a/recipes/wip/tools/science/celestia/recipe.toml b/recipes/wip/science/celestia/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/celestia/recipe.toml
rename to recipes/wip/science/celestia/recipe.toml
diff --git a/recipes/wip/tools/science/gromacs/recipe.toml b/recipes/wip/science/gromacs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/gromacs/recipe.toml
rename to recipes/wip/science/gromacs/recipe.toml
diff --git a/recipes/wip/tools/science/mrbayes/recipe.toml b/recipes/wip/science/mrbayes/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/mrbayes/recipe.toml
rename to recipes/wip/science/mrbayes/recipe.toml
diff --git a/recipes/wip/tools/science/oarfish/recipe.toml b/recipes/wip/science/oarfish/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/oarfish/recipe.toml
rename to recipes/wip/science/oarfish/recipe.toml
diff --git a/recipes/wip/tools/science/openfoam/recipe.toml b/recipes/wip/science/openfoam/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/openfoam/recipe.toml
rename to recipes/wip/science/openfoam/recipe.toml
diff --git a/recipes/wip/tools/science/openspace/recipe.toml b/recipes/wip/science/openspace/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/openspace/recipe.toml
rename to recipes/wip/science/openspace/recipe.toml
diff --git a/recipes/wip/tools/science/piscem/recipe.toml b/recipes/wip/science/piscem/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/piscem/recipe.toml
rename to recipes/wip/science/piscem/recipe.toml
diff --git a/recipes/wip/tools/science/polypolish/recipe.toml b/recipes/wip/science/polypolish/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/polypolish/recipe.toml
rename to recipes/wip/science/polypolish/recipe.toml
diff --git a/recipes/wip/tools/science/qmcpack/recipe.toml b/recipes/wip/science/qmcpack/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/qmcpack/recipe.toml
rename to recipes/wip/science/qmcpack/recipe.toml
diff --git a/recipes/wip/tools/science/scidataflow/recipe.toml b/recipes/wip/science/scidataflow/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/scidataflow/recipe.toml
rename to recipes/wip/science/scidataflow/recipe.toml
diff --git a/recipes/wip/tools/science/simpleaf/recipe.toml b/recipes/wip/science/simpleaf/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/simpleaf/recipe.toml
rename to recipes/wip/science/simpleaf/recipe.toml
diff --git a/recipes/wip/tools/science/specfem2d/recipe.toml b/recipes/wip/science/specfem2d/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/specfem2d/recipe.toml
rename to recipes/wip/science/specfem2d/recipe.toml
diff --git a/recipes/wip/tools/science/specfem3d-globe/recipe.toml b/recipes/wip/science/specfem3d-globe/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/specfem3d-globe/recipe.toml
rename to recipes/wip/science/specfem3d-globe/recipe.toml
diff --git a/recipes/wip/tools/science/specfem3d/recipe.toml b/recipes/wip/science/specfem3d/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/specfem3d/recipe.toml
rename to recipes/wip/science/specfem3d/recipe.toml
diff --git a/recipes/wip/tools/science/vidoxide/recipe.toml b/recipes/wip/science/vidoxide/recipe.toml
similarity index 100%
rename from recipes/wip/tools/science/vidoxide/recipe.toml
rename to recipes/wip/science/vidoxide/recipe.toml
diff --git a/recipes/wip/tools/security/airgorah/recipe.toml b/recipes/wip/security/airgorah/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/airgorah/recipe.toml
rename to recipes/wip/security/airgorah/recipe.toml
diff --git a/recipes/wip/tools/security/angryoxide/recipe.toml b/recipes/wip/security/angryoxide/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/angryoxide/recipe.toml
rename to recipes/wip/security/angryoxide/recipe.toml
diff --git a/recipes/wip/tools/security/apbf/recipe.toml b/recipes/wip/security/apbf/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/apbf/recipe.toml
rename to recipes/wip/security/apbf/recipe.toml
diff --git a/recipes/wip/tools/security/authoscope/recipe.toml b/recipes/wip/security/authoscope/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/authoscope/recipe.toml
rename to recipes/wip/security/authoscope/recipe.toml
diff --git a/recipes/wip/tools/security/binsec/recipe.toml b/recipes/wip/security/binsec/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/binsec/recipe.toml
rename to recipes/wip/security/binsec/recipe.toml
diff --git a/recipes/wip/tools/security/burrow/recipe.toml b/recipes/wip/security/burrow/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/burrow/recipe.toml
rename to recipes/wip/security/burrow/recipe.toml
diff --git a/recipes/wip/tools/security/capstone/recipe.toml b/recipes/wip/security/capstone/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/capstone/recipe.toml
rename to recipes/wip/security/capstone/recipe.toml
diff --git a/recipes/wip/tools/security/cargo-scan/recipe.toml b/recipes/wip/security/cargo-scan/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/cargo-scan/recipe.toml
rename to recipes/wip/security/cargo-scan/recipe.toml
diff --git a/recipes/wip/tools/security/clamav/recipe.toml b/recipes/wip/security/clamav/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/clamav/recipe.toml
rename to recipes/wip/security/clamav/recipe.toml
diff --git a/recipes/wip/tools/security/cotp/recipe.toml b/recipes/wip/security/cotp/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/cotp/recipe.toml
rename to recipes/wip/security/cotp/recipe.toml
diff --git a/recipes/wip/tools/security/dfir-toolkit/recipe.toml b/recipes/wip/security/dfir-toolkit/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/dfir-toolkit/recipe.toml
rename to recipes/wip/security/dfir-toolkit/recipe.toml
diff --git a/recipes/wip/tools/security/feroxbuster/recipe.toml b/recipes/wip/security/feroxbuster/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/feroxbuster/recipe.toml
rename to recipes/wip/security/feroxbuster/recipe.toml
diff --git a/recipes/wip/tools/security/flawz/recipe.toml b/recipes/wip/security/flawz/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/flawz/recipe.toml
rename to recipes/wip/security/flawz/recipe.toml
diff --git a/recipes/wip/tools/security/john-the-ripper/recipe.toml b/recipes/wip/security/john-the-ripper/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/john-the-ripper/recipe.toml
rename to recipes/wip/security/john-the-ripper/recipe.toml
diff --git a/recipes/wip/tools/security/kanha/recipe.toml b/recipes/wip/security/kanha/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/kanha/recipe.toml
rename to recipes/wip/security/kanha/recipe.toml
diff --git a/recipes/wip/tools/security/keyscope/recipe.toml b/recipes/wip/security/keyscope/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/keyscope/recipe.toml
rename to recipes/wip/security/keyscope/recipe.toml
diff --git a/recipes/wip/tools/security/motus/recipe.toml b/recipes/wip/security/motus/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/motus/recipe.toml
rename to recipes/wip/security/motus/recipe.toml
diff --git a/recipes/wip/tools/security/nitrocli/recipe.toml b/recipes/wip/security/nitrocli/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/nitrocli/recipe.toml
rename to recipes/wip/security/nitrocli/recipe.toml
diff --git a/recipes/wip/tools/security/openpgp-ca/recipe.toml b/recipes/wip/security/openpgp-ca/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/openpgp-ca/recipe.toml
rename to recipes/wip/security/openpgp-ca/recipe.toml
diff --git a/recipes/wip/tools/security/plutus-rustus/recipe.toml b/recipes/wip/security/plutus-rustus/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/plutus-rustus/recipe.toml
rename to recipes/wip/security/plutus-rustus/recipe.toml
diff --git a/recipes/wip/tools/security/recdec/recipe.toml b/recipes/wip/security/recdec/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/recdec/recipe.toml
rename to recipes/wip/security/recdec/recipe.toml
diff --git a/recipes/wip/tools/security/rowhammer-test/recipe.toml b/recipes/wip/security/rowhammer-test/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/rowhammer-test/recipe.toml
rename to recipes/wip/security/rowhammer-test/recipe.toml
diff --git a/recipes/wip/tools/security/rshijack/recipe.toml b/recipes/wip/security/rshijack/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/rshijack/recipe.toml
rename to recipes/wip/security/rshijack/recipe.toml
diff --git a/recipes/wip/tools/security/rustyvault/recipe.toml b/recipes/wip/security/rustyvault/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/rustyvault/recipe.toml
rename to recipes/wip/security/rustyvault/recipe.toml
diff --git a/recipes/wip/tools/security/sn0int/recipe.toml b/recipes/wip/security/sn0int/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sn0int/recipe.toml
rename to recipes/wip/security/sn0int/recipe.toml
diff --git a/recipes/wip/tools/security/sniffglue/recipe.toml b/recipes/wip/security/sniffglue/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sniffglue/recipe.toml
rename to recipes/wip/security/sniffglue/recipe.toml
diff --git a/recipes/wip/tools/security/sniffnet/recipe.toml b/recipes/wip/security/sniffnet/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sniffnet/recipe.toml
rename to recipes/wip/security/sniffnet/recipe.toml
diff --git a/recipes/wip/tools/security/sq/recipe.toml b/recipes/wip/security/sq/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sq/recipe.toml
rename to recipes/wip/security/sq/recipe.toml
diff --git a/recipes/wip/tools/security/sqop/recipe.toml b/recipes/wip/security/sqop/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sqop/recipe.toml
rename to recipes/wip/security/sqop/recipe.toml
diff --git a/recipes/wip/tools/security/sqv/recipe.toml b/recipes/wip/security/sqv/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sqv/recipe.toml
rename to recipes/wip/security/sqv/recipe.toml
diff --git a/recipes/wip/tools/security/sss-cli/recipe.toml b/recipes/wip/security/sss-cli/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/sss-cli/recipe.toml
rename to recipes/wip/security/sss-cli/recipe.toml
diff --git a/recipes/wip/tools/security/stegano/recipe.toml b/recipes/wip/security/stegano/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/stegano/recipe.toml
rename to recipes/wip/security/stegano/recipe.toml
diff --git a/recipes/wip/tools/security/vagga/recipe.toml b/recipes/wip/security/vagga/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/vagga/recipe.toml
rename to recipes/wip/security/vagga/recipe.toml
diff --git a/recipes/wip/tools/security/veldora/recipe.toml b/recipes/wip/security/veldora/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/veldora/recipe.toml
rename to recipes/wip/security/veldora/recipe.toml
diff --git a/recipes/wip/tools/security/veracrypt/recipe.toml b/recipes/wip/security/veracrypt/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/veracrypt/recipe.toml
rename to recipes/wip/security/veracrypt/recipe.toml
diff --git a/recipes/wip/tools/security/weggli/recipe.toml b/recipes/wip/security/weggli/recipe.toml
similarity index 100%
rename from recipes/wip/tools/security/weggli/recipe.toml
rename to recipes/wip/security/weggli/recipe.toml
diff --git a/recipes/wip/tools/terminal/alacritty/recipe.toml b/recipes/wip/terminal/alacritty/recipe.toml
similarity index 100%
rename from recipes/wip/tools/terminal/alacritty/recipe.toml
rename to recipes/wip/terminal/alacritty/recipe.toml
diff --git a/recipes/wip/tools/terminal/rioterm/recipe.toml b/recipes/wip/terminal/rioterm/recipe.toml
similarity index 100%
rename from recipes/wip/tools/terminal/rioterm/recipe.toml
rename to recipes/wip/terminal/rioterm/recipe.toml
diff --git a/recipes/wip/tools/terminal/tab-rs/recipe.toml b/recipes/wip/terminal/tab-rs/recipe.toml
similarity index 100%
rename from recipes/wip/tools/terminal/tab-rs/recipe.toml
rename to recipes/wip/terminal/tab-rs/recipe.toml
diff --git a/recipes/wip/tools/terminal/tmux/recipe.toml b/recipes/wip/terminal/tmux/recipe.toml
similarity index 100%
rename from recipes/wip/tools/terminal/tmux/recipe.toml
rename to recipes/wip/terminal/tmux/recipe.toml
diff --git a/recipes/wip/tools/terminal/wezterm/recipe.toml b/recipes/wip/terminal/wezterm/recipe.toml
similarity index 100%
rename from recipes/wip/tools/terminal/wezterm/recipe.toml
rename to recipes/wip/terminal/wezterm/recipe.toml
diff --git a/recipes/wip/tools/terminal/zellij/recipe.toml b/recipes/wip/terminal/zellij/recipe.toml
similarity index 100%
rename from recipes/wip/tools/terminal/zellij/recipe.toml
rename to recipes/wip/terminal/zellij/recipe.toml
diff --git a/recipes/wip/tools/time/dispute/recipe.toml b/recipes/wip/time/dispute/recipe.toml
similarity index 100%
rename from recipes/wip/tools/time/dispute/recipe.toml
rename to recipes/wip/time/dispute/recipe.toml
diff --git a/recipes/wip/tools/time/tomotroid/recipe.toml b/recipes/wip/time/tomotroid/recipe.toml
similarity index 100%
rename from recipes/wip/tools/time/tomotroid/recipe.toml
rename to recipes/wip/time/tomotroid/recipe.toml