diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 6753bb7689..18d4a536d8 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -94,7 +94,7 @@ AUDIO HERMITE
 /*============================================================
 RSOUND
 ============================================================ */
-#ifdef __CELLOS_LV2__
+#ifdef HAVE_RSOUND
 #include "../../console/librsound/librsound.c"
 #include "../../audio/rsound.c"
 #endif
diff --git a/msvc-ps3/SSNES PS3/SSNES PS3.sln b/msvc-ps3/RetroArch-PS3/RetroArch-PS3.sln
similarity index 84%
rename from msvc-ps3/SSNES PS3/SSNES PS3.sln
rename to msvc-ps3/RetroArch-PS3/RetroArch-PS3.sln
index a3113b869e..9444cb20f9 100644
--- a/msvc-ps3/SSNES PS3/SSNES PS3.sln	
+++ b/msvc-ps3/RetroArch-PS3/RetroArch-PS3.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSNES PS3", "SSNES PS3.vcxproj", "{EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-PS3", "RetroArch-PS3.vcxproj", "{EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/msvc-ps3/RetroArch-PS3/RetroArch-PS3.vcxproj b/msvc-ps3/RetroArch-PS3/RetroArch-PS3.vcxproj
new file mode 100644
index 0000000000..5cb4a35f6e
--- /dev/null
+++ b/msvc-ps3/RetroArch-PS3/RetroArch-PS3.vcxproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|PS3">
+      <Configuration>Debug</Configuration>
+      <Platform>PS3</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|PS3">
+      <Configuration>Release</Configuration>
+      <Platform>PS3</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\console\griffin\griffin.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\console\rzlib\rzlib.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
+    </ClCompile>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}</ProjectGuid>
+    <ProjectName>RetroArch-PS3 SNC</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>SNC</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>SNC</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
+    <ClCompile>
+      <UserPreprocessorDefinitions>_DEBUG;__CELL_ASSERT__;HAVE_OPENGL=1;RARCH_CONSOLE;HAVE_CG=1;HAVE_CONFIGFILE=1;HAVE_NETPLAY=1;HAVE_SOCKET_LEGACY=1;PACKAGE_VERSION="0.9.6-rc1";HAVE_SCREENSHOTS_BUILTIN=1;main=rarch_main;%(UserPreprocessorDefinitions);HAVE_RARCH_MAIN_WRAP;HAVE_RSOUND;HAVE_RARCH_EXEC;HAVE_ZLIB=1;HAVE_LIBRETRO_MANAGEMENT</UserPreprocessorDefinitions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <PreprocessorDefinitions>%(UserPreprocessorDefinitions);$(BuiltInDefines);__INTELLISENSE__;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGLcgc.a";libcgc.a;libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libretro.a;libnet_stub.a;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
+    <ClCompile>
+      <UserPreprocessorDefinitions>NDEBUG;HAVE_OPENGL=1;RARCH_CONSOLE;HAVE_CG=1;HAVE_CONFIGFILE=1;HAVE_NETPLAY=1;HAVE_SOCKET_LEGACY=1;PACKAGE_VERSION="0.9.6-rc1";HAVE_SCREENSHOTS_BUILTIN=1;main="rarch_main";%(UserPreprocessorDefinitions);HAVE_RARCH_MAIN_WRAP;HAVE_RSOUND;HAVE_RARCH_EXEC;HAVE_ZLIB=1;HAVE_LIBRETRO_MANAGEMENT</UserPreprocessorDefinitions>
+      <OptimizationLevel>Level2</OptimizationLevel>
+      <PreprocessorDefinitions>%(UserPreprocessorDefinitions);$(BuiltInDefines);__INTELLISENSE__;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGLcgc.a";libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libretro.a;libnet_stub.a;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/msvc-ps3/RetroArch-PS3/RetroArch-PS3.vcxproj.filters b/msvc-ps3/RetroArch-PS3/RetroArch-PS3.vcxproj.filters
new file mode 100644
index 0000000000..8000860aaa
--- /dev/null
+++ b/msvc-ps3/RetroArch-PS3/RetroArch-PS3.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;cc;s;asm</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp</Extensions>
+    </Filter>
+    <Filter Include="Source Files\console">
+      <UniqueIdentifier>{1e6c0cd0-6066-4209-82b4-2be77bf07d0a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\console\rzlib">
+      <UniqueIdentifier>{5b516a7d-b155-4e31-b42a-140d883fde84}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\console\griffin">
+      <UniqueIdentifier>{fac58d49-76df-48f6-bead-170b6b2117b3}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\console\griffin\griffin.c">
+      <Filter>Source Files\console\griffin</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\console\rzlib\rzlib.c">
+      <Filter>Source Files\console\rzlib</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/msvc-ps3/SSNES PS3/SSNES PS3.vcxproj b/msvc-ps3/SSNES PS3/SSNES PS3.vcxproj
deleted file mode 100644
index 116b5f5fde..0000000000
--- a/msvc-ps3/SSNES PS3/SSNES PS3.vcxproj	
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EAC43BA5-5C6A-4FE4-8E50-CD9B5BD3E0F9}</ProjectGuid>
-    <ProjectName>SSNES PS3 SNC</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>SNC</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>SNC</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <UserPreprocessorDefinitions>_DEBUG;__CELL_ASSERT__;HAVE_OPENGL=1;SSNES_CONSOLE;HAVE_CG=1;HAVE_CONFIGFILE=1;HAVE_NETPLAY=1;HAVE_SOCKET_LEGACY=1;PACKAGE_VERSION="0.9.6-rc1";HAVE_SCREENSHOTS_BUILTIN=1;main=ssnes_main;%(UserPreprocessorDefinitions)</UserPreprocessorDefinitions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <PreprocessorDefinitions>%(UserPreprocessorDefinitions);$(BuiltInDefines);__INTELLISENSE__;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug\libPSGLcgc.a";libcgc.a;libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libsnes.a;libnet_stub.a;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <UserPreprocessorDefinitions>NDEBUG;HAVE_OPENGL=1;SSNES_CONSOLE;HAVE_CG=1;HAVE_CONFIGFILE=1;HAVE_NETPLAY=1;HAVE_SOCKET_LEGACY=1;PACKAGE_VERSION="0.9.6-rc1";HAVE_SCREENSHOTS_BUILTIN=1;main="ssnes_main";%(UserPreprocessorDefinitions)</UserPreprocessorDefinitions>
-      <OptimizationLevel>Level2</OptimizationLevel>
-      <PreprocessorDefinitions>%(UserPreprocessorDefinitions);$(BuiltInDefines);__INTELLISENSE__;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGL.a";"$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\ultra-opt\libPSGLcgc.a";libdbgfont.a;libgcm_cmd.a;libgcm_sys_stub.a;libresc_stub.a;libio_stub.a;libfs_stub.a;libsysutil_stub.a;libsysutil_game_stub.a;libsysutil_screenshot_stub.a;libjpgdec_stub.a;libpngdec_stub.a;libpthread.a;libsysmodule_stub.a;libaudio_stub.a;$(TargetDir)libsnes.a;libnet_stub.a;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\audio\hermite.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\utils.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\bps.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\conf\config_file.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\console\main_wrap.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\console\rom_ext.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\driver.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dynamic.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\fifo_buffer.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\file.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\getopt.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\gfx_common.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\shader_cg.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\snes_state.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\message.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\movie.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\netplay.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\netplay_compat.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\cellframework2\fileio\file_browser.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\cellframework2\input\pad_input.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\image.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\main.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\menu.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\ps3_audio.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\ps3_input.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\ps3_video_psgl.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\rewind.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\screenshot.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\settings.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ssnes.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\strl.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\ups.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">CompileAsC</CompileAs>
-    </ClCompile>
-  </ItemGroup>
-  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/msvc-ps3/SSNES PS3/SSNES PS3.vcxproj.filters b/msvc-ps3/SSNES PS3/SSNES PS3.vcxproj.filters
deleted file mode 100644
index 22248fda3c..0000000000
--- a/msvc-ps3/SSNES PS3/SSNES PS3.vcxproj.filters	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;cc;s;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp</Extensions>
-    </Filter>
-    <Filter Include="Source Files\ps3">
-      <UniqueIdentifier>{877fea8c-d126-4e77-b55f-aa607faac9fd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ps3\cellframework2">
-      <UniqueIdentifier>{f1f446f4-fc8a-4942-8221-6150136316de}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ps3\cellframework2\fileio">
-      <UniqueIdentifier>{31a13b43-e88e-4d72-80c2-109f2c68bf67}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ps3\cellframework2\input">
-      <UniqueIdentifier>{210e876f-56ed-4abf-98e1-01a7b0aaa736}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ps3\audio">
-      <UniqueIdentifier>{e96ddb00-622b-41fe-a6dc-1c89055726b9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\conf">
-      <UniqueIdentifier>{22cef0c9-7b48-4a37-af92-3cdd8f09f7f7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\gfx">
-      <UniqueIdentifier>{550c6478-6ebf-4a55-8718-63b0be8bb426}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\console">
-      <UniqueIdentifier>{1e6c0cd0-6066-4209-82b4-2be77bf07d0a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\ups.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bps.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\driver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\fifo_buffer.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\file.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\getopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\message.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\movie.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\netplay.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\netplay_compat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\rewind.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\screenshot.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\settings.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ssnes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\strl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\ps3_video_psgl.c">
-      <Filter>Source Files\ps3</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\image.c">
-      <Filter>Source Files\ps3</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\main.c">
-      <Filter>Source Files\ps3</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\menu.c">
-      <Filter>Source Files\ps3</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\ps3_audio.c">
-      <Filter>Source Files\ps3</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\ps3_input.c">
-      <Filter>Source Files\ps3</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\cellframework2\fileio\file_browser.c">
-      <Filter>Source Files\ps3\cellframework2\fileio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ps3\cellframework2\input\pad_input.c">
-      <Filter>Source Files\ps3\cellframework2\input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\hermite.c">
-      <Filter>Source Files\ps3\audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\utils.c">
-      <Filter>Source Files\ps3\audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\conf\config_file.c">
-      <Filter>Source Files\conf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\gfx_common.c">
-      <Filter>Source Files\gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\snes_state.c">
-      <Filter>Source Files\gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\shader_cg.c">
-      <Filter>Source Files\gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dynamic.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\console\rom_ext.c">
-      <Filter>Source Files\console</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\console\main_wrap.c">
-      <Filter>Source Files\console</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file