diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 7eb87d6f90..72d7cfd8c4 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -26,6 +26,7 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/Boot/Boot_ELF.cpp
 			Src/Boot/Boot_WiiWAD.cpp
 			Src/Boot/ElfReader.cpp
+			Src/Boot/SettingsGenerator.cpp
 			Src/Debugger/Debugger_SymbolMap.cpp
 			Src/Debugger/Dump.cpp
 			Src/Debugger/PPCDebugInterface.cpp
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index c9017f9309..b969d9d142 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -1,599 +1,601 @@
-<?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="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8C60E805-0DA5-4E25-8F84-038DB504BB0D}</ProjectGuid>
-    <RootNamespace>Core</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\ActionReplay.cpp" />
-    <ClCompile Include="Src\ARDecrypt.cpp" />
-    <ClCompile Include="Src\BootManager.cpp" />
-    <ClCompile Include="Src\Boot\Boot.cpp" />
-    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp" />
-    <ClCompile Include="Src\Boot\Boot_DOL.cpp" />
-    <ClCompile Include="Src\Boot\Boot_ELF.cpp" />
-    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp" />
-    <ClCompile Include="Src\Boot\ElfReader.cpp" />
-    <ClCompile Include="Src\ConfigManager.cpp" />
-    <ClCompile Include="Src\Console.cpp" />
-    <ClCompile Include="Src\Core.cpp" />
-    <ClCompile Include="Src\CoreParameter.cpp" />
-    <ClCompile Include="Src\CoreRerecording.cpp" />
-    <ClCompile Include="Src\CoreTiming.cpp" />
-    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
-    <ClCompile Include="Src\Debugger\Dump.cpp" />
-    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" />
-    <ClCompile Include="Src\DSP\assemble.cpp" />
-    <ClCompile Include="Src\DSP\disassemble.cpp" />
-    <ClCompile Include="Src\DSP\DSPAccelerator.cpp" />
-    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp" />
-    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp" />
-    <ClCompile Include="Src\DSP\DSPCore.cpp" />
-    <ClCompile Include="Src\DSP\DSPEmitter.cpp" />
-    <ClCompile Include="Src\DSP\DSPHWInterface.cpp" />
-    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp" />
-    <ClCompile Include="Src\DSP\DspIntBranch.cpp" />
-    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp" />
-    <ClCompile Include="Src\DSP\DSPInterpreter.cpp" />
-    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp" />
-    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp" />
-    <ClCompile Include="Src\DSP\DspIntMisc.cpp" />
-    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp" />
-    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp" />
-    <ClCompile Include="Src\DSP\DSPStacks.cpp" />
-    <ClCompile Include="Src\DSP\DSPTables.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp" />
-    <ClCompile Include="Src\DSP\LabelMap.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp" />
-    <ClCompile Include="Src\GeckoCode.cpp" />
-    <ClCompile Include="Src\GeckoCodeConfig.cpp" />
-    <ClCompile Include="Src\HLE\HLE.cpp" />
-    <ClCompile Include="Src\HLE\HLE_Misc.cpp" />
-    <ClCompile Include="Src\HLE\HLE_OS.cpp" />
-    <ClCompile Include="Src\HW\AudioInterface.cpp" />
-    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp" />
-    <ClCompile Include="Src\HW\CPU.cpp" />
-    <ClCompile Include="Src\HW\DSP.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp" />
-    <ClCompile Include="Src\HW\DVDInterface.cpp" />
-    <ClCompile Include="Src\HW\EXI.cpp" />
-    <ClCompile Include="Src\HW\EXI_Channel.cpp" />
-    <ClCompile Include="Src\HW\EXI_Device.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp" />
-    <ClCompile Include="Src\HW\GCMemcard.cpp" />
-    <ClCompile Include="Src\HW\GCPad.cpp" />
-    <ClCompile Include="Src\HW\GCPadEmu.cpp" />
-    <ClCompile Include="Src\HW\GPFifo.cpp" />
-    <ClCompile Include="Src\HW\HW.cpp" />
-    <ClCompile Include="Src\HW\Memmap.cpp" />
-    <ClCompile Include="Src\HW\MemmapFunctions.cpp" />
-    <ClCompile Include="Src\HW\MemoryInterface.cpp" />
-    <ClCompile Include="Src\HW\ProcessorInterface.cpp" />
-    <ClCompile Include="Src\HW\SI.cpp" />
-    <ClCompile Include="Src\HW\SI_Device.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp" />
-    <ClCompile Include="Src\HW\Sram.cpp" />
-    <ClCompile Include="Src\HW\StreamADPCM.cpp" />
-    <ClCompile Include="Src\HW\SystemTimers.cpp" />
-    <ClCompile Include="Src\HW\VideoInterface.cpp" />
-    <ClCompile Include="Src\HW\Wiimote.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp" />
-    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp" />
-    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp" />
-    <ClCompile Include="Src\HW\WII_IOB.cpp" />
-    <ClCompile Include="Src\HW\WII_IPC.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
-    <ClCompile Include="Src\MemTools.cpp" />
-    <ClCompile Include="Src\Movie.cpp" />
-    <ClCompile Include="Src\NetPlay.cpp" />
-    <ClCompile Include="Src\NetPlayClient.cpp" />
-    <ClCompile Include="Src\NetPlayServer.cpp" />
-    <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\DSPEmulator.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp" />
-    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp" />
-    <ClCompile Include="Src\PowerPC\PowerPC.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCCache.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCTables.cpp" />
-    <ClCompile Include="Src\PowerPC\Profiler.cpp" />
-    <ClCompile Include="Src\PowerPC\SignatureDB.cpp" />
-    <ClCompile Include="Src\State.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\Tracer.cpp" />
-    <ClCompile Include="Src\VolumeHandler.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\ActionReplay.h" />
-    <ClInclude Include="Src\ARDecrypt.h" />
-    <ClInclude Include="Src\BootManager.h" />
-    <ClInclude Include="Src\Boot\Boot.h" />
-    <ClInclude Include="Src\Boot\Boot_DOL.h" />
-    <ClInclude Include="Src\Boot\Boot_ELF.h" />
-    <ClInclude Include="Src\Boot\ElfReader.h" />
-    <ClInclude Include="Src\Boot\ElfTypes.h" />
-    <ClInclude Include="Src\ConfigManager.h" />
-    <ClInclude Include="Src\Console.h" />
-    <ClInclude Include="Src\Core.h" />
-    <ClInclude Include="Src\CoreParameter.h" />
-    <ClInclude Include="Src\CoreTiming.h" />
-    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h" />
-    <ClInclude Include="Src\Debugger\Dump.h" />
-    <ClInclude Include="Src\Debugger\GCELF.h" />
-    <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
-    <ClInclude Include="Src\DolLoader.h" />
-    <ClInclude Include="Src\DSP\assemble.h" />
-    <ClInclude Include="Src\DSP\disassemble.h" />
-    <ClInclude Include="Src\DSP\DSPAccelerator.h" />
-    <ClInclude Include="Src\DSP\DSPAnalyzer.h" />
-    <ClInclude Include="Src\DSP\DSPBreakpoints.h" />
-    <ClInclude Include="Src\DSP\DSPCodeUtil.h" />
-    <ClInclude Include="Src\DSP\DSPCommon.h" />
-    <ClInclude Include="Src\DSP\DSPCore.h" />
-    <ClInclude Include="Src\DSP\DSPEmitter.h" />
-    <ClInclude Include="Src\DSP\DSPHost.h" />
-    <ClInclude Include="Src\DSP\DSPHWInterface.h" />
-    <ClInclude Include="Src\DSP\DSPIntCCUtil.h" />
-    <ClInclude Include="Src\DSP\DSPInterpreter.h" />
-    <ClInclude Include="Src\DSP\DSPIntExtOps.h" />
-    <ClInclude Include="Src\DSP\DSPIntUtil.h" />
-    <ClInclude Include="Src\DSP\DSPMemoryMap.h" />
-    <ClInclude Include="Src\DSP\DSPStacks.h" />
-    <ClInclude Include="Src\DSP\DSPTables.h" />
-    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h" />
-    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h" />
-    <ClInclude Include="Src\DSP\LabelMap.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h" />
-    <ClInclude Include="Src\GeckoCode.h" />
-    <ClInclude Include="Src\GeckoCodeConfig.h" />
-    <ClInclude Include="Src\HLE\HLE.h" />
-    <ClInclude Include="Src\HLE\HLE_Misc.h" />
-    <ClInclude Include="Src\HLE\HLE_OS.h" />
-    <ClInclude Include="Src\Host.h" />
-    <ClInclude Include="Src\HW\AudioInterface.h" />
-    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h" />
-    <ClInclude Include="Src\HW\CPU.h" />
-    <ClInclude Include="Src\HW\DSP.h" />
-    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h" />
-    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h" />
-    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_ADPCM.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h" />
-    <ClInclude Include="Src\HW\DVDInterface.h" />
-    <ClInclude Include="Src\HW\EXI.h" />
-    <ClInclude Include="Src\HW\EXI_Channel.h" />
-    <ClInclude Include="Src\HW\EXI_Device.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceAD16.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceGecko.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceIPL.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceMic.h" />
-    <ClInclude Include="Src\HW\GCMemcard.h" />
-    <ClInclude Include="Src\HW\GCPad.h" />
-    <ClInclude Include="Src\HW\GCPadEmu.h" />
-    <ClInclude Include="Src\HW\GPFifo.h" />
-    <ClInclude Include="Src\HW\HW.h" />
-    <ClInclude Include="Src\HW\Memmap.h" />
-    <ClInclude Include="Src\HW\MemoryInterface.h" />
-    <ClInclude Include="Src\HW\ProcessorInterface.h" />
-    <ClInclude Include="Src\HW\SI.h" />
-    <ClInclude Include="Src\HW\SI_Device.h" />
-    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGBA.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGCController.h" />
-    <ClInclude Include="Src\HW\Sram.h" />
-    <ClInclude Include="Src\HW\StreamADPCM.h" />
-    <ClInclude Include="Src\HW\SystemTimers.h" />
-    <ClInclude Include="Src\HW\VideoInterface.h" />
-    <ClInclude Include="Src\HW\Wiimote.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h" />
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h" />
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h" />
-    <ClInclude Include="Src\HW\WII_IOB.h" />
-    <ClInclude Include="Src\HW\WII_IPC.h" />
-    <ClInclude Include="Src\IPC_HLE\hci.h" />
-    <ClInclude Include="Src\IPC_HLE\fakepoll.h" />
-    <ClInclude Include="Src\IPC_HLE\l2cap.h" />
-    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" />
-    <ClInclude Include="Src\MemTools.h" />
-    <ClInclude Include="Src\Movie.h" />
-    <ClInclude Include="Src\NetPlay.h" />
-    <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\DSPEmulator.h" />
-    <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />
-    <ClInclude Include="Src\PowerPC\Gekko.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\Jit.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h" />
-    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h" />
-    <ClInclude Include="Src\PowerPC\PowerPC.h" />
-    <ClInclude Include="Src\PowerPC\PPCAnalyst.h" />
-    <ClInclude Include="Src\PowerPC\PPCCache.h" />
-    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h" />
-    <ClInclude Include="Src\PowerPC\PPCTables.h" />
-    <ClInclude Include="Src\PowerPC\Profiler.h" />
-    <ClInclude Include="Src\PowerPC\SignatureDB.h" />
-    <ClInclude Include="Src\State.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Tracer.h" />
-    <ClInclude Include="Src\VolumeHandler.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt" />
-    <None Include="Src\SConscript" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
-      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
-      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?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="DebugFast|Win32">
+      <Configuration>DebugFast</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugFast|x64">
+      <Configuration>DebugFast</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8C60E805-0DA5-4E25-8F84-038DB504BB0D}</ProjectGuid>
+    <RootNamespace>Core</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_Release.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_Release.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\openssl\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Src\ActionReplay.cpp" />
+    <ClCompile Include="Src\ARDecrypt.cpp" />
+    <ClCompile Include="Src\BootManager.cpp" />
+    <ClCompile Include="Src\Boot\Boot.cpp" />
+    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp" />
+    <ClCompile Include="Src\Boot\Boot_DOL.cpp" />
+    <ClCompile Include="Src\Boot\Boot_ELF.cpp" />
+    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp" />
+    <ClCompile Include="Src\Boot\ElfReader.cpp" />
+    <ClCompile Include="Src\Boot\SettingsGenerator.cpp" />
+    <ClCompile Include="Src\ConfigManager.cpp" />
+    <ClCompile Include="Src\Console.cpp" />
+    <ClCompile Include="Src\Core.cpp" />
+    <ClCompile Include="Src\CoreParameter.cpp" />
+    <ClCompile Include="Src\CoreRerecording.cpp" />
+    <ClCompile Include="Src\CoreTiming.cpp" />
+    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
+    <ClCompile Include="Src\Debugger\Dump.cpp" />
+    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" />
+    <ClCompile Include="Src\DSP\assemble.cpp" />
+    <ClCompile Include="Src\DSP\disassemble.cpp" />
+    <ClCompile Include="Src\DSP\DSPAccelerator.cpp" />
+    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp" />
+    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp" />
+    <ClCompile Include="Src\DSP\DSPCore.cpp" />
+    <ClCompile Include="Src\DSP\DSPEmitter.cpp" />
+    <ClCompile Include="Src\DSP\DSPHWInterface.cpp" />
+    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp" />
+    <ClCompile Include="Src\DSP\DspIntBranch.cpp" />
+    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp" />
+    <ClCompile Include="Src\DSP\DSPInterpreter.cpp" />
+    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp" />
+    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp" />
+    <ClCompile Include="Src\DSP\DspIntMisc.cpp" />
+    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp" />
+    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp" />
+    <ClCompile Include="Src\DSP\DSPStacks.cpp" />
+    <ClCompile Include="Src\DSP\DSPTables.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp" />
+    <ClCompile Include="Src\DSP\LabelMap.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp" />
+    <ClCompile Include="Src\GeckoCode.cpp" />
+    <ClCompile Include="Src\GeckoCodeConfig.cpp" />
+    <ClCompile Include="Src\HLE\HLE.cpp" />
+    <ClCompile Include="Src\HLE\HLE_Misc.cpp" />
+    <ClCompile Include="Src\HLE\HLE_OS.cpp" />
+    <ClCompile Include="Src\HW\AudioInterface.cpp" />
+    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp" />
+    <ClCompile Include="Src\HW\CPU.cpp" />
+    <ClCompile Include="Src\HW\DSP.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp" />
+    <ClCompile Include="Src\HW\DVDInterface.cpp" />
+    <ClCompile Include="Src\HW\EXI.cpp" />
+    <ClCompile Include="Src\HW\EXI_Channel.cpp" />
+    <ClCompile Include="Src\HW\EXI_Device.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp" />
+    <ClCompile Include="Src\HW\GCMemcard.cpp" />
+    <ClCompile Include="Src\HW\GCPad.cpp" />
+    <ClCompile Include="Src\HW\GCPadEmu.cpp" />
+    <ClCompile Include="Src\HW\GPFifo.cpp" />
+    <ClCompile Include="Src\HW\HW.cpp" />
+    <ClCompile Include="Src\HW\Memmap.cpp" />
+    <ClCompile Include="Src\HW\MemmapFunctions.cpp" />
+    <ClCompile Include="Src\HW\MemoryInterface.cpp" />
+    <ClCompile Include="Src\HW\ProcessorInterface.cpp" />
+    <ClCompile Include="Src\HW\SI.cpp" />
+    <ClCompile Include="Src\HW\SI_Device.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp" />
+    <ClCompile Include="Src\HW\Sram.cpp" />
+    <ClCompile Include="Src\HW\StreamADPCM.cpp" />
+    <ClCompile Include="Src\HW\SystemTimers.cpp" />
+    <ClCompile Include="Src\HW\VideoInterface.cpp" />
+    <ClCompile Include="Src\HW\Wiimote.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp" />
+    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp" />
+    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp" />
+    <ClCompile Include="Src\HW\WII_IOB.cpp" />
+    <ClCompile Include="Src\HW\WII_IPC.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
+    <ClCompile Include="Src\MemTools.cpp" />
+    <ClCompile Include="Src\Movie.cpp" />
+    <ClCompile Include="Src\NetPlay.cpp" />
+    <ClCompile Include="Src\NetPlayClient.cpp" />
+    <ClCompile Include="Src\NetPlayServer.cpp" />
+    <ClCompile Include="Src\PatchEngine.cpp" />
+    <ClCompile Include="Src\DSPEmulator.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp" />
+    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp" />
+    <ClCompile Include="Src\PowerPC\PowerPC.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCCache.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCTables.cpp" />
+    <ClCompile Include="Src\PowerPC\Profiler.cpp" />
+    <ClCompile Include="Src\PowerPC\SignatureDB.cpp" />
+    <ClCompile Include="Src\State.cpp" />
+    <ClCompile Include="Src\stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Src\Tracer.cpp" />
+    <ClCompile Include="Src\VolumeHandler.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Src\ActionReplay.h" />
+    <ClInclude Include="Src\ARDecrypt.h" />
+    <ClInclude Include="Src\BootManager.h" />
+    <ClInclude Include="Src\Boot\Boot.h" />
+    <ClInclude Include="Src\Boot\Boot_DOL.h" />
+    <ClInclude Include="Src\Boot\Boot_ELF.h" />
+    <ClInclude Include="Src\Boot\ElfReader.h" />
+    <ClInclude Include="Src\Boot\ElfTypes.h" />
+    <ClInclude Include="Src\Boot\SettingsGenerator.h" />
+    <ClInclude Include="Src\ConfigManager.h" />
+    <ClInclude Include="Src\Console.h" />
+    <ClInclude Include="Src\Core.h" />
+    <ClInclude Include="Src\CoreParameter.h" />
+    <ClInclude Include="Src\CoreTiming.h" />
+    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h" />
+    <ClInclude Include="Src\Debugger\Dump.h" />
+    <ClInclude Include="Src\Debugger\GCELF.h" />
+    <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
+    <ClInclude Include="Src\DolLoader.h" />
+    <ClInclude Include="Src\DSP\assemble.h" />
+    <ClInclude Include="Src\DSP\disassemble.h" />
+    <ClInclude Include="Src\DSP\DSPAccelerator.h" />
+    <ClInclude Include="Src\DSP\DSPAnalyzer.h" />
+    <ClInclude Include="Src\DSP\DSPBreakpoints.h" />
+    <ClInclude Include="Src\DSP\DSPCodeUtil.h" />
+    <ClInclude Include="Src\DSP\DSPCommon.h" />
+    <ClInclude Include="Src\DSP\DSPCore.h" />
+    <ClInclude Include="Src\DSP\DSPEmitter.h" />
+    <ClInclude Include="Src\DSP\DSPHost.h" />
+    <ClInclude Include="Src\DSP\DSPHWInterface.h" />
+    <ClInclude Include="Src\DSP\DSPIntCCUtil.h" />
+    <ClInclude Include="Src\DSP\DSPInterpreter.h" />
+    <ClInclude Include="Src\DSP\DSPIntExtOps.h" />
+    <ClInclude Include="Src\DSP\DSPIntUtil.h" />
+    <ClInclude Include="Src\DSP\DSPMemoryMap.h" />
+    <ClInclude Include="Src\DSP\DSPStacks.h" />
+    <ClInclude Include="Src\DSP\DSPTables.h" />
+    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h" />
+    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h" />
+    <ClInclude Include="Src\DSP\LabelMap.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h" />
+    <ClInclude Include="Src\GeckoCode.h" />
+    <ClInclude Include="Src\GeckoCodeConfig.h" />
+    <ClInclude Include="Src\HLE\HLE.h" />
+    <ClInclude Include="Src\HLE\HLE_Misc.h" />
+    <ClInclude Include="Src\HLE\HLE_OS.h" />
+    <ClInclude Include="Src\Host.h" />
+    <ClInclude Include="Src\HW\AudioInterface.h" />
+    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h" />
+    <ClInclude Include="Src\HW\CPU.h" />
+    <ClInclude Include="Src\HW\DSP.h" />
+    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h" />
+    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h" />
+    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_ADPCM.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h" />
+    <ClInclude Include="Src\HW\DVDInterface.h" />
+    <ClInclude Include="Src\HW\EXI.h" />
+    <ClInclude Include="Src\HW\EXI_Channel.h" />
+    <ClInclude Include="Src\HW\EXI_Device.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceAD16.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceGecko.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceIPL.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceMic.h" />
+    <ClInclude Include="Src\HW\GCMemcard.h" />
+    <ClInclude Include="Src\HW\GCPad.h" />
+    <ClInclude Include="Src\HW\GCPadEmu.h" />
+    <ClInclude Include="Src\HW\GPFifo.h" />
+    <ClInclude Include="Src\HW\HW.h" />
+    <ClInclude Include="Src\HW\Memmap.h" />
+    <ClInclude Include="Src\HW\MemoryInterface.h" />
+    <ClInclude Include="Src\HW\ProcessorInterface.h" />
+    <ClInclude Include="Src\HW\SI.h" />
+    <ClInclude Include="Src\HW\SI_Device.h" />
+    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h" />
+    <ClInclude Include="Src\HW\SI_DeviceGBA.h" />
+    <ClInclude Include="Src\HW\SI_DeviceGCController.h" />
+    <ClInclude Include="Src\HW\Sram.h" />
+    <ClInclude Include="Src\HW\StreamADPCM.h" />
+    <ClInclude Include="Src\HW\SystemTimers.h" />
+    <ClInclude Include="Src\HW\VideoInterface.h" />
+    <ClInclude Include="Src\HW\Wiimote.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h" />
+    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h" />
+    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h" />
+    <ClInclude Include="Src\HW\WII_IOB.h" />
+    <ClInclude Include="Src\HW\WII_IPC.h" />
+    <ClInclude Include="Src\IPC_HLE\hci.h" />
+    <ClInclude Include="Src\IPC_HLE\fakepoll.h" />
+    <ClInclude Include="Src\IPC_HLE\l2cap.h" />
+    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" />
+    <ClInclude Include="Src\MemTools.h" />
+    <ClInclude Include="Src\Movie.h" />
+    <ClInclude Include="Src\NetPlay.h" />
+    <ClInclude Include="Src\PatchEngine.h" />
+    <ClInclude Include="Src\DSPEmulator.h" />
+    <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />
+    <ClInclude Include="Src\PowerPC\Gekko.h" />
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h" />
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h" />
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\Jit.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h" />
+    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h" />
+    <ClInclude Include="Src\PowerPC\PowerPC.h" />
+    <ClInclude Include="Src\PowerPC\PPCAnalyst.h" />
+    <ClInclude Include="Src\PowerPC\PPCCache.h" />
+    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h" />
+    <ClInclude Include="Src\PowerPC\PPCTables.h" />
+    <ClInclude Include="Src\PowerPC\Profiler.h" />
+    <ClInclude Include="Src\PowerPC\SignatureDB.h" />
+    <ClInclude Include="Src\State.h" />
+    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="Src\Tracer.h" />
+    <ClInclude Include="Src\VolumeHandler.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CMakeLists.txt" />
+    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt" />
+    <None Include="Src\SConscript" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
+      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
+      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
+      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index 2639fe9ce0..185642dc3e 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -1,1187 +1,1193 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\ConfigManager.cpp" />
-    <ClCompile Include="Src\Console.cpp" />
-    <ClCompile Include="Src\Core.cpp" />
-    <ClCompile Include="Src\CoreParameter.cpp" />
-    <ClCompile Include="Src\CoreRerecording.cpp" />
-    <ClCompile Include="Src\CoreTiming.cpp" />
-    <ClCompile Include="Src\MemTools.cpp" />
-    <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\DSPEmulator.cpp" />
-    <ClCompile Include="Src\State.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\Tracer.cpp" />
-    <ClCompile Include="Src\VolumeHandler.cpp" />
-    <ClCompile Include="Src\ActionReplay.cpp">
-      <Filter>ActionReplay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ARDecrypt.cpp">
-      <Filter>ActionReplay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_DOL.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_ELF.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\ElfReader.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp">
-      <Filter>Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\Dump.cpp">
-      <Filter>Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp">
-      <Filter>Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPEmitter.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\assemble.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\disassemble.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPAccelerator.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPCore.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPHWInterface.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPInterpreter.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPStacks.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPTables.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\LabelMap.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GeckoCode.cpp">
-      <Filter>GeckoCode</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GeckoCodeConfig.cpp">
-      <Filter>GeckoCode</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HLE\HLE.cpp">
-      <Filter>HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HLE\HLE_Misc.cpp">
-      <Filter>HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HLE\HLE_OS.cpp">
-      <Filter>HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntBranch.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntMisc.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\GCPad.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\GCPadEmu.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_Channel.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_Device.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\Sram.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSP.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\GPFifo.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\MemoryInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\ProcessorInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\AudioInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\StreamADPCM.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DVDInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_Device.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\VideoInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\HW.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\CPU.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\Memmap.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\MemmapFunctions.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SystemTimers.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PowerPC.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCCache.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCTables.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Profiler.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\SignatureDB.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\DI - Drive Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WII_IPC.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WII_IOB.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IO Bridge</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\Wiimote.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NetPlay.cpp">
-      <Filter>NetPlay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NetPlayServer.cpp">
-      <Filter>NetPlay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NetPlayClient.cpp">
-      <Filter>NetPlay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BootManager.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Movie.cpp" />
-    <ClCompile Include="Src\HW\GCMemcard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\ConfigManager.h" />
-    <ClInclude Include="Src\Console.h" />
-    <ClInclude Include="Src\Core.h" />
-    <ClInclude Include="Src\CoreParameter.h" />
-    <ClInclude Include="Src\CoreTiming.h" />
-    <ClInclude Include="Src\Host.h" />
-    <ClInclude Include="Src\MemTools.h" />
-    <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\DSPEmulator.h" />
-    <ClInclude Include="Src\State.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Tracer.h" />
-    <ClInclude Include="Src\VolumeHandler.h" />
-    <ClInclude Include="Src\ARDecrypt.h">
-      <Filter>ActionReplay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ActionReplay.h">
-      <Filter>ActionReplay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\Boot.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\Boot_DOL.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\Boot_ELF.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\ElfTypes.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\ElfReader.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\Dump.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\GCELF.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\PPCDebugInterface.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h">
-      <Filter>DSPCore\JIT</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h">
-      <Filter>DSPCore\JIT</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPEmitter.h">
-      <Filter>DSPCore\JIT</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\assemble.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\disassemble.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPCore.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPAccelerator.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPAnalyzer.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPBreakpoints.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPCodeUtil.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPCommon.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPHWInterface.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPInterpreter.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPMemoryMap.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPStacks.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPTables.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\LabelMap.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GeckoCodeConfig.h">
-      <Filter>GeckoCode</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GeckoCode.h">
-      <Filter>GeckoCode</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HLE\HLE_OS.h">
-      <Filter>HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HLE\HLE.h">
-      <Filter>HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HLE\HLE_Misc.h">
-      <Filter>HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPIntUtil.h">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPIntCCUtil.h">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPIntExtOps.h">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\GCPadEmu.h">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\GCPad.h">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceMic.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_Channel.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_Device.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceAD16.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceGecko.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceIPL.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\Sram.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_ADPCM.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSP.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPHost.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\GPFifo.h">
-      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\MemoryInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\ProcessorInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\AudioInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\StreamADPCM.h">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DVDInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceGCController.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_Device.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceGBA.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\VideoInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\Jit.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\HW.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\CPU.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\Memmap.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SystemTimers.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Gekko.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\SignatureDB.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PowerPC.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCAnalyst.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCCache.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCTables.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Profiler.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\DI - Drive Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WII_IPC.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\hci.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\l2cap.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WII_IOB.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IO Bridge</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\Wiimote.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\CPUCoreBase.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DolLoader.h" />
-    <ClInclude Include="Src\NetPlay.h">
-      <Filter>NetPlay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BootManager.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Movie.h" />
-	<ClInclude Include="Src\HW\GCMemcard.h">
-	  <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
-	</ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\fakepoll.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="Src\SConscript" />
-    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="ActionReplay">
-      <UniqueIdentifier>{c871a264-a881-44f2-88b1-406b282cd9fe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Boot">
-      <UniqueIdentifier>{0fe14029-e862-44b4-9358-d1cd44e42454}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Debugger">
-      <UniqueIdentifier>{fba97574-484f-4330-9674-69c0aeffd22f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GeckoCode">
-      <UniqueIdentifier>{684ba5fe-ccca-4d1b-94fa-3a2119353257}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HLE">
-      <UniqueIdentifier>{67aea903-7a27-4b1e-a4af-60f58818ba58}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DSPCore">
-      <UniqueIdentifier>{81d2e0cb-4bea-47ed-9bc3-fdc461ea4148}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DSPCore\JIT">
-      <UniqueIdentifier>{6aa99e27-bf15-43dc-8f14-c80383037a99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DSPCore\Interpreter">
-      <UniqueIdentifier>{45a9bf0a-e022-4ace-a99f-df675a0b251d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC">
-      <UniqueIdentifier>{1905e5c1-a593-454d-b0a0-68bf6cdbec12}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\Interpreter">
-      <UniqueIdentifier>{57e4ab87-a563-40c5-9a3d-6b5443750a96}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\JitCommon">
-      <UniqueIdentifier>{1f8821ba-2dde-4b1a-9125-5f74006b1053}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\Jit64">
-      <UniqueIdentifier>{02777c32-ac14-4a06-9006-8ffc370bc231}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\JitIL">
-      <UniqueIdentifier>{0201c158-1162-48d8-b6d4-239d8202d200}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29">
-      <UniqueIdentifier>{21df1345-8145-4179-8cf5-a26b6887de5d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\AI - Audio Interface">
-      <UniqueIdentifier>{b34c5e25-c21d-401b-9b21-990f1a7908e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DI - Drive Interface">
-      <UniqueIdentifier>{b948ee86-1471-42b2-ab6f-ca0ce1c9e4d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE">
-      <UniqueIdentifier>{a25bdd3e-b989-4c5b-b56c-2f37ab4972c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE">
-      <UniqueIdentifier>{1966cfa5-57f3-4fdb-8d32-d34f033903af}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes">
-      <UniqueIdentifier>{43f6de5c-946b-426d-9735-b774c3365ae4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE">
-      <UniqueIdentifier>{9f00a3b5-c0f3-4a3f-a756-25435ea996e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\EXI - Expansion Interface">
-      <UniqueIdentifier>{decdd68e-4e41-4589-bc13-5318705e2f94}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\GCPad">
-      <UniqueIdentifier>{e88d682e-a0c2-438d-9283-ab1ec250d3ae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo">
-      <UniqueIdentifier>{36465b2e-d5c4-402c-abff-ed04c84a1566}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\PI - Processor Interface">
-      <UniqueIdentifier>{b7771463-73bf-457b-891f-9dcaa04076ea}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\SI - Serial Interface">
-      <UniqueIdentifier>{e34c8a58-7799-4afe-b0f9-1c5ff759639b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\MI - Memory Interface">
-      <UniqueIdentifier>{2ee04eb4-0d32-4e15-bd0e-811d408de20c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\VI - Video Interface">
-      <UniqueIdentifier>{808c3dc1-5fec-4565-8c2e-fa7e1232a31c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wii IPC">
-      <UniqueIdentifier>{ef5b78c3-47ec-4bd6-9809-f9e7da6e0861}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wii IO Bridge">
-      <UniqueIdentifier>{49635c9b-0874-4e71-9165-edaae632ab1c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29">
-      <UniqueIdentifier>{e2711d6f-b5f5-4c74-97c2-66f9620a2d86}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\DI - Drive Interface">
-      <UniqueIdentifier>{1be114bb-c572-4cdb-9650-4d24d282d4bb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\ES">
-      <UniqueIdentifier>{ff0e9f64-a636-4998-8cae-fe122c8da934}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\FS">
-      <UniqueIdentifier>{30eda257-4d78-4db7-873e-c408db52d772}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\Keyboard">
-      <UniqueIdentifier>{ed6f41bf-4f52-402b-ab1d-d5bf9e71c538}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\Net">
-      <UniqueIdentifier>{362606ce-fa05-4829-831f-bf9e0acf9909}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\SDIO - SD Card">
-      <UniqueIdentifier>{ebe09d6a-7cd0-4909-83e9-abafd3e8571f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote">
-      <UniqueIdentifier>{e7c723c0-693a-4cf8-973a-b349537adcc7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote">
-      <UniqueIdentifier>{0ab9fa49-fd0b-4eba-aa9f-2b774baa8e63}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu">
-      <UniqueIdentifier>{c53079fe-d19c-4492-b37e-bf8bd4f55fa8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment">
-      <UniqueIdentifier>{565ae8e7-ae6e-42f9-ae13-90c1aa017856}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Real">
-      <UniqueIdentifier>{1c21a3e1-b791-4a23-b0d5-ed2b2c34007f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NetPlay">
-      <UniqueIdentifier>{231ceb02-1122-402a-87a8-094a9ed768c2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="FifoPlayer">
-      <UniqueIdentifier>{ca7d56f7-4e84-4d15-9aea-7ae6fa7d6586}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\GCMemcard">
-      <UniqueIdentifier>{3e9e6e83-c1bf-45f9-aeff-231f98f60d29}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Src\ConfigManager.cpp" />
+    <ClCompile Include="Src\Console.cpp" />
+    <ClCompile Include="Src\Core.cpp" />
+    <ClCompile Include="Src\CoreParameter.cpp" />
+    <ClCompile Include="Src\CoreRerecording.cpp" />
+    <ClCompile Include="Src\CoreTiming.cpp" />
+    <ClCompile Include="Src\MemTools.cpp" />
+    <ClCompile Include="Src\PatchEngine.cpp" />
+    <ClCompile Include="Src\DSPEmulator.cpp" />
+    <ClCompile Include="Src\State.cpp" />
+    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="Src\Tracer.cpp" />
+    <ClCompile Include="Src\VolumeHandler.cpp" />
+    <ClCompile Include="Src\ActionReplay.cpp">
+      <Filter>ActionReplay</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ARDecrypt.cpp">
+      <Filter>ActionReplay</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\Boot.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\Boot_DOL.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\Boot_ELF.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\ElfReader.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp">
+      <Filter>Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\Dump.cpp">
+      <Filter>Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp">
+      <Filter>Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPEmitter.cpp">
+      <Filter>DSPCore\JIT</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\assemble.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\disassemble.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPAccelerator.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPCore.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPHWInterface.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPInterpreter.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPStacks.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPTables.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\LabelMap.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\GeckoCode.cpp">
+      <Filter>GeckoCode</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\GeckoCodeConfig.cpp">
+      <Filter>GeckoCode</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HLE\HLE.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HLE\HLE_Misc.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HLE\HLE_OS.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DspIntBranch.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DspIntMisc.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\GCPad.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\GCPadEmu.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_Channel.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_Device.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\Sram.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSP.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\GPFifo.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\MemoryInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\ProcessorInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\AudioInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\StreamADPCM.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\DVDInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\SI.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\SI_Device.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\VideoInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\HW.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\CPU.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\Memmap.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\MemmapFunctions.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\SystemTimers.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\PowerPC.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\PPCCache.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\PPCTables.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\Profiler.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PowerPC\SignatureDB.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\DI - Drive Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WII_IPC.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WII_IOB.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wii IO Bridge</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HW\Wiimote.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\NetPlay.cpp">
+      <Filter>NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\NetPlayServer.cpp">
+      <Filter>NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\NetPlayClient.cpp">
+      <Filter>NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\BootManager.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Movie.cpp" />
+    <ClCompile Include="Src\HW\GCMemcard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Boot\SettingsGenerator.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Src\ConfigManager.h" />
+    <ClInclude Include="Src\Console.h" />
+    <ClInclude Include="Src\Core.h" />
+    <ClInclude Include="Src\CoreParameter.h" />
+    <ClInclude Include="Src\CoreTiming.h" />
+    <ClInclude Include="Src\Host.h" />
+    <ClInclude Include="Src\MemTools.h" />
+    <ClInclude Include="Src\PatchEngine.h" />
+    <ClInclude Include="Src\DSPEmulator.h" />
+    <ClInclude Include="Src\State.h" />
+    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="Src\Tracer.h" />
+    <ClInclude Include="Src\VolumeHandler.h" />
+    <ClInclude Include="Src\ARDecrypt.h">
+      <Filter>ActionReplay</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\ActionReplay.h">
+      <Filter>ActionReplay</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Boot\Boot.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Boot\Boot_DOL.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Boot\Boot_ELF.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Boot\ElfTypes.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Boot\ElfReader.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\Dump.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\GCELF.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\PPCDebugInterface.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h">
+      <Filter>DSPCore\JIT</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h">
+      <Filter>DSPCore\JIT</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPEmitter.h">
+      <Filter>DSPCore\JIT</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\assemble.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\disassemble.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPCore.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPAccelerator.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPAnalyzer.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPBreakpoints.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPCodeUtil.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPCommon.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPHWInterface.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPInterpreter.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPMemoryMap.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPStacks.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPTables.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\LabelMap.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\GeckoCodeConfig.h">
+      <Filter>GeckoCode</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\GeckoCode.h">
+      <Filter>GeckoCode</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HLE\HLE_OS.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HLE\HLE.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HLE\HLE_Misc.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPIntUtil.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPIntCCUtil.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPIntExtOps.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\GCPadEmu.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\GCPad.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceMic.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_Channel.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_Device.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceAD16.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceGecko.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceIPL.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\Sram.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_ADPCM.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSP.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DSP\DSPHost.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\GPFifo.h">
+      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\MemoryInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\ProcessorInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\AudioInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\StreamADPCM.h">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\DVDInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\SI_DeviceGCController.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\SI.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\SI_Device.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\SI_DeviceGBA.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\VideoInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64\Jit.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\HW.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\CPU.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\Memmap.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\SystemTimers.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Gekko.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\SignatureDB.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\PowerPC.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\PPCAnalyst.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\PPCCache.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\PPCTables.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\Profiler.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\DI - Drive Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WII_IPC.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\hci.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\l2cap.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WII_IOB.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wii IO Bridge</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HW\Wiimote.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PowerPC\CPUCoreBase.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\DolLoader.h" />
+    <ClInclude Include="Src\NetPlay.h">
+      <Filter>NetPlay</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\BootManager.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Movie.h" />
+    <ClInclude Include="Src\HW\GCMemcard.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\IPC_HLE\fakepoll.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Boot\SettingsGenerator.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CMakeLists.txt" />
+    <None Include="Src\SConscript" />
+    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="ActionReplay">
+      <UniqueIdentifier>{c871a264-a881-44f2-88b1-406b282cd9fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Boot">
+      <UniqueIdentifier>{0fe14029-e862-44b4-9358-d1cd44e42454}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Debugger">
+      <UniqueIdentifier>{fba97574-484f-4330-9674-69c0aeffd22f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GeckoCode">
+      <UniqueIdentifier>{684ba5fe-ccca-4d1b-94fa-3a2119353257}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HLE">
+      <UniqueIdentifier>{67aea903-7a27-4b1e-a4af-60f58818ba58}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DSPCore">
+      <UniqueIdentifier>{81d2e0cb-4bea-47ed-9bc3-fdc461ea4148}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DSPCore\JIT">
+      <UniqueIdentifier>{6aa99e27-bf15-43dc-8f14-c80383037a99}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DSPCore\Interpreter">
+      <UniqueIdentifier>{45a9bf0a-e022-4ace-a99f-df675a0b251d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC">
+      <UniqueIdentifier>{1905e5c1-a593-454d-b0a0-68bf6cdbec12}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\Interpreter">
+      <UniqueIdentifier>{57e4ab87-a563-40c5-9a3d-6b5443750a96}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\JitCommon">
+      <UniqueIdentifier>{1f8821ba-2dde-4b1a-9125-5f74006b1053}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\Jit64">
+      <UniqueIdentifier>{02777c32-ac14-4a06-9006-8ffc370bc231}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\JitIL">
+      <UniqueIdentifier>{0201c158-1162-48d8-b6d4-239d8202d200}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29">
+      <UniqueIdentifier>{21df1345-8145-4179-8cf5-a26b6887de5d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\AI - Audio Interface">
+      <UniqueIdentifier>{b34c5e25-c21d-401b-9b21-990f1a7908e1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DI - Drive Interface">
+      <UniqueIdentifier>{b948ee86-1471-42b2-ab6f-ca0ce1c9e4d6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE">
+      <UniqueIdentifier>{a25bdd3e-b989-4c5b-b56c-2f37ab4972c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE">
+      <UniqueIdentifier>{1966cfa5-57f3-4fdb-8d32-d34f033903af}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes">
+      <UniqueIdentifier>{43f6de5c-946b-426d-9735-b774c3365ae4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE">
+      <UniqueIdentifier>{9f00a3b5-c0f3-4a3f-a756-25435ea996e1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\EXI - Expansion Interface">
+      <UniqueIdentifier>{decdd68e-4e41-4589-bc13-5318705e2f94}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\GCPad">
+      <UniqueIdentifier>{e88d682e-a0c2-438d-9283-ab1ec250d3ae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo">
+      <UniqueIdentifier>{36465b2e-d5c4-402c-abff-ed04c84a1566}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\PI - Processor Interface">
+      <UniqueIdentifier>{b7771463-73bf-457b-891f-9dcaa04076ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\SI - Serial Interface">
+      <UniqueIdentifier>{e34c8a58-7799-4afe-b0f9-1c5ff759639b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\MI - Memory Interface">
+      <UniqueIdentifier>{2ee04eb4-0d32-4e15-bd0e-811d408de20c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\VI - Video Interface">
+      <UniqueIdentifier>{808c3dc1-5fec-4565-8c2e-fa7e1232a31c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wii IPC">
+      <UniqueIdentifier>{ef5b78c3-47ec-4bd6-9809-f9e7da6e0861}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wii IO Bridge">
+      <UniqueIdentifier>{49635c9b-0874-4e71-9165-edaae632ab1c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29">
+      <UniqueIdentifier>{e2711d6f-b5f5-4c74-97c2-66f9620a2d86}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\DI - Drive Interface">
+      <UniqueIdentifier>{1be114bb-c572-4cdb-9650-4d24d282d4bb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\ES">
+      <UniqueIdentifier>{ff0e9f64-a636-4998-8cae-fe122c8da934}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\FS">
+      <UniqueIdentifier>{30eda257-4d78-4db7-873e-c408db52d772}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\Keyboard">
+      <UniqueIdentifier>{ed6f41bf-4f52-402b-ab1d-d5bf9e71c538}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\Net">
+      <UniqueIdentifier>{362606ce-fa05-4829-831f-bf9e0acf9909}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\SDIO - SD Card">
+      <UniqueIdentifier>{ebe09d6a-7cd0-4909-83e9-abafd3e8571f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote">
+      <UniqueIdentifier>{e7c723c0-693a-4cf8-973a-b349537adcc7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote">
+      <UniqueIdentifier>{0ab9fa49-fd0b-4eba-aa9f-2b774baa8e63}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu">
+      <UniqueIdentifier>{c53079fe-d19c-4492-b37e-bf8bd4f55fa8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment">
+      <UniqueIdentifier>{565ae8e7-ae6e-42f9-ae13-90c1aa017856}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Real">
+      <UniqueIdentifier>{1c21a3e1-b791-4a23-b0d5-ed2b2c34007f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="NetPlay">
+      <UniqueIdentifier>{231ceb02-1122-402a-87a8-094a9ed768c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FifoPlayer">
+      <UniqueIdentifier>{ca7d56f7-4e84-4d15-9aea-7ae6fa7d6586}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\GCMemcard">
+      <UniqueIdentifier>{3e9e6e83-c1bf-45f9-aeff-231f98f60d29}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
index 2555416a04..0353351cc1 100644
--- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
@@ -36,6 +36,7 @@
 #include "VolumeCreator.h"
 #include "Boot.h"
 #include "HLE/HLE.h"
+#include "SettingsGenerator.h"
 
 void CBoot::RunFunction(u32 _iAddr)
 {
@@ -181,8 +182,9 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
 	// \title\00000001\00000002\data\setting.txt directly after the read the
 	// SYSCONF file. The games also read it to 0x3800, what is a little strange
 	// however is that it only reads the first 100 bytes of it.
-	std::string region_filename,
-				settings_Filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_SETTING);
+	std::string settings_Filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_SETTING);
+	std::string area, model, code, video, game;
+	
 
 	switch((DiscIO::IVolume::ECountry)_CountryCode)
 	{
@@ -190,38 +192,57 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
 	case DiscIO::IVolume::COUNTRY_TAIWAN: 
 		// TODO: Determine if Korea / Taiwan have their own specific settings.
 	case DiscIO::IVolume::COUNTRY_JAPAN:
-		region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_JAP_SETTING;
+		area = "JPN";
+		video = "NTSC";
 		break;
 
 	case DiscIO::IVolume::COUNTRY_USA:
-		region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_USA_SETTING;
+		area = "USA";
+		video = "NTSC";
 		break;
 
 	case DiscIO::IVolume::COUNTRY_EUROPE:
-		region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_EUR_SETTING;
+		area = "EUR";
+		video = "PAL";
 		break;
 
 	default:
 		// PanicAlertT("SetupWiiMem: Unknown country. Wii boot process will be switched to European settings.");
-		region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_EUR_SETTING;
+		area = "EUR";
+		video = "PAL";
 		break;
 	}
 
-	{
+	model = "RVL-001(" + area + ")";
+	code = "L" + area.substr(0,1);
+	game = area.substr(0,2);
+
+	SettingsGenerator gen;
+	gen.AddSetting("AREA", area.c_str());
+	gen.AddSetting("MODEL", model.c_str());
+	gen.AddSetting("DVD", "0");
+	gen.AddSetting("MPCH", "0x7FFE");
+	gen.AddSetting("CODE", code.c_str());
+	gen.AddSetting("SERNO", "000000000");
+	gen.AddSetting("VIDEO", video.c_str());
+	gen.AddSetting("GAME", game.c_str());
+
+	
 	if (File::Exists(settings_Filename))
 	{
 		File::Delete(settings_Filename);
 	}
 	File::CreateFullPath(settings_Filename);
-	File::Copy(region_filename, settings_Filename);
-	File::IOFile settingsFile(settings_Filename, "rb");
-	if (!settingsFile)
+
 	{
-		PanicAlertT("SetupWiiMem: Cant find setting file");	
+	File::IOFile settingsFileHandle(settings_Filename, "wb");
+	
+	if (!settingsFileHandle.WriteBytes(gen.GetData(), SETTINGS_SIZE))
+	{
+		PanicAlertT("SetupWiiMem: Cant create setting file");	
 		return false;
 	}
-
-	settingsFile.ReadBytes(Memory::GetPointer(0x3800), 256);
+	Memory::WriteBigEData(gen.GetData(), 0x3800, SETTINGS_SIZE);
 	}
 
 	/*