diff --git a/recipes/wip/emulators/pc/8086-emulator/recipe.toml b/recipes/wip/emulators/cpu/8086-emulator/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pc/8086-emulator/recipe.toml
rename to recipes/wip/emulators/cpu/8086-emulator/recipe.toml
diff --git a/recipes/wip/emulators/mipsy/recipe.toml b/recipes/wip/emulators/cpu/mipsy/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mipsy/recipe.toml
rename to recipes/wip/emulators/cpu/mipsy/recipe.toml
diff --git a/recipes/wip/emulators/rustzx/recipe.toml b/recipes/wip/emulators/cpu/rustzx/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rustzx/recipe.toml
rename to recipes/wip/emulators/cpu/rustzx/recipe.toml
diff --git a/recipes/wip/emulators/rvemu/recipe.toml b/recipes/wip/emulators/cpu/rvemu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rvemu/recipe.toml
rename to recipes/wip/emulators/cpu/rvemu/recipe.toml
diff --git a/recipes/wip/emulators/scemu/recipe.toml b/recipes/wip/emulators/cpu/scemu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/scemu/recipe.toml
rename to recipes/wip/emulators/cpu/scemu/recipe.toml
diff --git a/recipes/wip/emulators/unicorn/recipe.toml b/recipes/wip/emulators/cpu/unicorn/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/unicorn/recipe.toml
rename to recipes/wip/emulators/cpu/unicorn/recipe.toml
diff --git a/recipes/wip/emulators/mimic/recipe.toml b/recipes/wip/emulators/game-console/gameboy/mimic/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mimic/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/mimic/recipe.toml
diff --git a/recipes/wip/emulators/rboy/recipe.toml b/recipes/wip/emulators/game-console/gameboy/rboy/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rboy/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/rboy/recipe.toml
diff --git a/recipes/wip/emulators/rustboy-advance-ng/recipe.toml b/recipes/wip/emulators/game-console/gameboy/rustboy-advance-ng/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rustboy-advance-ng/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/rustboy-advance-ng/recipe.toml
diff --git a/recipes/wip/emulators/game-console/nestur/recipe.toml b/recipes/wip/emulators/game-console/nes/nestur/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/nestur/recipe.toml
rename to recipes/wip/emulators/game-console/nes/nestur/recipe.toml
diff --git a/recipes/wip/emulators/pinky/recipe.toml b/recipes/wip/emulators/game-console/nes/pinky/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pinky/recipe.toml
rename to recipes/wip/emulators/game-console/nes/pinky/recipe.toml
diff --git a/recipes/wip/emulators/potatis/recipe.toml b/recipes/wip/emulators/game-console/nes/potatis/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/potatis/recipe.toml
rename to recipes/wip/emulators/game-console/nes/potatis/recipe.toml
diff --git a/recipes/wip/emulators/rusticnes-sdl/recipe.toml b/recipes/wip/emulators/game-console/nes/rusticnes-sdl/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rusticnes-sdl/recipe.toml
rename to recipes/wip/emulators/game-console/nes/rusticnes-sdl/recipe.toml
diff --git a/recipes/wip/emulators/tetanes/recipe.toml b/recipes/wip/emulators/game-console/nes/tetanes/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/tetanes/recipe.toml
rename to recipes/wip/emulators/game-console/nes/tetanes/recipe.toml
diff --git a/recipes/wip/emulators/meru/recipe.toml b/recipes/wip/emulators/game-console/nintendo/meru/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/meru/recipe.toml
rename to recipes/wip/emulators/game-console/nintendo/meru/recipe.toml
diff --git a/recipes/wip/emulators/game-console/duckstation/recipe.toml b/recipes/wip/emulators/game-console/ps1/duckstation/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/game-console/duckstation/recipe.toml
rename to recipes/wip/emulators/game-console/ps1/duckstation/recipe.toml
diff --git a/recipes/wip/emulators/pcsx-rearmed/recipe.toml b/recipes/wip/emulators/game-console/ps1/pcsx-rearmed/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pcsx-rearmed/recipe.toml
rename to recipes/wip/emulators/game-console/ps1/pcsx-rearmed/recipe.toml
diff --git a/recipes/wip/emulators/rpsx/recipe.toml b/recipes/wip/emulators/game-console/ps1/rpsx/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rpsx/recipe.toml
rename to recipes/wip/emulators/game-console/ps1/rpsx/recipe.toml
diff --git a/recipes/wip/emulators/trapezoid/recipe.toml b/recipes/wip/emulators/game-console/ps1/trapezoid/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/trapezoid/recipe.toml
rename to recipes/wip/emulators/game-console/ps1/trapezoid/recipe.toml
diff --git a/recipes/wip/emulators/pcsx2/recipe.toml b/recipes/wip/emulators/game-console/ps2/pcsx2/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pcsx2/recipe.toml
rename to recipes/wip/emulators/game-console/ps2/pcsx2/recipe.toml
diff --git a/recipes/wip/emulators/rpcs3/recipe.toml b/recipes/wip/emulators/game-console/ps3/rpcs3/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rpcs3/recipe.toml
rename to recipes/wip/emulators/game-console/ps3/rpcs3/recipe.toml
diff --git a/recipes/wip/emulators/ppsspp/recipe.toml b/recipes/wip/emulators/game-console/psp/ppsspp/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/ppsspp/recipe.toml
rename to recipes/wip/emulators/game-console/psp/ppsspp/recipe.toml
diff --git a/recipes/wip/emulators/vita3k/recipe.toml b/recipes/wip/emulators/game-console/psvita/vita3k/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/vita3k/recipe.toml
rename to recipes/wip/emulators/game-console/psvita/vita3k/recipe.toml
diff --git a/recipes/wip/emulators/picodrive/recipe.toml b/recipes/wip/emulators/game-console/sega/picodrive/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/picodrive/recipe.toml
rename to recipes/wip/emulators/game-console/sega/picodrive/recipe.toml
diff --git a/recipes/wip/emulators/uoyabause/recipe.toml b/recipes/wip/emulators/game-console/sega/uoyabause/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/uoyabause/recipe.toml
rename to recipes/wip/emulators/game-console/sega/uoyabause/recipe.toml
diff --git a/recipes/wip/emulators/snes9x/recipe.toml b/recipes/wip/emulators/game-console/snes/snes9x/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/snes9x/recipe.toml
rename to recipes/wip/emulators/game-console/snes/snes9x/recipe.toml
diff --git a/recipes/wip/emulators/zsnes/recipe.toml b/recipes/wip/emulators/game-console/snes/zsnes/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/zsnes/recipe.toml
rename to recipes/wip/emulators/game-console/snes/zsnes/recipe.toml
diff --git a/recipes/wip/emulators/xemu/recipe.toml b/recipes/wip/emulators/game-console/xbox/xemu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/xemu/recipe.toml
rename to recipes/wip/emulators/game-console/xbox/xemu/recipe.toml
diff --git a/recipes/wip/emulators/xenia/recipe.toml b/recipes/wip/emulators/game-console/xbox360/xenia/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/xenia/recipe.toml
rename to recipes/wip/emulators/game-console/xbox360/xenia/recipe.toml
diff --git a/recipes/wip/emulators/touchhle/recipe.toml b/recipes/wip/emulators/mobile/touchhle/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/touchhle/recipe.toml
rename to recipes/wip/emulators/mobile/touchhle/recipe.toml
diff --git a/recipes/wip/emulators/wie/recipe.toml b/recipes/wip/emulators/mobile/wie/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/wie/recipe.toml
rename to recipes/wip/emulators/mobile/wie/recipe.toml
diff --git a/recipes/wip/emulators/ruffle/recipe.toml b/recipes/wip/emulators/pc/ruffle/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/ruffle/recipe.toml
rename to recipes/wip/emulators/pc/ruffle/recipe.toml
diff --git a/recipes/wip/emulators/pc/boxedwine/recipe.toml b/recipes/wip/emulators/pc/wine/boxedwine/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/pc/boxedwine/recipe.toml
rename to recipes/wip/emulators/pc/wine/boxedwine/recipe.toml
diff --git a/recipes/wip/emulators/wine-stable/recipe.toml b/recipes/wip/emulators/pc/wine/wine-stable/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/wine-stable/recipe.toml
rename to recipes/wip/emulators/pc/wine/wine-stable/recipe.toml
diff --git a/recipes/wip/emulators/rust-u2f/recipe.toml b/recipes/wip/emulators/security/rust-u2f/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/rust-u2f/recipe.toml
rename to recipes/wip/emulators/security/rust-u2f/recipe.toml