diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj
index c6cffcc70..8fb918c53 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj
@@ -269,24 +269,6 @@
     <ClCompile Include="throttle.cpp" />
     <ClCompile Include="tileView.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\matrix_sse2-x64.asm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Assembling x64...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ml64 /nologo /c /Zi /Fo"$(IntDir)%(FileName).obj" "%(FullPath)"
-</Command>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Assembling x64...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ml64 /nologo /c /Zi /Fo"$(IntDir)%(FileName).obj" "%(FullPath)"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(FileName).obj;%(Outputs)</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release FastBuild|Win32'">true</ExcludedFromBuild>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release FastBuild|Win32'">Assembling x64...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release FastBuild|Win32'">ml64 /nologo /c /Zi /Fo"$(IntDir)%(FileName).obj" "%(FullPath)"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release FastBuild|Win32'">$(IntDir)%(FileName).obj;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources.rc" />
   </ItemGroup>
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj.filters b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
index b6ad258c9..380f47c90 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj.filters
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
@@ -1,588 +1,577 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    <Filter Include="Core">
+      <UniqueIdentifier>{e246e968-7cf0-4440-8af1-2ca31a9c8b69}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\core">
-      <UniqueIdentifier>{1aac1cb6-6338-401b-8378-f607b26ca0b9}</UniqueIdentifier>
+    <Filter Include="Core\addons">
+      <UniqueIdentifier>{3db93853-68d0-4283-a892-42763712c46c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\windows">
-      <UniqueIdentifier>{a553d508-6693-4d6f-8ce6-c3b6d5167e4f}</UniqueIdentifier>
+    <Filter Include="Core\gdbstub">
+      <UniqueIdentifier>{f33115c7-3743-41eb-be5b-63fafc938175}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\windows\filters">
-      <UniqueIdentifier>{0548405c-fbdd-496f-ba62-d9cf581c6bcf}</UniqueIdentifier>
+    <Filter Include="Core\utils">
+      <UniqueIdentifier>{7ce489f5-c2ee-4aff-b45c-20a0be4ff7cd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\windows\userconfig">
-      <UniqueIdentifier>{49f1a847-e764-4f17-9682-e67b6bc6fef7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\core">
-      <UniqueIdentifier>{6a7f043c-74d6-4565-adac-2b80eec24d4e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\core\addons">
-      <UniqueIdentifier>{7d657a0f-2523-4600-8c13-6768c4cf7142}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\core\utils">
-      <UniqueIdentifier>{91f184aa-ad13-4099-bd81-419def9a5a24}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\core\utils\decrypt">
-      <UniqueIdentifier>{4223f32d-baf0-4ddb-b40b-01c0b00b3bc7}</UniqueIdentifier>
+    <Filter Include="Core\utils\decrypt">
+      <UniqueIdentifier>{8eb8e94f-68c8-4120-bc36-ca23191db499}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\windows">
       <UniqueIdentifier>{00f21c6a-62f1-45a0-9229-837ce991baa7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\windows\filters">
-      <UniqueIdentifier>{70b64298-1d4c-4758-8185-e0f8655ef7eb}</UniqueIdentifier>
+    <Filter Include="Windows">
+      <UniqueIdentifier>{a6b232c3-aba7-4534-94ba-9cd66d5b8b61}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Windows\filters">
+      <UniqueIdentifier>{f101873e-401f-43c0-ac0a-394785a44dfa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Windows\resources">
+      <UniqueIdentifier>{ea3f95b4-10be-49ef-9ae0-c1e08da5a730}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Windows\tools">
+      <UniqueIdentifier>{b7de5c12-630e-4b43-81ac-3cdf74f286a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Windows\userconfig">
+      <UniqueIdentifier>{8f61be53-ba2f-4d17-97bc-cae6e4a04117}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\addons.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\addons\compactFlash.cpp">
-      <Filter>Source Files\core\addons</Filter>
+      <Filter>Core\addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\addons\expMemory.cpp">
+      <Filter>Core\addons</Filter>
     </ClCompile>
     <ClCompile Include="..\addons\gbagame.cpp">
-      <Filter>Source Files\core\addons</Filter>
+      <Filter>Core\addons</Filter>
     </ClCompile>
     <ClCompile Include="..\addons\guitarGrip.cpp">
-      <Filter>Source Files\core\addons</Filter>
+      <Filter>Core\addons</Filter>
     </ClCompile>
     <ClCompile Include="..\addons\none.cpp">
-      <Filter>Source Files\core\addons</Filter>
+      <Filter>Core\addons</Filter>
     </ClCompile>
     <ClCompile Include="..\addons\rumblepak.cpp">
-      <Filter>Source Files\core\addons</Filter>
+      <Filter>Core\addons</Filter>
     </ClCompile>
     <ClCompile Include="..\aggdraw.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\armcpu.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\arm_instructions.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\bios.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\cheatSystem.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\commandline.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\common.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\cp15.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\debug.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\Disassembler.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\FIFO.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\fs-windows.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\gdbstub\gdbstub.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Core\gdbstub</Filter>
     </ClCompile>
     <ClCompile Include="..\gfx3d.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\GPU.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\GPU_OSD.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\lua-engine.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\matrix.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\mc.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\MMU.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\movie.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\NDSSystem.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\OGLRender.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\rasterize.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\readwrite.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\render3D.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\ROMReader.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\rtc.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\saves.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\SPU.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\texcache.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\thumb_instructions.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\ConvertUTF.c">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\decrypt\crc.cpp">
-      <Filter>Source Files\core\utils\decrypt</Filter>
+      <Filter>Core\utils\decrypt</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\decrypt\decrypt.cpp">
-      <Filter>Source Files\core\utils\decrypt</Filter>
+      <Filter>Core\utils\decrypt</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\decrypt\header.cpp">
-      <Filter>Source Files\core\utils\decrypt</Filter>
+      <Filter>Core\utils\decrypt</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\guid.cpp">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\md5.cpp">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\xstring.cpp">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClCompile>
     <ClCompile Include="..\wifi.cpp">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="7zip.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="AboutBox.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="aviout.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="cheatsWin.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="colorctrl.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="console.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="CWindow.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="disView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="filter\2xsai.cpp">
-      <Filter>Source Files\windows\filters</Filter>
+      <Filter>Windows\filters</Filter>
     </ClCompile>
     <ClCompile Include="filter\bilinear.cpp">
-      <Filter>Source Files\windows\filters</Filter>
+      <Filter>Windows\filters</Filter>
     </ClCompile>
     <ClCompile Include="filter\hq2x.cpp">
-      <Filter>Source Files\windows\filters</Filter>
+      <Filter>Windows\filters</Filter>
     </ClCompile>
     <ClCompile Include="filter\scanline.cpp">
-      <Filter>Source Files\windows\filters</Filter>
+      <Filter>Windows\filters</Filter>
     </ClCompile>
     <ClCompile Include="FirmConfig.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="gbaslot_config.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="ginfo.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="hotkey.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="inputdx.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="IORegView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="lightView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="luaconsole.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="mapView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="matrixView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="memView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="mic.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="oamView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="ogl.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="OpenArchive.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="palView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="pathsettings.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="ramwatch.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="ram_search.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="replay.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="snddx.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="soundView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="throttle.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClCompile>
     <ClCompile Include="tileView.cpp">
-      <Filter>Source Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\agg2d.inl">
-      <Filter>Source Files\core</Filter>
+      <Filter>Core</Filter>
     </None>
     <None Include="..\instruction_tabdef.inc">
-      <Filter>Header Files</Filter>
+      <Filter>Core</Filter>
     </None>
     <None Include="..\thumb_tabdef.inc">
-      <Filter>Header Files</Filter>
+      <Filter>Core</Filter>
     </None>
     <None Include="bitmap1.bmp">
-      <Filter>Resource Files</Filter>
+      <Filter>Windows\resources</Filter>
     </None>
     <None Include="DeSmuME.ico">
-      <Filter>Resource Files</Filter>
+      <Filter>Windows\resources</Filter>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resources.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\addons.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\agg2d.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\aggdraw.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\armcpu.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\arm_instructions.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\bios.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\bits.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\cheatSystem.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\commandline.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\common.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\cp15.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\debug.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\Disassembler.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\driver.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\fat.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\FIFO.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\fs.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\gdbstub.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core\gdbstub</Filter>
     </ClInclude>
     <ClInclude Include="..\gfx3d.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\GPU.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\GPU_osd.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\lua-engine.h">
-      <Filter>Header Files</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="..\matrix.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\mc.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\mem.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\memorystream.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\mic.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\MMU.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\movie.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\NDSSystem.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\OGLRender.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\rasterize.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\readwrite.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\registers.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\render3D.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\ROMReader.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\rtc.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\saves.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\shaders.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\SPU.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\texcache.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\thumb_instructions.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\types.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\ConvertUTF.h">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\decrypt\crc.h">
-      <Filter>Source Files\core\utils\decrypt</Filter>
+      <Filter>Core\utils\decrypt</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\decrypt\decrypt.h">
-      <Filter>Source Files\core\utils\decrypt</Filter>
+      <Filter>Core\utils\decrypt</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\decrypt\header.h">
-      <Filter>Source Files\core\utils\decrypt</Filter>
+      <Filter>Core\utils\decrypt</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\guid.h">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\md5.h">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\valuearray.h">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\xstring.h">
-      <Filter>Source Files\core\utils</Filter>
+      <Filter>Core\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\version.h">
-      <Filter>Header Files</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="..\wifi.h">
-      <Filter>Header Files\core</Filter>
+      <Filter>Core</Filter>
     </ClInclude>
     <ClInclude Include="7zip.h">
-      <Filter>Header Files</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="7zipstreams.h">
-      <Filter>Header Files</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="AboutBox.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="aviout.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="cheatsWin.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="colorctrl.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="console.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="CWindow.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="disView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="filter\filter.h">
-      <Filter>Header Files\windows\filters</Filter>
+      <Filter>Windows\filters</Filter>
     </ClInclude>
     <ClInclude Include="FirmConfig.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="gbaslot_config.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="ginfo.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="hotkey.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="inputdx.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="IORegView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="lightView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="main.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="mapView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="matrixView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="memView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="oamView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="OpenArchive.h">
-      <Filter>Header Files</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="palView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="pathsettings.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="ramwatch.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="ram_search.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="replay.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="snddx.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="soundView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="throttle.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows</Filter>
     </ClInclude>
     <ClInclude Include="tileView.h">
-      <Filter>Header Files\windows</Filter>
+      <Filter>Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="userconfig\userconfig.h">
-      <Filter>Header Files\windows\userconfig</Filter>
+      <Filter>Windows\userconfig</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\matrix_sse2-x64.asm">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
+    <ResourceCompile Include="resources.rc">
+      <Filter>Windows\resources</Filter>
+    </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>