diff --git a/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
index 56cd52bb25..093461d42c 100644
--- a/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
+++ b/OpenSim/Grid/AssetServer/GetAssetStreamHandler.cs
@@ -10,7 +10,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
 
-namespace OpenSim.Grid.AssetServer
+namespace OpenSim.Framework.Servers
 {
     public class GetAssetStreamHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs b/OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs
index 69551d8265..a62f2b0da0 100644
--- a/OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs
+++ b/OpenSim/Grid/AssetServer/PostAssetStreamHandler.cs
@@ -6,7 +6,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 
-namespace OpenSim.Grid.AssetServer
+namespace OpenSim.Framework.Servers
 {
     public class PostAssetStreamHandler : BaseStreamHandler
     {
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 58c6758cf6..369052cf50 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Grid.AssetServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;