Index: src/libchcore/libchcore.vc140.vcxproj.filters
===================================================================
diff -u -N -r1506d51ff1c0a5d156dab398051efc0c87473e81 -r3ccbdb8d3eac3427e6d3354854476e57fdc7ceb9
--- src/libchcore/libchcore.vc140.vcxproj.filters	(.../libchcore.vc140.vcxproj.filters)	(revision 1506d51ff1c0a5d156dab398051efc0c87473e81)
+++ src/libchcore/libchcore.vc140.vcxproj.filters	(.../libchcore.vc140.vcxproj.filters)	(revision 3ccbdb8d3eac3427e6d3354854476e57fdc7ceb9)
@@ -84,6 +84,12 @@
     <Filter Include="Source Files\Shared">
       <UniqueIdentifier>{0bd6a559-b992-4f1d-abe6-f8105a9d5f50}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Tools\Data Buffer\Queues">
+      <UniqueIdentifier>{94659973-1dd0-4e22-83c6-2fc26d3bf56e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\DataBuffer">
+      <UniqueIdentifier>{64486dcc-0c2a-468c-9498-c4ff0c2183af}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ESubTaskTypes.h">
@@ -350,9 +356,6 @@
     <ClInclude Include="TEvent.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
-    <ClInclude Include="TOverlappedDataBuffer.h">
-      <Filter>Source Files\Tools\Data Buffer</Filter>
-    </ClInclude>
     <ClInclude Include="RoundingFunctions.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
@@ -464,12 +467,33 @@
     <ClInclude Include="OverlappedCallbacks.h">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClInclude>
-    <ClInclude Include="TOrderedBufferQueue.h">
+    <ClInclude Include="TOverlappedMemoryPool.h">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClInclude>
-    <ClInclude Include="TOverlappedMemoryPool.h">
+    <ClInclude Include="TOverlappedReader.h">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClInclude>
+    <ClInclude Include="TOverlappedWriter.h">
+      <Filter>Source Files\Tools\Data Buffer</Filter>
+    </ClInclude>
+    <ClInclude Include="TBufferList.h">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClInclude>
+    <ClInclude Include="TFailedBufferQueue.h">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClInclude>
+    <ClInclude Include="TOrderedBufferQueue.h">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClInclude>
+    <ClInclude Include="TWriteBufferQueueWrapper.h">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClInclude>
+    <ClInclude Include="TOverlappedDataBuffer.h">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClInclude>
+    <ClInclude Include="TReadBufferQueueWrapper.h">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="TSubTaskArray.cpp">
@@ -739,24 +763,15 @@
     <ClCompile Include="TEvent.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
-    <ClCompile Include="TOverlappedDataBuffer.cpp">
-      <Filter>Source Files\Tools\Data Buffer</Filter>
-    </ClCompile>
     <ClCompile Include="TWin32ErrorFormatter.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
-    <ClCompile Include="Tests\TOverlappedDataBufferTests.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="TTaskConfigTracker.cpp">
       <Filter>Source Files\Task Config</Filter>
     </ClCompile>
     <ClCompile Include="TTaskConfigBufferSizes.cpp">
       <Filter>Source Files\Task Config</Filter>
     </ClCompile>
-    <ClCompile Include="Tests\TestsTBufferSizes.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="TBufferSizes.cpp">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClCompile>
@@ -847,17 +862,71 @@
     <ClCompile Include="TOverlappedReaderWriter.cpp">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClCompile>
-    <ClCompile Include="Tests\TOverlappedReaderWriterTests.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="OverlappedCallbacks.cpp">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClCompile>
-    <ClCompile Include="TOrderedBufferQueue.cpp">
+    <ClCompile Include="TOverlappedMemoryPool.cpp">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClCompile>
-    <ClCompile Include="TOverlappedMemoryPool.cpp">
+    <ClCompile Include="TOverlappedReader.cpp">
       <Filter>Source Files\Tools\Data Buffer</Filter>
     </ClCompile>
+    <ClCompile Include="TOverlappedWriter.cpp">
+      <Filter>Source Files\Tools\Data Buffer</Filter>
+    </ClCompile>
+    <ClCompile Include="TBufferList.cpp">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="TFailedBufferQueue.cpp">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="TOrderedBufferQueue.cpp">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="TWriteBufferQueueWrapper.cpp">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="TOverlappedDataBuffer.cpp">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="TReadBufferQueueWrapper.cpp">
+      <Filter>Source Files\Tools\Data Buffer\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TOverlappedReaderWriterTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TOverlappedDataBufferTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TestsTBufferSizes.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TBufferListTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TOverlappedMemoryPoolTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\OverlappedCallbacksTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TFailedBufferQueueTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TOrderedBufferQueueTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TOverlappedReaderTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TOverlappedWriterTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TReadBufferQueueWrapperTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TWriteBufferQueueWrapperTests.cpp">
+      <Filter>Tests\DataBuffer</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file