diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index c69ad030e8..0b4f9fbdd2 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -20,11 +20,11 @@
 #include <string.h>
 
 #if defined(__CELLOS_LV2__)
-#include "frontend_ps3.c"
+#include "platform/platform_ps3.c"
 #elif defined(GEKKO)
-#include "frontend_gx.c"
+#include "platform/platform_gx.c"
 #elif defined(_XBOX)
-#include "frontend_xdk.c"
+#include "platform/platform_xdk.c"
 #endif
 
 #undef main
diff --git a/frontend/frontend_gx.c b/frontend/platform/platform_gx.c
similarity index 97%
rename from frontend/frontend_gx.c
rename to frontend/platform/platform_gx.c
index 359aac47b8..c209a17e56 100644
--- a/frontend/frontend_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -16,19 +16,19 @@
  */
 
 #include <stdbool.h>
-#include "../driver.h"
-#include "../general.h"
-#include "../libretro.h"
+#include "../../driver.h"
+#include "../../general.h"
+#include "../../libretro.h"
 
-#include "../console/rgui/rgui.h"
-#include "../gfx/fonts/bitmap.h"
+#include "../../console/rgui/rgui.h"
+#include "../../gfx/fonts/bitmap.h"
 
-#include "../console/rarch_console_exec.h"
-#include "../console/rarch_console_input.h"
-#include "../console/rarch_console_settings.h"
+#include "../../console/rarch_console_exec.h"
+#include "../../console/rarch_console_input.h"
+#include "../../console/rarch_console_settings.h"
 
 #ifdef HW_RVL
-#include "../wii/mem2_manager.h"
+#include "../../wii/mem2_manager.h"
 #endif
 
 #include <stdlib.h>
diff --git a/frontend/frontend_ps3.c b/frontend/platform/platform_ps3.c
similarity index 89%
rename from frontend/frontend_ps3.c
rename to frontend/platform/platform_ps3.c
index b1e548b74f..0e7b4638df 100644
--- a/frontend/frontend_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -1,22 +1,38 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2013 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <sys/process.h>
 
-#include "../ps3/sdk_defines.h"
-#include "../ps3/ps3_input.h"
+#include "../../ps3/sdk_defines.h"
+#include "../../ps3/ps3_input.h"
 
 #include "../console/rarch_console.h"
 
 #ifdef HAVE_RARCH_EXEC
-#include "../console/rarch_console_exec.h"
+#include "../../console/rarch_console_exec.h"
 #endif
 
-#include "../console/rarch_console_libretro_mgmt.h"
-#include "../console/rarch_console_config.h"
-#include "../console/rarch_console_settings.h"
-#include "../conf/config_file.h"
-#include "../general.h"
-#include "../file.h"
+#include "../../console/rarch_console_libretro_mgmt.h"
+#include "../../console/rarch_console_config.h"
+#include "../../console/rarch_console_settings.h"
+#include "../../conf/config_file.h"
+#include "../../general.h"
+#include "../../file.h"
 
-#include "../console/rmenu/rmenu.h"
+#include "../../console/rmenu/rmenu.h"
 
 #define EMULATOR_CONTENT_DIR "SSNE10000"
 
@@ -333,6 +349,10 @@ static void system_deinit(void)
 #endif
 }
 
+static void system_deinit_save(void)
+{
+}
+
 static void system_exitspawn(void)
 {
 #ifdef HAVE_RARCH_EXEC
diff --git a/frontend/frontend_xdk.c b/frontend/platform/platform_xdk.c
similarity index 90%
rename from frontend/frontend_xdk.c
rename to frontend/platform/platform_xdk.c
index 77c6d34b4e..dd9fff4832 100644
--- a/frontend/frontend_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -22,27 +22,27 @@
 
 #if defined(_XBOX360)
 #include <xfilecache.h>
-#include "../360/frontend-xdk/menu.h"
-#include "../xdk/menu_shared.h"
+#include "../../360/frontend-xdk/menu.h"
+#include "../../xdk/menu_shared.h"
 #elif defined(_XBOX1)
-#include "../xbox1/frontend/RetroLaunch/IoSupport.h"
-#include "../console/rmenu/rmenu.h"
+#include "../../xbox1/frontend/RetroLaunch/IoSupport.h"
+#include "../../console/rmenu/rmenu.h"
 #endif
 
 #include <xbdm.h>
 
 #ifdef _XBOX
-#include "../xdk/xdk_d3d.h"
+#include "../../xdk/xdk_d3d.h"
 #endif
 
-#include "../console/rarch_console.h"
-#include "../console/rarch_console_exec.h"
-#include "../console/rarch_console_libretro_mgmt.h"
-#include "../console/rarch_console_config.h"
-#include "../conf/config_file.h"
-#include "../conf/config_file_macros.h"
-#include "../file.h"
-#include "../general.h"
+#include "../../console/rarch_console.h"
+#include "../../console/rarch_console_exec.h"
+#include "../../console/rarch_console_libretro_mgmt.h"
+#include "../../console/rarch_console_config.h"
+#include "../../conf/config_file.h"
+#include "../../conf/config_file_macros.h"
+#include "../../file.h"
+#include "../../general.h"
 
 static void get_environment_settings(int argc, char *argv[])
 {
@@ -157,4 +157,4 @@ static void system_exitspawn(void)
 {
    if(g_extern.console.external_launch.enable)
       rarch_console_exec(g_extern.console.external_launch.launch_app);
-}
\ No newline at end of file
+}