Index: src/libchengine/TSizeFormatter.cpp
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/TSizeFormatter.cpp	(.../TSizeFormatter.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/TSizeFormatter.cpp	(.../TSizeFormatter.cpp)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -94,7 +94,7 @@
 	bool TSizeFormatter::ReadFromConfig(chengine::TConfig& rConfig, PCTSTR pszNodeName)
 	{
 		std::wstring strBuffer;
-		chengine::TString strValue;
+		string::TString strValue;
 
 		if(!GetConfigValue(rConfig, Concat(strBuffer, pszNodeName, _T("Bytes")), strValue))
 			return false;
Index: src/libchengine/TSpeedTracker.cpp
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/TSpeedTracker.cpp	(.../TSpeedTracker.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/TSpeedTracker.cpp	(.../TSpeedTracker.cpp)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -2,12 +2,15 @@
 #include "TSpeedTracker.h"
 #include <boost/numeric/conversion/cast.hpp>
 #include <numeric>
-#include "ErrorCodes.h"
-#include "TCoreException.h"
-#include "MathFunctions.h"
+#include "../libchcore/ErrorCodes.h"
 #include <boost/lexical_cast.hpp>
-#include "TStringArray.h"
+#include "../libchcore/TCoreException.h"
+#include "../libchcore/MathFunctions.h"
+#include "../libstring/TStringArray.h"
 
+using namespace chcore;
+using namespace string;
+
 namespace chengine
 {
 	TSpeedTracker::TSpeedTracker(unsigned long long ullTrackTime, unsigned long long ullSampleTime) :
Index: src/libchengine/TSpeedTracker.h
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/TSpeedTracker.h	(.../TSpeedTracker.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/TSpeedTracker.h	(.../TSpeedTracker.h)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -1,7 +1,7 @@
 #ifndef __TSPEEDTRACKER_H__
 #define __TSPEEDTRACKER_H__
 
-#include "TString.h"
+#include "../libstring/TString.h"
 
 namespace chengine
 {
@@ -19,8 +19,8 @@
 		// retrieves speed per second
 		double GetSpeed() const;
 
-		TString ToString() const;
-		void FromString(const TString& strData);
+		string::TString ToString() const;
+		void FromString(const string::TString& strData);
 
 	private:
 		static double NormalizeValueByTime(unsigned long long ullValue, unsigned long long ullTime, unsigned long long ullNormalizeTime = 1000);
Index: src/libchengine/TaskID.h
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/TaskID.h	(.../TaskID.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/TaskID.h	(.../TaskID.h)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -19,11 +19,11 @@
 #ifndef __TASKID_H__
 #define __TASKID_H__
 
-#include "SerializerDataTypes.h"
+#include "../libserializer/SerializerDataTypes.h"
 
 namespace chengine
 {
-	typedef object_id_t taskid_t;
+	typedef serializer::object_id_t taskid_t;
 	enum ENoTaskID { NoTaskID = 0 };
 }
 
Index: src/libchengine/Tests/TestsTConfig.cpp
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/Tests/TestsTConfig.cpp	(.../TestsTConfig.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTConfig.cpp	(.../TestsTConfig.cpp)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -6,10 +6,12 @@
 #include <codecvt>
 #include <boost/algorithm/string/replace.hpp>
 #include "../TConfig.h"
-#include "../TStringArray.h"
 #include "../TConfigArray.h"
+#include "../../libstring/TStringArray.h"
 
 using namespace chengine;
+using namespace string;
+using namespace chcore;
 
 namespace
 {
Index: src/libchengine/Tests/TestsTDestinationPathProvider.cpp
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/Tests/TestsTDestinationPathProvider.cpp	(.../TestsTDestinationPathProvider.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTDestinationPathProvider.cpp	(.../TestsTDestinationPathProvider.cpp)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -7,6 +7,8 @@
 
 using namespace testing;
 using namespace chengine;
+using namespace string;
+using namespace chcore;
 
 class IFilesystemMock : public IFilesystem
 {
Index: src/libchengine/Tests/TestsTModificationTracker.cpp
===================================================================
diff -u -N
--- src/libchengine/Tests/TestsTModificationTracker.cpp	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTModificationTracker.cpp	(revision 0)
@@ -1,128 +0,0 @@
-#include "stdafx.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "../TModificationTracker.h"
-#include "../TString.h"
-
-using namespace chengine;
-
-TEST(TModificationTrackerTests, DefaultConstructor)
-{
-	TModificationTracker<TString> tracker;
-
-	EXPECT_TRUE(tracker.IsModified());
-	EXPECT_EQ(TString(), tracker);
-	EXPECT_FALSE(tracker.IsAdded());
-}
-
-TEST(TModificationTrackerTests, ValueConstructor_NotAdded)
-{
-	TModificationTracker<TString> tracker(L"SomeString", false);
-
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-	EXPECT_TRUE(tracker.IsModified());
-	EXPECT_FALSE(tracker.IsAdded());
-}
-
-TEST(TModificationTrackerTests, ValueConstructor_Added)
-{
-	TModificationTracker<TString> tracker(L"SomeString", true);
-
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-	EXPECT_TRUE(tracker.IsModified());
-	EXPECT_TRUE(tracker.IsAdded());
-}
-
-TEST(TModificationTrackerTests, CopyConstructor_NotAdded)
-{
-	TModificationTracker<TString> tracker(L"SomeString", false);
-	TModificationTracker<TString> tracker2(tracker);
-
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-	EXPECT_TRUE(tracker2.IsModified());
-	EXPECT_FALSE(tracker2.IsAdded());
-}
-
-TEST(TModificationTrackerTests, CopyConstructor_Added)
-{
-	TModificationTracker<TString> tracker(L"SomeString", true);
-	TModificationTracker<TString> tracker2(tracker);
-
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-	EXPECT_TRUE(tracker2.IsModified());
-	EXPECT_TRUE(tracker2.IsAdded());
-}
-
-///////////////////////////////////////////////////////////////////////////
-TEST(TModificationTrackerTests, AssignmentOperator_ModificationTracker_NotAdded)
-{
-	TModificationTracker<TString> tracker(L"SomeString", false);
-	TModificationTracker<TString> tracker2;
-	
-	tracker2 = tracker;
-
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-	EXPECT_TRUE(tracker2.IsModified());
-	EXPECT_FALSE(tracker2.IsAdded());
-}
-
-TEST(TModificationTrackerTests, AssignmentOperator_ModificationTracker_Added)
-{
-	TModificationTracker<TString> tracker(L"SomeString", true);
-	TModificationTracker<TString> tracker2;
-
-	tracker2 = tracker;
-
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-	EXPECT_TRUE(tracker2.IsModified());
-	EXPECT_TRUE(tracker2.IsAdded());
-}
-
-TEST(TModificationTrackerTests, AssignmentOperator_ValueModified)
-{
-	TModificationTracker<TString> tracker(L"SomeString", false);
-	tracker.ClearModifications();
-
-	tracker = L"OtherString";
-
-	EXPECT_EQ(TString(L"OtherString"), tracker);
-	EXPECT_TRUE(tracker.IsModified());
-	EXPECT_FALSE(tracker.IsAdded());
-}
-
-TEST(TModificationTrackerTests, AssignmentOperator_ValueNotModified)
-{
-	TModificationTracker<TString> tracker(L"SomeString", false);
-	tracker.ClearModifications();
-
-	tracker = L"SomeString";
-
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-	EXPECT_FALSE(tracker.IsModified());
-	EXPECT_FALSE(tracker.IsAdded());
-}
-
-///////////////////////////////////////////////////////////////////////////
-TEST(TModificationTrackerTests, Modify)
-{
-	TModificationTracker<TString> tracker(L"SomeString", false);
-	tracker.ClearModifications();
-
-	tracker.Modify() = L"SomeString";
-
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-	EXPECT_TRUE(tracker.IsModified());
-	EXPECT_FALSE(tracker.IsAdded());
-}
-
-///////////////////////////////////////////////////////////////////////////
-TEST(TModificationTrackerTests, IsModified_IsAdded_ClearModifications)
-{
-	TModificationTracker<TString> tracker(L"SomeString", true);
-	EXPECT_TRUE(tracker.IsModified());
-	EXPECT_TRUE(tracker.IsAdded());
-
-	tracker.ClearModifications();
-	EXPECT_FALSE(tracker.IsModified());
-	EXPECT_FALSE(tracker.IsAdded());
-}
Index: src/libchengine/Tests/TestsTSQLiteDatabase.cpp
===================================================================
diff -u -N
--- src/libchengine/Tests/TestsTSQLiteDatabase.cpp	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTSQLiteDatabase.cpp	(revision 0)
@@ -1,14 +0,0 @@
-#include "stdafx.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "../TSQLiteDatabase.h"
-
-using namespace chengine;
-using namespace sqlite;
-
-TEST(SQLiteDatabase, CreationWithVerification)
-{
-	TSQLiteDatabase db(PathFromString(_T(":memory:")));
-	EXPECT_TRUE(db.GetHandle() != nullptr);
-	EXPECT_FALSE(db.GetInTransaction());
-}
Index: src/libchengine/Tests/TestsTSQLiteStatement.cpp
===================================================================
diff -u -N
--- src/libchengine/Tests/TestsTSQLiteStatement.cpp	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTSQLiteStatement.cpp	(revision 0)
@@ -1,109 +0,0 @@
-#include "stdafx.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "../TSQLiteDatabase.h"
-#include "../TSQLiteStatement.h"
-#include "../TSQLiteException.h"
-
-using namespace chengine;
-using namespace sqlite;
-
-TEST(SQLiteStatement, CorrectPrepare)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	tStatement.Prepare(_T("CREATE TABLE test(col1 INTEGER, col2 VARCHAR(40))"));
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-}
-
-TEST(SQLiteStatement, IncorrectPrepare)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	EXPECT_THROW(tStatement.Prepare(_T("CREATE incorrect TABLE test(col1 INTEGER, col2 VARCHAR(40))")), TSQLiteException);
-}
-
-TEST(SQLiteStatement, PreparedStep)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	tStatement.Prepare(_T("CREATE TABLE test(col1 INTEGER, col2 VARCHAR(40))"));
-	EXPECT_EQ(tStatement.Step(), TSQLiteStatement::eStep_Finished);
-}
-
-TEST(SQLiteStatement, UnpreparedStep)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	EXPECT_THROW(tStatement.Step(), TSQLiteException);
-}
-
-TEST(SQLiteStatement, UnpreparedBind)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	// insert data
-	EXPECT_THROW(tStatement.BindValue(1, 54), TSQLiteException);
-}
-
-TEST(SQLiteStatement, InsertAndRetrieveData)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	// create schema
-	tStatement.Prepare(_T("CREATE TABLE test(col1 INTEGER, col2 VARCHAR(40))"));
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-
-	// insert data
-	tStatement.Prepare(_T("INSERT INTO test(col1, col2) VALUES(?1, ?2)"));
-	tStatement.BindValue(1, 54);
-	tStatement.BindValue(2, _T("Some Value"));
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-
-	// retrieve data
-	tStatement.Prepare(_T("SELECT col2, col1 FROM test"));
-	EXPECT_EQ(TSQLiteStatement::eStep_HasRow, tStatement.Step());
-	EXPECT_EQ(54, tStatement.GetInt(1));
-	EXPECT_EQ(TString(_T("Some Value")), tStatement.GetText(0));
-}
-
-TEST(SQLiteStatement, ClearBindings)
-{
-	TSQLiteDatabasePtr spDB(new TSQLiteDatabase(PathFromString(_T(":memory:"))));
-	TSQLiteStatement tStatement(spDB);
-
-	// create schema
-	tStatement.Prepare(_T("CREATE TABLE test(col1 INTEGER, col2 VARCHAR(40))"));
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-
-	// insert data
-	tStatement.Prepare(_T("INSERT INTO test(col1, col2) VALUES(?1, ?2)"));
-
-	tStatement.BindValue(1, 54);
-	tStatement.BindValue(2, _T("Some Value"));
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-
-	tStatement.BindValue(1, 32);
-	tStatement.BindValue(2, _T("???"));
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-
-	// retrieve data
-	tStatement.Prepare(_T("SELECT col2, col1 FROM test ORDER BY col1"));
-	EXPECT_EQ(TSQLiteStatement::eStep_HasRow, tStatement.Step());
-
-	EXPECT_EQ(32, tStatement.GetInt(1));
-	EXPECT_EQ(TString(_T("???")), tStatement.GetText(0));
-
-	EXPECT_EQ(TSQLiteStatement::eStep_HasRow, tStatement.Step());
-
-	EXPECT_EQ(54, tStatement.GetInt(1));
-	EXPECT_EQ(TString(_T("Some Value")), tStatement.GetText(0));
-
-	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
-}
Index: src/libchengine/Tests/TestsTSharedModificationTracker.cpp
===================================================================
diff -u -N
--- src/libchengine/Tests/TestsTSharedModificationTracker.cpp	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTSharedModificationTracker.cpp	(revision 0)
@@ -1,193 +0,0 @@
-#include "stdafx.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "../TSharedModificationTracker.h"
-#include <bitset>
-#include "../TString.h"
-
-using namespace chengine;
-
-TEST(TSharedModificationTrackerTests, DefaultConstructor)
-{
-	enum { eMyElement, eLast };
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-
-	EXPECT_EQ(true, tracker.IsModified());
-	EXPECT_EQ(true, setBits[eMyElement]);
-	EXPECT_EQ(TString(), tracker);
-}
-
-TEST(TSharedModificationTrackerTests, AlmostCopyConstructor_Modified)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-
-	std::bitset<eLast> setBits2;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker2(tracker, setBits2);
-
-	EXPECT_EQ(true, tracker2.IsModified());
-	EXPECT_EQ(true, setBits2[eMyElement]);
-	EXPECT_EQ(TString(), tracker2);
-}
-
-TEST(TSharedModificationTrackerTests, AlmostCopyConstructor_Modified_WithValue)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-	tracker = L"SomeString";
-
-	std::bitset<eLast> setBits2;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker2(tracker, setBits2);
-
-	EXPECT_EQ(true, tracker2.IsModified());
-	EXPECT_EQ(true, setBits2[eMyElement]);
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-}
-
-TEST(TSharedModificationTrackerTests, AlmostCopyConstructor_Unmodified)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-	tracker.MarkAsUnmodified();
-
-	std::bitset<eLast> setBits2;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker2(tracker, setBits2);
-
-	EXPECT_EQ(false, tracker2.IsModified());
-	EXPECT_EQ(false, setBits2[eMyElement]);
-}
-
-TEST(TSharedModificationTrackerTests, AlmostCopyConstructor_Unmodified_WithValue)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-	tracker = L"SomeString";
-	tracker.MarkAsUnmodified();
-
-	std::bitset<eLast> setBits2;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker2(tracker, setBits2);
-
-	EXPECT_EQ(false, tracker2.IsModified());
-	EXPECT_EQ(false, setBits2[eMyElement]);
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-}
-
-TEST(TSharedModificationTrackerTests, ConstructorWithValue)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits, L"SomeString");
-
-	EXPECT_EQ(true, tracker.IsModified());
-	EXPECT_EQ(true, setBits[eMyElement]);
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-}
-
-///////////////////////////////////////////////////////////////////////////
-TEST(TSharedModificationTrackerTests, AssignmentOperator_SharedTracker)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits, L"SomeString");
-
-	std::bitset<eLast> setBits2;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker2(setBits2);
-	tracker2 = tracker;
-
-	EXPECT_EQ(true, tracker2.IsModified());
-	EXPECT_EQ(true, setBits2[eMyElement]);
-	EXPECT_EQ(TString(L"SomeString"), tracker2);
-}
-
-TEST(TSharedModificationTrackerTests, AssignmentOperator_OtherValue_ModifiesValue)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-
-	tracker = L"SomeString";
-
-	EXPECT_EQ(true, tracker.IsModified());
-	EXPECT_EQ(true, setBits[eMyElement]);
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-}
-
-TEST(TSharedModificationTrackerTests, AssignmentOperator_OtherValue_DoesNotModifyValue)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits);
-
-	tracker = L"SomeString";
-
-	EXPECT_EQ(true, tracker.IsModified());
-	EXPECT_EQ(true, setBits[eMyElement]);
-	EXPECT_EQ(TString(L"SomeString"), tracker);
-}
-
-///////////////////////////////////////////////////////////////////////////
-TEST(TSharedModificationTrackerTests, Modify)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits, L"SomeString");
-	tracker.MarkAsUnmodified();
-
-	tracker.Modify() = L"OtherString";
-
-	EXPECT_EQ(true, tracker.IsModified());
-	EXPECT_EQ(true, setBits[eMyElement]);
-	EXPECT_EQ(TString(L"OtherString"), tracker);
-}
-
-///////////////////////////////////////////////////////////////////////////
-TEST(TSharedModificationTrackerTests, MarkAsModified_MarkAsUnmodified)
-{
-	enum
-	{
-		eMyElement, eLast
-	};
-	std::bitset<eLast> setBits;
-	TSharedModificationTracker<TString, std::bitset<eLast>, eMyElement> tracker(setBits, L"SomeString");
-
-	EXPECT_EQ(true, tracker.IsModified());
-
-	tracker.MarkAsUnmodified();
-	EXPECT_EQ(false, tracker.IsModified());
-
-	tracker.MarkAsModified();
-	EXPECT_EQ(true, tracker.IsModified());
-}
Index: src/libchengine/Tests/TestsTSpeedTracker.cpp
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/Tests/TestsTSpeedTracker.cpp	(.../TestsTSpeedTracker.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/Tests/TestsTSpeedTracker.cpp	(.../TestsTSpeedTracker.cpp)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -2,7 +2,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 #include "../TSpeedTracker.h"
-#include "../TCoreException.h"
+#include "../../libchcore/TCoreException.h"
 
 using namespace chengine;
 
@@ -88,7 +88,7 @@
 	TSpeedTracker tTracker(1000, 100);		// track last second with 100ms samples
 	tTracker.AddSample(0, 0);			// start
 	tTracker.AddSample(8000, 110);
-	EXPECT_THROW(tTracker.AddSample(4000, 40), TCoreException);
+	EXPECT_THROW(tTracker.AddSample(4000, 40), chcore::TCoreException);
 }
 
 TEST(TSpeedTrackerTests, MultipleSamplesCornerCase_VeryLargeInterval)
@@ -160,9 +160,9 @@
 TEST(TSpeedTrackerTests, ConstructionWithBadParams)
 {
 	// zero length sample is not allowed
-	EXPECT_THROW(TSpeedTracker tTracker(5000, 0), TCoreException);
+	EXPECT_THROW(TSpeedTracker tTracker(5000, 0), chcore::TCoreException);
 	// tracking time less than sample time is not allowed
-	EXPECT_THROW(TSpeedTracker tTracker(0, 1000), TCoreException);
+	EXPECT_THROW(TSpeedTracker tTracker(0, 1000), chcore::TCoreException);
 }
 
 TEST(TSpeedTrackerTests, MultipleVeryShortSamplesWithZeroIntervalData_CornerCase)
Index: src/libchengine/libchengine.vcxproj.filters
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libchengine/libchengine.vcxproj.filters	(.../libchengine.vcxproj.filters)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libchengine/libchengine.vcxproj.filters	(.../libchengine.vcxproj.filters)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -27,15 +27,6 @@
     <Filter Include="Source Files\Tools">
       <UniqueIdentifier>{1fddd996-c723-4b09-9c98-868df98fe204}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Serialization">
-      <UniqueIdentifier>{2a642b1a-83b2-4643-ac85-d040e8904d4d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Serialization\SQLite">
-      <UniqueIdentifier>{3ce71f46-ef32-4c71-9ac0-bcb36d6b6e99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Serialization\SQLite\SQLite Schemas">
-      <UniqueIdentifier>{0b6550bf-a20b-4f12-9469-bd3e3bfa40fa}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Tools\SQLite">
       <UniqueIdentifier>{e6da867d-b0bd-42d5-a0c8-43542984582f}</UniqueIdentifier>
     </Filter>
@@ -45,18 +36,12 @@
     <Filter Include="Source Files\Tools\Config\details">
       <UniqueIdentifier>{0f10fd6b-7813-419a-a276-cedaa42bc7bc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Tools\ModificationTrackers">
-      <UniqueIdentifier>{d920c603-b44c-47ce-89c3-ead84fc29116}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Tests">
       <UniqueIdentifier>{b7eef53f-fb70-4f50-aa6d-0a699bb20f25}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Stats">
       <UniqueIdentifier>{28670d3c-b5d8-4acb-91aa-c886efae641c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Serialization\Fake">
-      <UniqueIdentifier>{9d121063-367c-4424-8009-12b3635e0fed}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Filesystems">
       <UniqueIdentifier>{30d60be9-a936-4191-a66d-64e127f3d258}</UniqueIdentifier>
     </Filter>
@@ -66,9 +51,6 @@
     <Filter Include="Source Files\Filesystems\Local">
       <UniqueIdentifier>{3de9b5f5-44fa-4e4b-9a63-f93d940d537a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Tools\Exceptions">
-      <UniqueIdentifier>{a77c6575-b7b7-4683-9295-d5173da8c76b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Filesystems\Exceptions">
       <UniqueIdentifier>{b5e932b3-5a5a-465b-8ade-3354c81e1996}</UniqueIdentifier>
     </Filter>
@@ -161,9 +143,6 @@
     <ClInclude Include="TTaskManagerStatsSnapshot.h">
       <Filter>Source Files\Task Manager</Filter>
     </ClInclude>
-    <ClInclude Include="TAutoHandles.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TBasePathData.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
@@ -185,96 +164,24 @@
     <ClInclude Include="stdafx.h">
       <Filter>Source Files\Library files</Filter>
     </ClInclude>
-    <ClInclude Include="ErrorCodes.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TConfigSerializers.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
     <ClInclude Include="TDateTime.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
-    <ClInclude Include="TPath.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TSharedMemory.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TString.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TStringArray.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TStringSet.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TTaskDefinition.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
     <ClInclude Include="TTaskOperationPlan.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
-    <ClInclude Include="TWorkerThreadController.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="IFeedbackHandler.h">
       <Filter>Source Files\Feedback</Filter>
     </ClInclude>
     <ClInclude Include="IFeedbackHandlerFactory.h">
       <Filter>Source Files\Feedback</Filter>
     </ClInclude>
-    <ClInclude Include="ISQLiteSerializerSchema.h">
-      <Filter>Source Files\Serialization\SQLite\SQLite Schemas</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteTaskManagerSchema.h">
-      <Filter>Source Files\Serialization\SQLite\SQLite Schemas</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteTaskSchema.h">
-      <Filter>Source Files\Serialization\SQLite\SQLite Schemas</Filter>
-    </ClInclude>
-    <ClInclude Include="TSerializerVersion.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteColumnDefinition.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteSerializer.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteSerializerContainer.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteSerializerFactory.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteSerializerRowData.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="TSQLiteSerializerRowReader.h">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClInclude>
-    <ClInclude Include="IColumnsDefinition.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="ISerializer.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="ISerializerContainer.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="ISerializerFactory.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="ISerializerRowData.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="ISerializerRowReader.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="TSerializerException.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
     <ClInclude Include="TSubTaskArrayStatsSnapshot.h">
       <Filter>Source Files\SubTasks</Filter>
     </ClInclude>
@@ -299,27 +206,9 @@
     <ClInclude Include="TSQLiteTransaction.h">
       <Filter>Source Files\Tools\SQLite</Filter>
     </ClInclude>
-    <ClInclude Include="ITimestampProvider.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="MathFunctions.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TPathContainer.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TSimpleTimer.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TSpeedTracker.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
-    <ClInclude Include="TStringException.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TTimestampProviderTickCount.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TConfig.h">
       <Filter>Source Files\Tools\Config</Filter>
     </ClInclude>
@@ -335,21 +224,9 @@
     <ClInclude Include="TConfigNotifier.h">
       <Filter>Source Files\Tools\Config</Filter>
     </ClInclude>
-    <ClInclude Include="TSharedModificationTracker.h">
-      <Filter>Source Files\Tools\ModificationTrackers</Filter>
-    </ClInclude>
-    <ClInclude Include="TModificationTracker.h">
-      <Filter>Source Files\Tools\ModificationTrackers</Filter>
-    </ClInclude>
-    <ClInclude Include="TRemovedObjects.h">
-      <Filter>Source Files\Serialization</Filter>
-    </ClInclude>
     <ClInclude Include="TTaskBaseData.h">
       <Filter>Source Files\Task</Filter>
     </ClInclude>
-    <ClInclude Include="TFileTime.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TPlainStringPool.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
@@ -374,15 +251,6 @@
     <ClInclude Include="EFeedbackResult.h">
       <Filter>Source Files\Feedback</Filter>
     </ClInclude>
-    <ClInclude Include="TFakeFileSerializer.h">
-      <Filter>Source Files\Serialization\Fake</Filter>
-    </ClInclude>
-    <ClInclude Include="RoundingFunctions.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TWin32ErrorFormatter.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="TTaskConfigTracker.h">
       <Filter>Source Files\Task Config</Filter>
     </ClInclude>
@@ -395,12 +263,6 @@
     <ClInclude Include="EFileError.h">
       <Filter>Source Files\Feedback</Filter>
     </ClInclude>
-    <ClInclude Include="TStringPattern.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TStringPatternArray.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="IFilesystem.h">
       <Filter>Source Files\Filesystems</Filter>
     </ClInclude>
@@ -425,9 +287,6 @@
     <ClInclude Include="TLocalFilesystemFind.h">
       <Filter>Source Files\Filesystems\Local</Filter>
     </ClInclude>
-    <ClInclude Include="SerializerDataTypes.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="CommonDataTypes.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
@@ -437,15 +296,6 @@
     <ClInclude Include="ETaskCurrentState.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
-    <ClInclude Include="TBaseException.h">
-      <Filter>Source Files\Tools\Exceptions</Filter>
-    </ClInclude>
-    <ClInclude Include="TCoreException.h">
-      <Filter>Source Files\Tools\Exceptions</Filter>
-    </ClInclude>
-    <ClInclude Include="TCoreWin32Exception.h">
-      <Filter>Source Files\Tools\Exceptions</Filter>
-    </ClInclude>
     <ClInclude Include="TFileException.h">
       <Filter>Source Files\Filesystems\Exceptions</Filter>
     </ClInclude>
@@ -461,9 +311,6 @@
     <ClInclude Include="TCoreEngine.h">
       <Filter>Source Files\Library files</Filter>
     </ClInclude>
-    <ClInclude Include="StreamingHelpers.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="GTestMacros.h">
       <Filter>Tests</Filter>
     </ClInclude>
@@ -497,12 +344,6 @@
     <ClInclude Include="TSizeFormatter.h">
       <Filter>Source Files\Tools</Filter>
     </ClInclude>
-    <ClInclude Include="TIpcMutex.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="TIpcMutexLock.h">
-      <Filter>Source Files\Tools</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h" />
     <ClInclude Include="EngineConstants.h">
       <Filter>Source Files\Shared</Filter>
@@ -620,87 +461,18 @@
     <ClCompile Include="TDateTime.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
-    <ClCompile Include="TPath.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TSharedMemory.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TString.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TStringArray.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TStringSet.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="TTaskDefinition.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
     <ClCompile Include="TTaskOperationPlan.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
-    <ClCompile Include="TWorkerThreadController.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="IFeedbackHandler.cpp">
       <Filter>Source Files\Feedback</Filter>
     </ClCompile>
     <ClCompile Include="IFeedbackHandlerFactory.cpp">
       <Filter>Source Files\Feedback</Filter>
     </ClCompile>
-    <ClCompile Include="ISQLiteSerializerSchema.cpp">
-      <Filter>Source Files\Serialization\SQLite\SQLite Schemas</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteTaskManagerSchema.cpp">
-      <Filter>Source Files\Serialization\SQLite\SQLite Schemas</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteTaskSchema.cpp">
-      <Filter>Source Files\Serialization\SQLite\SQLite Schemas</Filter>
-    </ClCompile>
-    <ClCompile Include="TSerializerVersion.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteColumnDefinition.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteSerializer.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteSerializerContainer.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteSerializerFactory.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteSerializerRowData.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="TSQLiteSerializerRowReader.cpp">
-      <Filter>Source Files\Serialization\SQLite</Filter>
-    </ClCompile>
-    <ClCompile Include="IColumnsDefinition.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="ISerializer.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="ISerializerContainer.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="ISerializerFactory.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="ISerializerRowData.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="ISerializerRowReader.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="TSerializerException.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
     <ClCompile Include="TSubTaskArrayStatsSnapshot.cpp">
       <Filter>Source Files\SubTasks</Filter>
     </ClCompile>
@@ -722,24 +494,9 @@
     <ClCompile Include="TSQLiteTransaction.cpp">
       <Filter>Source Files\Tools\SQLite</Filter>
     </ClCompile>
-    <ClCompile Include="MathFunctions.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TPathContainer.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TSimpleTimer.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="TSpeedTracker.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
-    <ClCompile Include="TStringException.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TTimestampProviderTickCount.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="TConfig.cpp">
       <Filter>Source Files\Tools\Config</Filter>
     </ClCompile>
@@ -755,36 +512,12 @@
     <ClCompile Include="TConfigNotifier.cpp">
       <Filter>Source Files\Tools\Config</Filter>
     </ClCompile>
-    <ClCompile Include="TRemovedObjects.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
     <ClCompile Include="TTaskBaseData.cpp">
       <Filter>Source Files\Task</Filter>
     </ClCompile>
-    <ClCompile Include="TFileTime.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTSimpleTimer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTSmartPath.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="Tests\TestsTSpeedTracker.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="Tests\TestsTSQLiteDatabase.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTSQLiteStatement.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTSQLiteTransaction.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTString.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\tests\tests_shared\TestsExports.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -812,39 +545,15 @@
     <ClCompile Include="TFeedbackHandlerBase.cpp">
       <Filter>Source Files\Feedback</Filter>
     </ClCompile>
-    <ClCompile Include="TFakeFileSerializer.cpp">
-      <Filter>Source Files\Serialization\Fake</Filter>
-    </ClCompile>
-    <ClCompile Include="TWin32ErrorFormatter.cpp">
-      <Filter>Source Files\Tools</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\TestsTModificationTracker.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTSharedModificationTracker.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="TStringPattern.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TStringPatternArray.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="Tests\TestsTStringPatternArray.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="Tests\TestsTFileFilter.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="Tests\TestsTStringPattern.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="IFilesystem.cpp">
       <Filter>Source Files\Filesystems</Filter>
     </ClCompile>
@@ -863,15 +572,6 @@
     <ClCompile Include="TLocalFilesystemFind.cpp">
       <Filter>Source Files\Filesystems\Local</Filter>
     </ClCompile>
-    <ClCompile Include="TBaseException.cpp">
-      <Filter>Source Files\Tools\Exceptions</Filter>
-    </ClCompile>
-    <ClCompile Include="TCoreException.cpp">
-      <Filter>Source Files\Tools\Exceptions</Filter>
-    </ClCompile>
-    <ClCompile Include="TCoreWin32Exception.cpp">
-      <Filter>Source Files\Tools\Exceptions</Filter>
-    </ClCompile>
     <ClCompile Include="TFileException.cpp">
       <Filter>Source Files\Filesystems\Exceptions</Filter>
     </ClCompile>
@@ -947,12 +647,6 @@
     <ClCompile Include="TSizeFormatter.cpp">
       <Filter>Source Files\Tools</Filter>
     </ClCompile>
-    <ClCompile Include="TIpcMutex.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="TIpcMutexLock.cpp">
-      <Filter>Source Files\Tools</Filter>
-    </ClCompile>
     <ClCompile Include="TFilesystemFeedbackWrapper.cpp">
       <Filter>Source Files\Filesystems\OverlappedIO\Feedback Wrappers</Filter>
     </ClCompile>
Index: src/libstring/Tests/TestsTString.cpp
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a
--- src/libstring/Tests/TestsTString.cpp	(.../TestsTString.cpp)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/libstring/Tests/TestsTString.cpp	(.../TestsTString.cpp)	(revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a)
@@ -4,7 +4,6 @@
 #include "../TString.h"
 #include "../TStringException.h"
 #include "../TStringArray.h"
-#include "../TCoreException.h"
 
 using namespace string;
 
@@ -426,7 +425,7 @@
 	EXPECT_EQ(arrSplitted.GetAt(6), _T(""));
 	EXPECT_EQ(arrSplitted.GetAt(7), _T(""));
 	EXPECT_EQ(arrSplitted.GetAt(8), _T(""));
-	EXPECT_THROW(arrSplitted.GetAt(9), TCoreException);
+	EXPECT_THROW(arrSplitted.GetAt(9), TStringException);
 }
 
 TEST(TStringTests, Split_NormalStringMultipleSeparators)
@@ -443,7 +442,7 @@
 	EXPECT_EQ(arrSplitted.GetAt(6), _T(""));
 	EXPECT_EQ(arrSplitted.GetAt(7), _T(""));
 	EXPECT_EQ(arrSplitted.GetAt(8), _T(""));
-	EXPECT_THROW(arrSplitted.GetAt(9), TCoreException);
+	EXPECT_THROW(arrSplitted.GetAt(9), TStringException);
 }
 
 TEST(TStringTests, CompareCaseSensitive_WithPtrToString)