Index: src/ch/ch.vc140.vcxproj.filters
===================================================================
diff -u -N -r1c366a50e84393bce67e50dcccc4fc5ff147db27 -r814b694086d5dc450efb6a5e5c6902145ddc07fd
--- src/ch/ch.vc140.vcxproj.filters	(.../ch.vc140.vcxproj.filters)	(revision 1c366a50e84393bce67e50dcccc4fc5ff147db27)
+++ src/ch/ch.vc140.vcxproj.filters	(.../ch.vc140.vcxproj.filters)	(revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
@@ -58,6 +58,12 @@
     <Filter Include="Source Files\GUI\Dialogs\Feedback">
       <UniqueIdentifier>{7a5ae1dd-a331-406c-a572-4997184a5725}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\GUI\Dialogs\Feedback rule editor">
+      <UniqueIdentifier>{8c3e3738-a438-429e-8ad7-0dc13303f711}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\GUI\Utils">
+      <UniqueIdentifier>{706a4df6-9c2d-4ee9-aef5-b0ff6d19d94d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\ipcstructs.h">
@@ -105,9 +111,6 @@
     <ClInclude Include="MainWnd.h">
       <Filter>Source Files\GUI</Filter>
     </ClInclude>
-    <ClInclude Include="MemDC.h">
-      <Filter>Source Files\GUI</Filter>
-    </ClInclude>
     <ClInclude Include="Theme Helpers.h">
       <Filter>Source Files\GUI</Filter>
     </ClInclude>
@@ -255,6 +258,30 @@
     <ClInclude Include="resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
+    <ClInclude Include="RuleEditAlreadyExistsDlg.h">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClInclude>
+    <ClInclude Include="RuleEditDlg.h">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClInclude>
+    <ClInclude Include="RuleEditErrorDlg.h">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClInclude>
+    <ClInclude Include="RuleEditNotEnoughSpaceDlg.h">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClInclude>
+    <ClInclude Include="ComboDataWrapper.h">
+      <Filter>Source Files\GUI\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="FilterTypesMenuWrapper.h">
+      <Filter>Source Files\GUI\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="GuiOptions.h">
+      <Filter>Source Files\Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="TaskContextMenu.h">
+      <Filter>Source Files\Tools</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\common\TShellExtMenuConfig.cpp">
@@ -437,6 +464,27 @@
     <ClCompile Include="AppAutorun.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
+    <ClCompile Include="RuleEditAlreadyExistsDlg.cpp">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClCompile>
+    <ClCompile Include="RuleEditDlg.cpp">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClCompile>
+    <ClCompile Include="RuleEditErrorDlg.cpp">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClCompile>
+    <ClCompile Include="RuleEditNotEnoughSpaceDlg.cpp">
+      <Filter>Source Files\GUI\Dialogs\Feedback rule editor</Filter>
+    </ClCompile>
+    <ClCompile Include="FilterTypesMenuWrapper.cpp">
+      <Filter>Source Files\GUI\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="GuiOptions.cpp">
+      <Filter>Source Files\Tools</Filter>
+    </ClCompile>
+    <ClCompile Include="TaskContextMenu.cpp">
+      <Filter>Source Files\Tools</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\ch.rc2">