Index: src/ch.sln
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch.sln	(.../ch.sln)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch.sln	(.../ch.sln)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -1,31 +1,31 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Copy Handler", "ch\ch.vcproj", "{4B215B9A-58CA-4987-AC95-7DFC3043E100}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ch", "ch\ch.vcproj", "{4B215B9A-58CA-4987-AC95-7DFC3043E100}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyHandlerShellExt", "chext\chext.vcproj", "{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chext", "chext\chext.vcproj", "{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
-		Release MinDependency = Release MinDependency
 	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{4B215B9A-58CA-4987-AC95-7DFC3043E100}.Debug.ActiveCfg = Debug|Win32
 		{4B215B9A-58CA-4987-AC95-7DFC3043E100}.Debug.Build.0 = Debug|Win32
 		{4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release.ActiveCfg = Release|Win32
 		{4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release.Build.0 = Release|Win32
-		{4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release MinDependency.ActiveCfg = Release|Win32
-		{4B215B9A-58CA-4987-AC95-7DFC3043E100}.Release MinDependency.Build.0 = Release|Win32
 		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Debug.ActiveCfg = Debug|Win32
 		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Debug.Build.0 = Debug|Win32
-		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release.ActiveCfg = Release MinDependency|Win32
-		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release.Build.0 = Release MinDependency|Win32
-		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release MinDependency.ActiveCfg = Release MinDependency|Win32
-		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release MinDependency.Build.0 = Release MinDependency|Win32
+		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release.ActiveCfg = Release|Win32
+		{7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
Index: src/ch/AboutDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/AboutDlg.cpp	(.../AboutDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/AboutDlg.cpp	(.../AboutDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 #include "resource.h"
 #include "AboutDlg.h"
 #include "StaticEx.h"
Index: src/ch/BufferSizeDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/BufferSizeDlg.cpp	(.../BufferSizeDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/BufferSizeDlg.cpp	(.../BufferSizeDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -21,7 +21,7 @@
 #include "stdafx.h"
 #include "resource.h"
 #include "BufferSizeDlg.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -26,7 +26,7 @@
 #include "BufferSizeDlg.h"
 #include "FilterDlg.h"
 #include "StringHelpers.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/FileInfo.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/FileInfo.cpp	(.../FileInfo.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FileInfo.cpp	(.../FileInfo.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -30,7 +30,7 @@
 #include "DataBuffer.h"
 #include "Device IO.h"
 #include "imagehlp.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #undef THIS_FILE
Index: src/ch/FilterDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/FilterDlg.cpp	(.../FilterDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FilterDlg.cpp	(.../FilterDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "copy handler.h"
+#include "ch.h"
 #include "FilterDlg.h"
 
 #ifdef _DEBUG
Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 #include "DirTreeCtrl.h"
 #include "FolderDialog.h"
 #include "memdc.h"
Index: src/ch/HelpLngDialog.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/HelpLngDialog.cpp	(.../HelpLngDialog.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/HelpLngDialog.cpp	(.../HelpLngDialog.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -20,7 +20,7 @@
 
 #include "stdafx.h"
 #include "HelpLngDialog.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/MainWnd.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #include "MainWnd.h"
 #include "OptionsDlg.h"
Index: src/ch/MiniViewDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -20,7 +20,7 @@
 
 #include "stdafx.h"
 #include "MiniViewDlg.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/NotEnoughRoomDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/NotEnoughRoomDlg.cpp	(.../NotEnoughRoomDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/NotEnoughRoomDlg.cpp	(.../NotEnoughRoomDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "copy handler.h"
+#include "ch.h"
 #include "NotEnoughRoomDlg.h"
 #include "btnIDs.h"
 #include "StringHelpers.h"
Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 #include "resource.h"
 #include "OptionsDlg.h"
 #include "BufferSizeDlg.h"
Index: src/ch/PropertyListCtrl.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 #include "PropertyListCtrl.h"
 #include "dialogs.h"
 
Index: src/ch/RecentDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/RecentDlg.cpp	(.../RecentDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/RecentDlg.cpp	(.../RecentDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "copy handler.h"
+#include "ch.h"
 #include "RecentDlg.h"
 #include "dialogs.h"
 
Index: src/ch/ReplacePathsDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/ReplacePathsDlg.cpp	(.../ReplacePathsDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ReplacePathsDlg.cpp	(.../ReplacePathsDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -22,7 +22,7 @@
 #include "resource.h"
 #include "ReplacePathsDlg.h"
 #include "dialogs.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/ShortcutsDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "copy handler.h"
+#include "ch.h"
 #include "ShortcutsDlg.h"
 #include "dialogs.h"
 
Index: src/ch/ShutdownDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/ShutdownDlg.cpp	(.../ShutdownDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ShutdownDlg.cpp	(.../ShutdownDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "copy handler.h"
+#include "ch.h"
 #include "ShutdownDlg.h"
 
 #ifdef _DEBUG
Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 #include "resource.h"
 #include "StatusDlg.h"
 #include "BufferSizeDlg.h"
Index: src/ch/StringHelpers.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/StringHelpers.cpp	(.../StringHelpers.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/StringHelpers.cpp	(.../StringHelpers.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -18,7 +18,7 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *************************************************************************/
 #include "stdafx.h"
-#include "Copy Handler.h"
+#include "ch.h"
 #include "StringHelpers.h"
 #include "stdio.h"
 
Index: src/ch/Structs.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/Structs.cpp	(.../Structs.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/Structs.cpp	(.../Structs.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -22,7 +22,7 @@
 #include "resource.h"
 #include "StringHelpers.h"
 #include "..\common\FileSupport.h"
-#include "Copy Handler.h"
+#include "ch.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
Index: src/ch/ch.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/ch.cpp	(.../ch.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "stdafx.h"
-#include "COPY HANDLER.h"
+#include "ch.h"
 
 #include "CfgProperties.h"
 #include "MainWnd.h"
Index: src/ch/ch.rc
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/ch.rc	(.../ch.rc)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ch.rc	(.../ch.rc)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -31,7 +31,7 @@
 // 25
 //
 
-IDR_THANKS_TEXT         25                      "res\\Thanks.txt"
+IDR_THANKS_TEXT         25                      "res\\thanks.txt"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -40,7 +40,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\COPY HANDLER.ico"
+IDR_MAINFRAME           ICON                    "res\\ch.ico"
 IDI_ERROR_ICON          ICON                    "res\\error.ico"
 IDI_WORKING_ICON        ICON                    "res\\working.ico"
 IDI_PAUSED_ICON         ICON                    "res\\paused.ico"
@@ -1070,7 +1070,7 @@
     "LANGUAGE 9, 1\r\n"
     "#pragma code_page(1252)\r\n"
     "#endif\r\n"
-    "#include ""res\\COPY HANDLER.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""res\\ch.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\0"
 END
@@ -1612,7 +1612,7 @@
 LANGUAGE 9, 1
 #pragma code_page(1252)
 #endif
-#include "res\COPY HANDLER.rc2"  // non-Microsoft Visual C++ edited resources
+#include "res\ch.rc2"  // non-Microsoft Visual C++ edited resources
 #include "afxres.rc"         // Standard components
 #endif
 /////////////////////////////////////////////////////////////////////////////
Index: src/ch/ch.vcproj
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/ch/ch.vcproj	(.../ch.vcproj)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ch.vcproj	(.../ch.vcproj)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="Copy Handler"
-	RootNamespace="Copy Handler"
-	SccProjectName="Copy Handler"
+	Name="ch"
+	RootNamespace="ch"
+	SccProjectName="ch"
 	SccLocalPath="."
 	Keyword="MFCProj">
 	<Platforms>
@@ -14,7 +14,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
+			OutputDirectory="..\..\bin\debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			UseOfMFC="2"
@@ -23,31 +23,26 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\modules\App Framework,..\MODULES"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Debug/Copy Handler.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
+				DebugInformationFormat="4"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf.lib"
-				OutputFile="../BIN/Debug/ch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/ch.pdb"
 				SubSystem="2"
 				TargetMachine="1"/>
 			<Tool
@@ -56,7 +51,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/Copy Handler.tlb"
+				TypeLibraryName=".\Debug/ch.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -80,76 +75,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Final Release|Win32"
-			OutputDirectory=".\Copy_Handler___Win32_Final_Release"
-			IntermediateDirectory=".\Copy_Handler___Win32_Final_Release"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OptimizeForProcessor="1"
-				AdditionalIncludeDirectories="..\..\..\MODULES,..\..\MODULES\,..\..\..\MODULES\App Framework"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Copy_Handler___Win32_Final_Release/Copy Handler.pch"
-				AssemblerOutput="4"
-				AssemblerListingLocation=".\Copy_Handler___Win32_Final_Release/"
-				ObjectFile=".\Copy_Handler___Win32_Final_Release/"
-				ProgramDataBaseFileName=".\Copy_Handler___Win32_Final_Release/"
-				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib"
-				OutputFile="../BIN/Release/ch.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Copy_Handler___Win32_Final_Release/ch.pdb"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Copy_Handler___Win32_Final_Release/Copy Handler.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
+			OutputDirectory="..\..\bin\release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			UseOfMFC="2"
@@ -159,31 +86,22 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="2"
-				OptimizeForProcessor="1"
-				AdditionalIncludeDirectories="..\modules\App Framework,..\MODULES"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Release/Copy Handler.pch"
-				AssemblerOutput="4"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf.lib"
-				OutputFile="../BIN/Release/ch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/ch.pdb"
 				SubSystem="2"
 				TargetMachine="1"/>
 			<Tool
@@ -192,7 +110,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Copy Handler.tlb"
+				TypeLibraryName=".\Release/ch.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -224,134 +142,27 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
 				RelativePath="AboutDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\AppHelper.cpp">
+				RelativePath="AppHelper.cpp">
 			</File>
 			<File
 				RelativePath="BufferSizeDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CfgProperties.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\ConfigManager.cpp">
+				RelativePath="ch.cpp">
 			</File>
 			<File
-				RelativePath="COPY HANDLER.cpp">
+				RelativePath="ch.rc">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="COPY HANDLER.rc">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						CommandLine="$(SolutionDir)other\Scripts\Exe2Lng.exe &quot;$(InputPath)&quot; &quot;$(InputDir)Scripts\header.lng&quot; &quot;$(InputDir)\chtmp.rc&quot; &quot;$(TargetDir)..\..\other\Langs\English.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(DevEnvDir)..\..\vc7\atlmfc\include\afxres.h&quot;
+						CommandLine="$(SolutionDir)..\other\scripts\Exe2Lng.exe &quot;$(InputPath)&quot; &quot;$(InputDir)Scripts\header.lng&quot; &quot;$(InputDir)\chtmp.rc&quot; &quot;$(TargetDir)..\..\other\Langs\English.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(DevEnvDir)..\..\vc7\atlmfc\include\afxres.h&quot;
 rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;
 del &quot;$(InputDir)\chtmp.rc&quot;
 "
@@ -362,1016 +173,144 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						CommandLine="$(SolutionDir)other\Scripts\Exe2Lng.exe &quot;$(InputPath)&quot; &quot;$(InputDir)Scripts\header.lng&quot; &quot;$(OutDir)\chtmp.rc&quot; &quot;$(TargetDir)..\..\other\Langs\English.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(DevEnvDir)..\..\vc7\atlmfc\include\afxres.h&quot;
-rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(OutDir)\chtmp.rc&quot;
-del &quot;$(OutDir)\chtmp.rc&quot;
+						CommandLine="$(SolutionDir)..\other\scripts\Exe2Lng.exe &quot;$(InputPath)&quot; &quot;$(InputDir)Scripts\header.lng&quot; &quot;$(InputDir)\chtmp.rc&quot; &quot;$(TargetDir)..\..\other\Langs\English.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(DevEnvDir)..\..\vc7\atlmfc\include\afxres.h&quot;
+rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;
+del &quot;$(InputDir)\chtmp.rc&quot;
 "
 						Outputs="$(OutDir)\$(InputName).res"/>
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="ConfigManager.cpp">
+			</File>
+			<File
 				RelativePath="CustomCopyDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DataBuffer.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DestPath.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Dialogs.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirTreeCtrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DstFileErrorDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FFListCtrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\FileEx.cpp">
+				RelativePath="FileEx.cpp">
 			</File>
 			<File
 				RelativePath="FileInfo.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Common\FileSupport.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
+				RelativePath="..\common\FileSupport.cpp">
 			</File>
 			<File
 				RelativePath="FilterDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FolderDialog.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="HelpLngDialog.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\IniFile.cpp">
+				RelativePath="IniFile.cpp">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\LanguageDialog.cpp">
+				RelativePath="LanguageDialog.cpp">
 			</File>
 			<File
 				RelativePath="MainWnd.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MiniViewDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="NotEnoughRoomDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="OptionsDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ProgressListBox.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="PropertyListCtrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="RecentDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="register.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ReplaceFilesDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ReplaceOnlyDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ReplacePathsDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\ResourceManager.cpp">
+				RelativePath="ResourceManager.cpp">
 			</File>
 			<File
 				RelativePath="shortcuts.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ShortcutsDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ShutdownDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="SmallReplaceFilesDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="StaticEx.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="StatusDlg.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="stdafx.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						UsePrecompiledHeader="1"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="StringHelpers.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="structs.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Theme Helpers.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ThemedButton.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\TrayIcon.cpp">
+				RelativePath="TrayIcon.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -1381,10 +320,10 @@
 				RelativePath="AboutDlg.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\af_defs.h">
+				RelativePath="af_defs.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\AppHelper.h">
+				RelativePath="AppHelper.h">
 			</File>
 			<File
 				RelativePath="btnIDs.h">
@@ -1396,13 +335,13 @@
 				RelativePath="CfgProperties.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\charvect.h">
+				RelativePath="ch.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\ConfigManager.h">
+				RelativePath="charvect.h">
 			</File>
 			<File
-				RelativePath="COPY HANDLER.h">
+				RelativePath="ConfigManager.h">
 			</File>
 			<File
 				RelativePath="CustomCopyDlg.h">
@@ -1426,13 +365,13 @@
 				RelativePath="DstFileErrorDlg.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\ExceptionEx.h">
+				RelativePath="ExceptionEx.h">
 			</File>
 			<File
 				RelativePath="FFListCtrl.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\FileEx.h">
+				RelativePath="FileEx.h">
 			</File>
 			<File
 				RelativePath="FileInfo.h">
@@ -1450,19 +389,19 @@
 				RelativePath="HelpLngDialog.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\IniFile.h">
+				RelativePath="IniFile.h">
 			</File>
 			<File
 				RelativePath="..\Common\ipcstructs.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\LanguageDialog.h">
+				RelativePath="LanguageDialog.h">
 			</File>
 			<File
 				RelativePath="MainWnd.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\MemDC.h">
+				RelativePath="MemDC.h">
 			</File>
 			<File
 				RelativePath="MiniViewDlg.h">
@@ -1501,34 +440,25 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating html help include file..."
-						CommandLine="call $(SolutionDir)other\Scripts\makehelpmap.bat &quot;$(InputPath)&quot; &quot;..\other\Help\HTMLDefines.h&quot;
+						CommandLine="call $(SolutionDir)..\other\Scripts\makehelpmap.bat &quot;$(InputPath)&quot; &quot;..\..\other\Help\HTMLDefines.h&quot;
 "
-						Outputs="..\other\Help\HTMLDefines.h"/>
+						Outputs="..\..\other\Help\HTMLDefines.h"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Final Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating html help include file..."
-						CommandLine="call makehelpmap.bat &quot;$(InputPath)&quot; &quot;..\other\Help\HTMLDefines.h&quot;
-"
-						Outputs="..\other\Help\HTMLDefines.h"/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating html help include file..."
-						CommandLine="call $(SolutionDir)other\Scripts\makehelpmap.bat &quot;$(InputPath)&quot; &quot;..\other\Help\HTMLDefines.h&quot;
+						CommandLine="call $(SolutionDir)..\other\Scripts\makehelpmap.bat &quot;$(InputPath)&quot; &quot;..\..\other\Help\HTMLDefines.h&quot;
 "
-						Outputs="..\other\Help\HTMLDefines.h"/>
+						Outputs="..\..\other\Help\HTMLDefines.h"/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\resource.hm">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\ResourceManager.h">
+				RelativePath="ResourceManager.h">
 			</File>
 			<File
 				RelativePath="shortcuts.h">
@@ -1564,7 +494,7 @@
 				RelativePath="ThemedButton.h">
 			</File>
 			<File
-				RelativePath="..\modules\App Framework\TrayIcon.h">
+				RelativePath="TrayIcon.h">
 			</File>
 		</Filter>
 		<Filter
@@ -1580,27 +510,15 @@
 				RelativePath="res\cd.ico">
 			</File>
 			<File
-				RelativePath="..\Documentation\Help\PL\ch.gif">
+				RelativePath="res\ch.ico">
 			</File>
 			<File
-				RelativePath="help\ch.gif">
+				RelativePath="res\ch.rc2">
 			</File>
 			<File
-				RelativePath="..\Documentation\Help\EN\ch.gif">
-			</File>
-			<File
-				RelativePath="res\COPY HANDLER.ico">
-			</File>
-			<File
-				RelativePath="res\COPY HANDLER.rc2">
-			</File>
-			<File
 				RelativePath="res\delshort.ico">
 			</File>
 			<File
-				RelativePath="res\diskette.ico">
-			</File>
-			<File
 				RelativePath="res\err.ico">
 			</File>
 			<File
@@ -1616,7 +534,7 @@
 				RelativePath="res\hd.ico">
 			</File>
 			<File
-				RelativePath="res\Hd2.ico">
+				RelativePath="res\hd2.ico">
 			</File>
 			<File
 				RelativePath="res\info.ico">
@@ -1668,11 +586,8 @@
 			RelativePath="res\manifest.txt">
 		</File>
 		<File
-			RelativePath="RES\Thanks.txt">
+			RelativePath="res\thanks.txt">
 		</File>
-		<File
-			RelativePath="..\other\TODO.TXT">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
Index: src/ch/res/ch.ico
===================================================================
diff -u -N
Binary files differ
Index: src/ch/res/COPY HANDLER.ico
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
Binary files differ
Index: src/ch/res/ch.rc2
===================================================================
diff -u -N
--- src/ch/res/ch.rc2	(revision 0)
+++ src/ch/res/ch.rc2	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -0,0 +1,13 @@
+//
+// SYSTEMTRAY.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
Index: src/ch/res/COPY HANDLER.rc2
===================================================================
diff -u -N
--- src/ch/res/COPY HANDLER.rc2	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/res/COPY HANDLER.rc2	(revision 0)
@@ -1,13 +0,0 @@
-//
-// SYSTEMTRAY.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-	#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-/////////////////////////////////////////////////////////////////////////////
Index: src/chext/DropMenuExt.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/chext/DropMenuExt.cpp	(.../DropMenuExt.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/DropMenuExt.cpp	(.../DropMenuExt.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -18,7 +18,7 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *************************************************************************/
 #include "stdafx.h"
-#include "CopyHandlerShellExt.h"
+#include "chext.h"
 #include "DropMenuExt.h"
 #include "clipboard.h"
 /////////////////////////////////////////////////////////////////////////////
Index: src/chext/MenuExt.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -18,11 +18,11 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *************************************************************************/
 #include "stdafx.h"
-#include "CopyHandlerShellExt.h"
+#include "chext.h"
 #include "MenuExt.h"
 #include "clipboard.h"
-#include "..\Common\ipcstructs.h"
-#include "..\Common\FileSupport.h"
+#include "..\common\ipcstructs.h"
+#include "..\common\FileSupport.h"
 #include "stdio.h"
 #include "memory.h"
 #include "StringHelpers.h"
Index: src/chext/chext.cpp
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/chext/chext.cpp	(.../chext.cpp)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/chext.cpp	(.../chext.cpp)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -25,9 +25,9 @@
 #include "stdafx.h"
 #include "resource.h"
 #include <initguid.h>
-#include "CopyHandlerShellExt.h"
+#include "chext.h"
 
-#include "CopyHandlerShellExt_i.c"
+#include "chext_i.c"
 #include "MenuExt.h"
 #include "DropMenuExt.h"
 
Index: src/chext/chext.rc
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/chext/chext.rc	(.../chext.rc)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/chext.rc	(.../chext.rc)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -40,7 +40,7 @@
 
 3 TEXTINCLUDE 
 BEGIN
-    "1 TYPELIB ""CopyHandlerShellExt.tlb""\r\n"
+    "1 TYPELIB ""chext.tlb""\r\n"
     "\0"
 END
 
@@ -107,7 +107,7 @@
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-1 TYPELIB "CopyHandlerShellExt.tlb"
+1 TYPELIB "chext.tlb"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
Index: src/chext/chext.vcproj
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/chext/chext.vcproj	(.../chext.vcproj)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/chext.vcproj	(.../chext.vcproj)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -2,7 +2,8 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="CopyHandlerShellExt"
+	Name="chext"
+	RootNamespace="chext"
 	SccProjectName=""
 	SccLocalPath=""
 	Keyword="AtlProj">
@@ -13,7 +14,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
+			OutputDirectory="..\..\bin\debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -26,36 +27,27 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Debug/CopyHandlerShellExt.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				Description="Performing registration"
-				CommandLine="start regsvr32 /s /c &quot;$(TargetPath)&quot;
-echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
+				Description="NOT performing registration [commented out]"
+				CommandLine="rem start regsvr32 /s /c &quot;$(TargetPath)&quot;
+rem echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 "
 				Outputs="$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../BIN/Debug/chext.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\CopyHandlerShellExt.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/chext.pdb"
 				SubSystem="2"
-				ImportLibrary=".\Debug/chext.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/CopyHandlerShellExt.tlb"
+				TypeLibraryName=".\Debug/chext.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -79,8 +71,8 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release MinDependency|Win32"
-			OutputDirectory=".\ReleaseMinDependency"
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\release"
 			IntermediateDirectory=".\ReleaseMinDependency"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -97,34 +89,25 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\ReleaseMinDependency/CopyHandlerShellExt.pch"
-				AssemblerListingLocation=".\ReleaseMinDependency/"
-				ObjectFile=".\ReleaseMinDependency/"
-				ProgramDataBaseFileName=".\ReleaseMinDependency/"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
-echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
+				Description="NOT performing registration [commented out]"
+				CommandLine="rem start regsvr32 /s /c &quot;$(TargetPath)&quot;
+rem echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 "
 				Outputs="$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../BIN/Release/chext.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\CopyHandlerShellExt.def"
-				ProgramDatabaseFile=".\ReleaseMinDependency/chext.pdb"
 				SubSystem="2"
-				ImportLibrary=".\ReleaseMinDependency/chext.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\ReleaseMinDependency/CopyHandlerShellExt.tlb"
+				TypeLibraryName=".\ReleaseMinDependency/chext.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -155,173 +138,64 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="clipboard.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"/>
-				</FileConfiguration>
+				RelativePath="chext.cpp">
 			</File>
 			<File
-				RelativePath="CopyHandlerShellExt.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"/>
-				</FileConfiguration>
+				RelativePath="chext.def">
 			</File>
 			<File
-				RelativePath="CopyHandlerShellExt.def">
-			</File>
-			<File
-				RelativePath="CopyHandlerShellExt.idl">
+				RelativePath="chext.idl">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCMIDLTool"
 						GenerateStublessProxies="TRUE"
-						TypeLibraryName=".\CopyHandlerShellExt.tlb"
-						HeaderFileName="CopyHandlerShellExt.h"
-						InterfaceIdentifierFileName="CopyHandlerShellExt_i.c"/>
+						TypeLibraryName=".\chext.tlb"
+						HeaderFileName="chext.h"
+						InterfaceIdentifierFileName="chext_i.c"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release MinDependency|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCMIDLTool"
 						GenerateStublessProxies="TRUE"
-						TypeLibraryName=".\CopyHandlerShellExt.tlb"
-						HeaderFileName="CopyHandlerShellExt.h"
-						InterfaceIdentifierFileName="CopyHandlerShellExt_i.c"/>
+						TypeLibraryName=".\chext.tlb"
+						HeaderFileName="chext.h"
+						InterfaceIdentifierFileName="chext_i.c"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="CopyHandlerShellExt.rc">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="$(OUTDIR)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="$(OUTDIR)"/>
-				</FileConfiguration>
+				RelativePath="chext.rc">
 			</File>
 			<File
+				RelativePath="clipboard.cpp">
+			</File>
+			<File
 				RelativePath="DropMenuExt.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Common\FileSupport.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"/>
-				</FileConfiguration>
+				RelativePath="..\common\FileSupport.cpp">
 			</File>
 			<File
 				RelativePath="MenuExt.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="StdAfx.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release MinDependency|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="StringHelpers.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release MinDependency|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;$(NoInherit)"/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -334,13 +208,13 @@
 				RelativePath="DropMenuExt.h">
 			</File>
 			<File
-				RelativePath="..\Common\FileSupport.h">
+				RelativePath="..\common\FileSupport.h">
 			</File>
 			<File
 				RelativePath="IContextMenuImpl.h">
 			</File>
 			<File
-				RelativePath="..\Common\ipcstructs.h">
+				RelativePath="..\common\ipcstructs.h">
 			</File>
 			<File
 				RelativePath="IShellExtInitImpl.h">
Index: src/chext/dlldata.c
===================================================================
diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0
--- src/chext/dlldata.c	(.../dlldata.c)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/chext/dlldata.c	(.../dlldata.c)	(revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0)
@@ -19,12 +19,12 @@
 extern "C"   {
 #endif
 
-EXTERN_PROXY_FILE( CopyHandlerShellExt )
+EXTERN_PROXY_FILE( chext )
 
 
 PROXYFILE_LIST_START
 /* Start of list */
-  REFERENCE_PROXY_FILE( CopyHandlerShellExt ),
+  REFERENCE_PROXY_FILE( chext ),
 /* End of list */
 PROXYFILE_LIST_END