diff --git a/recipes/linux/cores-x86_64 b/recipes/linux/cores-x86_64
index 6c734c7e..902baf1b 100644
--- a/recipes/linux/cores-x86_64
+++ b/recipes/linux/cores-x86_64
@@ -33,7 +33,7 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Make
 handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile . 
 hatari libretro-hatari https://github.com/libretro/libretro-hatari.git PROJECT YES GENERIC Makefile.libretro . 
 imageviewer libretro-imageviewer https://github.com/libretro/imageviewer-libretro.git PROJECT YES GENERIC Makefile.libretro . 
-mame078 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile . PTR64=1 
+mame078 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC Makefile . PTR64=1 
 mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile.libretro . VRENDER=soft PTR64=1 
 mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile . 
diff --git a/recipes/wii/devkitwii b/recipes/nintendo/gamecube
similarity index 87%
rename from recipes/wii/devkitwii
rename to recipes/nintendo/gamecube
index 5d7fd5d9..01e58032 100644
--- a/recipes/wii/devkitwii
+++ b/recipes/nintendo/gamecube
@@ -1,10 +1,11 @@
-fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
-fba_cores_cps1 libretro-fba_cps1 https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-old/trunk/fbacores/cps1 
-fba_cores_cps2 libretro-fba_cps2 https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-old/trunk/fbacores/cps2 
-fba_cores_neo libretro-fba_neo https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo 
+fba_cores_cps1 libretro-fba_cps1 https://github.com/libretro/fba_cores_cps1.git PROJECT YES GENERIC makefile.libretro . 
+fba_cores_cps2 libretro-fba_cps2 https://github.com/libretro/fba_cores_cps2.git PROJECT YES GENERIC makefile.libretro . 
+fba_cores_neo libretro-fba_neo https://github.com/libretro/fba_cores_neo.git PROJECT YES GENERIC makefile.libretro . 
+fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile.libretro libgambatte 
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
+imageviewer libretro-imageviewer https://github.com/libretro/imageviewer-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
@@ -19,5 +20,4 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC Makefile.libretro . 
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . 
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC Makefile.libretro . 
-imageviewer libretro-imageviewer https://github.com/libretro/imageviewer-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 
diff --git a/recipes/ngc/devkitngc.conf b/recipes/nintendo/gamecube.conf
similarity index 100%
rename from recipes/ngc/devkitngc.conf
rename to recipes/nintendo/gamecube.conf
diff --git a/recipes/ngc/devkitngc.ra b/recipes/nintendo/gamecube.ra
similarity index 100%
rename from recipes/ngc/devkitngc.ra
rename to recipes/nintendo/gamecube.ra
diff --git a/recipes/ngc/devkitngc b/recipes/nintendo/wii
similarity index 87%
rename from recipes/ngc/devkitngc
rename to recipes/nintendo/wii
index b232d8e6..01e58032 100644
--- a/recipes/ngc/devkitngc
+++ b/recipes/nintendo/wii
@@ -1,10 +1,11 @@
 fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
-fba_cores_cps1 libretro-fba_cps1 https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 
-fba_cores_cps2 libretro-fba_cps2 https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 
-fba_cores_neo libretro-fba_neo https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo 
+fba_cores_cps1 libretro-fba_cps1 https://github.com/libretro/fba_cores_cps1.git PROJECT YES GENERIC makefile.libretro . 
+fba_cores_cps2 libretro-fba_cps2 https://github.com/libretro/fba_cores_cps2.git PROJECT YES GENERIC makefile.libretro . 
+fba_cores_neo libretro-fba_neo https://github.com/libretro/fba_cores_neo.git PROJECT YES GENERIC makefile.libretro . 
 fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile.libretro libgambatte 
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
+imageviewer libretro-imageviewer https://github.com/libretro/imageviewer-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
@@ -19,5 +20,4 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC Makefile.libretro . 
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . 
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC Makefile.libretro . 
-imageviewer libretro-imageviewer https://github.com/libretro/imageviewer-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 
diff --git a/recipes/wii/devkitwii.conf b/recipes/nintendo/wii.conf
similarity index 100%
rename from recipes/wii/devkitwii.conf
rename to recipes/nintendo/wii.conf
diff --git a/recipes/wii/devkitwii.ra b/recipes/nintendo/wii.ra
similarity index 100%
rename from recipes/wii/devkitwii.ra
rename to recipes/nintendo/wii.ra