diff --git a/recipes/wip/emulators/finalburn-neo/recipe.toml b/recipes/wip/emulators/game-console/arcade/finalburn-neo/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/finalburn-neo/recipe.toml
rename to recipes/wip/emulators/game-console/arcade/finalburn-neo/recipe.toml
diff --git a/recipes/wip/emulators/mame/recipe.toml b/recipes/wip/emulators/game-console/arcade/mame/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mame/recipe.toml
rename to recipes/wip/emulators/game-console/arcade/mame/recipe.toml
diff --git a/recipes/wip/emulators/clementine/recipe.toml b/recipes/wip/emulators/game-console/clementine/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/clementine/recipe.toml
rename to recipes/wip/emulators/game-console/clementine/recipe.toml
diff --git a/recipes/wip/emulators/duckstation/recipe.toml b/recipes/wip/emulators/game-console/duckstation/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/duckstation/recipe.toml
rename to recipes/wip/emulators/game-console/duckstation/recipe.toml
diff --git a/recipes/wip/emulators/boytacean/recipe.toml b/recipes/wip/emulators/game-console/gameboy/boytacean/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/boytacean/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/boytacean/recipe.toml
diff --git a/recipes/wip/emulators/gameboy-emu/recipe.toml b/recipes/wip/emulators/game-console/gameboy/gameboy-emu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/gameboy-emu/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/gameboy-emu/recipe.toml
diff --git a/recipes/wip/emulators/gameroy/recipe.toml b/recipes/wip/emulators/game-console/gameboy/gameroy/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/gameroy/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/gameroy/recipe.toml
diff --git a/recipes/wip/emulators/mooneye-gb/recipe.toml b/recipes/wip/emulators/game-console/gameboy/mooneye-gb/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mooneye-gb/recipe.toml
rename to recipes/wip/emulators/game-console/gameboy/mooneye-gb/recipe.toml
diff --git a/recipes/wip/emulators/jgenesis/recipe.toml b/recipes/wip/emulators/game-console/jgenesis/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/jgenesis/recipe.toml
rename to recipes/wip/emulators/game-console/jgenesis/recipe.toml
diff --git a/recipes/wip/emulators/gopher64/recipe.toml b/recipes/wip/emulators/game-console/n64/gopher64/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/gopher64/recipe.toml
rename to recipes/wip/emulators/game-console/n64/gopher64/recipe.toml
diff --git a/recipes/wip/emulators/mupen64plus-audio-sdl/recipe.toml b/recipes/wip/emulators/game-console/n64/mupen64plus-audio-sdl/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mupen64plus-audio-sdl/recipe.toml
rename to recipes/wip/emulators/game-console/n64/mupen64plus-audio-sdl/recipe.toml
diff --git a/recipes/wip/emulators/mupen64plus-core/recipe.toml b/recipes/wip/emulators/game-console/n64/mupen64plus-core/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mupen64plus-core/recipe.toml
rename to recipes/wip/emulators/game-console/n64/mupen64plus-core/recipe.toml
diff --git a/recipes/wip/emulators/mupen64plus-input-sdl/recipe.toml b/recipes/wip/emulators/game-console/n64/mupen64plus-input-sdl/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mupen64plus-input-sdl/recipe.toml
rename to recipes/wip/emulators/game-console/n64/mupen64plus-input-sdl/recipe.toml
diff --git a/recipes/wip/emulators/mupen64plus-ui-console/recipe.toml b/recipes/wip/emulators/game-console/n64/mupen64plus-ui-console/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mupen64plus-ui-console/recipe.toml
rename to recipes/wip/emulators/game-console/n64/mupen64plus-ui-console/recipe.toml
diff --git a/recipes/wip/emulators/mupen64plus-video-glide64/recipe.toml b/recipes/wip/emulators/game-console/n64/mupen64plus-video-glide64/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mupen64plus-video-glide64/recipe.toml
rename to recipes/wip/emulators/game-console/n64/mupen64plus-video-glide64/recipe.toml
diff --git a/recipes/wip/emulators/mupen64plus-video-rice/recipe.toml b/recipes/wip/emulators/game-console/n64/mupen64plus-video-rice/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/mupen64plus-video-rice/recipe.toml
rename to recipes/wip/emulators/game-console/n64/mupen64plus-video-rice/recipe.toml
diff --git a/recipes/wip/emulators/melonds/recipe.toml b/recipes/wip/emulators/game-console/nds/melonds/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/melonds/recipe.toml
rename to recipes/wip/emulators/game-console/nds/melonds/recipe.toml
diff --git a/recipes/wip/emulators/nestur/recipe.toml b/recipes/wip/emulators/game-console/nestur/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/nestur/recipe.toml
rename to recipes/wip/emulators/game-console/nestur/recipe.toml
diff --git a/recipes/wip/emulators/dolphin-emu/recipe.toml b/recipes/wip/emulators/game-console/nintendo/dolphin-emu/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/dolphin-emu/recipe.toml
rename to recipes/wip/emulators/game-console/nintendo/dolphin-emu/recipe.toml
diff --git a/recipes/wip/emulators/obliteration/recipe.toml b/recipes/wip/emulators/game-console/ps4/obliteration/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/obliteration/recipe.toml
rename to recipes/wip/emulators/game-console/ps4/obliteration/recipe.toml
diff --git a/recipes/wip/emulators/8086-emulator/recipe.toml b/recipes/wip/emulators/pc/8086-emulator/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/8086-emulator/recipe.toml
rename to recipes/wip/emulators/pc/8086-emulator/recipe.toml
diff --git a/recipes/wip/emulators/boxedwine/recipe.toml b/recipes/wip/emulators/pc/boxedwine/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/boxedwine/recipe.toml
rename to recipes/wip/emulators/pc/boxedwine/recipe.toml
diff --git a/recipes/wip/emulators/darling/recipe.toml b/recipes/wip/emulators/pc/darling/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/darling/recipe.toml
rename to recipes/wip/emulators/pc/darling/recipe.toml
diff --git a/recipes/wip/emulators/martypc/recipe.toml b/recipes/wip/emulators/pc/martypc/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/martypc/recipe.toml
rename to recipes/wip/emulators/pc/martypc/recipe.toml
diff --git a/recipes/wip/emulators/opengmk/recipe.toml b/recipes/wip/emulators/pc/opengmk/recipe.toml
similarity index 100%
rename from recipes/wip/emulators/opengmk/recipe.toml
rename to recipes/wip/emulators/pc/opengmk/recipe.toml
diff --git a/recipes/wip/tools/unicorn/recipe.toml b/recipes/wip/emulators/unicorn/recipe.toml
similarity index 100%
rename from recipes/wip/tools/unicorn/recipe.toml
rename to recipes/wip/emulators/unicorn/recipe.toml