diff --git a/recipes/wip/emulators/cpu/6502-emulator/recipe.toml b/recipes/wip/emu/cpu/6502-emulator/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/6502-emulator/recipe.toml
rename to recipes/wip/emu/cpu/6502-emulator/recipe.toml
diff --git a/recipes/wip/emulators/cpu/8086-emulator/recipe.toml b/recipes/wip/emu/cpu/8086-emulator/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/8086-emulator/recipe.toml
rename to recipes/wip/emu/cpu/8086-emulator/recipe.toml
diff --git a/recipes/wip/emulators/cpu/mipsy/recipe.toml b/recipes/wip/emu/cpu/mipsy/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/mipsy/recipe.toml
rename to recipes/wip/emu/cpu/mipsy/recipe.toml
diff --git a/recipes/wip/emulators/cpu/rustzx/recipe.toml b/recipes/wip/emu/cpu/rustzx/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/rustzx/recipe.toml
rename to recipes/wip/emu/cpu/rustzx/recipe.toml
diff --git a/recipes/wip/emulators/cpu/rvemu/recipe.toml b/recipes/wip/emu/cpu/rvemu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/rvemu/recipe.toml
rename to recipes/wip/emu/cpu/rvemu/recipe.toml
diff --git a/recipes/wip/emulators/cpu/scemu/recipe.toml b/recipes/wip/emu/cpu/scemu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/scemu/recipe.toml
rename to recipes/wip/emu/cpu/scemu/recipe.toml
diff --git a/recipes/wip/emulators/cpu/unicorn/recipe.toml b/recipes/wip/emu/cpu/unicorn/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/cpu/unicorn/recipe.toml
rename to recipes/wip/emu/cpu/unicorn/recipe.toml
diff --git a/recipes/wip/emulators/game-console/azahar/recipe.toml b/recipes/wip/emu/game-console/azahar/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/azahar/recipe.toml
rename to recipes/wip/emu/game-console/azahar/recipe.toml
diff --git a/recipes/wip/emulators/game-console/clementine/recipe.toml b/recipes/wip/emu/game-console/clementine/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/clementine/recipe.toml
rename to recipes/wip/emu/game-console/clementine/recipe.toml
diff --git a/recipes/wip/emulators/game-console/dolphin-emu/recipe.toml b/recipes/wip/emu/game-console/dolphin-emu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/dolphin-emu/recipe.toml
rename to recipes/wip/emu/game-console/dolphin-emu/recipe.toml
diff --git a/recipes/wip/emulators/game-console/finalburn-neo/recipe.toml b/recipes/wip/emu/game-console/finalburn-neo/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/finalburn-neo/recipe.toml
rename to recipes/wip/emu/game-console/finalburn-neo/recipe.toml
diff --git a/recipes/wip/emulators/game-console/gameboy/boytacean/recipe.toml b/recipes/wip/emu/game-console/gameboy/boytacean/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/gameboy/boytacean/recipe.toml
rename to recipes/wip/emu/game-console/gameboy/boytacean/recipe.toml
diff --git a/recipes/wip/emulators/game-console/gameboy/gameroy/recipe.toml b/recipes/wip/emu/game-console/gameboy/gameroy/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/gameboy/gameroy/recipe.toml
rename to recipes/wip/emu/game-console/gameboy/gameroy/recipe.toml
diff --git a/recipes/wip/emulators/game-console/gameboy/mimic/recipe.toml b/recipes/wip/emu/game-console/gameboy/mimic/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/gameboy/mimic/recipe.toml
rename to recipes/wip/emu/game-console/gameboy/mimic/recipe.toml
diff --git a/recipes/wip/emulators/game-console/gopher64/recipe.toml b/recipes/wip/emu/game-console/gopher64/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/gopher64/recipe.toml
rename to recipes/wip/emu/game-console/gopher64/recipe.toml
diff --git a/recipes/wip/emulators/game-console/jgenesis/recipe.toml b/recipes/wip/emu/game-console/jgenesis/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/jgenesis/recipe.toml
rename to recipes/wip/emu/game-console/jgenesis/recipe.toml
diff --git a/recipes/wip/emulators/game-console/mame/recipe.toml b/recipes/wip/emu/game-console/mame/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/mame/recipe.toml
rename to recipes/wip/emu/game-console/mame/recipe.toml
diff --git a/recipes/wip/emulators/game-console/melonds/recipe.toml b/recipes/wip/emu/game-console/melonds/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/melonds/recipe.toml
rename to recipes/wip/emu/game-console/melonds/recipe.toml
diff --git a/recipes/wip/emulators/game-console/meru/recipe.toml b/recipes/wip/emu/game-console/meru/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/meru/recipe.toml
rename to recipes/wip/emu/game-console/meru/recipe.toml
diff --git a/recipes/wip/emulators/game-console/mupen64plus-core/recipe.toml b/recipes/wip/emu/game-console/mupen64plus-core/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/mupen64plus-core/recipe.toml
rename to recipes/wip/emu/game-console/mupen64plus-core/recipe.toml
diff --git a/recipes/wip/emulators/game-console/obliteration/recipe.toml b/recipes/wip/emu/game-console/obliteration/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/obliteration/recipe.toml
rename to recipes/wip/emu/game-console/obliteration/recipe.toml
diff --git a/recipes/wip/emulators/game-console/pcsx2/recipe.toml b/recipes/wip/emu/game-console/pcsx2/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/pcsx2/recipe.toml
rename to recipes/wip/emu/game-console/pcsx2/recipe.toml
diff --git a/recipes/wip/emulators/game-console/picodrive/recipe.toml b/recipes/wip/emu/game-console/picodrive/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/picodrive/recipe.toml
rename to recipes/wip/emu/game-console/picodrive/recipe.toml
diff --git a/recipes/wip/emulators/game-console/play/recipe.toml b/recipes/wip/emu/game-console/play/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/play/recipe.toml
rename to recipes/wip/emu/game-console/play/recipe.toml
diff --git a/recipes/wip/emulators/game-console/ppsspp/recipe.toml b/recipes/wip/emu/game-console/ppsspp/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/ppsspp/recipe.toml
rename to recipes/wip/emu/game-console/ppsspp/recipe.toml
diff --git a/recipes/wip/emulators/game-console/ps1/duckstation/recipe.toml b/recipes/wip/emu/game-console/ps1/duckstation/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/ps1/duckstation/recipe.toml
rename to recipes/wip/emu/game-console/ps1/duckstation/recipe.toml
diff --git a/recipes/wip/emulators/game-console/ps1/pcsx-rearmed/recipe.toml b/recipes/wip/emu/game-console/ps1/pcsx-rearmed/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/ps1/pcsx-rearmed/recipe.toml
rename to recipes/wip/emu/game-console/ps1/pcsx-rearmed/recipe.toml
diff --git a/recipes/wip/emulators/game-console/ps1/rpsx/recipe.toml b/recipes/wip/emu/game-console/ps1/rpsx/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/ps1/rpsx/recipe.toml
rename to recipes/wip/emu/game-console/ps1/rpsx/recipe.toml
diff --git a/recipes/wip/emulators/game-console/ps1/trapezoid/recipe.toml b/recipes/wip/emu/game-console/ps1/trapezoid/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/ps1/trapezoid/recipe.toml
rename to recipes/wip/emu/game-console/ps1/trapezoid/recipe.toml
diff --git a/recipes/wip/emulators/game-console/rpcs3/recipe.toml b/recipes/wip/emu/game-console/rpcs3/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/rpcs3/recipe.toml
rename to recipes/wip/emu/game-console/rpcs3/recipe.toml
diff --git a/recipes/wip/emulators/game-console/shadps4/recipe.toml b/recipes/wip/emu/game-console/shadps4/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/shadps4/recipe.toml
rename to recipes/wip/emu/game-console/shadps4/recipe.toml
diff --git a/recipes/wip/emulators/game-console/snes9x/recipe.toml b/recipes/wip/emu/game-console/snes9x/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/snes9x/recipe.toml
rename to recipes/wip/emu/game-console/snes9x/recipe.toml
diff --git a/recipes/wip/emulators/game-console/tetanes/recipe.toml b/recipes/wip/emu/game-console/tetanes/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/tetanes/recipe.toml
rename to recipes/wip/emu/game-console/tetanes/recipe.toml
diff --git a/recipes/wip/emulators/game-console/uoyabause/recipe.toml b/recipes/wip/emu/game-console/uoyabause/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/uoyabause/recipe.toml
rename to recipes/wip/emu/game-console/uoyabause/recipe.toml
diff --git a/recipes/wip/emulators/game-console/vita3k/recipe.toml b/recipes/wip/emu/game-console/vita3k/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/vita3k/recipe.toml
rename to recipes/wip/emu/game-console/vita3k/recipe.toml
diff --git a/recipes/wip/emulators/game-console/xemu/recipe.toml b/recipes/wip/emu/game-console/xemu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/xemu/recipe.toml
rename to recipes/wip/emu/game-console/xemu/recipe.toml
diff --git a/recipes/wip/emulators/game-console/xenia-canary/recipe.toml b/recipes/wip/emu/game-console/xenia-canary/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/xenia-canary/recipe.toml
rename to recipes/wip/emu/game-console/xenia-canary/recipe.toml
diff --git a/recipes/wip/emulators/game-console/zsnes/recipe.toml b/recipes/wip/emu/game-console/zsnes/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/zsnes/recipe.toml
rename to recipes/wip/emu/game-console/zsnes/recipe.toml
diff --git a/recipes/wip/emulators/mobile/touchhle/recipe.toml b/recipes/wip/emu/mobile/touchhle/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mobile/touchhle/recipe.toml
rename to recipes/wip/emu/mobile/touchhle/recipe.toml
diff --git a/recipes/wip/emulators/mobile/wie/recipe.toml b/recipes/wip/emu/mobile/wie/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mobile/wie/recipe.toml
rename to recipes/wip/emu/mobile/wie/recipe.toml
diff --git a/recipes/wip/emulators/pc/darling/recipe.toml b/recipes/wip/emu/pc/darling/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pc/darling/recipe.toml
rename to recipes/wip/emu/pc/darling/recipe.toml
diff --git a/recipes/wip/emulators/pc/martypc/recipe.toml b/recipes/wip/emu/pc/martypc/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pc/martypc/recipe.toml
rename to recipes/wip/emu/pc/martypc/recipe.toml
diff --git a/recipes/wip/emulators/pc/opengmk/recipe.toml b/recipes/wip/emu/pc/opengmk/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pc/opengmk/recipe.toml
rename to recipes/wip/emu/pc/opengmk/recipe.toml
diff --git a/recipes/wip/emulators/pc/ruffle/recipe.toml b/recipes/wip/emu/pc/ruffle/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pc/ruffle/recipe.toml
rename to recipes/wip/emu/pc/ruffle/recipe.toml
diff --git a/recipes/wip/emulators/security/rust-u2f/recipe.toml b/recipes/wip/emu/security/rust-u2f/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/security/rust-u2f/recipe.toml
rename to recipes/wip/emu/security/rust-u2f/recipe.toml
diff --git a/recipes/wip/emulators/windows/boxedwine/recipe.toml b/recipes/wip/emu/windows/boxedwine/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/windows/boxedwine/recipe.toml
rename to recipes/wip/emu/windows/boxedwine/recipe.toml
diff --git a/recipes/wip/emulators/windows/hangover/recipe.toml b/recipes/wip/emu/windows/hangover/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/windows/hangover/recipe.toml
rename to recipes/wip/emu/windows/hangover/recipe.toml
diff --git a/recipes/wip/emulators/windows/retrowin32/recipe.toml b/recipes/wip/emu/windows/retrowin32/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/windows/retrowin32/recipe.toml
rename to recipes/wip/emu/windows/retrowin32/recipe.toml
diff --git a/recipes/wip/emulators/windows/wine-stable/recipe.toml b/recipes/wip/emu/windows/wine-stable/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/windows/wine-stable/recipe.toml
rename to recipes/wip/emu/windows/wine-stable/recipe.toml