diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
index 54451fdf95..34bb85aa5a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
@@ -31,7 +31,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using OpenSim.Framework;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
index 19a41ec349..4e802ed59b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -31,7 +31,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using OpenSim.Framework;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
index 37286bda0d..062b12b060 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
@@ -31,7 +31,7 @@ using log4net;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectors.User
diff --git a/OpenSim/Server/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs
index 52f8e2b6cf..b08c8cf523 100644
--- a/OpenSim/Server/AssetServer/AssetServerMain.cs
+++ b/OpenSim/Server/AssetServer/AssetServerMain.cs
@@ -27,7 +27,7 @@
 
 using System;
 using OpenSim.Server.Base;
-using OpenSim.Server.AssetServer.Handlers;
+using OpenSim.Server.Handlers.Asset;
 
 namespace OpenSim.Server.AssetServer
 {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
similarity index 95%
rename from OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
rename to OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 8606d38c81..64014f58f9 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -27,12 +27,11 @@
 
 using System;
 using Nini.Config;
-using OpenSim.Servers.Base;
-using OpenSim.Servers.AssetServer.Handlers;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer.Handlers
+namespace OpenSim.Server.Handlers.Asset
 {
     public class AssetServiceConnector
     {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
similarity index 97%
rename from OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
rename to OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index e90353bc3d..f9eceeb257 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -35,12 +35,12 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Serialization;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer.Handlers
+namespace OpenSim.Server.Handlers.Asset
 {
     public class AssetServerDeleteHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
similarity index 98%
rename from OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
rename to OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 7bb3364917..0ededcabcd 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -35,12 +35,12 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Serialization;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer.Handlers
+namespace OpenSim.Server.Handlers.Asset
 {
     public class AssetServerGetHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
similarity index 97%
rename from OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
rename to OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
index 5a051016ab..5ca9eaec96 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
@@ -35,12 +35,12 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Serialization;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer.Handlers
+namespace OpenSim.Server.Handlers.Asset
 {
     public class AssetServerPostHandler : BaseStreamHandler
     {
diff --git a/OpenSim/SimulatorServices/RegionAssetService.cs b/OpenSim/SimulatorServices/RegionAssetService.cs
index 651e6d4afa..3a7ccc8dfa 100644
--- a/OpenSim/SimulatorServices/RegionAssetService.cs
+++ b/OpenSim/SimulatorServices/RegionAssetService.cs
@@ -32,7 +32,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Servers.AssetServer.Handlers;
+using OpenSim.Server.Handlers.Asset;
 
 namespace OpenSim.Region.SimulatorServices
 {
diff --git a/prebuild.xml b/prebuild.xml
index feeb1591fe..1c4d41ed2b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1387,19 +1387,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
+    <Project name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenMetaverseTypes.dll"/>
@@ -1439,7 +1439,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Server.Base"/>
-      <Reference name="OpenSim.Server.AssetServer.Handlers"/>
+      <Reference name="OpenSim.Server.Handlers"/>
       <Reference name="OpenSim.Services.Base" />
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="Nini.dll" />
@@ -1603,7 +1603,7 @@
       <Reference name="OpenSim.Framework.Servers.HttpServer" />
       <Reference name="OpenSim.Region.Framework" />
       <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="OpenSim.Servers.AssetServer.Handlers"/>
+      <Reference name="OpenSim.Server.Handlers"/>
       <Reference name="Mono.Addins.dll" />
       <Reference name="XMLRPC.dll"/>
       <Reference name="Nini.dll" />