diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 2d1430afd4..9f936e83e7 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -19,7 +19,7 @@ endif
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
 PPU_CFLAGS		+= -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
-PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_context.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c
+PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_driver.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index cbd5afc4a6..2eef884ca2 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch
 PSP_EBOOT_ICON = psp1/ICON0.PNG
 PSP_EBOOT_PIC1 = psp1/PIC1.PNG
 
-OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o psp1/kernel_functions.o 
+OBJS = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o psp1/kernel_functions.o 
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index cd0b97e088..3a164175c6 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = wii/app_booter
 
-OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
+OBJ = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
index d742c49898..a5d4692c3d 100644
--- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
+++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
@@ -295,9 +295,9 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
     <ClCompile Include="..\..\frontend\frontend_salamander.c" />
-    <ClCompile Include="..\..\frontend\frontend_context.c" />
-    <ClCompile Include="..\..\frontend\platform\platform_null.c" />
-    <ClCompile Include="..\..\frontend\platform\platform_xdk.c" />
+    <ClCompile Include="..\..\frontend\frontend_driver.c" />
+    <ClCompile Include="..\..\frontend\drivers\platform_null.c" />
+    <ClCompile Include="..\..\frontend\drivers\platform_xdk.c" />
     <ClCompile Include="..\..\libretro-sdk\string\string_list.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -310,4 +310,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
index 3074c399b0..a83285970e 100644
--- a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
+++ b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
@@ -273,7 +273,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\frontend\frontend_context.c">
+				RelativePath="..\..\frontend\frontend_driver.c">
 				<FileConfiguration
 					Name="Debug|Xbox">
 					<Tool
@@ -339,10 +339,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\frontend\platform\platform_null.c">
+				RelativePath="..\..\frontend\drivers\platform_null.c">
 			</File>
 			<File
-				RelativePath="..\..\frontend\platform\platform_xdk.c">
+				RelativePath="..\..\frontend\drivers\platform_xdk.c">
 				<FileConfiguration
 					Name="Debug|Xbox">
 					<Tool