Index: src/libchcore/libchcore.vc140.vcxproj.filters
===================================================================
diff -u -N -rb0a003dc39e6d21e34779cf1cf5d8a07318c1f5f -r7892d3d5ca43da7dca4d9e8e0c321c21c3e13ea0
--- src/libchcore/libchcore.vc140.vcxproj.filters	(.../libchcore.vc140.vcxproj.filters)	(revision b0a003dc39e6d21e34779cf1cf5d8a07318c1f5f)
+++ src/libchcore/libchcore.vc140.vcxproj.filters	(.../libchcore.vc140.vcxproj.filters)	(revision 7892d3d5ca43da7dca4d9e8e0c321c21c3e13ea0)
@@ -383,9 +383,6 @@
     <ClInclude Include="TFakeFileSerializer.h">
       <Filter>Source Files\Serialization\Fake</Filter>
     </ClInclude>
-    <ClInclude Include="TEvent.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="RoundingFunctions.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
@@ -558,6 +555,12 @@
     <ClInclude Include="TOverlappedThreadPool.h">
       <Filter>Source Files\Filesystems\OverlappedIO\ThreadSupport</Filter>
     </ClInclude>
+    <ClInclude Include="TEvent.h">
+      <Filter>Source Files\Tools\Threading</Filter>
+    </ClInclude>
+    <ClInclude Include="TEventGuard.h">
+      <Filter>Source Files\Tools\Threading</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="TSubTaskArray.cpp">
@@ -824,9 +827,6 @@
     <ClCompile Include="TFakeFileSerializer.cpp">
       <Filter>Source Files\Serialization\Fake</Filter>
     </ClCompile>
-    <ClCompile Include="TEvent.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="TWin32ErrorFormatter.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
@@ -1010,6 +1010,12 @@
     <ClCompile Include="TOverlappedThreadPool.cpp">
       <Filter>Source Files\Filesystems\OverlappedIO\ThreadSupport</Filter>
     </ClCompile>
+    <ClCompile Include="TEvent.cpp">
+      <Filter>Source Files\Tools\Threading</Filter>
+    </ClCompile>
+    <ClCompile Include="TEventGuard.cpp">
+      <Filter>Source Files\Tools\Threading</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libchcore.rc">