diff --git a/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
similarity index 100%
rename from ProtoProxy/Connection.cpp
rename to Tools/ProtoProxy/Connection.cpp
diff --git a/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h
similarity index 100%
rename from ProtoProxy/Connection.h
rename to Tools/ProtoProxy/Connection.h
diff --git a/ProtoProxy/Globals.cpp b/Tools/ProtoProxy/Globals.cpp
similarity index 100%
rename from ProtoProxy/Globals.cpp
rename to Tools/ProtoProxy/Globals.cpp
diff --git a/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
similarity index 100%
rename from ProtoProxy/Globals.h
rename to Tools/ProtoProxy/Globals.h
diff --git a/ProtoProxy/ProtoProxy.cpp b/Tools/ProtoProxy/ProtoProxy.cpp
similarity index 100%
rename from ProtoProxy/ProtoProxy.cpp
rename to Tools/ProtoProxy/ProtoProxy.cpp
diff --git a/ProtoProxy/ProtoProxy.sln b/Tools/ProtoProxy/ProtoProxy.sln
similarity index 93%
rename from ProtoProxy/ProtoProxy.sln
rename to Tools/ProtoProxy/ProtoProxy.sln
index 62d298905..5488abd41 100644
--- a/ProtoProxy/ProtoProxy.sln
+++ b/Tools/ProtoProxy/ProtoProxy.sln
@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtoProxy", "ProtoProxy.vc
 		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CryptoPP", "..\VC2008\CryptoPP.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CryptoPP", "..\..\VC2008\CryptoPP.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ProtoProxy/ProtoProxy.txt b/Tools/ProtoProxy/ProtoProxy.txt
similarity index 100%
rename from ProtoProxy/ProtoProxy.txt
rename to Tools/ProtoProxy/ProtoProxy.txt
diff --git a/ProtoProxy/ProtoProxy.vcproj b/Tools/ProtoProxy/ProtoProxy.vcproj
similarity index 85%
rename from ProtoProxy/ProtoProxy.vcproj
rename to Tools/ProtoProxy/ProtoProxy.vcproj
index dc11923f4..b7384ee8a 100644
--- a/ProtoProxy/ProtoProxy.vcproj
+++ b/Tools/ProtoProxy/ProtoProxy.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../source"
+				AdditionalIncludeDirectories="../..;../../source"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..;../source"
+				AdditionalIncludeDirectories="../..;../../source"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -225,35 +225,35 @@
 			Name="shared"
 			>
 			<File
-				RelativePath="..\source\ByteBuffer.cpp"
+				RelativePath="..\..\source\ByteBuffer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ByteBuffer.h"
+				RelativePath="..\..\source\ByteBuffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\OSSupport\CriticalSection.cpp"
+				RelativePath="..\..\source\OSSupport\CriticalSection.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\OSSupport\CriticalSection.h"
+				RelativePath="..\..\source\OSSupport\CriticalSection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\OSSupport\IsThread.cpp"
+				RelativePath="..\..\source\OSSupport\IsThread.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\OSSupport\IsThread.h"
+				RelativePath="..\..\source\OSSupport\IsThread.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StringUtils.cpp"
+				RelativePath="..\..\source\StringUtils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StringUtils.h"
+				RelativePath="..\..\source\StringUtils.h"
 				>
 			</File>
 		</Filter>
diff --git a/ProtoProxy/Server.cpp b/Tools/ProtoProxy/Server.cpp
similarity index 100%
rename from ProtoProxy/Server.cpp
rename to Tools/ProtoProxy/Server.cpp
diff --git a/ProtoProxy/Server.h b/Tools/ProtoProxy/Server.h
similarity index 100%
rename from ProtoProxy/Server.h
rename to Tools/ProtoProxy/Server.h