diff --git a/OpenSim/Servers/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs
similarity index 94%
rename from OpenSim/Servers/AssetServer/AssetServerMain.cs
rename to OpenSim/Server/AssetServer/AssetServerMain.cs
index 8e3bc149b0..52f8e2b6cf 100644
--- a/OpenSim/Servers/AssetServer/AssetServerMain.cs
+++ b/OpenSim/Server/AssetServer/AssetServerMain.cs
@@ -26,10 +26,10 @@
  */
 
 using System;
-using OpenSim.Servers.Base;
-using OpenSim.Servers.AssetServer.Handlers;
+using OpenSim.Server.Base;
+using OpenSim.Server.AssetServer.Handlers;
 
-namespace OpenSim.Servers.AssetServer
+namespace OpenSim.Server.AssetServer
 {
     public class AssetServer
     {
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
similarity index 100%
rename from OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
rename to OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
similarity index 100%
rename from OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
rename to OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
similarity index 100%
rename from OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
rename to OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
similarity index 100%
rename from OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
rename to OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
similarity index 99%
rename from OpenSim/Servers/Base/HttpServerBase.cs
rename to OpenSim/Server/Base/HttpServerBase.cs
index 5286744df4..dc12cf93b6 100644
--- a/OpenSim/Servers/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using log4net;
 using Nini.Config;
 
-namespace OpenSim.Servers.Base
+namespace OpenSim.Server.Base
 {
     public class HttpServerBase : ServicesServerBase
     {
diff --git a/OpenSim/Servers/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
similarity index 99%
rename from OpenSim/Servers/Base/ServerUtils.cs
rename to OpenSim/Server/Base/ServerUtils.cs
index 834576bdea..ae0c3d4e01 100644
--- a/OpenSim/Servers/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -32,7 +32,7 @@ using System.Xml;
 using System.Xml.Serialization;
 using System.Text;
 
-namespace OpenSim.Servers.Base
+namespace OpenSim.Server.Base
 {
     public static class ServerUtils
     {
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
similarity index 99%
rename from OpenSim/Servers/Base/ServicesServerBase.cs
rename to OpenSim/Server/Base/ServicesServerBase.cs
index 6129407f8f..5350bce56a 100644
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -37,7 +37,7 @@ using log4net.Core;
 using log4net.Repository;
 using Nini.Config;
 
-namespace OpenSim.Servers.Base
+namespace OpenSim.Server.Base
 {
     public class ServicesServerBase
     {
diff --git a/prebuild.xml b/prebuild.xml
index 62286aa2fe..feeb1591fe 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1359,7 +1359,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.Base" path="OpenSim/Servers/Base" type="Library">
+    <Project name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1407,7 +1407,7 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Servers.Base"/>
+      <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Base" />
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="Nini.dll" />
@@ -1418,7 +1418,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/AssetServer" type="Exe">
+    <Project name="OpenSim.Server.AssetServer" path="OpenSim/Server/AssetServer" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1438,8 +1438,8 @@
       <Reference name="OpenSim.Framework"/>
       <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.Server.Base"/>
+      <Reference name="OpenSim.Server.AssetServer.Handlers"/>
       <Reference name="OpenSim.Services.Base" />
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="Nini.dll" />
@@ -1475,7 +1475,7 @@
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Data" />
       <Reference name="OpenSim.Region.Framework" />
-      <Reference name="OpenSim.Servers.Base" />
+      <Reference name="OpenSim.Server.Base" />
       <Reference name="OpenSim.Services.Connectors" />
       <Reference name="OpenSim.Services.Base" />
       <Reference name="OpenSim.Services.Interfaces" />