diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index 5bae7b7..24da555 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-GENPLUS_SRC_DIR := ../../source
+GENPLUS_SRC_DIR := ../../core
 LIBRETRO_DIR	:= ../
 
 LOCAL_MODULE    := retro
diff --git a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
index ffa6eea..f8b8762 100644
--- a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
+++ b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\source";"$(SolutionDir)\..\..\source\cd_hw";"$(SolutionDir)\..\..\source\cart_hw";"$(SolutionDir)\..\..\source\sound";"$(SolutionDir)\..\..\source\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\source\m68k";"$(SolutionDir)\..\..\source\input_hw";"$(SolutionDir)\..\..\source\cart_hw\svp";"$(SolutionDir)\..\..\source\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\core";"$(SolutionDir)\..\..\core\cd_hw";"$(SolutionDir)\..\..\core\cart_hw";"$(SolutionDir)\..\..\core\sound";"$(SolutionDir)\..\..\core\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\core\m68k";"$(SolutionDir)\..\..\core\input_hw";"$(SolutionDir)\..\..\core\cart_hw\svp";"$(SolutionDir)\..\..\core\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
 				PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -55,7 +55,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\source";"$(SolutionDir)\..\..\source\cd_hw";"$(SolutionDir)\..\..\source\cart_hw";"$(SolutionDir)\..\..\source\sound";"$(SolutionDir)\..\..\source\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\source\m68k";"$(SolutionDir)\..\..\source\input_hw";"$(SolutionDir)\..\..\source\cart_hw\svp";"$(SolutionDir)\..\..\source\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\core";"$(SolutionDir)\..\..\core\cd_hw";"$(SolutionDir)\..\..\core\cart_hw";"$(SolutionDir)\..\..\core\sound";"$(SolutionDir)\..\..\core\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\core\m68k";"$(SolutionDir)\..\..\core\input_hw";"$(SolutionDir)\..\..\core\cart_hw\svp";"$(SolutionDir)\..\..\core\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -90,7 +90,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\source";"$(SolutionDir)\..\..\source\cd_hw";"$(SolutionDir)\..\..\source\cart_hw";"$(SolutionDir)\..\..\source\sound";"$(SolutionDir)\..\..\source\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\source\m68k";"$(SolutionDir)\..\..\source\input_hw";"$(SolutionDir)\..\..\source\cart_hw\svp";"$(SolutionDir)\..\..\source\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\core";"$(SolutionDir)\..\..\core\cd_hw";"$(SolutionDir)\..\..\core\cart_hw";"$(SolutionDir)\..\..\core\sound";"$(SolutionDir)\..\..\core\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\core\m68k";"$(SolutionDir)\..\..\core\input_hw";"$(SolutionDir)\..\..\core\cart_hw\svp";"$(SolutionDir)\..\..\core\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;FASTCAP;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -126,7 +126,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\source";"$(SolutionDir)\..\..\source\cd_hw";"$(SolutionDir)\..\..\source\cart_hw";"$(SolutionDir)\..\..\source\sound";"$(SolutionDir)\..\..\source\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\source\m68k";"$(SolutionDir)\..\..\source\input_hw";"$(SolutionDir)\..\..\source\cart_hw\svp";"$(SolutionDir)\..\..\source\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\core";"$(SolutionDir)\..\..\core\cd_hw";"$(SolutionDir)\..\..\core\cart_hw";"$(SolutionDir)\..\..\core\sound";"$(SolutionDir)\..\..\core\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\core\m68k";"$(SolutionDir)\..\..\core\input_hw";"$(SolutionDir)\..\..\core\cart_hw\svp";"$(SolutionDir)\..\..\core\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -162,7 +162,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\source";"$(SolutionDir)\..\..\source\cd_hw";"$(SolutionDir)\..\..\source\cart_hw";"$(SolutionDir)\..\..\source\sound";"$(SolutionDir)\..\..\source\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\source\m68k";"$(SolutionDir)\..\..\source\input_hw";"$(SolutionDir)\..\..\source\cart_hw\svp";"$(SolutionDir)\..\..\source\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
+				AdditionalIncludeDirectories=""$(SolutionDir)\..\..\core";"$(SolutionDir)\..\..\core\cd_hw";"$(SolutionDir)\..\..\core\cart_hw";"$(SolutionDir)\..\..\core\sound";"$(SolutionDir)\..\..\core\z80";"$(SolutionDir)\..\..\";"$(SolutionDir)";"$(SolutionDir)\..\..\core\m68k";"$(SolutionDir)\..\..\core\input_hw";"$(SolutionDir)\..\..\core\cart_hw\svp";"$(SolutionDir)\..\..\core\ntsc";"$(SolutionDir)\..\..\libretro";"$(SolutionDir)\msvc-2003-xbox1""
 				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;LTCG;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -202,68 +202,68 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="source"
+				Name="core"
 				Filter="">
 				<File
-					RelativePath="..\..\..\source\genesis.c">
+					RelativePath="..\..\..\core\genesis.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\io_ctrl.c">
+					RelativePath="..\..\..\core\io_ctrl.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\loadrom.c">
+					RelativePath="..\..\..\core\loadrom.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\mem68k.c">
+					RelativePath="..\..\..\core\mem68k.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\membnk.c">
+					RelativePath="..\..\..\core\membnk.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\memz80.c">
+					RelativePath="..\..\..\core\memz80.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\state.c">
+					RelativePath="..\..\..\core\state.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\system.c">
+					RelativePath="..\..\..\core\system.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\vdp_ctrl.c">
+					RelativePath="..\..\..\core\vdp_ctrl.c">
 				</File>
 				<File
-					RelativePath="..\..\..\source\vdp_render.c">
+					RelativePath="..\..\..\core\vdp_render.c">
 				</File>
 				<Filter
 					Name="cd_hw"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\cd_hw\cd_cart.c">
+						RelativePath="..\..\..\core\cd_hw\cd_cart.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cd_hw\cdc.c">
+						RelativePath="..\..\..\core\cd_hw\cdc.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cd_hw\cdd.c">
+						RelativePath="..\..\..\core\cd_hw\cdd.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cd_hw\gfx.c">
+						RelativePath="..\..\..\core\cd_hw\gfx.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cd_hw\pcm.c">
+						RelativePath="..\..\..\core\cd_hw\pcm.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cd_hw\scd.c">
+						RelativePath="..\..\..\core\cd_hw\scd.c">
 					</File>
 				</Filter>
 				<Filter
 					Name="cart_hw"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\cart_hw\areplay.c">
+						RelativePath="..\..\..\core\cart_hw\areplay.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\eeprom_93c.c">
+						RelativePath="..\..\..\core\cart_hw\eeprom_93c.c">
 						<FileConfiguration
 							Name="Debug|Xbox">
 							<Tool
@@ -296,7 +296,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\eeprom_i2c.c">
+						RelativePath="..\..\..\core\cart_hw\eeprom_i2c.c">
 						<FileConfiguration
 							Name="Debug|Xbox">
 							<Tool
@@ -329,7 +329,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\eeprom_spi.c">
+						RelativePath="..\..\..\core\cart_hw\eeprom_spi.c">
 						<FileConfiguration
 							Name="Debug|Xbox">
 							<Tool
@@ -362,25 +362,25 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\ggenie.c">
+						RelativePath="..\..\..\core\cart_hw\ggenie.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\md_cart.c">
+						RelativePath="..\..\..\core\cart_hw\md_cart.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\sms_cart.c">
+						RelativePath="..\..\..\core\cart_hw\sms_cart.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\cart_hw\sram.c">
+						RelativePath="..\..\..\core\cart_hw\sram.c">
 					</File>
 					<Filter
 						Name="svp"
 						Filter="">
 						<File
-							RelativePath="..\..\..\source\cart_hw\svp\ssp16.c">
+							RelativePath="..\..\..\core\cart_hw\svp\ssp16.c">
 						</File>
 						<File
-							RelativePath="..\..\..\source\cart_hw\svp\svp.c">
+							RelativePath="..\..\..\core\cart_hw\svp\svp.c">
 						</File>
 					</Filter>
 				</Filter>
@@ -388,80 +388,80 @@
 					Name="sound"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\sound\blip_buf.c">
+						RelativePath="..\..\..\core\sound\blip_buf.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\sound\eq.c">
+						RelativePath="..\..\..\core\sound\eq.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\sound\sn76489.c">
+						RelativePath="..\..\..\core\sound\sn76489.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\sound\sound.c">
+						RelativePath="..\..\..\core\sound\sound.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\sound\ym2413.c">
+						RelativePath="..\..\..\core\sound\ym2413.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\sound\ym2612.c">
+						RelativePath="..\..\..\core\sound\ym2612.c">
 					</File>
 				</Filter>
 				<Filter
 					Name="z80"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\z80\z80.c">
+						RelativePath="..\..\..\core\z80\z80.c">
 					</File>
 				</Filter>
 				<Filter
 					Name="input_hw"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\input_hw\activator.c">
+						RelativePath="..\..\..\core\input_hw\activator.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\gamepad.c">
+						RelativePath="..\..\..\core\input_hw\gamepad.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\input.c">
+						RelativePath="..\..\..\core\input_hw\input.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\lightgun.c">
+						RelativePath="..\..\..\core\input_hw\lightgun.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\mouse.c">
+						RelativePath="..\..\..\core\input_hw\mouse.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\paddle.c">
+						RelativePath="..\..\..\core\input_hw\paddle.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\sportspad.c">
+						RelativePath="..\..\..\core\input_hw\sportspad.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\teamplayer.c">
+						RelativePath="..\..\..\core\input_hw\teamplayer.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\terebi_oekaki.c">
+						RelativePath="..\..\..\core\input_hw\terebi_oekaki.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\input_hw\xe_a1p.c">
+						RelativePath="..\..\..\core\input_hw\xe_a1p.c">
 					</File>
 				</Filter>
 				<Filter
 					Name="ntsc"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\ntsc\md_ntsc.c">
+						RelativePath="..\..\..\core\ntsc\md_ntsc.c">
 					</File>
 					<File
-						RelativePath="..\..\..\source\ntsc\sms_ntsc.c">
+						RelativePath="..\..\..\core\ntsc\sms_ntsc.c">
 					</File>
 				</Filter>
 				<Filter
 					Name="m68k"
 					Filter="">
 					<File
-						RelativePath="..\..\..\source\m68k\m68kcpu.c">
+						RelativePath="..\..\..\core\m68k\m68kcpu.c">
 						<FileConfiguration
 							Name="Debug|Xbox">
 							<Tool
@@ -494,7 +494,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\source\m68k\s68kcpu.c">
+						RelativePath="..\..\..\core\m68k\s68kcpu.c">
 						<FileConfiguration
 							Name="Debug|Xbox">
 							<Tool
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
index 73254a8..c2828ee 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\cart_hw\areplay.c">
+    <ClCompile Include="..\..\..\core\cart_hw\areplay.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -35,7 +35,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_93c.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -43,7 +43,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_i2c.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -51,7 +51,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_spi.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -59,7 +59,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\ggenie.c">
+    <ClCompile Include="..\..\..\core\cart_hw\ggenie.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -67,7 +67,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\md_cart.c">
+    <ClCompile Include="..\..\..\core\cart_hw\md_cart.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -75,7 +75,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\sms_cart.c">
+    <ClCompile Include="..\..\..\core\cart_hw\sms_cart.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -83,7 +83,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\sram.c">
+    <ClCompile Include="..\..\..\core\cart_hw\sram.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -91,28 +91,28 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\svp\ssp16.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\svp\svp.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\cdc.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\cdd.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\cd_cart.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\gfx.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\pcm.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\scd.c" />
-    <ClCompile Include="..\..\..\source\genesis.c" />
-    <ClCompile Include="..\..\..\source\input_hw\activator.c" />
-    <ClCompile Include="..\..\..\source\input_hw\gamepad.c" />
-    <ClCompile Include="..\..\..\source\input_hw\input.c" />
-    <ClCompile Include="..\..\..\source\input_hw\lightgun.c" />
-    <ClCompile Include="..\..\..\source\input_hw\mouse.c" />
-    <ClCompile Include="..\..\..\source\input_hw\paddle.c" />
-    <ClCompile Include="..\..\..\source\input_hw\sportspad.c" />
-    <ClCompile Include="..\..\..\source\input_hw\teamplayer.c" />
-    <ClCompile Include="..\..\..\source\input_hw\terebi_oekaki.c" />
-    <ClCompile Include="..\..\..\source\input_hw\xe_a1p.c" />
-    <ClCompile Include="..\..\..\source\io_ctrl.c" />
-    <ClCompile Include="..\..\..\source\loadrom.c" />
-    <ClCompile Include="..\..\..\source\m68k\m68kcpu.c">
+    <ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cdc.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cdd.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cd_cart.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\gfx.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\pcm.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\scd.c" />
+    <ClCompile Include="..\..\..\core\genesis.c" />
+    <ClCompile Include="..\..\..\core\input_hw\activator.c" />
+    <ClCompile Include="..\..\..\core\input_hw\gamepad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\input.c" />
+    <ClCompile Include="..\..\..\core\input_hw\lightgun.c" />
+    <ClCompile Include="..\..\..\core\input_hw\mouse.c" />
+    <ClCompile Include="..\..\..\core\input_hw\paddle.c" />
+    <ClCompile Include="..\..\..\core\input_hw\sportspad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\teamplayer.c" />
+    <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c" />
+    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c" />
+    <ClCompile Include="..\..\..\core\io_ctrl.c" />
+    <ClCompile Include="..\..\..\core\loadrom.c" />
+    <ClCompile Include="..\..\..\core\m68k\m68kcpu.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -120,7 +120,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\m68k\s68kcpu.c">
+    <ClCompile Include="..\..\..\core\m68k\s68kcpu.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -128,12 +128,12 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\mem68k.c" />
-    <ClCompile Include="..\..\..\source\membnk.c" />
-    <ClCompile Include="..\..\..\source\memz80.c" />
-    <ClCompile Include="..\..\..\source\ntsc\md_ntsc.c" />
-    <ClCompile Include="..\..\..\source\ntsc\sms_ntsc.c" />
-    <ClCompile Include="..\..\..\source\sound\blip_buf.c">
+    <ClCompile Include="..\..\..\core\mem68k.c" />
+    <ClCompile Include="..\..\..\core\membnk.c" />
+    <ClCompile Include="..\..\..\core\memz80.c" />
+    <ClCompile Include="..\..\..\core\ntsc\md_ntsc.c" />
+    <ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c" />
+    <ClCompile Include="..\..\..\core\sound\blip_buf.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -141,16 +141,16 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\eq.c" />
-    <ClCompile Include="..\..\..\source\sound\sn76489.c" />
-    <ClCompile Include="..\..\..\source\sound\sound.c" />
-    <ClCompile Include="..\..\..\source\sound\ym2413.c" />
-    <ClCompile Include="..\..\..\source\sound\ym2612.c" />
-    <ClCompile Include="..\..\..\source\state.c" />
-    <ClCompile Include="..\..\..\source\system.c" />
-    <ClCompile Include="..\..\..\source\vdp_ctrl.c" />
-    <ClCompile Include="..\..\..\source\vdp_render.c" />
-    <ClCompile Include="..\..\..\source\z80\z80.c" />
+    <ClCompile Include="..\..\..\core\sound\eq.c" />
+    <ClCompile Include="..\..\..\core\sound\sn76489.c" />
+    <ClCompile Include="..\..\..\core\sound\sound.c" />
+    <ClCompile Include="..\..\..\core\sound\ym2413.c" />
+    <ClCompile Include="..\..\..\core\sound\ym2612.c" />
+    <ClCompile Include="..\..\..\core\state.c" />
+    <ClCompile Include="..\..\..\core\system.c" />
+    <ClCompile Include="..\..\..\core\vdp_ctrl.c" />
+    <ClCompile Include="..\..\..\core\vdp_render.c" />
+    <ClCompile Include="..\..\..\core\z80\z80.c" />
     <ClCompile Include="..\..\libretro.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -244,7 +244,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\cd_hw;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -265,7 +265,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\cd_hw;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -287,7 +287,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;__LIBRETRO__;USE_16BPP_RENDERING;INLINE=static _inline;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\cd_hw;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -312,7 +312,7 @@
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;__LIBRETRO__;USE_16BPP_RENDERING;INLINE=static _inline;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\cd_hw;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -335,7 +335,7 @@
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\cd_hw;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
@@ -358,7 +358,7 @@
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\cd_hw;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
index 57f616a..657a081 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
@@ -38,149 +38,149 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\vdp_render.c">
+    <ClCompile Include="..\..\..\core\vdp_render.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\genesis.c">
+    <ClCompile Include="..\..\..\core\genesis.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\io_ctrl.c">
+    <ClCompile Include="..\..\..\core\io_ctrl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\loadrom.c">
+    <ClCompile Include="..\..\..\core\loadrom.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\mem68k.c">
+    <ClCompile Include="..\..\..\core\mem68k.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\membnk.c">
+    <ClCompile Include="..\..\..\core\membnk.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\memz80.c">
+    <ClCompile Include="..\..\..\core\memz80.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\state.c">
+    <ClCompile Include="..\..\..\core\state.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\system.c">
+    <ClCompile Include="..\..\..\core\system.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\vdp_ctrl.c">
+    <ClCompile Include="..\..\..\core\vdp_ctrl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\z80\z80.c">
+    <ClCompile Include="..\..\..\core\z80\z80.c">
       <Filter>Source Files\z80</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\ym2612.c">
+    <ClCompile Include="..\..\..\core\sound\ym2612.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\eq.c">
+    <ClCompile Include="..\..\..\core\sound\eq.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\sn76489.c">
+    <ClCompile Include="..\..\..\core\sound\sn76489.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\sound.c">
+    <ClCompile Include="..\..\..\core\sound\sound.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\ym2413.c">
+    <ClCompile Include="..\..\..\core\sound\ym2413.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\ntsc\sms_ntsc.c">
+    <ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c">
       <Filter>Source Files\ntsc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\ntsc\md_ntsc.c">
+    <ClCompile Include="..\..\..\core\ntsc\md_ntsc.c">
       <Filter>Source Files\ntsc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\m68k\s68kcpu.c">
+    <ClCompile Include="..\..\..\core\m68k\s68kcpu.c">
       <Filter>Source Files\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\m68k\m68kcpu.c">
+    <ClCompile Include="..\..\..\core\m68k\m68kcpu.c">
       <Filter>Source Files\m68k</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro.c">
       <Filter>Source Files\libretro</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\xe_a1p.c">
+    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\activator.c">
+    <ClCompile Include="..\..\..\core\input_hw\activator.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\gamepad.c">
+    <ClCompile Include="..\..\..\core\input_hw\gamepad.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\input.c">
+    <ClCompile Include="..\..\..\core\input_hw\input.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\lightgun.c">
+    <ClCompile Include="..\..\..\core\input_hw\lightgun.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\mouse.c">
+    <ClCompile Include="..\..\..\core\input_hw\mouse.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\paddle.c">
+    <ClCompile Include="..\..\..\core\input_hw\paddle.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\sportspad.c">
+    <ClCompile Include="..\..\..\core\input_hw\sportspad.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\teamplayer.c">
+    <ClCompile Include="..\..\..\core\input_hw\teamplayer.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\terebi_oekaki.c">
+    <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\sram.c">
+    <ClCompile Include="..\..\..\core\cart_hw\sram.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\areplay.c">
+    <ClCompile Include="..\..\..\core\cart_hw\areplay.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\ggenie.c">
+    <ClCompile Include="..\..\..\core\cart_hw\ggenie.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\md_cart.c">
+    <ClCompile Include="..\..\..\core\cart_hw\md_cart.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\sms_cart.c">
+    <ClCompile Include="..\..\..\core\cart_hw\sms_cart.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\svp\svp.c">
+    <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c">
       <Filter>Source Files\cart_hw\svp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\svp\ssp16.c">
+    <ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c">
       <Filter>Source Files\cart_hw\svp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\cd_cart.c">
+    <ClCompile Include="..\..\..\core\cd_hw\cd_cart.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\cdc.c">
+    <ClCompile Include="..\..\..\core\cd_hw\cdc.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\cdd.c">
+    <ClCompile Include="..\..\..\core\cd_hw\cdd.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\gfx.c">
+    <ClCompile Include="..\..\..\core\cd_hw\gfx.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\pcm.c">
+    <ClCompile Include="..\..\..\core\cd_hw\pcm.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\scd.c">
+    <ClCompile Include="..\..\..\core\cd_hw\scd.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\blip_buf.c">
+    <ClCompile Include="..\..\..\core\sound\blip_buf.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_spi.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_93c.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_i2c.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index 5a40738..bb77921 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -11,53 +11,53 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\cart_hw\areplay.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_93c.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_i2c.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_spi.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\ggenie.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\md_cart.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\sms_cart.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\sram.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\svp\ssp16.c" />
-    <ClCompile Include="..\..\..\source\cart_hw\svp\svp.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\cdc.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\cdd.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\cd_cart.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\gfx.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\pcm.c" />
-    <ClCompile Include="..\..\..\source\cd_hw\scd.c" />
-    <ClCompile Include="..\..\..\source\genesis.c" />
-    <ClCompile Include="..\..\..\source\input_hw\activator.c" />
-    <ClCompile Include="..\..\..\source\input_hw\gamepad.c" />
-    <ClCompile Include="..\..\..\source\input_hw\input.c" />
-    <ClCompile Include="..\..\..\source\input_hw\lightgun.c" />
-    <ClCompile Include="..\..\..\source\input_hw\mouse.c" />
-    <ClCompile Include="..\..\..\source\input_hw\paddle.c" />
-    <ClCompile Include="..\..\..\source\input_hw\sportspad.c" />
-    <ClCompile Include="..\..\..\source\input_hw\teamplayer.c" />
-    <ClCompile Include="..\..\..\source\input_hw\terebi_oekaki.c" />
-    <ClCompile Include="..\..\..\source\input_hw\xe_a1p.c" />
-    <ClCompile Include="..\..\..\source\io_ctrl.c" />
-    <ClCompile Include="..\..\..\source\loadrom.c" />
-    <ClCompile Include="..\..\..\source\m68k\m68kcpu.c" />
-    <ClCompile Include="..\..\..\source\m68k\s68kcpu.c" />
-    <ClCompile Include="..\..\..\source\mem68k.c" />
-    <ClCompile Include="..\..\..\source\membnk.c" />
-    <ClCompile Include="..\..\..\source\memz80.c" />
-    <ClCompile Include="..\..\..\source\ntsc\md_ntsc.c" />
-    <ClCompile Include="..\..\..\source\ntsc\sms_ntsc.c" />
-    <ClCompile Include="..\..\..\source\sound\blip_buf.c" />
-    <ClCompile Include="..\..\..\source\sound\eq.c" />
-    <ClCompile Include="..\..\..\source\sound\sn76489.c" />
-    <ClCompile Include="..\..\..\source\sound\sound.c" />
-    <ClCompile Include="..\..\..\source\sound\ym2413.c" />
-    <ClCompile Include="..\..\..\source\sound\ym2612.c" />
-    <ClCompile Include="..\..\..\source\state.c" />
-    <ClCompile Include="..\..\..\source\system.c" />
-    <ClCompile Include="..\..\..\source\vdp_ctrl.c" />
-    <ClCompile Include="..\..\..\source\vdp_render.c" />
-    <ClCompile Include="..\..\..\source\z80\z80.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\areplay.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\ggenie.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\md_cart.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\sms_cart.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\sram.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cdc.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cdd.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cd_cart.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\gfx.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\pcm.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\scd.c" />
+    <ClCompile Include="..\..\..\core\genesis.c" />
+    <ClCompile Include="..\..\..\core\input_hw\activator.c" />
+    <ClCompile Include="..\..\..\core\input_hw\gamepad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\input.c" />
+    <ClCompile Include="..\..\..\core\input_hw\lightgun.c" />
+    <ClCompile Include="..\..\..\core\input_hw\mouse.c" />
+    <ClCompile Include="..\..\..\core\input_hw\paddle.c" />
+    <ClCompile Include="..\..\..\core\input_hw\sportspad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\teamplayer.c" />
+    <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c" />
+    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c" />
+    <ClCompile Include="..\..\..\core\io_ctrl.c" />
+    <ClCompile Include="..\..\..\core\loadrom.c" />
+    <ClCompile Include="..\..\..\core\m68k\m68kcpu.c" />
+    <ClCompile Include="..\..\..\core\m68k\s68kcpu.c" />
+    <ClCompile Include="..\..\..\core\mem68k.c" />
+    <ClCompile Include="..\..\..\core\membnk.c" />
+    <ClCompile Include="..\..\..\core\memz80.c" />
+    <ClCompile Include="..\..\..\core\ntsc\md_ntsc.c" />
+    <ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c" />
+    <ClCompile Include="..\..\..\core\sound\blip_buf.c" />
+    <ClCompile Include="..\..\..\core\sound\eq.c" />
+    <ClCompile Include="..\..\..\core\sound\sn76489.c" />
+    <ClCompile Include="..\..\..\core\sound\sound.c" />
+    <ClCompile Include="..\..\..\core\sound\ym2413.c" />
+    <ClCompile Include="..\..\..\core\sound\ym2612.c" />
+    <ClCompile Include="..\..\..\core\state.c" />
+    <ClCompile Include="..\..\..\core\system.c" />
+    <ClCompile Include="..\..\..\core\vdp_ctrl.c" />
+    <ClCompile Include="..\..\..\core\vdp_render.c" />
+    <ClCompile Include="..\..\..\core\z80\z80.c" />
     <ClCompile Include="..\..\libretro.c" />
     <ClCompile Include="..\..\scrc32.c" />
   </ItemGroup>
@@ -104,7 +104,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../../source;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../source/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../source/m68k;$(SolutionDir)/../../source/z80;$(SolutionDir)/../../source/input_hw;$(SolutionDir)/../../source/cart_hw;$(SolutionDir)/../../source/sound;$(SolutionDir)/../../source/ntsc;$(SolutionDir)/../../source/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -121,7 +121,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../../source;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../source/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../source/m68k;$(SolutionDir)/../../source/z80;$(SolutionDir)/../../source/input_hw;$(SolutionDir)/../../source/cart_hw;$(SolutionDir)/../../source/sound;$(SolutionDir)/../../source/ntsc;$(SolutionDir)/../../source/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
index eaf7203..42f5874 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -42,152 +42,152 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\cart_hw\svp\svp.c">
+    <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c">
       <Filter>Source Files\cart_hw\svp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\svp\ssp16.c">
+    <ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c">
       <Filter>Source Files\cart_hw\svp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\sram.c">
+    <ClCompile Include="..\..\..\core\cart_hw\sram.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\areplay.c">
+    <ClCompile Include="..\..\..\core\cart_hw\areplay.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\ggenie.c">
+    <ClCompile Include="..\..\..\core\cart_hw\ggenie.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\md_cart.c">
+    <ClCompile Include="..\..\..\core\cart_hw\md_cart.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\sms_cart.c">
+    <ClCompile Include="..\..\..\core\cart_hw\sms_cart.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\xe_a1p.c">
+    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\activator.c">
+    <ClCompile Include="..\..\..\core\input_hw\activator.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\gamepad.c">
+    <ClCompile Include="..\..\..\core\input_hw\gamepad.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\input.c">
+    <ClCompile Include="..\..\..\core\input_hw\input.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\lightgun.c">
+    <ClCompile Include="..\..\..\core\input_hw\lightgun.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\mouse.c">
+    <ClCompile Include="..\..\..\core\input_hw\mouse.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\paddle.c">
+    <ClCompile Include="..\..\..\core\input_hw\paddle.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\sportspad.c">
+    <ClCompile Include="..\..\..\core\input_hw\sportspad.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\teamplayer.c">
+    <ClCompile Include="..\..\..\core\input_hw\teamplayer.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\input_hw\terebi_oekaki.c">
+    <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c">
       <Filter>Source Files\input_hw</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro.c">
       <Filter>Source Files\libretro</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\m68k\s68kcpu.c">
+    <ClCompile Include="..\..\..\core\m68k\s68kcpu.c">
       <Filter>Source Files\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\m68k\m68kcpu.c">
+    <ClCompile Include="..\..\..\core\m68k\m68kcpu.c">
       <Filter>Source Files\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\ntsc\sms_ntsc.c">
+    <ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c">
       <Filter>Source Files\ntsc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\ntsc\md_ntsc.c">
+    <ClCompile Include="..\..\..\core\ntsc\md_ntsc.c">
       <Filter>Source Files\ntsc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\ym2612.c">
+    <ClCompile Include="..\..\..\core\sound\ym2612.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\eq.c">
+    <ClCompile Include="..\..\..\core\sound\eq.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\sn76489.c">
+    <ClCompile Include="..\..\..\core\sound\sn76489.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\sound.c">
+    <ClCompile Include="..\..\..\core\sound\sound.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\ym2413.c">
+    <ClCompile Include="..\..\..\core\sound\ym2413.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\z80\z80.c">
+    <ClCompile Include="..\..\..\core\z80\z80.c">
       <Filter>Source Files\z80</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\vdp_render.c">
+    <ClCompile Include="..\..\..\core\vdp_render.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\genesis.c">
+    <ClCompile Include="..\..\..\core\genesis.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\io_ctrl.c">
+    <ClCompile Include="..\..\..\core\io_ctrl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\loadrom.c">
+    <ClCompile Include="..\..\..\core\loadrom.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\mem68k.c">
+    <ClCompile Include="..\..\..\core\mem68k.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\membnk.c">
+    <ClCompile Include="..\..\..\core\membnk.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\memz80.c">
+    <ClCompile Include="..\..\..\core\memz80.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\state.c">
+    <ClCompile Include="..\..\..\core\state.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\system.c">
+    <ClCompile Include="..\..\..\core\system.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\vdp_ctrl.c">
+    <ClCompile Include="..\..\..\core\vdp_ctrl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\scd.c">
+    <ClCompile Include="..\..\..\core\cd_hw\scd.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\cd_cart.c">
+    <ClCompile Include="..\..\..\core\cd_hw\cd_cart.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\cdc.c">
+    <ClCompile Include="..\..\..\core\cd_hw\cdc.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\cdd.c">
+    <ClCompile Include="..\..\..\core\cd_hw\cdd.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\gfx.c">
+    <ClCompile Include="..\..\..\core\cd_hw\gfx.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cd_hw\pcm.c">
+    <ClCompile Include="..\..\..\core\cd_hw\pcm.c">
       <Filter>Source Files\cd_hw</Filter>
     </ClCompile>
     <ClCompile Include="..\..\scrc32.c">
       <Filter>Source Files\libretro</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_spi.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_93c.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\cart_hw\eeprom_i2c.c">
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sound\blip_buf.c">
+    <ClCompile Include="..\..\..\core\sound\blip_buf.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>