diff --git a/xenon/cond.c b/360/frontend-xenon/cond.c
similarity index 100%
rename from xenon/cond.c
rename to 360/frontend-xenon/cond.c
diff --git a/xenon/main.c b/360/frontend-xenon/main.c
similarity index 97%
rename from xenon/main.c
rename to 360/frontend-xenon/main.c
index 7aedb5b39e..725515e6bc 100644
--- a/xenon/main.c
+++ b/360/frontend-xenon/main.c
@@ -31,14 +31,14 @@
 #include <xenon_soc/xenon_power.h>
 #include <elf/elf.h>
 #include <dirent.h>
-#include "../compat/strl.h"
+#include "../../compat/strl.h"
 
 #undef main
 
 int rarch_main(int argc, char **argv);
-static void start_ssnes(const char *path)
+static void start_rarch(const char *path)
 {
-   char arg0[] = "ssnes";
+   char arg0[] = "retroarch";
    char arg1[256];
    strlcpy(arg1, path, sizeof(arg1));
    char *argv[3] = { arg0, arg1, NULL };
@@ -169,7 +169,7 @@ int main(void)
 
             printf("%s\n", fn);
 
-            start_ssnes(fn);
+            start_rarch(fn);
          }
       }
 
diff --git a/xenon/xenon360_audio.c b/360/xenon360_audio.c
similarity index 100%
rename from xenon/xenon360_audio.c
rename to 360/xenon360_audio.c
diff --git a/xenon/xenon360_input.c b/360/xenon360_input.c
similarity index 100%
rename from xenon/xenon360_input.c
rename to 360/xenon360_input.c
diff --git a/xenon/xenon360_video.c b/360/xenon360_video.c
similarity index 100%
rename from xenon/xenon360_video.c
rename to 360/xenon360_video.c
diff --git a/Makefile.xenon b/Makefile.xenon
index ec25a6d6fa..60664d7e38 100644
--- a/Makefile.xenon
+++ b/Makefile.xenon
@@ -18,7 +18,7 @@ PPU_TARGET_ADJUSTED := retroarch-libxenon.elf32
 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
 INCDIRS = -I. -I$(DEVKITXENON)/usr/include
 
-OBJ = fifo_buffer.o retroarch.o driver.o file.o file_path.o settings.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
+OBJ = fifo_buffer.o retroarch.o driver.o file.o file_path.o settings.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o 360/frontend-xenon/main.o 360/xenon360_audio.o 360/xenon360_input.o 360/xenon360_video.o
 
 LIBS = -lretro -lxenon -lm -lc
 DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.6\" -DRARCH_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=rarch_main