diff --git a/recipes/wip/dev/managers/moon/recipe.toml b/recipes/wip/dev/mgmt/moon/recipe.toml similarity index 100% rename from recipes/wip/dev/managers/moon/recipe.toml rename to recipes/wip/dev/mgmt/moon/recipe.toml diff --git a/recipes/wip/dev/managers/proto/recipe.toml b/recipes/wip/dev/mgmt/proto/recipe.toml similarity index 100% rename from recipes/wip/dev/managers/proto/recipe.toml rename to recipes/wip/dev/mgmt/proto/recipe.toml diff --git a/recipes/wip/dev/managers/ratifact/recipe.toml b/recipes/wip/dev/mgmt/ratifact/recipe.toml similarity index 100% rename from recipes/wip/dev/managers/ratifact/recipe.toml rename to recipes/wip/dev/mgmt/ratifact/recipe.toml diff --git a/recipes/wip/games/simulation/egregoria/recipe.toml b/recipes/wip/games/sim/egregoria/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/egregoria/recipe.toml rename to recipes/wip/games/sim/egregoria/recipe.toml diff --git a/recipes/wip/games/simulation/ferroliquid/recipe.toml b/recipes/wip/games/sim/ferroliquid/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/ferroliquid/recipe.toml rename to recipes/wip/games/sim/ferroliquid/recipe.toml diff --git a/recipes/wip/games/simulation/formicarium/recipe.toml b/recipes/wip/games/sim/formicarium/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/formicarium/recipe.toml rename to recipes/wip/games/sim/formicarium/recipe.toml diff --git a/recipes/wip/games/simulation/game-of-life-gtk/recipe.toml b/recipes/wip/games/sim/game-of-life-gtk/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/game-of-life-gtk/recipe.toml rename to recipes/wip/games/sim/game-of-life-gtk/recipe.toml diff --git a/recipes/wip/games/simulation/game-of-life-piston/recipe.toml b/recipes/wip/games/sim/game-of-life-piston/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/game-of-life-piston/recipe.toml rename to recipes/wip/games/sim/game-of-life-piston/recipe.toml diff --git a/recipes/wip/games/simulation/game-of-life-rs/recipe.toml b/recipes/wip/games/sim/game-of-life-rs/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/game-of-life-rs/recipe.toml rename to recipes/wip/games/sim/game-of-life-rs/recipe.toml diff --git a/recipes/wip/games/simulation/nbodysim/recipe.toml b/recipes/wip/games/sim/nbodysim/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/nbodysim/recipe.toml rename to recipes/wip/games/sim/nbodysim/recipe.toml diff --git a/recipes/wip/games/simulation/sandbox-rs2/recipe.toml b/recipes/wip/games/sim/sandbox-rs2/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/sandbox-rs2/recipe.toml rename to recipes/wip/games/sim/sandbox-rs2/recipe.toml diff --git a/recipes/wip/games/simulation/symbiants/recipe.toml b/recipes/wip/games/sim/symbiants/recipe.toml similarity index 100% rename from recipes/wip/games/simulation/symbiants/recipe.toml rename to recipes/wip/games/sim/symbiants/recipe.toml diff --git a/recipes/wip/logging/krapslog/recipe.toml b/recipes/wip/logs/krapslog/recipe.toml similarity index 100% rename from recipes/wip/logging/krapslog/recipe.toml rename to recipes/wip/logs/krapslog/recipe.toml diff --git a/recipes/wip/net/bittorrent/aquatic-udp/recipe.toml b/recipes/wip/net/torrent/aquatic-udp/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/aquatic-udp/recipe.toml rename to recipes/wip/net/torrent/aquatic-udp/recipe.toml diff --git a/recipes/wip/net/bittorrent/attractorr/recipe.toml b/recipes/wip/net/torrent/attractorr/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/attractorr/recipe.toml rename to recipes/wip/net/torrent/attractorr/recipe.toml diff --git a/recipes/wip/net/bittorrent/btpd/recipe.toml b/recipes/wip/net/torrent/btpd/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/btpd/recipe.toml rename to recipes/wip/net/torrent/btpd/recipe.toml diff --git a/recipes/wip/net/bittorrent/rtorrent/recipe.toml b/recipes/wip/net/torrent/rtorrent/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/rtorrent/recipe.toml rename to recipes/wip/net/torrent/rtorrent/recipe.toml diff --git a/recipes/wip/net/bittorrent/superseedr/recipe.toml b/recipes/wip/net/torrent/superseedr/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/superseedr/recipe.toml rename to recipes/wip/net/torrent/superseedr/recipe.toml diff --git a/recipes/wip/net/bittorrent/synapse-bt/recipe.toml b/recipes/wip/net/torrent/synapse-bt/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/synapse-bt/recipe.toml rename to recipes/wip/net/torrent/synapse-bt/recipe.toml diff --git a/recipes/wip/net/bittorrent/transg-tui/recipe.toml b/recipes/wip/net/torrent/transg-tui/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/transg-tui/recipe.toml rename to recipes/wip/net/torrent/transg-tui/recipe.toml diff --git a/recipes/wip/net/bittorrent/transmission-cli/recipe.toml b/recipes/wip/net/torrent/transmission-cli/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/transmission-cli/recipe.toml rename to recipes/wip/net/torrent/transmission-cli/recipe.toml diff --git a/recipes/wip/net/bittorrent/transmission-daemon/recipe.toml b/recipes/wip/net/torrent/transmission-daemon/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/transmission-daemon/recipe.toml rename to recipes/wip/net/torrent/transmission-daemon/recipe.toml diff --git a/recipes/wip/net/bittorrent/transmission-gtk/recipe.toml b/recipes/wip/net/torrent/transmission-gtk/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/transmission-gtk/recipe.toml rename to recipes/wip/net/torrent/transmission-gtk/recipe.toml diff --git a/recipes/wip/net/bittorrent/webtorrent-cli/recipe.toml b/recipes/wip/net/torrent/webtorrent-cli/recipe.toml similarity index 100% rename from recipes/wip/net/bittorrent/webtorrent-cli/recipe.toml rename to recipes/wip/net/torrent/webtorrent-cli/recipe.toml diff --git a/recipes/wip/science/alevin-fry/recipe.toml b/recipes/wip/sci/alevin-fry/recipe.toml similarity index 100% rename from recipes/wip/science/alevin-fry/recipe.toml rename to recipes/wip/sci/alevin-fry/recipe.toml diff --git a/recipes/wip/science/astroterm/recipe.toml b/recipes/wip/sci/astroterm/recipe.toml similarity index 100% rename from recipes/wip/science/astroterm/recipe.toml rename to recipes/wip/sci/astroterm/recipe.toml diff --git a/recipes/wip/science/axe/recipe.toml b/recipes/wip/sci/axe/recipe.toml similarity index 100% rename from recipes/wip/science/axe/recipe.toml rename to recipes/wip/sci/axe/recipe.toml diff --git a/recipes/wip/science/beagle/recipe.toml b/recipes/wip/sci/beagle/recipe.toml similarity index 100% rename from recipes/wip/science/beagle/recipe.toml rename to recipes/wip/sci/beagle/recipe.toml diff --git a/recipes/wip/science/celestia-data/recipe.toml b/recipes/wip/sci/celestia-data/recipe.toml similarity index 100% rename from recipes/wip/science/celestia-data/recipe.toml rename to recipes/wip/sci/celestia-data/recipe.toml diff --git a/recipes/wip/science/celestia/recipe.toml b/recipes/wip/sci/celestia/recipe.toml similarity index 100% rename from recipes/wip/science/celestia/recipe.toml rename to recipes/wip/sci/celestia/recipe.toml diff --git a/recipes/wip/science/chem-creator/recipe.toml b/recipes/wip/sci/chem-creator/recipe.toml similarity index 100% rename from recipes/wip/science/chem-creator/recipe.toml rename to recipes/wip/sci/chem-creator/recipe.toml diff --git a/recipes/wip/science/cosmic-weather/recipe.toml b/recipes/wip/sci/cosmic-weather/recipe.toml similarity index 100% rename from recipes/wip/science/cosmic-weather/recipe.toml rename to recipes/wip/sci/cosmic-weather/recipe.toml diff --git a/recipes/wip/science/fluidx3d/recipe.toml b/recipes/wip/sci/fluidx3d/recipe.toml similarity index 100% rename from recipes/wip/science/fluidx3d/recipe.toml rename to recipes/wip/sci/fluidx3d/recipe.toml diff --git a/recipes/wip/science/fsa/recipe.toml b/recipes/wip/sci/fsa/recipe.toml similarity index 100% rename from recipes/wip/science/fsa/recipe.toml rename to recipes/wip/sci/fsa/recipe.toml diff --git a/recipes/wip/science/gaia-sky/recipe.toml b/recipes/wip/sci/gaia-sky/recipe.toml similarity index 100% rename from recipes/wip/science/gaia-sky/recipe.toml rename to recipes/wip/sci/gaia-sky/recipe.toml diff --git a/recipes/wip/science/gromacs/recipe.toml b/recipes/wip/sci/gromacs/recipe.toml similarity index 100% rename from recipes/wip/science/gromacs/recipe.toml rename to recipes/wip/sci/gromacs/recipe.toml diff --git a/recipes/wip/science/mrbayes/recipe.toml b/recipes/wip/sci/mrbayes/recipe.toml similarity index 100% rename from recipes/wip/science/mrbayes/recipe.toml rename to recipes/wip/sci/mrbayes/recipe.toml diff --git a/recipes/wip/science/multiqc/recipe.toml b/recipes/wip/sci/multiqc/recipe.toml similarity index 100% rename from recipes/wip/science/multiqc/recipe.toml rename to recipes/wip/sci/multiqc/recipe.toml diff --git a/recipes/wip/science/mummer/recipe.toml b/recipes/wip/sci/mummer/recipe.toml similarity index 100% rename from recipes/wip/science/mummer/recipe.toml rename to recipes/wip/sci/mummer/recipe.toml diff --git a/recipes/wip/science/nucleus/recipe.toml b/recipes/wip/sci/nucleus/recipe.toml similarity index 100% rename from recipes/wip/science/nucleus/recipe.toml rename to recipes/wip/sci/nucleus/recipe.toml diff --git a/recipes/wip/science/oarfish/recipe.toml b/recipes/wip/sci/oarfish/recipe.toml similarity index 100% rename from recipes/wip/science/oarfish/recipe.toml rename to recipes/wip/sci/oarfish/recipe.toml diff --git a/recipes/wip/science/openbabel/recipe.toml b/recipes/wip/sci/openbabel/recipe.toml similarity index 100% rename from recipes/wip/science/openbabel/recipe.toml rename to recipes/wip/sci/openbabel/recipe.toml diff --git a/recipes/wip/science/openfoam/recipe.toml b/recipes/wip/sci/openfoam/recipe.toml similarity index 100% rename from recipes/wip/science/openfoam/recipe.toml rename to recipes/wip/sci/openfoam/recipe.toml diff --git a/recipes/wip/science/openspace/recipe.toml b/recipes/wip/sci/openspace/recipe.toml similarity index 100% rename from recipes/wip/science/openspace/recipe.toml rename to recipes/wip/sci/openspace/recipe.toml diff --git a/recipes/wip/science/piscem/recipe.toml b/recipes/wip/sci/piscem/recipe.toml similarity index 100% rename from recipes/wip/science/piscem/recipe.toml rename to recipes/wip/sci/piscem/recipe.toml diff --git a/recipes/wip/science/polypolish/recipe.toml b/recipes/wip/sci/polypolish/recipe.toml similarity index 100% rename from recipes/wip/science/polypolish/recipe.toml rename to recipes/wip/sci/polypolish/recipe.toml diff --git a/recipes/wip/science/qgis-ltr/recipe.toml b/recipes/wip/sci/qgis-ltr/recipe.toml similarity index 100% rename from recipes/wip/science/qgis-ltr/recipe.toml rename to recipes/wip/sci/qgis-ltr/recipe.toml diff --git a/recipes/wip/science/qmcpack/recipe.toml b/recipes/wip/sci/qmcpack/recipe.toml similarity index 100% rename from recipes/wip/science/qmcpack/recipe.toml rename to recipes/wip/sci/qmcpack/recipe.toml diff --git a/recipes/wip/science/scidataflow/recipe.toml b/recipes/wip/sci/scidataflow/recipe.toml similarity index 100% rename from recipes/wip/science/scidataflow/recipe.toml rename to recipes/wip/sci/scidataflow/recipe.toml diff --git a/recipes/wip/science/simpleaf/recipe.toml b/recipes/wip/sci/simpleaf/recipe.toml similarity index 100% rename from recipes/wip/science/simpleaf/recipe.toml rename to recipes/wip/sci/simpleaf/recipe.toml diff --git a/recipes/wip/science/siril/recipe.toml b/recipes/wip/sci/siril/recipe.toml similarity index 100% rename from recipes/wip/science/siril/recipe.toml rename to recipes/wip/sci/siril/recipe.toml diff --git a/recipes/wip/science/sonde/recipe.toml b/recipes/wip/sci/sonde/recipe.toml similarity index 100% rename from recipes/wip/science/sonde/recipe.toml rename to recipes/wip/sci/sonde/recipe.toml diff --git a/recipes/wip/science/specfem2d/recipe.toml b/recipes/wip/sci/specfem2d/recipe.toml similarity index 100% rename from recipes/wip/science/specfem2d/recipe.toml rename to recipes/wip/sci/specfem2d/recipe.toml diff --git a/recipes/wip/science/specfem3d-globe/recipe.toml b/recipes/wip/sci/specfem3d-globe/recipe.toml similarity index 100% rename from recipes/wip/science/specfem3d-globe/recipe.toml rename to recipes/wip/sci/specfem3d-globe/recipe.toml diff --git a/recipes/wip/science/specfem3d/recipe.toml b/recipes/wip/sci/specfem3d/recipe.toml similarity index 100% rename from recipes/wip/science/specfem3d/recipe.toml rename to recipes/wip/sci/specfem3d/recipe.toml diff --git a/recipes/wip/science/stellarium/recipe.toml b/recipes/wip/sci/stellarium/recipe.toml similarity index 100% rename from recipes/wip/science/stellarium/recipe.toml rename to recipes/wip/sci/stellarium/recipe.toml diff --git a/recipes/wip/science/vidoxide/recipe.toml b/recipes/wip/sci/vidoxide/recipe.toml similarity index 100% rename from recipes/wip/science/vidoxide/recipe.toml rename to recipes/wip/sci/vidoxide/recipe.toml diff --git a/recipes/wip/science/weather/cosmic-ext-forecast/recipe.toml b/recipes/wip/sci/weather/cosmic-ext-forecast/recipe.toml similarity index 100% rename from recipes/wip/science/weather/cosmic-ext-forecast/recipe.toml rename to recipes/wip/sci/weather/cosmic-ext-forecast/recipe.toml diff --git a/recipes/wip/science/weather/weathr/recipe.toml b/recipes/wip/sci/weather/weathr/recipe.toml similarity index 100% rename from recipes/wip/science/weather/weathr/recipe.toml rename to recipes/wip/sci/weather/weathr/recipe.toml diff --git a/recipes/wip/science/wthrr/recipe.toml b/recipes/wip/sci/wthrr/recipe.toml similarity index 100% rename from recipes/wip/science/wthrr/recipe.toml rename to recipes/wip/sci/wthrr/recipe.toml diff --git a/recipes/wip/system/clipboard-project/recipe.toml b/recipes/wip/sys/clipboard-project/recipe.toml similarity index 100% rename from recipes/wip/system/clipboard-project/recipe.toml rename to recipes/wip/sys/clipboard-project/recipe.toml diff --git a/recipes/wip/system/desktop-file-utils/recipe.toml b/recipes/wip/sys/desktop-file-utils/recipe.toml similarity index 100% rename from recipes/wip/system/desktop-file-utils/recipe.toml rename to recipes/wip/sys/desktop-file-utils/recipe.toml diff --git a/recipes/wip/system/pik/recipe.toml b/recipes/wip/sys/pik/recipe.toml similarity index 100% rename from recipes/wip/system/pik/recipe.toml rename to recipes/wip/sys/pik/recipe.toml diff --git a/recipes/wip/system/procman/recipe.toml b/recipes/wip/sys/procman/recipe.toml similarity index 100% rename from recipes/wip/system/procman/recipe.toml rename to recipes/wip/sys/procman/recipe.toml diff --git a/recipes/wip/system/rustysd/recipe.toml b/recipes/wip/sys/rustysd/recipe.toml similarity index 100% rename from recipes/wip/system/rustysd/recipe.toml rename to recipes/wip/sys/rustysd/recipe.toml diff --git a/recipes/wip/system/serigy/recipe.toml b/recipes/wip/sys/serigy/recipe.toml similarity index 100% rename from recipes/wip/system/serigy/recipe.toml rename to recipes/wip/sys/serigy/recipe.toml diff --git a/recipes/wip/system/topgrade/recipe.toml b/recipes/wip/sys/topgrade/recipe.toml similarity index 100% rename from recipes/wip/system/topgrade/recipe.toml rename to recipes/wip/sys/topgrade/recipe.toml diff --git a/recipes/wip/system/xdg-desktop-portal-cosmic/recipe.toml b/recipes/wip/sys/xdg-desktop-portal-cosmic/recipe.toml similarity index 100% rename from recipes/wip/system/xdg-desktop-portal-cosmic/recipe.toml rename to recipes/wip/sys/xdg-desktop-portal-cosmic/recipe.toml diff --git a/recipes/wip/system/xdg-desktop-portal-gnome/recipe.toml b/recipes/wip/sys/xdg-desktop-portal-gnome/recipe.toml similarity index 100% rename from recipes/wip/system/xdg-desktop-portal-gnome/recipe.toml rename to recipes/wip/sys/xdg-desktop-portal-gnome/recipe.toml diff --git a/recipes/wip/system/xdg-desktop-portal-gtk/recipe.toml b/recipes/wip/sys/xdg-desktop-portal-gtk/recipe.toml similarity index 100% rename from recipes/wip/system/xdg-desktop-portal-gtk/recipe.toml rename to recipes/wip/sys/xdg-desktop-portal-gtk/recipe.toml diff --git a/recipes/wip/system/xdg-desktop-portal-kde/recipe.toml b/recipes/wip/sys/xdg-desktop-portal-kde/recipe.toml similarity index 100% rename from recipes/wip/system/xdg-desktop-portal-kde/recipe.toml rename to recipes/wip/sys/xdg-desktop-portal-kde/recipe.toml diff --git a/recipes/wip/system/xdg-desktop-portal-wlr/recipe.toml b/recipes/wip/sys/xdg-desktop-portal-wlr/recipe.toml similarity index 100% rename from recipes/wip/system/xdg-desktop-portal-wlr/recipe.toml rename to recipes/wip/sys/xdg-desktop-portal-wlr/recipe.toml diff --git a/recipes/wip/system/xdg-desktop-portal/recipe.toml b/recipes/wip/sys/xdg-desktop-portal/recipe.toml similarity index 100% rename from recipes/wip/system/xdg-desktop-portal/recipe.toml rename to recipes/wip/sys/xdg-desktop-portal/recipe.toml diff --git a/recipes/wip/terminal/agg/recipe.toml b/recipes/wip/term/agg/recipe.toml similarity index 100% rename from recipes/wip/terminal/agg/recipe.toml rename to recipes/wip/term/agg/recipe.toml diff --git a/recipes/wip/terminal/alacritty/recipe.toml b/recipes/wip/term/alacritty/recipe.toml similarity index 100% rename from recipes/wip/terminal/alacritty/recipe.toml rename to recipes/wip/term/alacritty/recipe.toml diff --git a/recipes/wip/terminal/amoxide/recipe.toml b/recipes/wip/term/amoxide/recipe.toml similarity index 100% rename from recipes/wip/terminal/amoxide/recipe.toml rename to recipes/wip/term/amoxide/recipe.toml diff --git a/recipes/wip/terminal/ascii-gen/recipe.toml b/recipes/wip/term/ascii-gen/recipe.toml similarity index 100% rename from recipes/wip/terminal/ascii-gen/recipe.toml rename to recipes/wip/term/ascii-gen/recipe.toml diff --git a/recipes/wip/terminal/asciiquarium/recipe.toml b/recipes/wip/term/asciiquarium/recipe.toml similarity index 100% rename from recipes/wip/terminal/asciiquarium/recipe.toml rename to recipes/wip/term/asciiquarium/recipe.toml diff --git a/recipes/wip/terminal/bobr/recipe.toml b/recipes/wip/term/bobr/recipe.toml similarity index 100% rename from recipes/wip/terminal/bobr/recipe.toml rename to recipes/wip/term/bobr/recipe.toml diff --git a/recipes/wip/terminal/boulette/recipe.toml b/recipes/wip/term/boulette/recipe.toml similarity index 100% rename from recipes/wip/terminal/boulette/recipe.toml rename to recipes/wip/term/boulette/recipe.toml diff --git a/recipes/wip/terminal/cbonsai/recipe.toml b/recipes/wip/term/cbonsai/recipe.toml similarity index 100% rename from recipes/wip/terminal/cbonsai/recipe.toml rename to recipes/wip/term/cbonsai/recipe.toml diff --git a/recipes/wip/terminal/chafa/recipe.toml b/recipes/wip/term/chafa/recipe.toml similarity index 100% rename from recipes/wip/terminal/chafa/recipe.toml rename to recipes/wip/term/chafa/recipe.toml diff --git a/recipes/wip/terminal/chatd/recipe.toml b/recipes/wip/term/chatd/recipe.toml similarity index 100% rename from recipes/wip/terminal/chatd/recipe.toml rename to recipes/wip/term/chatd/recipe.toml diff --git a/recipes/wip/terminal/conserver/recipe.toml b/recipes/wip/term/conserver/recipe.toml similarity index 100% rename from recipes/wip/terminal/conserver/recipe.toml rename to recipes/wip/term/conserver/recipe.toml diff --git a/recipes/wip/terminal/contour-terminal/recipe.toml b/recipes/wip/term/contour-terminal/recipe.toml similarity index 100% rename from recipes/wip/terminal/contour-terminal/recipe.toml rename to recipes/wip/term/contour-terminal/recipe.toml diff --git a/recipes/wip/terminal/countryfetch/recipe.toml b/recipes/wip/term/countryfetch/recipe.toml similarity index 100% rename from recipes/wip/terminal/countryfetch/recipe.toml rename to recipes/wip/term/countryfetch/recipe.toml diff --git a/recipes/wip/terminal/desktop-tui/recipe.toml b/recipes/wip/term/desktop-tui/recipe.toml similarity index 100% rename from recipes/wip/terminal/desktop-tui/recipe.toml rename to recipes/wip/term/desktop-tui/recipe.toml diff --git a/recipes/wip/terminal/emux/recipe.toml b/recipes/wip/term/emux/recipe.toml similarity index 100% rename from recipes/wip/terminal/emux/recipe.toml rename to recipes/wip/term/emux/recipe.toml diff --git a/recipes/wip/terminal/envx/recioe.toml b/recipes/wip/term/envx/recioe.toml similarity index 100% rename from recipes/wip/terminal/envx/recioe.toml rename to recipes/wip/term/envx/recioe.toml diff --git a/recipes/wip/terminal/freeze/recipe.toml b/recipes/wip/term/freeze/recipe.toml similarity index 100% rename from recipes/wip/terminal/freeze/recipe.toml rename to recipes/wip/term/freeze/recipe.toml diff --git a/recipes/wip/terminal/fsel/recipe.toml b/recipes/wip/term/fsel/recipe.toml similarity index 100% rename from recipes/wip/terminal/fsel/recipe.toml rename to recipes/wip/term/fsel/recipe.toml diff --git a/recipes/wip/terminal/ghostie/recipe.toml b/recipes/wip/term/ghostie/recipe.toml similarity index 100% rename from recipes/wip/terminal/ghostie/recipe.toml rename to recipes/wip/term/ghostie/recipe.toml diff --git a/recipes/wip/terminal/leadr/recipe.toml b/recipes/wip/term/leadr/recipe.toml similarity index 100% rename from recipes/wip/terminal/leadr/recipe.toml rename to recipes/wip/term/leadr/recipe.toml diff --git a/recipes/wip/terminal/lk/recipe.toml b/recipes/wip/term/lk/recipe.toml similarity index 100% rename from recipes/wip/terminal/lk/recipe.toml rename to recipes/wip/term/lk/recipe.toml diff --git a/recipes/wip/terminal/logria/recipe.toml b/recipes/wip/term/logria/recipe.toml similarity index 100% rename from recipes/wip/terminal/logria/recipe.toml rename to recipes/wip/term/logria/recipe.toml diff --git a/recipes/wip/terminal/loop/recipe.toml b/recipes/wip/term/loop/recipe.toml similarity index 100% rename from recipes/wip/terminal/loop/recipe.toml rename to recipes/wip/term/loop/recipe.toml diff --git a/recipes/wip/terminal/loriini/recipe.toml b/recipes/wip/term/loriini/recipe.toml similarity index 100% rename from recipes/wip/terminal/loriini/recipe.toml rename to recipes/wip/term/loriini/recipe.toml diff --git a/recipes/wip/terminal/lule/recipe.toml b/recipes/wip/term/lule/recipe.toml similarity index 100% rename from recipes/wip/terminal/lule/recipe.toml rename to recipes/wip/term/lule/recipe.toml diff --git a/recipes/wip/terminal/ngrv/recipe.toml b/recipes/wip/term/ngrv/recipe.toml similarity index 100% rename from recipes/wip/terminal/ngrv/recipe.toml rename to recipes/wip/term/ngrv/recipe.toml diff --git a/recipes/wip/terminal/otter-launcher/recipe.toml b/recipes/wip/term/otter-launcher/recipe.toml similarity index 100% rename from recipes/wip/terminal/otter-launcher/recipe.toml rename to recipes/wip/term/otter-launcher/recipe.toml diff --git a/recipes/wip/terminal/parallel/recipe.toml b/recipes/wip/term/parallel/recipe.toml similarity index 100% rename from recipes/wip/terminal/parallel/recipe.toml rename to recipes/wip/term/parallel/recipe.toml diff --git a/recipes/wip/terminal/pastel/recipe.toml b/recipes/wip/term/pastel/recipe.toml similarity index 100% rename from recipes/wip/terminal/pastel/recipe.toml rename to recipes/wip/term/pastel/recipe.toml diff --git a/recipes/wip/terminal/pay-respects/recipe.toml b/recipes/wip/term/pay-respects/recipe.toml similarity index 100% rename from recipes/wip/terminal/pay-respects/recipe.toml rename to recipes/wip/term/pay-respects/recipe.toml diff --git a/recipes/wip/terminal/pipecolor/recipe.toml b/recipes/wip/term/pipecolor/recipe.toml similarity index 100% rename from recipes/wip/terminal/pipecolor/recipe.toml rename to recipes/wip/term/pipecolor/recipe.toml diff --git a/recipes/wip/terminal/pipes-sh/recipe.toml b/recipes/wip/term/pipes-sh/recipe.toml similarity index 100% rename from recipes/wip/terminal/pipes-sh/recipe.toml rename to recipes/wip/term/pipes-sh/recipe.toml diff --git a/recipes/wip/terminal/pretty/recipe.toml b/recipes/wip/term/pretty/recipe.toml similarity index 100% rename from recipes/wip/terminal/pretty/recipe.toml rename to recipes/wip/term/pretty/recipe.toml diff --git a/recipes/wip/terminal/progress/recipe.toml b/recipes/wip/term/progress/recipe.toml similarity index 100% rename from recipes/wip/terminal/progress/recipe.toml rename to recipes/wip/term/progress/recipe.toml diff --git a/recipes/wip/terminal/pv/recipe.toml b/recipes/wip/term/pv/recipe.toml similarity index 100% rename from recipes/wip/terminal/pv/recipe.toml rename to recipes/wip/term/pv/recipe.toml diff --git a/recipes/wip/terminal/ratty/recipe.toml b/recipes/wip/term/ratty/recipe.toml similarity index 100% rename from recipes/wip/terminal/ratty/recipe.toml rename to recipes/wip/term/ratty/recipe.toml diff --git a/recipes/wip/terminal/rioterm/recipe.toml b/recipes/wip/term/rioterm/recipe.toml similarity index 100% rename from recipes/wip/terminal/rioterm/recipe.toml rename to recipes/wip/term/rioterm/recipe.toml diff --git a/recipes/wip/terminal/rterm/recipe.toml b/recipes/wip/term/rterm/recipe.toml similarity index 100% rename from recipes/wip/terminal/rterm/recipe.toml rename to recipes/wip/term/rterm/recipe.toml diff --git a/recipes/wip/terminal/scooter/recipe.toml b/recipes/wip/term/scooter/recipe.toml similarity index 100% rename from recipes/wip/terminal/scooter/recipe.toml rename to recipes/wip/term/scooter/recipe.toml diff --git a/recipes/wip/terminal/so/recipe.toml b/recipes/wip/term/so/recipe.toml similarity index 100% rename from recipes/wip/terminal/so/recipe.toml rename to recipes/wip/term/so/recipe.toml diff --git a/recipes/wip/terminal/starship/recipe.toml b/recipes/wip/term/starship/recipe.toml similarity index 100% rename from recipes/wip/terminal/starship/recipe.toml rename to recipes/wip/term/starship/recipe.toml diff --git a/recipes/wip/terminal/tab-rs/recipe.toml b/recipes/wip/term/tab-rs/recipe.toml similarity index 100% rename from recipes/wip/terminal/tab-rs/recipe.toml rename to recipes/wip/term/tab-rs/recipe.toml diff --git a/recipes/wip/terminal/tarts/recipe.toml b/recipes/wip/term/tarts/recipe.toml similarity index 100% rename from recipes/wip/terminal/tarts/recipe.toml rename to recipes/wip/term/tarts/recipe.toml diff --git a/recipes/wip/terminal/tattoy/recipe.toml b/recipes/wip/term/tattoy/recipe.toml similarity index 100% rename from recipes/wip/terminal/tattoy/recipe.toml rename to recipes/wip/term/tattoy/recipe.toml diff --git a/recipes/wip/terminal/tere/recipe.toml b/recipes/wip/term/tere/recipe.toml similarity index 100% rename from recipes/wip/terminal/tere/recipe.toml rename to recipes/wip/term/tere/recipe.toml diff --git a/recipes/wip/terminal/term39/recipe.toml b/recipes/wip/term/term39/recipe.toml similarity index 100% rename from recipes/wip/terminal/term39/recipe.toml rename to recipes/wip/term/term39/recipe.toml diff --git a/recipes/wip/terminal/termimage/recipe.toml b/recipes/wip/term/termimage/recipe.toml similarity index 100% rename from recipes/wip/terminal/termimage/recipe.toml rename to recipes/wip/term/termimage/recipe.toml diff --git a/recipes/wip/terminal/terminal-toys/recipe.toml b/recipes/wip/term/terminal-toys/recipe.toml similarity index 100% rename from recipes/wip/terminal/terminal-toys/recipe.toml rename to recipes/wip/term/terminal-toys/recipe.toml diff --git a/recipes/wip/terminal/terminal-yt/recipe.toml b/recipes/wip/term/terminal-yt/recipe.toml similarity index 100% rename from recipes/wip/terminal/terminal-yt/recipe.toml rename to recipes/wip/term/terminal-yt/recipe.toml diff --git a/recipes/wip/terminal/thokr/recipe.toml b/recipes/wip/term/thokr/recipe.toml similarity index 100% rename from recipes/wip/terminal/thokr/recipe.toml rename to recipes/wip/term/thokr/recipe.toml diff --git a/recipes/wip/terminal/tmux/recipe.toml b/recipes/wip/term/tmux/recipe.toml similarity index 100% rename from recipes/wip/terminal/tmux/recipe.toml rename to recipes/wip/term/tmux/recipe.toml diff --git a/recipes/wip/terminal/tmux/redox.patch b/recipes/wip/term/tmux/redox.patch similarity index 100% rename from recipes/wip/terminal/tmux/redox.patch rename to recipes/wip/term/tmux/redox.patch diff --git a/recipes/wip/terminal/tmuxpanel/recipe.toml b/recipes/wip/term/tmuxpanel/recipe.toml similarity index 100% rename from recipes/wip/terminal/tmuxpanel/recipe.toml rename to recipes/wip/term/tmuxpanel/recipe.toml diff --git a/recipes/wip/terminal/toyterm/recipe.toml b/recipes/wip/term/toyterm/recipe.toml similarity index 100% rename from recipes/wip/terminal/toyterm/recipe.toml rename to recipes/wip/term/toyterm/recipe.toml diff --git a/recipes/wip/terminal/ttyd/recipe.toml b/recipes/wip/term/ttyd/recipe.toml similarity index 100% rename from recipes/wip/terminal/ttyd/recipe.toml rename to recipes/wip/term/ttyd/recipe.toml diff --git a/recipes/wip/terminal/ttywatch/recipe.toml b/recipes/wip/term/ttywatch/recipe.toml similarity index 100% rename from recipes/wip/terminal/ttywatch/recipe.toml rename to recipes/wip/term/ttywatch/recipe.toml diff --git a/recipes/wip/terminal/tvk/recipe.toml b/recipes/wip/term/tvk/recipe.toml similarity index 100% rename from recipes/wip/terminal/tvk/recipe.toml rename to recipes/wip/term/tvk/recipe.toml diff --git a/recipes/wip/terminal/useenv/recipe.toml b/recipes/wip/term/useenv/recipe.toml similarity index 100% rename from recipes/wip/terminal/useenv/recipe.toml rename to recipes/wip/term/useenv/recipe.toml diff --git a/recipes/wip/terminal/vhs/recipe.toml b/recipes/wip/term/vhs/recipe.toml similarity index 100% rename from recipes/wip/terminal/vhs/recipe.toml rename to recipes/wip/term/vhs/recipe.toml diff --git a/recipes/wip/terminal/wezterm/recipe.toml b/recipes/wip/term/wezterm/recipe.toml similarity index 100% rename from recipes/wip/terminal/wezterm/recipe.toml rename to recipes/wip/term/wezterm/recipe.toml diff --git a/recipes/wip/terminal/zellij/recipe.toml b/recipes/wip/term/zellij/recipe.toml similarity index 100% rename from recipes/wip/terminal/zellij/recipe.toml rename to recipes/wip/term/zellij/recipe.toml diff --git a/recipes/wip/video/camera/cosmic-ext-camera/recipe.toml b/recipes/wip/vid/camera/cosmic-ext-camera/recipe.toml similarity index 100% rename from recipes/wip/video/camera/cosmic-ext-camera/recipe.toml rename to recipes/wip/vid/camera/cosmic-ext-camera/recipe.toml diff --git a/recipes/wip/video/camera/tuicam/recipe.toml b/recipes/wip/vid/camera/tuicam/recipe.toml similarity index 100% rename from recipes/wip/video/camera/tuicam/recipe.toml rename to recipes/wip/vid/camera/tuicam/recipe.toml diff --git a/recipes/wip/video/camera/webcamoid/recipe.toml b/recipes/wip/vid/camera/webcamoid/recipe.toml similarity index 100% rename from recipes/wip/video/camera/webcamoid/recipe.toml rename to recipes/wip/vid/camera/webcamoid/recipe.toml diff --git a/recipes/wip/video/converters/handbrake-cli/recipe.toml b/recipes/wip/vid/converters/handbrake-cli/recipe.toml similarity index 100% rename from recipes/wip/video/converters/handbrake-cli/recipe.toml rename to recipes/wip/vid/converters/handbrake-cli/recipe.toml diff --git a/recipes/wip/video/converters/trv/recipe.toml b/recipes/wip/vid/converters/trv/recipe.toml similarity index 100% rename from recipes/wip/video/converters/trv/recipe.toml rename to recipes/wip/vid/converters/trv/recipe.toml diff --git a/recipes/wip/video/editors/anime-effects/recipe.toml b/recipes/wip/vid/editors/anime-effects/recipe.toml similarity index 100% rename from recipes/wip/video/editors/anime-effects/recipe.toml rename to recipes/wip/vid/editors/anime-effects/recipe.toml diff --git a/recipes/wip/video/editors/blind/recipe.toml b/recipes/wip/vid/editors/blind/recipe.toml similarity index 100% rename from recipes/wip/video/editors/blind/recipe.toml rename to recipes/wip/vid/editors/blind/recipe.toml diff --git a/recipes/wip/video/editors/openshot/recipe.toml b/recipes/wip/vid/editors/openshot/recipe.toml similarity index 100% rename from recipes/wip/video/editors/openshot/recipe.toml rename to recipes/wip/vid/editors/openshot/recipe.toml diff --git a/recipes/wip/video/editors/shotcut/recipe.toml b/recipes/wip/vid/editors/shotcut/recipe.toml similarity index 100% rename from recipes/wip/video/editors/shotcut/recipe.toml rename to recipes/wip/vid/editors/shotcut/recipe.toml diff --git a/recipes/wip/video/editors/video-trimmer/recipe.toml b/recipes/wip/vid/editors/video-trimmer/recipe.toml similarity index 100% rename from recipes/wip/video/editors/video-trimmer/recipe.toml rename to recipes/wip/vid/editors/video-trimmer/recipe.toml diff --git a/recipes/wip/video/other/alass/recipe.toml b/recipes/wip/vid/other/alass/recipe.toml similarity index 100% rename from recipes/wip/video/other/alass/recipe.toml rename to recipes/wip/vid/other/alass/recipe.toml diff --git a/recipes/wip/video/other/av1an/recipe.toml b/recipes/wip/vid/other/av1an/recipe.toml similarity index 100% rename from recipes/wip/video/other/av1an/recipe.toml rename to recipes/wip/vid/other/av1an/recipe.toml diff --git a/recipes/wip/video/other/avp/recipe.toml b/recipes/wip/vid/other/avp/recipe.toml similarity index 100% rename from recipes/wip/video/other/avp/recipe.toml rename to recipes/wip/vid/other/avp/recipe.toml diff --git a/recipes/wip/video/other/detect-scene-change/recipe.toml b/recipes/wip/vid/other/detect-scene-change/recipe.toml similarity index 100% rename from recipes/wip/video/other/detect-scene-change/recipe.toml rename to recipes/wip/vid/other/detect-scene-change/recipe.toml diff --git a/recipes/wip/video/other/dovi-tool/recipe.toml b/recipes/wip/vid/other/dovi-tool/recipe.toml similarity index 100% rename from recipes/wip/video/other/dovi-tool/recipe.toml rename to recipes/wip/vid/other/dovi-tool/recipe.toml diff --git a/recipes/wip/video/other/frei0r/recipe.toml b/recipes/wip/vid/other/frei0r/recipe.toml similarity index 100% rename from recipes/wip/video/other/frei0r/recipe.toml rename to recipes/wip/vid/other/frei0r/recipe.toml diff --git a/recipes/wip/video/other/gnome-video-effects/recipe.toml b/recipes/wip/vid/other/gnome-video-effects/recipe.toml similarity index 100% rename from recipes/wip/video/other/gnome-video-effects/recipe.toml rename to recipes/wip/vid/other/gnome-video-effects/recipe.toml diff --git a/recipes/wip/video/other/gopro-assembler/recipe.toml b/recipes/wip/vid/other/gopro-assembler/recipe.toml similarity index 100% rename from recipes/wip/video/other/gopro-assembler/recipe.toml rename to recipes/wip/vid/other/gopro-assembler/recipe.toml diff --git a/recipes/wip/video/other/gyroflow/recipe.toml b/recipes/wip/vid/other/gyroflow/recipe.toml similarity index 100% rename from recipes/wip/video/other/gyroflow/recipe.toml rename to recipes/wip/vid/other/gyroflow/recipe.toml diff --git a/recipes/wip/video/other/imdb-rename/recipe.toml b/recipes/wip/vid/other/imdb-rename/recipe.toml similarity index 100% rename from recipes/wip/video/other/imdb-rename/recipe.toml rename to recipes/wip/vid/other/imdb-rename/recipe.toml diff --git a/recipes/wip/video/other/jerry/recipe.toml b/recipes/wip/vid/other/jerry/recipe.toml similarity index 100% rename from recipes/wip/video/other/jerry/recipe.toml rename to recipes/wip/vid/other/jerry/recipe.toml diff --git a/recipes/wip/video/other/lecturecut/recipe.toml b/recipes/wip/vid/other/lecturecut/recipe.toml similarity index 100% rename from recipes/wip/video/other/lecturecut/recipe.toml rename to recipes/wip/vid/other/lecturecut/recipe.toml diff --git a/recipes/wip/video/other/lobster/recipe.toml b/recipes/wip/vid/other/lobster/recipe.toml similarity index 100% rename from recipes/wip/video/other/lobster/recipe.toml rename to recipes/wip/vid/other/lobster/recipe.toml diff --git a/recipes/wip/video/other/pipeline/recipe.toml b/recipes/wip/vid/other/pipeline/recipe.toml similarity index 100% rename from recipes/wip/video/other/pipeline/recipe.toml rename to recipes/wip/vid/other/pipeline/recipe.toml diff --git a/recipes/wip/video/other/smoothie-rs/recipe.toml b/recipes/wip/vid/other/smoothie-rs/recipe.toml similarity index 100% rename from recipes/wip/video/other/smoothie-rs/recipe.toml rename to recipes/wip/vid/other/smoothie-rs/recipe.toml diff --git a/recipes/wip/video/other/streamlib/recipe.toml b/recipes/wip/vid/other/streamlib/recipe.toml similarity index 100% rename from recipes/wip/video/other/streamlib/recipe.toml rename to recipes/wip/vid/other/streamlib/recipe.toml diff --git a/recipes/wip/video/other/streamlink/recipe.toml b/recipes/wip/vid/other/streamlink/recipe.toml similarity index 100% rename from recipes/wip/video/other/streamlink/recipe.toml rename to recipes/wip/vid/other/streamlink/recipe.toml diff --git a/recipes/wip/video/other/sub-batch/recipe.toml b/recipes/wip/vid/other/sub-batch/recipe.toml similarity index 100% rename from recipes/wip/video/other/sub-batch/recipe.toml rename to recipes/wip/vid/other/sub-batch/recipe.toml diff --git a/recipes/wip/video/other/teres/recipe.toml b/recipes/wip/vid/other/teres/recipe.toml similarity index 100% rename from recipes/wip/video/other/teres/recipe.toml rename to recipes/wip/vid/other/teres/recipe.toml diff --git a/recipes/wip/video/other/timelens/recipe.toml b/recipes/wip/vid/other/timelens/recipe.toml similarity index 100% rename from recipes/wip/video/other/timelens/recipe.toml rename to recipes/wip/vid/other/timelens/recipe.toml diff --git a/recipes/wip/video/other/trimmeroni/recipe.toml b/recipes/wip/vid/other/trimmeroni/recipe.toml similarity index 100% rename from recipes/wip/video/other/trimmeroni/recipe.toml rename to recipes/wip/vid/other/trimmeroni/recipe.toml diff --git a/recipes/wip/video/other/vapoursynth/recipe.toml b/recipes/wip/vid/other/vapoursynth/recipe.toml similarity index 100% rename from recipes/wip/video/other/vapoursynth/recipe.toml rename to recipes/wip/vid/other/vapoursynth/recipe.toml diff --git a/recipes/wip/video/other/video4discord/recipe.toml b/recipes/wip/vid/other/video4discord/recipe.toml similarity index 100% rename from recipes/wip/video/other/video4discord/recipe.toml rename to recipes/wip/vid/other/video4discord/recipe.toml diff --git a/recipes/wip/video/other/vidmerger/recipe.toml b/recipes/wip/vid/other/vidmerger/recipe.toml similarity index 100% rename from recipes/wip/video/other/vidmerger/recipe.toml rename to recipes/wip/vid/other/vidmerger/recipe.toml diff --git a/recipes/wip/video/other/yt-chanvids/recipe.toml b/recipes/wip/vid/other/yt-chanvids/recipe.toml similarity index 100% rename from recipes/wip/video/other/yt-chanvids/recipe.toml rename to recipes/wip/vid/other/yt-chanvids/recipe.toml