diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters
index c9a3d53b5..cc5a433ce 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj.filters
+++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters
@@ -151,12 +151,6 @@
     <ClCompile Include="Code\CaptureContext.cpp">
       <Filter>Code</Filter>
     </ClCompile>
-    <ClCompile Include="Code\CommonPipelineState.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Code\PersistantConfig.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
     <ClCompile Include="Widgets\TextureGoto.cpp">
       <Filter>Widgets</Filter>
     </ClCompile>
@@ -277,9 +271,6 @@
     <ClCompile Include="generated\moc_ConstantBufferPreviewer.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="Code\FormatElement.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
     <ClCompile Include="generated\moc_BufferViewer.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
@@ -466,18 +457,12 @@
     <ClCompile Include="Code\ScintillaSyntax.cpp">
       <Filter>Code</Filter>
     </ClCompile>
-    <ClCompile Include="Windows\DebugMessageView.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
     <ClCompile Include="generated\moc_DebugMessageView.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
     <ClCompile Include="generated\moc_StatisticsViewer.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="Windows\StatisticsViewer.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
     <ClCompile Include="Windows\Dialogs\SettingsDialog.cpp">
       <Filter>Windows\Dialogs</Filter>
     </ClCompile>
@@ -511,6 +496,21 @@
     <ClCompile Include="generated\moc_VirtualFileDialog.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
+    <ClCompile Include="Code\CommonPipelineState.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+    <ClCompile Include="Code\FormatElement.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
+    <ClCompile Include="Windows\DebugMessageView.cpp">
+      <Filter>Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="Windows\StatisticsViewer.cpp">
+      <Filter>Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="Code\PersistantConfig.cpp">
+      <Filter>Code</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="3rdparty\flowlayout\FlowLayout.h">
@@ -558,9 +558,6 @@
     <ClInclude Include="Code\CommonPipelineState.h">
       <Filter>Code</Filter>
     </ClInclude>
-    <ClInclude Include="Code\PersistantConfig.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
     <ClInclude Include="Widgets\TextureGoto.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -597,9 +594,6 @@
     <ClInclude Include="Code\QRDUtils.h">
       <Filter>Code</Filter>
     </ClInclude>
-    <ClInclude Include="Resources\resource.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
     <ClInclude Include="Code\qprocessinfo.h">
       <Filter>Code</Filter>
     </ClInclude>
@@ -870,18 +864,12 @@
     <ClInclude Include="Code\ScintillaSyntax.h">
       <Filter>Code</Filter>
     </ClInclude>
-    <ClInclude Include="Windows\DebugMessageView.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
     <ClInclude Include="generated\ui_DebugMessageView.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
     <ClInclude Include="generated\ui_StatisticsViewer.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
-    <ClInclude Include="Windows\StatisticsViewer.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
     <ClInclude Include="Windows\Dialogs\SettingsDialog.h">
       <Filter>Windows\Dialogs</Filter>
     </ClInclude>
@@ -912,6 +900,18 @@
     <ClInclude Include="generated\ui_VirtualFileDialog.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
+    <ClInclude Include="Windows\DebugMessageView.h">
+      <Filter>Windows</Filter>
+    </ClInclude>
+    <ClInclude Include="Windows\StatisticsViewer.h">
+      <Filter>Windows</Filter>
+    </ClInclude>
+    <ClInclude Include="Resources\resource.h">
+      <Filter>Resources</Filter>
+    </ClInclude>
+    <ClInclude Include="Code\PersistantConfig.h">
+      <Filter>Code</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="resources.qrc">
@@ -1148,8 +1148,6 @@
     <None Include="Windows\ShaderViewer.ui">
       <Filter>Windows</Filter>
     </None>
-    <None Include="Windows\DebugMessageView.ui" />
-    <None Include="Windows\StatisticsViewer.ui" />
     <None Include="Windows\Dialogs\SettingsDialog.ui">
       <Filter>Windows\Dialogs</Filter>
     </None>
@@ -1162,6 +1160,12 @@
     <None Include="Windows\Dialogs\VirtualFileDialog.ui">
       <Filter>Windows\Dialogs</Filter>
     </None>
+    <None Include="Windows\StatisticsViewer.ui">
+      <Filter>Windows</Filter>
+    </None>
+    <None Include="Windows\DebugMessageView.ui">
+      <Filter>Windows</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="generated\ui_AboutDialog.h">