diff --git a/OpenSim/Servers/Asset/AssetServerConnector.cs b/OpenSim/Servers/AssetServer/AssetServerConnector.cs
similarity index 98%
rename from OpenSim/Servers/Asset/AssetServerConnector.cs
rename to OpenSim/Servers/AssetServer/AssetServerConnector.cs
index 0dcfb5e6d0..1801e684f6 100644
--- a/OpenSim/Servers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Servers/AssetServer/AssetServerConnector.cs
@@ -28,6 +28,7 @@
 using System;
 using Nini.Config;
 using OpenSim.Servers.Base;
+using OpenSim.Servers.AssetServer.Handlers;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 
diff --git a/OpenSim/Servers/Asset/AssetServerMain.cs b/OpenSim/Servers/AssetServer/AssetServerMain.cs
similarity index 100%
rename from OpenSim/Servers/Asset/AssetServerMain.cs
rename to OpenSim/Servers/AssetServer/AssetServerMain.cs
diff --git a/OpenSim/Servers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
similarity index 98%
rename from OpenSim/Servers/Asset/AssetServerDeleteHandler.cs
rename to OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
index 010d7a7520..e90353bc3d 100644
--- a/OpenSim/Servers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer
+namespace OpenSim.Servers.AssetServer.Handlers
 {
     public class AssetServerDeleteHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Servers/Asset/AssetServerGetHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
similarity index 98%
rename from OpenSim/Servers/Asset/AssetServerGetHandler.cs
rename to OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
index 935a07c77d..7bb3364917 100644
--- a/OpenSim/Servers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer
+namespace OpenSim.Servers.AssetServer.Handlers
 {
     public class AssetServerGetHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Servers/Asset/AssetServerPostHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
similarity index 98%
rename from OpenSim/Servers/Asset/AssetServerPostHandler.cs
rename to OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
index 3bc7267cfc..5a051016ab 100644
--- a/OpenSim/Servers/Asset/AssetServerPostHandler.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer
+namespace OpenSim.Servers.AssetServer.Handlers
 {
     public class AssetServerPostHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Servers/User/UserServerConnector.cs b/OpenSim/Servers/UserServer/UserServerConnector.cs
similarity index 100%
rename from OpenSim/Servers/User/UserServerConnector.cs
rename to OpenSim/Servers/UserServer/UserServerConnector.cs
diff --git a/OpenSim/Servers/User/UserServerMain.cs b/OpenSim/Servers/UserServer/UserServerMain.cs
similarity index 100%
rename from OpenSim/Servers/User/UserServerMain.cs
rename to OpenSim/Servers/UserServer/UserServerMain.cs
diff --git a/prebuild.xml b/prebuild.xml
index c3f8458a54..c6f0dda57e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1382,7 +1382,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/User" type="Exe">
+    <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/UserServer" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1412,7 +1412,38 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/Asset" type="Exe">
+    <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Servers.Base"/>
+      <Reference name="OpenSim.Services.Base" />
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/AssetServer" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1433,13 +1464,14 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Servers.Base"/>
+      <Reference name="OpenSim.Servers.AssetServer.Handlers"/>
       <Reference name="OpenSim.Services.Base" />
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="false"/>
       </Files>
     </Project>