diff --git a/WebsitePanel/Sources/WSPTransportAgent/App.config b/WebsitePanel/Sources/Tools/WSPTransportAgent/App.config
similarity index 100%
rename from WebsitePanel/Sources/WSPTransportAgent/App.config
rename to WebsitePanel/Sources/Tools/WSPTransportAgent/App.config
diff --git a/WebsitePanel/Sources/WSPTransportAgent/Properties/AssemblyInfo.cs b/WebsitePanel/Sources/Tools/WSPTransportAgent/Properties/AssemblyInfo.cs
similarity index 100%
rename from WebsitePanel/Sources/WSPTransportAgent/Properties/AssemblyInfo.cs
rename to WebsitePanel/Sources/Tools/WSPTransportAgent/Properties/AssemblyInfo.cs
diff --git a/WebsitePanel/Sources/WSPTransportAgent/WSPRoutingAgent.cs b/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPRoutingAgent.cs
similarity index 100%
rename from WebsitePanel/Sources/WSPTransportAgent/WSPRoutingAgent.cs
rename to WebsitePanel/Sources/Tools/WSPTransportAgent/WSPRoutingAgent.cs
diff --git a/WebsitePanel/Sources/WSPTransportAgent/WSPTransportAgent.csproj b/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj
similarity index 100%
rename from WebsitePanel/Sources/WSPTransportAgent/WSPTransportAgent.csproj
rename to WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj
diff --git a/WebsitePanel/Sources/WSPTransportAgent/WSPTransportAgent.reg b/WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.reg
similarity index 100%
rename from WebsitePanel/Sources/WSPTransportAgent/WSPTransportAgent.reg
rename to WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.reg
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
index a88f65b6..fb708ef8 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
@@ -43,8 +43,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Plugins.PayPal
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Templates", "WebsitePanel.Templates\WebsitePanel.Templates.csproj", "{387FA0EF-3927-45FF-8F8F-BCCD735540C6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSPTransportAgent", "WSPTransportAgent\WSPTransportAgent.csproj", "{D959F137-A56F-4F4E-BA80-599FBE3700E3}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,10 +107,6 @@ Global
 		{387FA0EF-3927-45FF-8F8F-BCCD735540C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{387FA0EF-3927-45FF-8F8F-BCCD735540C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{387FA0EF-3927-45FF-8F8F-BCCD735540C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D959F137-A56F-4F4E-BA80-599FBE3700E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D959F137-A56F-4F4E-BA80-599FBE3700E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D959F137-A56F-4F4E-BA80-599FBE3700E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D959F137-A56F-4F4E-BA80-599FBE3700E3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE