Index: src/libchcore/FileFilter.cpp
===================================================================
diff -u -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/FileFilter.cpp	(.../FileFilter.cpp)	(revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c)
+++ src/libchcore/FileFilter.cpp	(.../FileFilter.cpp)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -119,7 +119,7 @@
 	return *this;
 }
 
-chcore::TString& TFileFilter::GetCombinedMask(chcore::TString& strMask) const
+TString& TFileFilter::GetCombinedMask(TString& strMask) const
 {
 	strMask.Clear();
 	size_t stCount = m_astrMask.GetCount();
@@ -135,14 +135,14 @@
 	return strMask;
 }
 
-void TFileFilter::SetCombinedMask(const chcore::TString& pMask)
+void TFileFilter::SetCombinedMask(const TString& pMask)
 {
 	m_astrMask.Clear();
 
 	pMask.Split(_T("|"), m_astrMask);
 }
 
-chcore::TString& TFileFilter::GetCombinedExcludeMask(chcore::TString& strMask) const
+TString& TFileFilter::GetCombinedExcludeMask(TString& strMask) const
 {
 	strMask.Clear();
 	size_t stCount = m_astrExcludeMask.GetCount();
@@ -158,14 +158,14 @@
 	return strMask;
 }
 
-void TFileFilter::SetCombinedExcludeMask(const chcore::TString& pMask)
+void TFileFilter::SetCombinedExcludeMask(const TString& pMask)
 {
 	m_astrExcludeMask.Clear();
 
 	pMask.Split(_T("|"), m_astrExcludeMask);
 }
 
-void TFileFilter::StoreInConfig(chcore::TConfig& rConfig) const
+void TFileFilter::StoreInConfig(TConfig& rConfig) const
 {
 	SetConfigValue(rConfig, _T("IncludeMask.Use"), m_bUseMask);
 	SetConfigValue(rConfig, _T("IncludeMask.MaskList.Mask"), m_astrMask);
@@ -201,7 +201,7 @@
 	SetConfigValue(rConfig, _T("Attributes.Directory"), m_iDirectory);
 }
 
-void TFileFilter::ReadFromConfig(const chcore::TConfig& rConfig)
+void TFileFilter::ReadFromConfig(const TConfig& rConfig)
 {
 	if(!GetConfigValue(rConfig, _T("IncludeMask.Use"), m_bUseMask))
 		m_bUseMask = false;
@@ -269,9 +269,9 @@
 		m_iDirectory = 0;
 }
 
-void TFileFilter::Serialize(chcore::TReadBinarySerializer& rSerializer)
+void TFileFilter::Serialize(TReadBinarySerializer& rSerializer)
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	Serialize(rSerializer, m_bUseMask);
 	Serialize(rSerializer, m_astrMask);
@@ -307,9 +307,9 @@
 	Serialize(rSerializer, m_iDirectory);
 }
 
-void TFileFilter::Serialize(chcore::TWriteBinarySerializer& rSerializer) const
+void TFileFilter::Serialize(TWriteBinarySerializer& rSerializer) const
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	Serialize(rSerializer, m_bUseMask);
 	Serialize(rSerializer, m_astrMask);
@@ -351,7 +351,7 @@
 	if(m_bUseMask)
 	{
 		bool bRes=false;
-		for(chcore::TStringArray::const_iterator iterMask = m_astrMask.Begin(); iterMask != m_astrMask.End(); ++iterMask)
+		for(TStringArray::const_iterator iterMask = m_astrMask.Begin(); iterMask != m_astrMask.End(); ++iterMask)
 		{
 			if(MatchMask(*iterMask, spInfo->GetFullFilePath().GetFileName().ToString()))
 				bRes = true;
@@ -363,7 +363,7 @@
 	// excluding mask
 	if(m_bUseExcludeMask)
 	{
-		for(chcore::TStringArray::const_iterator iterExcludeMask = m_astrExcludeMask.Begin(); iterExcludeMask != m_astrExcludeMask.End(); ++iterExcludeMask)
+		for(TStringArray::const_iterator iterExcludeMask = m_astrExcludeMask.Begin(); iterExcludeMask != m_astrExcludeMask.End(); ++iterExcludeMask)
 		{
 			if(MatchMask(*iterExcludeMask, spInfo->GetFullFilePath().GetFileName().ToString()))
 				return false;
@@ -606,28 +606,28 @@
 	return false;
 }
 
-void TFiltersArray::StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const
+void TFiltersArray::StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const
 {
 	rConfig.DeleteNode(pszNodeName);
 	BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
 	{
-		chcore::TConfig cfgNode;
+		TConfig cfgNode;
 		rFilter.StoreInConfig(cfgNode);
-		rConfig.AddSubConfig(chcore::TString(pszNodeName) + _T(".FilterDefinition"), cfgNode);
+		rConfig.AddSubConfig(TString(pszNodeName) + _T(".FilterDefinition"), cfgNode);
 	}
 }
 
-bool TFiltersArray::ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName)
+bool TFiltersArray::ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName)
 {
 	m_vFilters.clear();
 
-	chcore::TConfigArray vConfigs;
+	TConfigArray vConfigs;
 	if(!rConfig.ExtractMultiSubConfigs(pszNodeName, vConfigs))
 		return false;
 
 	for(size_t stIndex = 0; stIndex < vConfigs.GetCount(); ++stIndex)
 	{
-		const chcore::TConfig& rCfg = vConfigs.GetAt(stIndex);
+		const TConfig& rCfg = vConfigs.GetAt(stIndex);
 		TFileFilter tFilter;
 		tFilter.ReadFromConfig(rCfg);
 
@@ -636,15 +636,15 @@
 	return true;
 }
 
-void TFiltersArray::Serialize(chcore::TReadBinarySerializer& rSerializer)
+void TFiltersArray::Serialize(TReadBinarySerializer& rSerializer)
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 	Serialize(rSerializer, m_vFilters);
 }
 
-void TFiltersArray::Serialize(chcore::TWriteBinarySerializer& rSerializer) const
+void TFiltersArray::Serialize(TWriteBinarySerializer& rSerializer) const
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 	Serialize(rSerializer, m_vFilters);
 }
 
Index: src/libchcore/FileFilter.h
===================================================================
diff -u -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/FileFilter.h	(.../FileFilter.h)	(revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c)
+++ src/libchcore/FileFilter.h	(.../FileFilter.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -63,30 +63,30 @@
 
 	bool Match(const TFileInfoPtr& spInfo) const;
 
-	chcore::TString& GetCombinedMask(chcore::TString& pMask) const;
-	void SetCombinedMask(const chcore::TString& pMask);
+	TString& GetCombinedMask(TString& pMask) const;
+	void SetCombinedMask(const TString& pMask);
 
-	chcore::TString& GetCombinedExcludeMask(chcore::TString& pMask) const;
-	void SetCombinedExcludeMask(const chcore::TString& pMask);
+	TString& GetCombinedExcludeMask(TString& pMask) const;
+	void SetCombinedExcludeMask(const TString& pMask);
 
-	void StoreInConfig(chcore::TConfig& rConfig) const;
-	void ReadFromConfig(const chcore::TConfig& rConfig);
+	void StoreInConfig(TConfig& rConfig) const;
+	void ReadFromConfig(const TConfig& rConfig);
 
-	void Serialize(chcore::TReadBinarySerializer& rSerializer);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer) const;
+	void Serialize(TReadBinarySerializer& rSerializer);
+	void Serialize(TWriteBinarySerializer& rSerializer) const;
 
 	// atrributes access
 	bool GetUseMask() const { return m_bUseMask; }
 	void SetUseMask(bool bUseMask) { m_bUseMask = bUseMask; }
 
-	//   const chcore::TStringArray& GetMaskArray() const { return m_astrMask; }
-	//   chcore::TStringArray& GetMaskArray() { return m_astrMask; }
+	//   const TStringArray& GetMaskArray() const { return m_astrMask; }
+	//   TStringArray& GetMaskArray() { return m_astrMask; }
 
 	bool GetUseExcludeMask() const { return m_bUseExcludeMask; }
 	void SetUseExcludeMask(bool bUseExcludeMask) { m_bUseExcludeMask = bUseExcludeMask; }
 
-	//   const chcore::TStringArray& GetExcludeMaskArray() const { return m_astrExcludeMask; }
-	//   chcore::TStringArray& GetExcludeMaskArray() { return m_astrExcludeMask; }
+	//   const TStringArray& GetExcludeMaskArray() const { return m_astrExcludeMask; }
+	//   TStringArray& GetExcludeMaskArray() { return m_astrExcludeMask; }
 
 	bool GetUseSize1() const { return m_bUseSize1; }
 	void SetUseSize1(bool bUseSize1) { m_bUseSize1 = bUseSize1; }
@@ -168,11 +168,11 @@
 private:
 	// files mask
 	bool m_bUseMask;
-	chcore::TStringArray m_astrMask;
+	TStringArray m_astrMask;
 
 	// files mask-
 	bool m_bUseExcludeMask;
-	chcore::TStringArray m_astrExcludeMask;
+	TStringArray m_astrExcludeMask;
 
 	// size filtering
 	bool m_bUseSize1;
@@ -220,11 +220,11 @@
 	TFiltersArray& operator=(const TFiltersArray& rSrc);
 	bool Match(const TFileInfoPtr& spInfo) const;
 
-	void StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const;
-	bool ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName);
+	void StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const;
+	bool ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName);
 
-	void Serialize(chcore::TReadBinarySerializer& rSerializer);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer) const;
+	void Serialize(TReadBinarySerializer& rSerializer);
+	void Serialize(TWriteBinarySerializer& rSerializer) const;
 
 	bool IsEmpty() const;
 
Index: src/libchcore/FileInfo.cpp
===================================================================
diff -u -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/FileInfo.cpp	(.../FileInfo.cpp)	(revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c)
+++ src/libchcore/FileInfo.cpp	(.../FileInfo.cpp)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -61,7 +61,7 @@
 {
 }
 
-void TFileInfo::Init(const chcore::TSmartPath& rpathFile, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths,
+void TFileInfo::Init(const TSmartPath& rpathFile, size_t stSrcIndex, const TPathContainer* pBasePaths,
 					 DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
 					 uint_t uiFlags)
 {
@@ -79,7 +79,7 @@
 		m_pathFile.MakeRelativePath(m_pBasePaths->GetAt(m_stSrcIndex));	// cut path from clipboard
 }
 
-void TFileInfo::Init(const chcore::TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
+void TFileInfo::Init(const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
 					 uint_t uiFlags)
 {
 	m_pathFile = rpathFile;
@@ -93,7 +93,7 @@
 	m_uiFlags = uiFlags;
 }
 
-void TFileInfo::SetParentObject(size_t stIndex, const chcore::TPathContainer* pBasePaths)
+void TFileInfo::SetParentObject(size_t stIndex, const TPathContainer* pBasePaths)
 {
 	// cannot set parent object if there is already one specified
 	if(m_pBasePaths && m_stSrcIndex != std::numeric_limits<size_t>::max())
@@ -112,25 +112,25 @@
 		&& rInfo.m_ftLastWrite.dwHighDateTime == m_ftLastWrite.dwHighDateTime && rInfo.m_ftLastWrite.dwLowDateTime == m_ftLastWrite.dwLowDateTime && rInfo.m_uhFileSize == m_uhFileSize);
 }
 
-chcore::TSmartPath TFileInfo::GetFullFilePath() const
+TSmartPath TFileInfo::GetFullFilePath() const
 {
 	if(m_stSrcIndex != std::numeric_limits<size_t>::max())
 	{
 		BOOST_ASSERT(m_pBasePaths);
 		if(!m_pBasePaths)
 			THROW(_T("Invalid pointer"), 0, 0, 0);
 
-		chcore::TSmartPath pathCombined = m_pBasePaths->GetAt(m_stSrcIndex);
+		TSmartPath pathCombined = m_pBasePaths->GetAt(m_stSrcIndex);
 		pathCombined += m_pathFile;
 		return pathCombined;
 	}
 	else
 		return m_pathFile;
 }
 
-void TFileInfo::Serialize(chcore::TReadBinarySerializer& rSerializer)
+void TFileInfo::Serialize(TReadBinarySerializer& rSerializer)
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	Serialize(rSerializer, m_pathFile);
 	Serialize(rSerializer, m_stSrcIndex);
@@ -145,9 +145,9 @@
 	Serialize(rSerializer, m_uiFlags);
 }
 
-void TFileInfo::Serialize(chcore::TWriteBinarySerializer& rSerializer) const
+void TFileInfo::Serialize(TWriteBinarySerializer& rSerializer) const
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	Serialize(rSerializer, m_pathFile);
 	Serialize(rSerializer, m_stSrcIndex);
@@ -164,7 +164,7 @@
 
 ///////////////////////////////////////////////////////////////////////
 // Array
-TFileInfoArray::TFileInfoArray(const chcore::TPathContainer& rBasePaths) :
+TFileInfoArray::TFileInfoArray(const TPathContainer& rBasePaths) :
 	m_rBasePaths(rBasePaths)
 {
 }
@@ -227,9 +227,9 @@
 	return ullSize;
 }
 
-void TFileInfoArray::Serialize(chcore::TReadBinarySerializer& rSerializer, bool bOnlyFlags)
+void TFileInfoArray::Serialize(TReadBinarySerializer& rSerializer, bool bOnlyFlags)
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	size_t stCount;
 	Serialize(rSerializer, stCount);
@@ -263,9 +263,9 @@
 	}
 }
 
-void TFileInfoArray::Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bOnlyFlags) const
+void TFileInfoArray::Serialize(TWriteBinarySerializer& rSerializer, bool bOnlyFlags) const
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	size_t stCount = m_vFiles.size();
 	Serialize(rSerializer, stCount);
Index: src/libchcore/FileInfo.h
===================================================================
diff -u -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/FileInfo.h	(.../FileInfo.h)	(revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c)
+++ src/libchcore/FileInfo.h	(.../FileInfo.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -41,23 +41,23 @@
 	~TFileInfo();
 
 	// with base path
-	void Init(const chcore::TSmartPath& rpathFile, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths,
+	void Init(const TSmartPath& rpathFile, size_t stSrcIndex, const TPathContainer* pBasePaths,
 		DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite,
 		uint_t uiFlags);
 
 	// without base path
-	void Init(const chcore::TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation,
+	void Init(const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation,
 		FILETIME ftLastAccess, FILETIME ftLastWrite, uint_t uiFlags);
 
 	// setting parent object
-	void SetParentObject(size_t stIndex, const chcore::TPathContainer* pBasePaths);
+	void SetParentObject(size_t stIndex, const TPathContainer* pBasePaths);
 
 	ULONGLONG GetLength64() const { return m_uhFileSize; }
 	void SetLength64(ULONGLONG uhSize) { m_uhFileSize=uhSize; }
 
-	const chcore::TSmartPath& GetFilePath() const { return m_pathFile; }	// returns path with m_pathFile (probably not full)
-	chcore::TSmartPath GetFullFilePath() const;		// returns full path
-	void SetFilePath(const chcore::TSmartPath& tPath) { m_pathFile = tPath; };
+	const TSmartPath& GetFilePath() const { return m_pathFile; }	// returns path with m_pathFile (probably not full)
+	TSmartPath GetFullFilePath() const;		// returns full path
+	void SetFilePath(const TSmartPath& tPath) { m_pathFile = tPath; };
 
 	/* Get File times info (equivalent to CFindFile members) */
 	const FILETIME& GetCreationTime() const { return m_ftCreation; };
@@ -79,22 +79,22 @@
 	void SetFlags(uint_t uiFlags, uint_t uiMask = 0xffffffff) { m_uiFlags = (m_uiFlags & ~(uiFlags & uiMask)) | (uiFlags & uiMask); }
 
 	// operations
-	void SetClipboard(const chcore::TPathContainer* pBasePaths) { m_pBasePaths = pBasePaths; }
+	void SetClipboard(const TPathContainer* pBasePaths) { m_pBasePaths = pBasePaths; }
 
 	void SetSrcIndex(size_t stIndex) { m_stSrcIndex = stIndex; };
 	size_t GetSrcIndex() const { return m_stSrcIndex; };
 
 	// operators
 	bool operator==(const TFileInfo& rInfo);
 
-	void Serialize(chcore::TReadBinarySerializer& rSerializer);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer) const;
+	void Serialize(TReadBinarySerializer& rSerializer);
+	void Serialize(TWriteBinarySerializer& rSerializer) const;
 
 private:
-	chcore::TSmartPath m_pathFile;	// contains relative path (first path is in CClipboardArray)
+	TSmartPath m_pathFile;	// contains relative path (first path is in CClipboardArray)
 
 	size_t m_stSrcIndex;		// index in CClipboardArray table (which contains the first part of the path)
-	const chcore::TPathContainer* m_pBasePaths;
+	const TPathContainer* m_pBasePaths;
 
 	DWORD m_dwAttributes;	// attributes
 	ULONGLONG m_uhFileSize;
@@ -110,7 +110,7 @@
 class LIBCHCORE_API TFileInfoArray
 {
 public:
-	TFileInfoArray(const chcore::TPathContainer& rBasePaths);
+	TFileInfoArray(const TPathContainer& rBasePaths);
 	~TFileInfoArray();
 
 	// Adds a new object info to this container
@@ -136,11 +136,11 @@
 	unsigned long long CalculateTotalSize();
 
 	/// Stores infos about elements in the archive
-	void Serialize(chcore::TReadBinarySerializer& rSerializer, bool bOnlyFlags);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bOnlyFlags) const;
+	void Serialize(TReadBinarySerializer& rSerializer, bool bOnlyFlags);
+	void Serialize(TWriteBinarySerializer& rSerializer, bool bOnlyFlags) const;
 
 protected:
-	const chcore::TPathContainer& m_rBasePaths;
+	const TPathContainer& m_rBasePaths;
 
 #pragma warning(push)
 #pragma warning(disable: 4251)
Index: src/libchcore/TBasePathData.cpp
===================================================================
diff -u -rd345f15636dc88c4c40fe310ac7777bd024e12d9 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TBasePathData.cpp	(.../TBasePathData.cpp)	(revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
+++ src/libchcore/TBasePathData.cpp	(.../TBasePathData.cpp)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -41,36 +41,36 @@
 {
 }
 
-void TBasePathData::SetDestinationPath(const chcore::TSmartPath& tPath)
+void TBasePathData::SetDestinationPath(const TSmartPath& tPath)
 {
 	m_pathDst = tPath;
 }
 
-chcore::TSmartPath TBasePathData::GetDestinationPath() const
+TSmartPath TBasePathData::GetDestinationPath() const
 {
 	return m_pathDst;
 }
 
-void TBasePathData::Serialize(chcore::TReadBinarySerializer& rSerializer, bool bData)
+void TBasePathData::Serialize(TReadBinarySerializer& rSerializer, bool bData)
 {
 	if(bData)
-		chcore::Serializers::Serialize(rSerializer, m_bMove);
+		Serializers::Serialize(rSerializer, m_bMove);
 	else
-		chcore::Serializers::Serialize(rSerializer, m_pathDst);
+		Serializers::Serialize(rSerializer, m_pathDst);
 }
 
-void TBasePathData::Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bData)
+void TBasePathData::Serialize(TWriteBinarySerializer& rSerializer, bool bData)
 {
 	if(bData)
-		chcore::Serializers::Serialize(rSerializer, m_bMove);
+		Serializers::Serialize(rSerializer, m_bMove);
 	else
-		chcore::Serializers::Serialize(rSerializer, m_pathDst);
+		Serializers::Serialize(rSerializer, m_pathDst);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // TBasePathDataContainer
 
-TBasePathDataContainer::TBasePathDataContainer(const chcore::TPathContainer& tBasePaths) :
+TBasePathDataContainer::TBasePathDataContainer(const TPathContainer& tBasePaths) :
 	m_tBasePaths(tBasePaths)
 {
 }
@@ -141,9 +141,9 @@
 	return m_vEntries.size();
 }
 
-void TBasePathDataContainer::Serialize(chcore::TReadBinarySerializer& rSerializer, bool bData)
+void TBasePathDataContainer::Serialize(TReadBinarySerializer& rSerializer, bool bData)
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	size_t stCount;
 	Serialize(rSerializer, stCount);
@@ -173,9 +173,9 @@
 	}
 }
 
-void TBasePathDataContainer::Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bData)
+void TBasePathDataContainer::Serialize(TWriteBinarySerializer& rSerializer, bool bData)
 {
-	using chcore::Serializers::Serialize;
+	using Serializers::Serialize;
 
 	boost::shared_lock<boost::shared_mutex> lock(m_lock);
 	// write data
Index: src/libchcore/TBasePathData.h
===================================================================
diff -u -rd345f15636dc88c4c40fe310ac7777bd024e12d9 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TBasePathData.h	(.../TBasePathData.h)	(revision d345f15636dc88c4c40fe310ac7777bd024e12d9)
+++ src/libchcore/TBasePathData.h	(.../TBasePathData.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -39,17 +39,17 @@
 	void SetMove(bool bValue) { m_bMove=bValue; }
 	bool GetMove() const { return m_bMove; }
 
-	void SetDestinationPath(const chcore::TSmartPath& strPath);
-	chcore::TSmartPath GetDestinationPath() const;
+	void SetDestinationPath(const TSmartPath& strPath);
+	TSmartPath GetDestinationPath() const;
 	bool IsDestinationPathSet() const { return !m_pathDst.IsEmpty(); }
 
-	void Serialize(chcore::TReadBinarySerializer& rSerializer, bool bData);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bData);
+	void Serialize(TReadBinarySerializer& rSerializer, bool bData);
+	void Serialize(TWriteBinarySerializer& rSerializer, bool bData);
 
 private:
 	bool m_bMove;					// specifies if we can use MoveFile (if will be moved)
 
-	chcore::TSmartPath m_pathDst;	// dest path
+	TSmartPath m_pathDst;	// dest path
 };
 
 typedef boost::shared_ptr<TBasePathData> TBasePathDataPtr;
@@ -61,7 +61,7 @@
 {
 public:
 	// constructors/destructor
-	explicit TBasePathDataContainer(const chcore::TPathContainer& tBasePaths);
+	explicit TBasePathDataContainer(const TPathContainer& tBasePaths);
 	~TBasePathDataContainer();
 
 	// standard access to data
@@ -75,15 +75,15 @@
 	void Clear();
 
 	// serialization
-	void Serialize(chcore::TReadBinarySerializer& rSerializer, bool bData);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bData);
+	void Serialize(TReadBinarySerializer& rSerializer, bool bData);
+	void Serialize(TWriteBinarySerializer& rSerializer, bool bData);
 
 private:
 	TBasePathDataContainer(const TBasePathDataContainer& rSrc);
 	TBasePathDataContainer& operator=(const TBasePathDataContainer& rSrc);
 
 protected:
-	const chcore::TPathContainer& m_tBasePaths;
+	const TPathContainer& m_tBasePaths;
 
 #pragma warning(push)
 #pragma warning(disable: 4251)
Index: src/libchcore/TConfigSerializers.h
===================================================================
diff -u -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TConfigSerializers.h	(.../TConfigSerializers.h)	(revision 633a533cb6e741d44fe28aa56339e1d2709b1b27)
+++ src/libchcore/TConfigSerializers.h	(.../TConfigSerializers.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -31,12 +31,12 @@
 
 // CString config serializer
 
-static void StoreInConfig(const CString& strValue, chcore::TConfig& rConfig, PCTSTR pszPropName)
+static void StoreInConfig(const CString& strValue, TConfig& rConfig, PCTSTR pszPropName)
 {
 	rConfig.SetValue(pszPropName, TString((PCTSTR)strValue));
 }
 
-static bool ReadFromConfig(CString& strValue, const chcore::TConfig& rConfig, PCTSTR pszPropName)
+static bool ReadFromConfig(CString& strValue, const TConfig& rConfig, PCTSTR pszPropName)
 {
 	TString wstrData;
 	bool bRes = rConfig.GetValue(pszPropName, wstrData);
@@ -49,7 +49,7 @@
 
 // vector<CString> config serializer
 
-static void StoreInConfig(const std::vector<CString>& vValues, chcore::TConfig& rConfig, PCTSTR pszPropName)
+static void StoreInConfig(const std::vector<CString>& vValues, TConfig& rConfig, PCTSTR pszPropName)
 {
 	// convert to vector of wstrings (ineffective; there should be a better way to do this)
 	TStringArray vToStore;
@@ -61,7 +61,7 @@
 	rConfig.SetValue(pszPropName, vToStore);
 }
 
-static bool ReadFromConfig(std::vector<CString>& vValues, const chcore::TConfig& rConfig, PCTSTR pszPropName)
+static bool ReadFromConfig(std::vector<CString>& vValues, const TConfig& rConfig, PCTSTR pszPropName)
 {
 	vValues.clear();
 
Index: src/libchcore/TDateTime.cpp
===================================================================
diff -u -rf46d334ffd78c7daa7626f214ae698adbac5f36d -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TDateTime.cpp	(.../TDateTime.cpp)	(revision f46d334ffd78c7daa7626f214ae698adbac5f36d)
+++ src/libchcore/TDateTime.cpp	(.../TDateTime.cpp)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -206,22 +206,22 @@
 	return tDiffDateTime;
 }
 
-void TDateTime::StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const
+void TDateTime::StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const
 {
 	rConfig.SetValue(pszNodeName, m_tTime);
 }
 
-bool TDateTime::ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName)
+bool TDateTime::ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName)
 {
 	return rConfig.GetValue(pszNodeName, m_tTime);
 }
 
-void TDateTime::Serialize(chcore::TReadBinarySerializer& rSerializer)
+void TDateTime::Serialize(TReadBinarySerializer& rSerializer)
 {
 	Serializers::Serialize(rSerializer, m_tTime);
 }
 
-void TDateTime::Serialize(chcore::TWriteBinarySerializer& rSerializer) const
+void TDateTime::Serialize(TWriteBinarySerializer& rSerializer) const
 {
 	Serializers::Serialize(rSerializer, m_tTime);
 }
Index: src/libchcore/TDateTime.h
===================================================================
diff -u -rf46d334ffd78c7daa7626f214ae698adbac5f36d -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TDateTime.h	(.../TDateTime.h)	(revision f46d334ffd78c7daa7626f214ae698adbac5f36d)
+++ src/libchcore/TDateTime.h	(.../TDateTime.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -57,11 +57,11 @@
 	time_t Compare(const TDateTime& rOtherDateTime, bool bCompareDate, bool bCompareTime) const;
 
 	// serialization
-	void StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const;
-	bool ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName);
+	void StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const;
+	bool ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName);
 
-	void Serialize(chcore::TReadBinarySerializer& rSerializer);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer) const;
+	void Serialize(TReadBinarySerializer& rSerializer);
+	void Serialize(TWriteBinarySerializer& rSerializer) const;
 
 private:
 	time_t m_tTime;
Index: src/libchcore/TTaskOperationPlan.cpp
===================================================================
diff -u -r3c5b5d3aa77e6f39cfd5ab49ea462e094e030655 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TTaskOperationPlan.cpp	(.../TTaskOperationPlan.cpp)	(revision 3c5b5d3aa77e6f39cfd5ab49ea462e094e030655)
+++ src/libchcore/TTaskOperationPlan.cpp	(.../TTaskOperationPlan.cpp)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -129,14 +129,14 @@
 		return m_vSubOperations[stIndex].second;
 }
 
-void TOperationPlan::Serialize(chcore::TReadBinarySerializer& rSerializer)
+void TOperationPlan::Serialize(TReadBinarySerializer& rSerializer)
 {
 	EOperationType eOperation = eOperation_None;
 	Serializers::Serialize(rSerializer, eOperation);
 	SetOperationType(eOperation);
 }
 
-void TOperationPlan::Serialize(chcore::TWriteBinarySerializer& rSerializer) const
+void TOperationPlan::Serialize(TWriteBinarySerializer& rSerializer) const
 {
 	Serializers::Serialize(rSerializer, GetOperationType());
 }
Index: src/libchcore/TTaskOperationPlan.h
===================================================================
diff -u -r5fd6beaad9f1eccb664b997d151acb59961e4827 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TTaskOperationPlan.h	(.../TTaskOperationPlan.h)	(revision 5fd6beaad9f1eccb664b997d151acb59961e4827)
+++ src/libchcore/TTaskOperationPlan.h	(.../TTaskOperationPlan.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -62,8 +62,8 @@
 	ESubOperationType GetSubOperationAt(size_t stIndex) const;
 	double GetEstimatedTimeAt(size_t stIndex) const;
 
-	void Serialize(chcore::TReadBinarySerializer& rSerializer);
-	void Serialize(chcore::TWriteBinarySerializer& rSerializer) const;
+	void Serialize(TReadBinarySerializer& rSerializer);
+	void Serialize(TWriteBinarySerializer& rSerializer) const;
 
 private:
 	EOperationType m_eOperation;