diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index bc736b04b7..bd9ffb66a9 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -148,12 +148,6 @@
     <Compile Include="types\Triangle.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserServer\LocalUserProfileManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserServer\LoginServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="world\Avatar.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 0cb9bf612c..5e29b48e4d 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -25,8 +25,6 @@
                 <include name="CAPS/AdminWebFront.cs" />
                 <include name="types/Mesh.cs" />
                 <include name="types/Triangle.cs" />
-                <include name="UserServer/LocalUserProfileManager.cs" />
-                <include name="UserServer/LoginServer.cs" />
                 <include name="world/Avatar.cs" />
                 <include name="world/AvatarAnimations.cs" />
                 <include name="world/Entity.cs" />
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index c5858c102c..f56206fcfb 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -98,6 +98,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">
+      <Name>OpenSim.Servers</Name>
+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
       <Name>OpenSim.RegionServer</Name>
       <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 613f5275a2..deb4cfb1b7 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -26,6 +26,7 @@
                 <include name="../bin/OpenSim.Framework.dll" />
                 <include name="../bin/OpenSim.Framework.Console.dll" />
                 <include name="../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../bin/OpenSim.Servers.dll" />
                 <include name="../bin/OpenSim.RegionServer.dll" />
             </references>
         </csc>
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 227677f007..449896b4ee 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
 EndProject
 Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+    Debug|Any CPU = Debug|Any CPU
+    Release|Any CPU = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/Servers/LocalUserProfileManager.cs
similarity index 100%
rename from OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
rename to Servers/LocalUserProfileManager.cs
diff --git a/OpenSim.RegionServer/UserServer/LoginServer.cs b/Servers/LoginServer.cs
similarity index 96%
rename from OpenSim.RegionServer/UserServer/LoginServer.cs
rename to Servers/LoginServer.cs
index 4c77389bae..e0c090a4aa 100644
--- a/OpenSim.RegionServer/UserServer/LoginServer.cs
+++ b/Servers/LoginServer.cs
@@ -53,10 +53,8 @@ namespace OpenSim.UserServer
     public class LoginServer : LoginService, IUserServer
     {
         private IGridServer m_gridServer;
-        private ushort _loginPort = 8080;
         public IPAddress clientAddress = IPAddress.Loopback;
         public IPAddress remoteAddress = IPAddress.Any;
-        private Socket loginServer;
         private int NumClients;
         private string _defaultResponse;
         private bool userAccounts = false;
diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj
index d85c029691..bff245462c 100644
--- a/Servers/OpenSim.Servers.csproj
+++ b/Servers/OpenSim.Servers.csproj
@@ -92,6 +92,12 @@
     <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LocalUserProfileManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LoginServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build
index 48e8dec3c8..4bf9d18c98 100644
--- a/Servers/OpenSim.Servers.dll.build
+++ b/Servers/OpenSim.Servers.dll.build
@@ -13,6 +13,8 @@
             <sources failonempty="true">
                 <include name="BaseHttpServer.cs" />
                 <include name="IRestHandler.cs" />
+                <include name="LocalUserProfileManager.cs" />
+                <include name="LoginServer.cs" />
                 <include name="XmlRpcMethod.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index 3c847033fc..8cf0fcc68d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -387,6 +387,7 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Physics.Manager"/>
+      <Reference name="OpenSim.Servers"/>
       <Reference name="OpenSim.RegionServer"/>
 
       <Files>