diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj b/desmume/src/frontend/windows/DeSmuME.vcxproj
index 7d3002da1..6f917c5bd 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj
@@ -80,7 +80,6 @@
     <ClCompile Include="..\..\cp15.cpp" />
     <ClCompile Include="..\..\Database.cpp" />
     <ClCompile Include="..\..\debug.cpp" />
-    <ClCompile Include="..\..\Disassembler.cpp" />
     <ClCompile Include="..\..\driver.cpp" />
     <ClCompile Include="..\..\emufile.cpp" />
     <ClCompile Include="..\..\encrypt.cpp" />
@@ -224,6 +223,7 @@
     <ClCompile Include="..\..\metaspu\SoundTouch\sse_optimized.cpp" />
     <ClCompile Include="..\..\metaspu\SoundTouch\TDStretch.cpp" />
     <ClCompile Include="..\..\metaspu\SoundTouch\WavFile.cpp" />
+    <ClCompile Include="..\modules\Disassembler.cpp" />
     <ClCompile Include="..\modules\osd\agg\aggdraw.cpp" />
     <ClCompile Include="..\modules\osd\agg\agg_osd.cpp" />
     <ClCompile Include="AboutBox.cpp" />
@@ -347,6 +347,7 @@
     <ClInclude Include="..\..\libretro-common\include\features\features_cpu.h" />
     <ClInclude Include="..\..\types.h" />
     <ClInclude Include="..\..\utils\xstring.h" />
+    <ClInclude Include="..\..\version.h" />
     <ClInclude Include="..\addons\slot1comp_mc.h" />
     <ClInclude Include="..\addons\slot1comp_protocol.h" />
     <ClInclude Include="..\addons\slot1comp_rom.h" />
@@ -359,7 +360,6 @@
     <ClInclude Include="..\common.h" />
     <ClInclude Include="..\cp15.h" />
     <ClInclude Include="..\debug.h" />
-    <ClInclude Include="..\Disassembler.h" />
     <ClInclude Include="..\driver.h" />
     <ClInclude Include="..\emufile.h" />
     <ClInclude Include="..\encrypt.h" />
@@ -392,6 +392,7 @@
     <ClInclude Include="..\mic.h" />
     <ClInclude Include="..\MMU.h" />
     <ClInclude Include="..\MMU_timing.h" />
+    <ClInclude Include="..\modules\Disassembler.h" />
     <ClInclude Include="..\modules\osd\agg\agg2d.h" />
     <ClInclude Include="..\modules\osd\agg\aggdraw.h" />
     <ClInclude Include="..\modules\osd\agg\agg_osd.h" />
@@ -475,7 +476,6 @@
     <ClInclude Include="..\utils\tinyxml\tinystr.h" />
     <ClInclude Include="..\utils\tinyxml\tinyxml.h" />
     <ClInclude Include="..\utils\vfat.h" />
-    <ClInclude Include="..\version.h" />
     <ClInclude Include="..\wifi.h" />
     <ClInclude Include="..\utils\xstring.h" />
     <ClInclude Include="..\gdbstub.h" />
diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
index 586489780..e76ae1272 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
@@ -1,1887 +1,1710 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Core">
-      <UniqueIdentifier>{34192339-8456-4aa2-b100-d721ff246431}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\addons">
+    <Filter Include="addons">
       <UniqueIdentifier>{1761f316-4c22-4742-8f37-77ea008d2623}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\gdbstub">
-      <UniqueIdentifier>{cfb7bfbc-4470-4691-a3c2-b86c388e6a52}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils">
-      <UniqueIdentifier>{1b0f72b3-27d4-4d86-b253-eda5a3ebab7b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils\decrypt">
-      <UniqueIdentifier>{80fa193a-2814-401d-8a51-47c8d876eb8b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\metaspu">
-      <UniqueIdentifier>{53ec9c3c-7653-46ff-83a8-9590482bcf8b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\metaspu\win32">
-      <UniqueIdentifier>{a6e751df-3c94-41c0-96a1-5ca50d92b221}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\metaspu\SoundTouch">
-      <UniqueIdentifier>{e51fc8a7-4240-4b5c-8c2a-86c30fef95c9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows">
-      <UniqueIdentifier>{56813aa6-2261-4011-8938-105c0b4b3773}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\tools">
-      <UniqueIdentifier>{947281ba-49a1-4379-ab51-078980176832}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\resources">
-      <UniqueIdentifier>{e95a5ba4-9d37-4a40-928f-6ee2d8a3a13f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\libs">
-      <UniqueIdentifier>{42b6ff9b-c9ff-4006-b2f7-f3e3268b8c31}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils\libfat">
-      <UniqueIdentifier>{c751e37c-54da-44e2-9be8-0399cb02467a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils\tinyxml">
-      <UniqueIdentifier>{6d47beab-6087-48e1-953d-f5da134a023a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\filter">
+    <Filter Include="filter">
       <UniqueIdentifier>{0c7156df-b4ef-4cd2-af76-6a6c1e66145a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\utils\AsmJit">
-      <UniqueIdentifier>{faa7804e-deb3-482f-b348-921cb7dacca7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils\AsmJit\core">
-      <UniqueIdentifier>{82c38db3-d06d-44b5-a9a4-be3c002d0db0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils\AsmJit\x86">
-      <UniqueIdentifier>{0d620905-0dcf-47a4-bac2-91f307aa9994}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\File_Extractor">
-      <UniqueIdentifier>{d2287daf-de85-4c64-8eef-2198f501904a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\File_Extractor\7z_C">
-      <UniqueIdentifier>{a6326bbe-afb7-4dd5-ae76-a7436bc8f7db}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\File_Extractor\fex">
-      <UniqueIdentifier>{5f6c8f8e-0d1d-41a6-bd1f-0c7e51175b0f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Windows\File_Extractor\unrar">
-      <UniqueIdentifier>{6e0c9a80-56da-436a-a32d-d64cf6323ac7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common">
-      <UniqueIdentifier>{96d6a2cc-95dd-4cff-aedb-a4fca349e03e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\rthreads">
-      <UniqueIdentifier>{4081af90-0821-41a7-bfa5-a1ea2e2507b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\frontend">
+    <Filter Include="frontend">
       <UniqueIdentifier>{9bac6bce-2c43-4ed8-bc81-139766c97d61}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\frontend\modules">
+    <Filter Include="frontend\modules">
       <UniqueIdentifier>{bf0f0a1c-c47b-485d-88ef-77ec60ed76d8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\libretro-common\include">
-      <UniqueIdentifier>{3d685b20-07d6-40cd-9698-092e3956a99b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\include\rthreads">
-      <UniqueIdentifier>{f073b402-2ede-4541-ac04-8374eb50e6da}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\formats">
-      <UniqueIdentifier>{c36360aa-3622-438e-9d70-18c859eaeb01}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\formats\png">
-      <UniqueIdentifier>{7038db37-0de1-4561-aec4-d628e1d31265}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\formats\bmp">
-      <UniqueIdentifier>{3b266419-458b-493d-9c55-5d5cc6b212ce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\file">
-      <UniqueIdentifier>{114f59af-a844-468a-9cb9-2f7faf861035}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\include\formats">
-      <UniqueIdentifier>{9f342479-151c-448b-b5a1-6bf96ec68e4a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\file\nbio">
-      <UniqueIdentifier>{59d051e5-34eb-4b72-b6a1-7a893c6592e2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\string">
-      <UniqueIdentifier>{0bad36f3-5499-4402-bb16-6ceb744bf080}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\compat">
-      <UniqueIdentifier>{334a6ab8-9fe9-4577-983a-10f3b6fa95b9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\hash">
-      <UniqueIdentifier>{23ac753a-66cd-40c8-92c3-90f145eaf022}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\include\compat">
-      <UniqueIdentifier>{0e38e634-1de6-4c6e-b1d4-8b3f9e77840a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\include\streams">
-      <UniqueIdentifier>{2eba95b4-6c79-43a6-bc38-ae9ce1df54dd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\libretro-common\lists">
-      <UniqueIdentifier>{18cba3ce-aaa6-441d-8111-408d0fcef7d2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\utils\colorspacehandler">
-      <UniqueIdentifier>{db5dc512-2b75-4476-8cac-75fd4acfd85f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\frontend\modules\osd">
+    <Filter Include="frontend\modules\osd">
       <UniqueIdentifier>{2fa3e628-6c05-4f93-8543-dc1737844f89}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\frontend\modules\osd\agg">
+    <Filter Include="frontend\modules\osd\agg">
       <UniqueIdentifier>{7f9106f6-6228-4333-bc30-f3aa42054661}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\libretro-common\features">
-      <UniqueIdentifier>{15ea6bdf-cacd-4fcb-b2ed-5290b6f05007}</UniqueIdentifier>
+    <Filter Include="gdbstub">
+      <UniqueIdentifier>{cfb7bfbc-4470-4691-a3c2-b86c388e6a52}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\libretro-common\include\features">
+    <Filter Include="libretro-common">
+      <UniqueIdentifier>{96d6a2cc-95dd-4cff-aedb-a4fca349e03e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\rthreads">
+      <UniqueIdentifier>{4081af90-0821-41a7-bfa5-a1ea2e2507b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\include">
+      <UniqueIdentifier>{3d685b20-07d6-40cd-9698-092e3956a99b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\include\rthreads">
+      <UniqueIdentifier>{f073b402-2ede-4541-ac04-8374eb50e6da}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\include\formats">
+      <UniqueIdentifier>{9f342479-151c-448b-b5a1-6bf96ec68e4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\include\compat">
+      <UniqueIdentifier>{0e38e634-1de6-4c6e-b1d4-8b3f9e77840a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\include\streams">
+      <UniqueIdentifier>{2eba95b4-6c79-43a6-bc38-ae9ce1df54dd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\include\features">
       <UniqueIdentifier>{3b540aa2-669b-494c-9181-9d7b38549d3a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libretro-common\formats">
+      <UniqueIdentifier>{c36360aa-3622-438e-9d70-18c859eaeb01}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\formats\png">
+      <UniqueIdentifier>{7038db37-0de1-4561-aec4-d628e1d31265}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\formats\bmp">
+      <UniqueIdentifier>{3b266419-458b-493d-9c55-5d5cc6b212ce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\file">
+      <UniqueIdentifier>{114f59af-a844-468a-9cb9-2f7faf861035}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\file\nbio">
+      <UniqueIdentifier>{59d051e5-34eb-4b72-b6a1-7a893c6592e2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\string">
+      <UniqueIdentifier>{0bad36f3-5499-4402-bb16-6ceb744bf080}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\compat">
+      <UniqueIdentifier>{334a6ab8-9fe9-4577-983a-10f3b6fa95b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\hash">
+      <UniqueIdentifier>{23ac753a-66cd-40c8-92c3-90f145eaf022}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\lists">
+      <UniqueIdentifier>{18cba3ce-aaa6-441d-8111-408d0fcef7d2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libretro-common\features">
+      <UniqueIdentifier>{15ea6bdf-cacd-4fcb-b2ed-5290b6f05007}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="metaspu">
+      <UniqueIdentifier>{53ec9c3c-7653-46ff-83a8-9590482bcf8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="metaspu\win32">
+      <UniqueIdentifier>{a6e751df-3c94-41c0-96a1-5ca50d92b221}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="metaspu\SoundTouch">
+      <UniqueIdentifier>{e51fc8a7-4240-4b5c-8c2a-86c30fef95c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils">
+      <UniqueIdentifier>{1b0f72b3-27d4-4d86-b253-eda5a3ebab7b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\decrypt">
+      <UniqueIdentifier>{80fa193a-2814-401d-8a51-47c8d876eb8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\libfat">
+      <UniqueIdentifier>{c751e37c-54da-44e2-9be8-0399cb02467a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\tinyxml">
+      <UniqueIdentifier>{6d47beab-6087-48e1-953d-f5da134a023a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\AsmJit">
+      <UniqueIdentifier>{faa7804e-deb3-482f-b348-921cb7dacca7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\AsmJit\core">
+      <UniqueIdentifier>{82c38db3-d06d-44b5-a9a4-be3c002d0db0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\AsmJit\x86">
+      <UniqueIdentifier>{0d620905-0dcf-47a4-bac2-91f307aa9994}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils\colorspacehandler">
+      <UniqueIdentifier>{db5dc512-2b75-4476-8cac-75fd4acfd85f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows">
+      <UniqueIdentifier>{56813aa6-2261-4011-8938-105c0b4b3773}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\tools">
+      <UniqueIdentifier>{947281ba-49a1-4379-ab51-078980176832}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\resources">
+      <UniqueIdentifier>{e95a5ba4-9d37-4a40-928f-6ee2d8a3a13f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\libs">
+      <UniqueIdentifier>{42b6ff9b-c9ff-4006-b2f7-f3e3268b8c31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\File_Extractor">
+      <UniqueIdentifier>{d2287daf-de85-4c64-8eef-2198f501904a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\File_Extractor\7z_C">
+      <UniqueIdentifier>{a6326bbe-afb7-4dd5-ae76-a7436bc8f7db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\File_Extractor\fex">
+      <UniqueIdentifier>{5f6c8f8e-0d1d-41a6-bd1f-0c7e51175b0f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\Windows\File_Extractor\unrar">
+      <UniqueIdentifier>{6e0c9a80-56da-436a-a32d-d64cf6323ac7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\arm_instructions.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\armcpu.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bios.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\cheatSystem.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\commandline.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\cp15.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\debug.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Disassembler.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\driver.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\emufile.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FIFO.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\firmware.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx3d.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\GPU.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lua-engine.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\matrix.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mc.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\MMU.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\movie.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\NDSSystem.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\OGLRender.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\rasterize.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\readwrite.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\render3D.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ROMReader.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\rtc.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\saves.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\slot1.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\slot2.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\SPU.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\texcache.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\thumb_instructions.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\version.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\wifi.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\addons\slot2_expMemory.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_gbagame.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_guitarGrip.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_none.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_rumblepak.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gdbstub\gdbstub.cpp">
-      <Filter>Core\gdbstub</Filter>
+      <Filter>gdbstub</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\ConvertUTF.c">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\guid.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\md5.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\task.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\xstring.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\decrypt\crc.cpp">
-      <Filter>Core\utils\decrypt</Filter>
+      <Filter>utils\decrypt</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\decrypt\decrypt.cpp">
-      <Filter>Core\utils\decrypt</Filter>
+      <Filter>utils\decrypt</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\decrypt\header.cpp">
-      <Filter>Core\utils\decrypt</Filter>
+      <Filter>utils\decrypt</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\metaspu.cpp">
-      <Filter>Core\metaspu</Filter>
+      <Filter>metaspu</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SndOut.cpp">
-      <Filter>Core\metaspu</Filter>
+      <Filter>metaspu</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\Timestretcher.cpp">
-      <Filter>Core\metaspu</Filter>
+      <Filter>metaspu</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\win32\ConfigSoundtouch.cpp">
-      <Filter>Core\metaspu\win32</Filter>
+      <Filter>metaspu\win32</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\3dnow_win.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\AAFilter.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\cpu_detect_x86_win.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\FIFOSampleBuffer.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\FIRFilter.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\mmx_optimized.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\RateTransposer.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\SoundTouch.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\sse_optimized.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\TDStretch.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="..\..\metaspu\SoundTouch\WavFile.cpp">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClCompile>
     <ClCompile Include="AboutBox.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="aviout.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="cheatsWin.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="colorctrl.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="console.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="CWindow.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="FirmConfig.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="gbaslot_config.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="hotkey.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="inputdx.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="luaconsole.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="ogl.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="OpenArchive.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="pathsettings.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="recentroms.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="replay.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="snddx.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="slot1_config.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="throttle.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="winutil.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="disView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="ginfo.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="IORegView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="lightView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="mapView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="matrixView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="memView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="oamView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="palView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="ram_search.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="ramwatch.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="soundView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="tileView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_piano.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\dlditool.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1_none.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1_r4.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1_retail_nand.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\datetime.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\partition.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\cache.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\directory.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\disc.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\fatdir.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\fatfile.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\file_allocation_table.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\filetime.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\libfat.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\libfat_public_api.cpp">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\libfat\lock.cpp">
-      <Filter>Core\utils\libfat</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\path.cpp">
-      <Filter>Core</Filter>
+      <Filter>utils\libfat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_mpcf.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\vfat.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\emufat.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_paddle.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\tinyxml\tinystr.cpp">
-      <Filter>Core\utils\tinyxml</Filter>
+      <Filter>utils\tinyxml</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\tinyxml\tinyxml.cpp">
-      <Filter>Core\utils\tinyxml</Filter>
+      <Filter>utils\tinyxml</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\tinyxml\tinyxmlerror.cpp">
-      <Filter>Core\utils\tinyxml</Filter>
+      <Filter>utils\tinyxml</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\tinyxml\tinyxmlparser.cpp">
-      <Filter>Core\utils\tinyxml</Filter>
+      <Filter>utils\tinyxml</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\epx.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\hq2x.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\hq4x.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\lq2x.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\scanline.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\2xsai.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\bilinear.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="importSave.cpp">
-      <Filter>Windows</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\arm_jit.cpp">
-      <Filter>Core</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="FEX_Interface.cpp">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\assembler.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\assert.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\buffer.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\compiler.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\compilercontext.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\compilerfunc.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\compileritem.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\context.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\cpuinfo.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\defs.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\func.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\logger.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\memorymanager.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\memorymarker.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\operand.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\stringbuilder.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\stringutil.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\virtualmemory.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\core\zonememory.cpp">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86assembler.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86compiler.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86compilercontext.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86compilerfunc.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86compileritem.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86cpuinfo.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86defs.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86func.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86operand.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\AsmJit\x86\x86util.cpp">
-      <Filter>Core\utils\AsmJit\x86</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\OGLRender_3_2.cpp">
-      <Filter>Core</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClCompile>
     <ClCompile Include="sndxa2.cpp">
-      <Filter>Windows</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\encrypt.cpp">
-      <Filter>Core</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1_retail_auto.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1_retail_mcrom.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1comp_mc.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1comp_rom.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\advanscene.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1comp_protocol.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot1_retail_mcrom_debug.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\fsnitro.cpp">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="fsnitroView.cpp">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_passme.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\addons\slot2_auto.cpp">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\xbrz.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\win32\Threads.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zAlloc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zBuf.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zBuf2.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zCrc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zCrcOpt.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zDec.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zDecode.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zExtract.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zFile.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zIn.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\7zStream.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Alloc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Bcj2.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Bra.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Bra86.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\BraIA64.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\CpuArch.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Delta.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\LzFind.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\LzFindMt.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Lzma2Dec.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Lzma2Enc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Lzma86Dec.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Lzma86Enc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\LzmaDec.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\LzmaEnc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\LzmaLib.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\MtCoder.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Ppmd7.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Ppmd7Dec.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\7z_C\Ppmd7Enc.c">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\blargg_common.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\blargg_errors.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Data_Reader.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\fex.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\File_Extractor.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Gzip_Extractor.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Gzip_Reader.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Rar_Extractor.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Zip_Extractor.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Zip7_Extractor.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Zlib_Inflater.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\fex\Binary_Extractor.cpp">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\arcread.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\blake2s.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\blake2s_sse.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\blake2sp.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\coder.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\crc.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\encname.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\extract.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\getbits.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\hash.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\headers.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\model.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\pathfn.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\rarvm.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\rarvmtbl.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\rawread.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\secpassword.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\strfn.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\suballoc.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\timefn.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unicode.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpack.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpack15.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpack20.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpack30.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpack50.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpack50frag.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unpackinline.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unrar.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unrar_misc.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\unrar_open.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="File_Extractor\unrar\archive.cpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\rthreads\rthreads.c">
-      <Filter>Core\libretro-common\rthreads</Filter>
+      <Filter>libretro-common\rthreads</Filter>
     </ClCompile>
     <ClCompile Include="..\..\frontend\modules\ImageOut.cpp">
-      <Filter>Core\frontend\modules</Filter>
+      <Filter>frontend\modules</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\formats\png\rpng_encode.c">
-      <Filter>Core\libretro-common\formats\png</Filter>
+      <Filter>libretro-common\formats\png</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\formats\png\rpng.c">
-      <Filter>Core\libretro-common\formats\png</Filter>
+      <Filter>libretro-common\formats\png</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\formats\bmp\rbmp_encode.c">
-      <Filter>Core\libretro-common\formats\bmp</Filter>
+      <Filter>libretro-common\formats\bmp</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\nbio\nbio_stdio.c">
-      <Filter>Core\libretro-common\file\nbio</Filter>
+      <Filter>libretro-common\file\nbio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\compat\compat_posix_string.c">
-      <Filter>Core\libretro-common\compat</Filter>
+      <Filter>libretro-common\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\compat\compat_strcasestr.c">
-      <Filter>Core\libretro-common\compat</Filter>
+      <Filter>libretro-common\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\compat\compat_strl.c">
-      <Filter>Core\libretro-common\compat</Filter>
+      <Filter>libretro-common\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\compat\compat_getopt.c">
-      <Filter>Core\libretro-common\compat</Filter>
+      <Filter>libretro-common\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\compat\compat_fnmatch.c">
-      <Filter>Core\libretro-common\compat</Filter>
+      <Filter>libretro-common\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\retro_stat.c">
-      <Filter>Core\libretro-common\file</Filter>
+      <Filter>libretro-common\file</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\file_path.c">
-      <Filter>Core\libretro-common\file</Filter>
+      <Filter>libretro-common\file</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\retro_dirent.c">
-      <Filter>Core\libretro-common\file</Filter>
+      <Filter>libretro-common\file</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\hash\rhash.c">
-      <Filter>Core\libretro-common\hash</Filter>
+      <Filter>libretro-common\hash</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\rthreads\rsemaphore.c">
-      <Filter>Core\libretro-common\rthreads</Filter>
+      <Filter>libretro-common\rthreads</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\compat\compat_snprintf.c">
-      <Filter>Core\libretro-common\compat</Filter>
+      <Filter>libretro-common\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\streams\memory_stream.c">
-      <Filter>Core\libretro-common\include\streams</Filter>
+      <Filter>libretro-common\include\streams</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\streams\file_stream.c">
-      <Filter>Core\libretro-common\include\streams</Filter>
+      <Filter>libretro-common\include\streams</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\archive_file.c">
-      <Filter>Core\libretro-common\file</Filter>
+      <Filter>libretro-common\file</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\lists\file_list.c">
-      <Filter>Core\libretro-common\lists</Filter>
+      <Filter>libretro-common\lists</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\lists\string_list.c">
-      <Filter>Core\libretro-common\lists</Filter>
+      <Filter>libretro-common\lists</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\lists\dir_list.c">
-      <Filter>Core\libretro-common\lists</Filter>
+      <Filter>libretro-common\lists</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\archive_file_zlib.c">
-      <Filter>Core\libretro-common\file</Filter>
+      <Filter>libretro-common\file</Filter>
     </ClCompile>
     <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler.cpp">
-      <Filter>Core\utils\colorspacehandler</Filter>
+      <Filter>utils\colorspacehandler</Filter>
     </ClCompile>
     <ClCompile Include="..\..\filter\deposterize.cpp">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClCompile>
     <ClCompile Include="..\modules\osd\agg\aggdraw.cpp">
-      <Filter>Core\frontend\modules\osd\agg</Filter>
+      <Filter>frontend\modules\osd\agg</Filter>
     </ClCompile>
     <ClCompile Include="..\modules\osd\agg\agg_osd.cpp">
-      <Filter>Core\frontend\modules\osd\agg</Filter>
+      <Filter>frontend\modules\osd\agg</Filter>
     </ClCompile>
     <ClCompile Include="mic-win.cpp">
-      <Filter>Windows</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Database.cpp">
-      <Filter>Core</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\..\libretro-common\features\features_cpu.c">
-      <Filter>Core\libretro-common\features</Filter>
+      <Filter>libretro-common\features</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\arm_instructions.cpp" />
+    <ClCompile Include="..\..\arm_jit.cpp" />
+    <ClCompile Include="..\..\armcpu.cpp" />
+    <ClCompile Include="..\..\bios.cpp" />
+    <ClCompile Include="..\..\cheatSystem.cpp" />
+    <ClCompile Include="..\..\commandline.cpp" />
+    <ClCompile Include="..\..\common.cpp" />
+    <ClCompile Include="..\..\cp15.cpp" />
+    <ClCompile Include="..\..\Database.cpp" />
+    <ClCompile Include="..\..\debug.cpp" />
+    <ClCompile Include="..\..\driver.cpp" />
+    <ClCompile Include="..\..\emufile.cpp" />
+    <ClCompile Include="..\..\encrypt.cpp" />
+    <ClCompile Include="..\..\FIFO.cpp" />
+    <ClCompile Include="..\..\firmware.cpp" />
+    <ClCompile Include="..\..\gfx3d.cpp" />
+    <ClCompile Include="..\..\GPU.cpp" />
+    <ClCompile Include="..\..\lua-engine.cpp" />
+    <ClCompile Include="..\..\matrix.cpp" />
+    <ClCompile Include="..\..\mc.cpp" />
+    <ClCompile Include="..\..\MMU.cpp" />
+    <ClCompile Include="..\..\movie.cpp" />
+    <ClCompile Include="..\..\NDSSystem.cpp" />
+    <ClCompile Include="..\..\OGLRender.cpp" />
+    <ClCompile Include="..\..\OGLRender_3_2.cpp" />
+    <ClCompile Include="..\..\path.cpp" />
+    <ClCompile Include="..\..\rasterize.cpp" />
+    <ClCompile Include="..\..\readwrite.cpp" />
+    <ClCompile Include="..\..\render3D.cpp" />
+    <ClCompile Include="..\..\ROMReader.cpp" />
+    <ClCompile Include="..\..\rtc.cpp" />
+    <ClCompile Include="..\..\saves.cpp" />
+    <ClCompile Include="..\..\slot1.cpp" />
+    <ClCompile Include="..\..\slot2.cpp" />
+    <ClCompile Include="..\..\SPU.cpp" />
+    <ClCompile Include="..\..\texcache.cpp" />
+    <ClCompile Include="..\..\thumb_instructions.cpp" />
+    <ClCompile Include="..\..\version.cpp" />
+    <ClCompile Include="..\..\wifi.cpp" />
+    <ClCompile Include="..\modules\Disassembler.cpp">
+      <Filter>frontend\modules</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\armcpu.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\bios.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\bits.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cheatSystem.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\commandline.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\common.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cp15.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\debug.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Disassembler.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\driver.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\emufile.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\FIFO.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\firmware.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gfx3d.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\GPU.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lua-engine.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\matrix.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mc.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mem.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mic.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\MMU.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\MMU_timing.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\movie.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\NDSSystem.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\OGLRender.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\path.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\rasterize.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\readwrite.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\registers.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\render3D.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ROMReader.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\rtc.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\saves.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\slot1.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\SPU.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\texcache.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\version.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\wifi.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\utils\xstring.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="..\gdbstub.h">
-      <Filter>Core\gdbstub</Filter>
+      <Filter>gdbstub</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\ConvertUTF.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\guid.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\md5.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\task.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\valuearray.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\decrypt\crc.h">
-      <Filter>Core\utils\decrypt</Filter>
+      <Filter>utils\decrypt</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\decrypt\decrypt.h">
-      <Filter>Core\utils\decrypt</Filter>
+      <Filter>utils\decrypt</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\decrypt\header.h">
-      <Filter>Core\utils\decrypt</Filter>
+      <Filter>utils\decrypt</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\metaspu.h">
-      <Filter>Core\metaspu</Filter>
+      <Filter>metaspu</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SndOut.h">
-      <Filter>Core\metaspu</Filter>
+      <Filter>metaspu</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\win32\Dialogs.h">
-      <Filter>Core\metaspu\win32</Filter>
+      <Filter>metaspu\win32</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\AAFilter.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\BPMDetect.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\cpu_detect.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\FIFOSampleBuffer.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\FIFOSamplePipe.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\FIRFilter.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\RateTransposer.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\SoundTouch.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\STTypes.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\TDStretch.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="..\metaspu\SoundTouch\WavFile.h">
-      <Filter>Core\metaspu\SoundTouch</Filter>
+      <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
     <ClInclude Include="AboutBox.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="aviout.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="cheatsWin.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="colorctrl.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="console.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="CWindow.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="FirmConfig.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="gbaslot_config.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="hotkey.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="inputdx.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="main.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="OpenArchive.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="pathsettings.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="recentroms.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="replay.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="snddx.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="slot1_config.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="throttle.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="winpcap.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="winutil.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="disView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="ginfo.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="IORegView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="lightView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="mapView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="matrixView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="memView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="oamView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="palView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="ram_search.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="ramwatch.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="soundView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="tileView.h">
-      <Filter>Windows\tools</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\datetime.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\partition.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\bit_ops.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\cache.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\common.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\directory.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\disc.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\disc_io.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\fat.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\fatdir.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\fatfile.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\file_allocation_table.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\filetime.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\libfat_pc.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\libfat_public_api.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\lock.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\libfat\mem_allocate.h">
-      <Filter>Core\utils\libfat</Filter>
+      <Filter>utils\libfat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\vfat.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\emufat.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\emufat_types.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\tinyxml\tinystr.h">
-      <Filter>Core\utils\tinyxml</Filter>
+      <Filter>utils\tinyxml</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\tinyxml\tinyxml.h">
-      <Filter>Core\utils\tinyxml</Filter>
+      <Filter>utils\tinyxml</Filter>
     </ClInclude>
     <ClInclude Include="..\filter\filter.h">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClInclude>
     <ClInclude Include="..\filter\hq2x.h">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClInclude>
     <ClInclude Include="..\filter\interp.h">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClInclude>
     <ClInclude Include="..\filter\lq2x.h">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClInclude>
     <ClInclude Include="importSave.h">
-      <Filter>Windows</Filter>
-    </ClInclude>
-    <ClInclude Include="..\arm_jit.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\instruction_attributes.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\instructions.h">
-      <Filter>Core</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="FEX_Interface.h">
-      <Filter>Windows</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\asmjit.h">
-      <Filter>Core\utils\AsmJit</Filter>
+      <Filter>utils\AsmJit</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\config.h">
-      <Filter>Core\utils\AsmJit</Filter>
+      <Filter>utils\AsmJit</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core.h">
-      <Filter>Core\utils\AsmJit</Filter>
+      <Filter>utils\AsmJit</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86.h">
-      <Filter>Core\utils\AsmJit</Filter>
+      <Filter>utils\AsmJit</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\apibegin.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\apiend.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\assembler.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\assert.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\buffer.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\build.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\compiler.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\compilercontext.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\compilerfunc.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\compileritem.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\context.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\cpuinfo.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\defs.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\func.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\intutil.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\lock.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\logger.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\memorymanager.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\memorymarker.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\operand.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\podvector.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\stringbuilder.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\stringutil.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\virtualmemory.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\core\zonememory.h">
-      <Filter>Core\utils\AsmJit\core</Filter>
+      <Filter>utils\AsmJit\core</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86assembler.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86compiler.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86compilercontext.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86compilerfunc.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86compileritem.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86cpuinfo.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86defs.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86func.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86operand.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\AsmJit\x86\x86util.h">
-      <Filter>Core\utils\AsmJit\x86</Filter>
-    </ClInclude>
-    <ClInclude Include="..\OGLRender_3_2.h">
-      <Filter>Core</Filter>
+      <Filter>utils\AsmJit\x86</Filter>
     </ClInclude>
     <ClInclude Include="sndxa2.h">
-      <Filter>Windows</Filter>
-    </ClInclude>
-    <ClInclude Include="..\encrypt.h">
-      <Filter>Core</Filter>
+      <Filter>frontend\Windows</Filter>
     </ClInclude>
     <ClInclude Include="..\addons\slot1comp_mc.h">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClInclude>
     <ClInclude Include="..\addons\slot1comp_rom.h">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\advanscene.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\addons\slot1comp_protocol.h">
-      <Filter>Core\addons</Filter>
+      <Filter>addons</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\fsnitro.h">
-      <Filter>Core\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="fsnitroView.h">
-      <Filter>Windows\tools</Filter>
-    </ClInclude>
-    <ClInclude Include="..\slot2.h">
-      <Filter>Core</Filter>
+      <Filter>frontend\Windows\tools</Filter>
     </ClInclude>
     <ClInclude Include="..\filter\xbrz.h">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\win32\Threads.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7z.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zAlloc.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zBuf.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zCrc.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zDecode.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zExtract.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zFile.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zIn.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zTypes.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\7zVersion.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Alloc.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Bcj2.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Bra.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\CpuArch.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Delta.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzFind.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzFindMt.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzHash.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Lzma2Dec.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Lzma2Enc.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Lzma86.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzmaDec.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzmaEnc.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzmaLib.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\LzmaTypes.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\MtCoder.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Ppmd.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Ppmd7.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\RotateDefs.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Threads.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\7z_C\Types.h">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\blargg_common.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\blargg_config.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\blargg_endian.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\blargg_errors.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\blargg_source.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Data_Reader.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\fex.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\File_Extractor.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Gzip_Extractor.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Gzip_Reader.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Rar_Extractor.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Zip_Extractor.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Zip7_Extractor.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Zlib_Inflater.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\fex\Binary_Extractor.h">
-      <Filter>Windows\File_Extractor\fex</Filter>
+      <Filter>frontend\Windows\File_Extractor\fex</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\array.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\blake2s.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\coder.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\compress.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\encname.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\getbits.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\hash.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\headers.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\headers5.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\model.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\rar.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\rarvm.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\rawread.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\strfn.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\suballoc.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\timefn.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\unicode.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\unpack.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\unrar.h">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="File_Extractor\unrar\archive.hpp">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\rthreads\rthreads.h">
-      <Filter>Core\libretro-common\include\rthreads</Filter>
+      <Filter>libretro-common\include\rthreads</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\retro_miscellaneous.h">
-      <Filter>Core\libretro-common\include</Filter>
+      <Filter>libretro-common\include</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\retro_inline.h">
-      <Filter>Core\libretro-common\include</Filter>
+      <Filter>libretro-common\include</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\boolean.h">
-      <Filter>Core\libretro-common\include</Filter>
+      <Filter>libretro-common\include</Filter>
     </ClInclude>
     <ClInclude Include="..\frontend\modules\ImageOut.h">
-      <Filter>Core\frontend\modules</Filter>
+      <Filter>frontend\modules</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\formats\png\rpng_internal.h">
-      <Filter>Core\libretro-common\formats\png</Filter>
+      <Filter>libretro-common\formats\png</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\formats\rpng.h">
-      <Filter>Core\libretro-common\include\formats</Filter>
+      <Filter>libretro-common\include\formats</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\formats\image.h">
-      <Filter>Core\libretro-common\include\formats</Filter>
+      <Filter>libretro-common\include\formats</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\formats\rbmp.h">
-      <Filter>Core\libretro-common\include\formats</Filter>
+      <Filter>libretro-common\include\formats</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\compat\getopt.h">
-      <Filter>Core\libretro-common\include\compat</Filter>
+      <Filter>libretro-common\include\compat</Filter>
     </ClInclude>
     <ClInclude Include="..\libretro-common\include\compat\msvc.h">
-      <Filter>Core\libretro-common\include\compat</Filter>
+      <Filter>libretro-common\include\compat</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\colorspacehandler\colorspacehandler.h">
-      <Filter>Core\utils\colorspacehandler</Filter>
+      <Filter>utils\colorspacehandler</Filter>
     </ClInclude>
     <ClInclude Include="..\modules\osd\agg\agg2d.h">
-      <Filter>Core\frontend\modules\osd\agg</Filter>
+      <Filter>frontend\modules\osd\agg</Filter>
     </ClInclude>
     <ClInclude Include="..\modules\osd\agg\aggdraw.h">
-      <Filter>Core\frontend\modules\osd\agg</Filter>
+      <Filter>frontend\modules\osd\agg</Filter>
     </ClInclude>
     <ClInclude Include="..\modules\osd\agg\agg_osd.h">
-      <Filter>Core\frontend\modules\osd\agg</Filter>
+      <Filter>frontend\modules\osd\agg</Filter>
     </ClInclude>
     <ClInclude Include="..\..\utils\xstring.h">
-      <Filter>Core\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Database.h">
-      <Filter>Core</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\libretro-common\include\features\features_cpu.h">
-      <Filter>Core\libretro-common\include\features</Filter>
+      <Filter>libretro-common\include\features</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\types.h">
-      <Filter>Core</Filter>
+    <ClInclude Include="..\utils\xstring.h" />
+    <ClInclude Include="..\arm_jit.h" />
+    <ClInclude Include="..\armcpu.h" />
+    <ClInclude Include="..\bios.h" />
+    <ClInclude Include="..\bits.h" />
+    <ClInclude Include="..\cheatSystem.h" />
+    <ClInclude Include="..\commandline.h" />
+    <ClInclude Include="..\common.h" />
+    <ClInclude Include="..\cp15.h" />
+    <ClInclude Include="..\..\Database.h" />
+    <ClInclude Include="..\debug.h" />
+    <ClInclude Include="..\driver.h" />
+    <ClInclude Include="..\emufile.h" />
+    <ClInclude Include="..\encrypt.h" />
+    <ClInclude Include="..\FIFO.h" />
+    <ClInclude Include="..\firmware.h" />
+    <ClInclude Include="..\gfx3d.h" />
+    <ClInclude Include="..\GPU.h" />
+    <ClInclude Include="..\instruction_attributes.h" />
+    <ClInclude Include="..\instructions.h" />
+    <ClInclude Include="..\lua-engine.h" />
+    <ClInclude Include="..\matrix.h" />
+    <ClInclude Include="..\mc.h" />
+    <ClInclude Include="..\mem.h" />
+    <ClInclude Include="..\mic.h" />
+    <ClInclude Include="..\MMU.h" />
+    <ClInclude Include="..\MMU_timing.h" />
+    <ClInclude Include="..\movie.h" />
+    <ClInclude Include="..\NDSSystem.h" />
+    <ClInclude Include="..\OGLRender.h" />
+    <ClInclude Include="..\OGLRender_3_2.h" />
+    <ClInclude Include="..\path.h" />
+    <ClInclude Include="..\rasterize.h" />
+    <ClInclude Include="..\readwrite.h" />
+    <ClInclude Include="..\registers.h" />
+    <ClInclude Include="..\render3D.h" />
+    <ClInclude Include="..\ROMReader.h" />
+    <ClInclude Include="..\rtc.h" />
+    <ClInclude Include="..\saves.h" />
+    <ClInclude Include="..\slot1.h" />
+    <ClInclude Include="..\slot2.h" />
+    <ClInclude Include="..\SPU.h" />
+    <ClInclude Include="..\texcache.h" />
+    <ClInclude Include="..\..\types.h" />
+    <ClInclude Include="..\..\version.h" />
+    <ClInclude Include="..\wifi.h" />
+    <ClInclude Include="..\modules\Disassembler.h">
+      <Filter>frontend\modules</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\instruction_tabdef.inc">
-      <Filter>Core</Filter>
-    </None>
-    <None Include="..\thumb_tabdef.inc">
-      <Filter>Core</Filter>
-    </None>
     <None Include="bitmap1.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="DeSmuME.ico">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="..\filter\hq4x.dat">
-      <Filter>Core\filter</Filter>
+      <Filter>filter</Filter>
     </None>
     <None Include="..\utils\AsmJit\COPYING.txt">
-      <Filter>Core\utils\AsmJit</Filter>
+      <Filter>utils\AsmJit</Filter>
     </None>
     <None Include="File_Extractor\7z_C\7zC.txt">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </None>
     <None Include="File_Extractor\7z_C\changes.txt">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </None>
     <None Include="File_Extractor\7z_C\lzma.txt">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </None>
     <None Include="File_Extractor\7z_C\readme.txt">
-      <Filter>Windows\File_Extractor\7z_C</Filter>
+      <Filter>frontend\Windows\File_Extractor\7z_C</Filter>
     </None>
     <None Include="File_Extractor\unrar\changes.txt">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </None>
     <None Include="File_Extractor\unrar\license.txt">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </None>
     <None Include="File_Extractor\unrar\readme.txt">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </None>
     <None Include="File_Extractor\unrar\technote.txt">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </None>
     <None Include="File_Extractor\unrar\whatsnew.txt">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </None>
     <None Include="File_Extractor\unrar\acknow.txt">
-      <Filter>Windows\File_Extractor\unrar</Filter>
+      <Filter>frontend\Windows\File_Extractor\unrar</Filter>
     </None>
     <None Include="bitmaps\FileBinary.ico">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_STOP.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\FolderClosed.ico">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\FolderOpen.ico">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_FRAMEADVANCE.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_OPEN.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_PAUSE.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_PLAY.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_RESET.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_ROTATECCW.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="bitmaps\IDB_ROTATECW.bmp">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </None>
     <None Include="..\modules\osd\agg\agg2d.inl">
-      <Filter>Core\frontend\modules\osd\agg</Filter>
+      <Filter>frontend\modules\osd\agg</Filter>
     </None>
+    <None Include="..\instruction_tabdef.inc" />
+    <None Include="..\thumb_tabdef.inc" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources.rc">
-      <Filter>Windows\resources</Filter>
+      <Filter>frontend\Windows\resources</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="directx\directx.7z">
-      <Filter>Windows\libs</Filter>
+      <Filter>frontend\Windows\libs</Filter>
     </CustomBuild>
     <CustomBuild Include="lua\lua.7z">
-      <Filter>Windows\libs</Filter>
+      <Filter>frontend\Windows\libs</Filter>
     </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/desmume/src/frontend/windows/disView.cpp b/desmume/src/frontend/windows/disView.cpp
index 368d62c20..7d776b49d 100644
--- a/desmume/src/frontend/windows/disView.cpp
+++ b/desmume/src/frontend/windows/disView.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "MMU.h"
-#include "Disassembler.h"
+#include "frontend/modules/Disassembler.h"
 #include "NDSSystem.h"
 #include "armcpu.h"