diff --git a/OpenSim/Servers/AssetServer/AssetServerMain.cs b/OpenSim/Servers/AssetServer/AssetServerMain.cs
index bc738d74c2..8e3bc149b0 100644
--- a/OpenSim/Servers/AssetServer/AssetServerMain.cs
+++ b/OpenSim/Servers/AssetServer/AssetServerMain.cs
@@ -27,6 +27,7 @@
 
 using System;
 using OpenSim.Servers.Base;
+using OpenSim.Servers.AssetServer.Handlers;
 
 namespace OpenSim.Servers.AssetServer
 {
diff --git a/OpenSim/Servers/AssetServer/AssetServerConnector.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
similarity index 98%
rename from OpenSim/Servers/AssetServer/AssetServerConnector.cs
rename to OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
index 1801e684f6..8606d38c81 100644
--- a/OpenSim/Servers/AssetServer/AssetServerConnector.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
@@ -32,7 +32,7 @@ using OpenSim.Servers.AssetServer.Handlers;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 
-namespace OpenSim.Servers.AssetServer
+namespace OpenSim.Servers.AssetServer.Handlers
 {
     public class AssetServiceConnector
     {