diff --git a/Makefile.gc b/Makefile.ngc
similarity index 92%
rename from Makefile.gc
rename to Makefile.ngc
index 3af7276a97..6ff703f71b 100644
--- a/Makefile.gc
+++ b/Makefile.ngc
@@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 
-DOL_TARGET := retroarch_gx_gc.dol
-ELF_TARGET := retroarch_gx_gc.elf
+DOL_TARGET := retroarch_ngc.dol
+ELF_TARGET := retroarch_ngc.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
@@ -35,7 +35,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
 MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map -T gx/ld/ogc.ld
-LIBS := -lfat -lretro_wii -logc
+LIBS := -lfat -logc
 
 APP_BOOTER_DIR = gx/app_booter
 
@@ -80,7 +80,7 @@ $(ELF_TARGET): $(OBJ)
 	$(LD) -r -b binary -o $@ $<
 
 $(APP_BOOTER_DIR)/app_booter_gc.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=gc
+	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc
 
 pkg: all
 	cp -r $(DOL_TARGET) gx/pkg/CORE.dol
@@ -89,7 +89,7 @@ clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=gc clean
+	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc clean
 
 .PHONY: clean
 
diff --git a/Makefile.gc.salamander b/Makefile.ngc.salamander
similarity index 98%
rename from Makefile.gc.salamander
rename to Makefile.ngc.salamander
index 363449ad92..b5c51c9251 100644
--- a/Makefile.gc.salamander
+++ b/Makefile.ngc.salamander
@@ -35,7 +35,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
 MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-LIBS := -lfat -lretro_wii -logc
+LIBS := -lfat -lretro_ngc -logc
 
 APP_BOOTER_DIR = gx/app_booter
 
diff --git a/Makefile.wii b/Makefile.wii
index 3c92569158..c2b6ab354c 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 
-DOL_TARGET := retroarch_gx.dol
-ELF_TARGET := retroarch_gx.elf
+DOL_TARGET := retroarch_wii.dol
+ELF_TARGET := retroarch_wii.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
@@ -82,7 +82,7 @@ $(APP_BOOTER_DIR)/app_booter_wii.bin:
 	$(MAKE) -C $(APP_BOOTER_DIR) platform=wii
 
 pkg: all
-	cp -r $(DOL_TARGET) gx/pkg/CORE.dol
+	cp -r $(DOL_TARGET) wii/pkg/CORE.dol
 
 clean:
 	rm -f $(DOL_TARGET)
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index c20c48b9a9..f746807f78 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 
-DOL_TARGET := retroarch-salamander_gx.dol
-ELF_TARGET := retroarch-salamander_gx.elf
+DOL_TARGET := retroarch-salamander_wii.dol
+ELF_TARGET := retroarch-salamander_wii.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
@@ -35,7 +35,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte
+LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = gx/app_booter
 
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index d325ae58c5..8d33094438 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -128,8 +128,8 @@ VIDEO DRIVER
 #include "../../gfx/gl.c"
 #elif defined(GEKKO)
 #ifdef HW_RVL
-#include "../../gx/vi_encoder.c"
-#include "../../gx/mem2_manager.c"
+#include "../../wii/vi_encoder.c"
+#include "../../wii/mem2_manager.c"
 #endif
 #include "../../gx/gx_video.c"
 #endif
diff --git a/gx/mem2_manager.c b/wii/mem2_manager.c
similarity index 100%
rename from gx/mem2_manager.c
rename to wii/mem2_manager.c
diff --git a/gx/mem2_manager.h b/wii/mem2_manager.h
similarity index 100%
rename from gx/mem2_manager.h
rename to wii/mem2_manager.h
diff --git a/wii/pkg/icon.png b/wii/pkg/icon.png
new file mode 100644
index 0000000000..23d1a0762e
Binary files /dev/null and b/wii/pkg/icon.png differ
diff --git a/wii/pkg/meta.xml b/wii/pkg/meta.xml
new file mode 100644
index 0000000000..0d4b53ce65
--- /dev/null
+++ b/wii/pkg/meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<app version="1">
+  <name>RetroArch GX</name>
+  <coder>Maister, Squarepusher, ToadKing</coder>
+  <version>0.9.7.1</version>
+  <release_date>2012</release_date>
+  <short_description>Multi-system emulator</short_description> 
+  <long_description>A port of RetroArch to the GameCube/Wii.</long_description> 
+  <no_ios_reload/>
+</app>
diff --git a/gx/vi_encoder.c b/wii/vi_encoder.c
similarity index 100%
rename from gx/vi_encoder.c
rename to wii/vi_encoder.c
diff --git a/gx/vi_encoder.h b/wii/vi_encoder.h
similarity index 100%
rename from gx/vi_encoder.h
rename to wii/vi_encoder.h