diff --git a/OpenSim/OpenSim.Region/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/EstateManager.cs
similarity index 97%
rename from OpenSim/OpenSim.Region/Estate/EstateManager.cs
rename to OpenSim/OpenSim.Region/EstateManager.cs
index 875defdfa8..88b2dacc18 100644
--- a/OpenSim/OpenSim.Region/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/EstateManager.cs
@@ -37,7 +37,7 @@ using OpenSim;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim.Region.Estate
+namespace OpenSim.Region
 {
 
     /// <summary>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index ff916d1b69..03c7c7d70b 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -130,10 +130,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ParcelManager.cs">
+    <Compile Include="EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Estate\EstateManager.cs">
+    <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scene\Scene.cs">
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index a49c08f40d..6ddf462e73 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Region" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="EstateManager.cs" />
                 <include name="ParcelManager.cs" />
-                <include name="Estate/EstateManager.cs" />
                 <include name="Scene/Scene.cs" />
                 <include name="Scene/Scene.PacketHandlers.cs" />
                 <include name="Scene/Scene.Scripting.cs" />
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index e3ffca4e85..6b27f8f538 100644
--- a/OpenSim/OpenSim.Region/Scene/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -42,7 +42,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Scripting;
 using OpenSim.Terrain;
 using OpenGrid.Framework.Communications;
-using OpenSim.Region.Estate;
 
 
 namespace OpenSim.Region
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.API.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs
rename to OpenSim/OpenSim.RegionServer/ClientView.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs
rename to OpenSim/OpenSim.RegionServer/ClientViewBase.cs
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index c71e60c300..5c726bd7d6 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -130,6 +130,24 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClientView.AgentAssetUpload.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.API.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.ProcessPackets.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientViewBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -154,24 +172,6 @@
     <Compile Include="Assets\InventoryCache.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView\ClientView.AgentAssetUpload.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView\ClientView.API.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView\ClientView.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView\ClientView.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView\ClientView.ProcessPackets.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView\ClientViewBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 10e3422e06..87c5b22634 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,6 +11,12 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="ClientView.AgentAssetUpload.cs" />
+                <include name="ClientView.API.cs" />
+                <include name="ClientView.cs" />
+                <include name="ClientView.PacketHandlers.cs" />
+                <include name="ClientView.ProcessPackets.cs" />
+                <include name="ClientViewBase.cs" />
                 <include name="NetworkServersInfo.cs" />
                 <include name="OpenSimNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
@@ -19,12 +25,6 @@
                 <include name="UserConfigUtility.cs" />
                 <include name="VersionInfo.cs" />
                 <include name="Assets/InventoryCache.cs" />
-                <include name="ClientView/ClientView.AgentAssetUpload.cs" />
-                <include name="ClientView/ClientView.API.cs" />
-                <include name="ClientView/ClientView.cs" />
-                <include name="ClientView/ClientView.PacketHandlers.cs" />
-                <include name="ClientView/ClientView.ProcessPackets.cs" />
-                <include name="ClientView/ClientViewBase.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>