Index: src/libchengine/libchengine.vcxproj.filters
===================================================================
diff -u -N -r85b07e753393f661f7d8f528e4238ebb6e9e1204 -r301444777085263aae7aff911dd56722f302597e
--- src/libchengine/libchengine.vcxproj.filters	(.../libchengine.vcxproj.filters)	(revision 85b07e753393f661f7d8f528e4238ebb6e9e1204)
+++ src/libchengine/libchengine.vcxproj.filters	(.../libchengine.vcxproj.filters)	(revision 301444777085263aae7aff911dd56722f302597e)
@@ -27,9 +27,6 @@
     <Filter Include="Source Files\Tools">
       <UniqueIdentifier>{1fddd996-c723-4b09-9c98-868df98fe204}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Tools\SQLite">
-      <UniqueIdentifier>{e6da867d-b0bd-42d5-a0c8-43542984582f}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Tools\Config">
       <UniqueIdentifier>{e4894f9f-1e1d-451a-9a02-60b9d682b60f}</UniqueIdentifier>
     </Filter>
@@ -194,18 +191,6 @@
     <ClInclude Include="TTaskInfo.h">
       <Filter>Source Files\Task Manager</Filter>
     </ClInclude>
-    <ClInclude Include="TSQLiteDatabase.h">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteException.h">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteStatement.h">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteTransaction.h">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClInclude>
     <ClInclude Include="TSpeedTracker.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
@@ -227,12 +212,6 @@
     <ClInclude Include="TTaskBaseData.h">
       <Filter>Source Files\Task</Filter>
     </ClInclude>
-    <ClInclude Include="TPlainStringPool.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TObsoleteFiles.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TFeedbackHandlerWrapper.h">
       <Filter>Source Files\Feedback</Filter>
     </ClInclude>
@@ -311,9 +290,6 @@
     <ClInclude Include="TCoreEngine.h">
       <Filter>Source Files\Library files</Filter>
     </ClInclude>
-    <ClInclude Include="GTestMacros.h">
-      <Filter>Tests</Filter>
-    </ClInclude>
     <ClInclude Include="TOverlappedWriter.h">
       <Filter>Source Files\Filesystems\OverlappedIO\ReaderWriter</Filter>
     </ClInclude>
@@ -399,6 +375,12 @@
     <ClInclude Include="TBasePathDataContainer.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\GTestMacros.h">
+      <Filter>Tests</Filter>
+    </ClInclude>
+    <ClInclude Include="TObsoleteFiles.h">
+      <Filter>Source Files\Tools</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="TSubTaskArray.cpp">
@@ -485,18 +467,6 @@
     <ClCompile Include="TTaskInfo.cpp">
       <Filter>Source Files\Task Manager</Filter>
     </ClCompile>
-    <ClCompile Include="TSQLiteDatabase.cpp">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteException.cpp">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteStatement.cpp">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteTransaction.cpp">
-      <Filter>Source Files\Tools\SQLite</Filter>
-    </ClCompile>
     <ClCompile Include="TSpeedTracker.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
@@ -524,15 +494,9 @@
     <ClCompile Include="..\..\tests\tests_shared\TestsExports.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="TPlainStringPool.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="Tests\TestsTConfig.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="TObsoleteFiles.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="TFeedbackHandlerWrapper.cpp">
       <Filter>Source Files\Feedback</Filter>
     </ClCompile>
@@ -686,6 +650,15 @@
     <ClCompile Include="TBasePathDataContainer.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
+    <ClCompile Include="Tests\TestsWaitableQueue.cpp">
+      <Filter>Tests</Filter>
+    </ClCompile>
+    <ClCompile Include="Tests\TestsTThreadedQueueRunner.cpp">
+      <Filter>Tests</Filter>
+    </ClCompile>
+    <ClCompile Include="TObsoleteFiles.cpp">
+      <Filter>Source Files\Tools</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libchengine.rc">