diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index fd411511b..611fd4027 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -1418,6 +1418,62 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="filter"
+				>
+				<File
+					RelativePath="..\filter\2xsai.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\bilinear.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\epx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\filter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\hq2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\hq2x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\hq4x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\hq4x.dat"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\hq4x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\interp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\lq2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\lq2x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\filter\scanline.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Windows"
@@ -1606,50 +1662,6 @@
 				RelativePath=".\winutil.h"
 				>
 			</File>
-			<Filter
-				Name="filters"
-				>
-				<File
-					RelativePath=".\filter\2xsai.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\bilinear.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\epx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\filter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\hq2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\hq4x.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\hq4x.dat"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\hq4x.h"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\lq2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\filter\scanline.cpp"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="userconfig"
 				>
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj
index 08876a827..de98bb639 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj
@@ -452,6 +452,13 @@
     <ClCompile Include="..\driver.cpp" />
     <ClCompile Include="..\emufile.cpp" />
     <ClCompile Include="..\FIFO.cpp" />
+    <ClCompile Include="..\filter\2xsai.cpp" />
+    <ClCompile Include="..\filter\bilinear.cpp" />
+    <ClCompile Include="..\filter\epx.cpp" />
+    <ClCompile Include="..\filter\hq2x.cpp" />
+    <ClCompile Include="..\filter\hq4x.cpp" />
+    <ClCompile Include="..\filter\lq2x.cpp" />
+    <ClCompile Include="..\filter\scanline.cpp" />
     <ClCompile Include="..\firmware.cpp" />
     <ClCompile Include="..\fs-windows.cpp" />
     <ClCompile Include="..\gfx3d.cpp" />
@@ -533,7 +540,6 @@
     <ClCompile Include="colorctrl.cpp" />
     <ClCompile Include="console.cpp" />
     <ClCompile Include="CWindow.cpp" />
-    <ClCompile Include="filter\hq4x.cpp" />
     <ClCompile Include="FirmConfig.cpp" />
     <ClCompile Include="gbaslot_config.cpp" />
     <ClCompile Include="hotkey.cpp" />
@@ -550,12 +556,6 @@
     <ClCompile Include="slot1_config.cpp" />
     <ClCompile Include="throttle.cpp" />
     <ClCompile Include="winutil.cpp" />
-    <ClCompile Include="filter\2xsai.cpp" />
-    <ClCompile Include="filter\bilinear.cpp" />
-    <ClCompile Include="filter\epx.cpp" />
-    <ClCompile Include="filter\hq2x.cpp" />
-    <ClCompile Include="filter\lq2x.cpp" />
-    <ClCompile Include="filter\scanline.cpp" />
     <ClCompile Include="disView.cpp" />
     <ClCompile Include="ginfo.cpp" />
     <ClCompile Include="IORegView.cpp" />
@@ -587,6 +587,11 @@
     <ClInclude Include="..\emufile.h" />
     <ClInclude Include="..\fat.h" />
     <ClInclude Include="..\FIFO.h" />
+    <ClInclude Include="..\filter\filter.h" />
+    <ClInclude Include="..\filter\hq2x.h" />
+    <ClInclude Include="..\filter\hq4x.h" />
+    <ClInclude Include="..\filter\interp.h" />
+    <ClInclude Include="..\filter\lq2x.h" />
     <ClInclude Include="..\firmware.h" />
     <ClInclude Include="..\fs.h" />
     <ClInclude Include="..\gfx3d.h" />
@@ -674,7 +679,6 @@
     <ClInclude Include="console.h" />
     <ClInclude Include="CWindow.h" />
     <ClInclude Include="filter\hq2x.h" />
-    <ClInclude Include="filter\hq4x.h" />
     <ClInclude Include="filter\interp.h" />
     <ClInclude Include="filter\lq2x.h" />
     <ClInclude Include="FirmConfig.h" />
@@ -692,7 +696,6 @@
     <ClInclude Include="throttle.h" />
     <ClInclude Include="winpcap.h" />
     <ClInclude Include="winutil.h" />
-    <ClInclude Include="filter\filter.h" />
     <ClInclude Include="userconfig\userconfig.h" />
     <ClInclude Include="disView.h" />
     <ClInclude Include="ginfo.h" />
@@ -709,6 +712,7 @@
     <ClInclude Include="tileView.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\filter\hq4x.dat" />
     <None Include="..\instruction_tabdef.inc" />
     <None Include="..\thumb_tabdef.inc" />
     <None Include="bitmap1.bmp" />
@@ -825,7 +829,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">7z.exe;un7z_and_touch.bat;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.libs\wx.tag;%(Outputs)</Outputs>
     </CustomBuild>
-    <None Include="filter\hq4x.dat" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources.rc" />
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj.filters b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
index fe5b08a25..1c94a2168 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj.filters
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
@@ -31,9 +31,6 @@
     <Filter Include="Windows">
       <UniqueIdentifier>{56813aa6-2261-4011-8938-105c0b4b3773}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows\filters">
-      <UniqueIdentifier>{17421776-c56d-4ee0-820b-5ce136e020ea}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Windows\userconfig">
       <UniqueIdentifier>{78bb8fa0-5d56-4cf5-94b3-b020f4f4c290}</UniqueIdentifier>
     </Filter>
@@ -52,6 +49,9 @@
     <Filter Include="Core\utils\tinyxml">
       <UniqueIdentifier>{6d47beab-6087-48e1-953d-f5da134a023a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Core\filter">
+      <UniqueIdentifier>{0c7156df-b4ef-4cd2-af76-6a6c1e66145a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\addons.cpp">
@@ -327,24 +327,6 @@
     <ClCompile Include="winutil.cpp">
       <Filter>Windows</Filter>
     </ClCompile>
-    <ClCompile Include="filter\2xsai.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\bilinear.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\epx.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\hq2x.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\lq2x.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\scanline.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
     <ClCompile Include="disView.cpp">
       <Filter>Windows\tools</Filter>
     </ClCompile>
@@ -453,9 +435,6 @@
     <ClCompile Include="..\addons\slot2_paddle.cpp">
       <Filter>Core\addons</Filter>
     </ClCompile>
-    <ClCompile Include="filter\hq4x.cpp">
-      <Filter>Windows\filters</Filter>
-    </ClCompile>
     <ClCompile Include="..\utils\tinyxml\tinystr.cpp">
       <Filter>Core\utils\tinyxml</Filter>
     </ClCompile>
@@ -468,6 +447,27 @@
     <ClCompile Include="..\utils\tinyxml\tinyxmlparser.cpp">
       <Filter>Core\utils\tinyxml</Filter>
     </ClCompile>
+    <ClCompile Include="..\filter\epx.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\filter\hq2x.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\filter\hq4x.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\filter\lq2x.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\filter\scanline.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\filter\2xsai.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\filter\bilinear.cpp">
+      <Filter>Core\filter</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\addons.h">
@@ -752,9 +752,6 @@
     <ClInclude Include="winutil.h">
       <Filter>Windows</Filter>
     </ClInclude>
-    <ClInclude Include="filter\filter.h">
-      <Filter>Windows\filters</Filter>
-    </ClInclude>
     <ClInclude Include="userconfig\userconfig.h">
       <Filter>Windows\userconfig</Filter>
     </ClInclude>
@@ -861,15 +858,27 @@
     <ClInclude Include="..\utils\emufat_types.h">
       <Filter>Core\utils</Filter>
     </ClInclude>
-    <ClInclude Include="filter\hq4x.h">
-      <Filter>Windows\filters</Filter>
-    </ClInclude>
     <ClInclude Include="..\utils\tinyxml\tinystr.h">
       <Filter>Core\utils\tinyxml</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\tinyxml\tinyxml.h">
       <Filter>Core\utils\tinyxml</Filter>
     </ClInclude>
+    <ClInclude Include="..\filter\filter.h">
+      <Filter>Core\filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\filter\hq2x.h">
+      <Filter>Core\filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\filter\hq4x.h">
+      <Filter>Core\filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\filter\interp.h">
+      <Filter>Core\filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\filter\lq2x.h">
+      <Filter>Core\filter</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\instruction_tabdef.inc">
@@ -884,8 +893,8 @@
     <None Include="DeSmuME.ico">
       <Filter>Windows\resources</Filter>
     </None>
-    <None Include="filter\hq4x.dat">
-      <Filter>Windows\filters</Filter>
+    <None Include="..\filter\hq4x.dat">
+      <Filter>Core\filter</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>