279 files changed, 2803 insertions, 1913 deletions
diff --git a/OpenSim.build b/OpenSim.build
index d84663a..5803b42 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -46,61 +46,61 @@
        <echo message="Deleting all builds from all configurations" />
        <delete dir="${bin.dir}" failonerror="false" />
        <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="clean" />
-        <nant buildfile="Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="clean" />
-        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="clean" />
-        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="clean" />
-        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="clean" />
-        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="clean" />
-        <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="clean" />
-        <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="clean" />
    </target>
    <target name="build" depends="init" description="">
-        <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="build" />
-        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="build" />
-        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="build" />
-        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" />
-        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="build" />
-        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="build" />
-        <nant buildfile="Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />
+        <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="build" />
-        <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="build" />
+        <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="build" />
    </target>
    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@@ -111,32 +111,32 @@
    <target name="doc" depends="build-release">
        <echo message="Generating all documentation from all builds" />
-        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="doc" />
-        <nant buildfile="Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="doc" />
-        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="doc" />
-        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="doc" />
-        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="doc" />
-        <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="doc" />
-        <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="doc" />
-        <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="doc" />
    </target>
 </project>
diff --git a/OpenSim.sln b/OpenSim.sln
index 6ae3992..93a022d 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,169 +1,249 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications.OGS1", "Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj", "{17442AF1-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications", "OpenSim\Framework\Communications\OpenSim.Framework.Communications.csproj", "{CB52B7E7-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "Common\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim\Framework\Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Caches", "OpenSim\OpenSim.Caches\OpenSim.Caches.csproj", "{1938EB12-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.GenericConfig.Xml", "OpenSim\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj", "{C74E4A30-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "Common\OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Servers", "OpenSim\Framework\Servers\OpenSim.Framework.Servers.csproj", "{2CC71860-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManagement", "OpenSim\Framework\UserManager\OpenSim.Framework.UserManagement.csproj", "{586E2916-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "OpenSim\Region\Caches\OpenSim.Region.Caches.csproj", "{61FCCDB3-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Capabilities", "OpenSim\Region\Capabilities\OpenSim.Region.Capabilities.csproj", "{39038E85-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim\OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.LocalCommunications", "OpenSim\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj", "{79CED992-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.Local", "OpenSim\Region\Communications\Local\OpenSim.Region.Communications.Local.csproj", "{BFB5D807-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim\OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Environment\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim\OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim\OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region", "OpenSim\OpenSim.Region\OpenSim.Region.csproj", "{196916AF-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.BasicPhysicsPlugin", "OpenSim\Region\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj", "{15B4FEF3-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim\OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.Manager", "OpenSim\Region\Physics\Manager\OpenSim.Region.Physics.Manager.csproj", "{F4FF31EB-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Common\OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdePlugin", "OpenSim\Region\Physics\OdePlugin\OpenSim.Region.Physics.OdePlugin.csproj", "{90620634-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim\OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim\OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageSQLite", "OpenSim\Region\Storage\LocalStorageSQLite\OpenSim.Region.Storage.LocalStorageSQLite.csproj", "{477B9270-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Terrain.BasicTerrain", "OpenSim\Region\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj", "{C9E0F891-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
 EndProject
 Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
+    Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
+    Release|Any CPU = Release|Any CPU
-        EndGlobalSection
+  EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+  GlobalSection(ProjectDependencies) = postSolution
-                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({36B72A9B-0000-0000-0000-000000000000})
-                {17442AF1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
-                {17442AF1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
-                {17442AF1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({586E2916-0000-0000-0000-000000000000})
-                {17442AF1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({61FCCDB3-0000-0000-0000-000000000000})
-                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({DC3698B2-0000-0000-0000-000000000000})
-                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({BFB5D807-0000-0000-0000-000000000000})
-                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({4806E378-0000-0000-0000-000000000000})
-                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({DCBA491C-0000-0000-0000-000000000000})
-                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).15 = ({F4FF31EB-0000-0000-0000-000000000000})
-                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({438A9556-0000-0000-0000-000000000000}).16 = ({C9E0F891-0000-0000-0000-000000000000})
-                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-                {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-                {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
-                {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-                {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
-                {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
-                {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000})
-                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000})
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000})
-                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
-                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
-                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000})
-                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-                {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
-                {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
-                {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
-                {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
-                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
-                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-                {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-                {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-                {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
-                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
-                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+  EndGlobalSection
-                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        GlobalSection(SolutionProperties) = preSolution
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                HideSolutionNode = FALSE
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        EndGlobalSection
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 8d8a647..b17b37b 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -30,11 +30,13 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using libsecondlife;
+using libsecondlife.Packets;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
 {
 
    public class CommunicationsManager
@@ -43,9 +45,26 @@ namespace OpenGrid.Framework.Communications
        public IGridServices GridServer;
        public IInterRegionCommunications InterRegion;
+        public NetworkServersInfo ServersInfo;
        public CommunicationsManager(NetworkServersInfo serversInfo)
        {
+            ServersInfo = serversInfo;
+        }
+        #region Packet Handlers
+        public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
+        {
+            UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
+            if (profileData != null)
+            {
+                UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
+                packet.UUIDNameBlock[0].ID = profileData.UUID;
+                packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username);
+                packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname);
+                remote_client.OutPacket((Packet)packet);
+            }
            
        }
+        #endregion
    }
 }
diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index d3b7c07..a4812fb 100644
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -32,7 +32,7 @@ using System.Text;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
 {
    public class GridInfo
    {
diff --git a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 4cb8a38..7b0d340 100644
--- a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -31,7 +31,7 @@ using System.Text;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
 {
    public  interface IInterRegionCommunications
    {
diff --git a/Common/OpenGrid.Framework.Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index 3d8e791..37f4942 100644
--- a/Common/OpenGrid.Framework.Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -30,15 +30,18 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
 {
    public interface IUserServices
    {
        UserProfileData GetUserProfile(string firstName, string lastName);
        UserProfileData GetUserProfile(string name);
        UserProfileData GetUserProfile(LLUUID avatarID);
-        
+        UserProfileData SetupMasterUser(string firstName, string lastName);
+        UserProfileData SetupMasterUser(string firstName, string lastName, string password);
    }
 }
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 9a9568c..31ab172 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{CB52B7E7-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Communications</AssemblyName>
+    <AssemblyName>OpenSim.Framework.Communications</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Communications</RootNamespace>
+    <RootNamespace>OpenSim.Framework.Communications</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,15 +72,15 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\General\OpenSim.Framework.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 392220b..52d29f6 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Communications" default="build">
+<project name="OpenSim.Framework.Communications" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="CommunicationsManager.cs" />
@@ -22,16 +22,16 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index 83e7dd4..83e7dd4 100644
--- a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework.Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 8f715d2..8f715d2 100644
--- a/Common/OpenSim.Framework.Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
index e3847be..e3847be 100644
--- a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
diff --git a/Common/OpenSim.Framework.Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 1a92d8e..1a92d8e 100644
--- a/Common/OpenSim.Framework.Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
diff --git a/Common/OpenSim.Framework.Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs
index d7f945e..d7f945e 100644
--- a/Common/OpenSim.Framework.Console/MainLog.cs
+++ b/OpenSim/Framework/Console/MainLog.cs
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index af6c396..f3dcec5 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index 7ebdba1..eb40c0d 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -24,9 +24,9 @@
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 0e73ab2..dc8488e 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -29,11 +29,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
+namespace OpenSim.Framework.Data.DB4o
 {
    /// <summary>
    /// A grid server storage mechanism employing the DB4o database system
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 356a49c..3870a8c 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -29,10 +29,10 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Db4objects.Db4o;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
+namespace OpenSim.Framework.Data.DB4o
 {
    /// <summary>
    /// A Database manager for Db4o
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 315f48d..8caa75d 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -28,10 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
+namespace OpenSim.Framework.Data.DB4o
 {
    /// <summary>
    /// A User storage interface for the DB4o database system
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index 82d4f5f..b09cecf 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{FD2D303D-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
+    <AssemblyName>OpenSim.Framework.Data.DB4o</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
+    <RootNamespace>OpenSim.Framework.Data.DB4o</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -58,31 +58,31 @@
    <NoWarn></NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" >
+    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>System.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="libsecondlife.dll" >
-      <HintPath>System.Xml.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Data" >
+    <Reference Include="System" >
-      <HintPath>System.Data.dll</HintPath>
+      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="System.Data" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>System.Data.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
+    <Reference Include="System.Xml" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index 1a72d0a..f124eb5 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.GridInterfaces.Local" default="build">
+<project name="OpenSim.Framework.Data.DB4o" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,11 +8,13 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="DB4oGridData.cs" />
-                <include name="LocalAssetServer.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oUserData.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
@@ -21,9 +23,9 @@
                </lib>
                <include name="../../../bin/Db4objects.Db4o.dll" />
                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
+                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..68395a1 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.DB4o")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.DB4o")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 1dac4bd..5bdceaf 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MSSQL
+namespace OpenSim.Framework.Data.MSSQL
 {
    /// <summary>
    /// A grid data interface for Microsoft SQL Server
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 475a3e7..7cf1a56 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -32,9 +32,9 @@ using System.Data;
 using System.Data.SqlClient;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MSSQL
+namespace OpenSim.Framework.Data.MSSQL
 {
    /// <summary>
    /// A management class for the MS SQL Storage Engine
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
index 64bb78e..4c41a4f 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0A563AC1-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{17F7F694-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.MSSQL</AssemblyName>
+    <AssemblyName>OpenSim.Framework.Data.MSSQL</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.MSSQL</RootNamespace>
+    <RootNamespace>OpenSim.Framework.Data.MSSQL</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -76,9 +76,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
index 577da4b..a2b2e3d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.MSSQL" default="build">
+<project name="OpenSim.Framework.Data.MSSQL" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data.MSSQL" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Data.MSSQL" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="MSSQLGridData.cs" />
@@ -20,16 +20,16 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
index bbe3cdf..af310e8 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MSSQL")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 4d6cf63..43e3054 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
    /// <summary>
    /// A MySQL Interface for the Grid Server
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index fb429e4..434df1a 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
    /// <summary>
    /// A MySQL interface for the inventory server
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index c88b39f..8265614 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
    /// <summary>
    /// An interface to the log database for MySQL
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 53b3bdd..b2f398b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -36,9 +36,9 @@ using MySql.Data;
 using MySql.Data.Types;
 using MySql.Data.MySqlClient;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
    /// <summary>
    /// A MySQL Database manager
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 032a0e6..0304452 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -28,10 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
    /// <summary>
    /// A database interface class to a user profile storage system
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 75ef149..62e3887 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{17F7F6BE-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName>
+    <AssemblyName>OpenSim.Framework.Data.MySQL</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.MySQL</RootNamespace>
+    <RootNamespace>OpenSim.Framework.Data.MySQL</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -58,31 +58,31 @@
    <NoWarn></NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" >
+    <Reference Include="libsecondlife.dll" >
-      <HintPath>System.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="MySql.Data.dll" >
-      <HintPath>System.Xml.dll</HintPath>
+      <HintPath>..\..\..\bin\MySql.Data.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Data" >
+    <Reference Include="System" >
-      <HintPath>System.Data.dll</HintPath>
+      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="System.Data" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>System.Data.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="MySql.Data.dll" >
+    <Reference Include="System.Xml" >
-      <HintPath>..\..\bin\MySql.Data.dll</HintPath>
+      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index a5f4028..594ec52 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.MySQL" default="build">
+<project name="OpenSim.Framework.Data.MySQL" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="MySQLGridData.cs" />
@@ -23,17 +23,17 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/MySql.Data.dll" />
+                <include name="../../../bin/MySql.Data.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d6..d67ccf6 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921 b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index fa17367..4ba24f1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1E3F341A-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{6ECC56A9-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.SQLite</AssemblyName>
+    <AssemblyName>OpenSim.Framework.Data.SQLite</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.SQLite</RootNamespace>
+    <RootNamespace>OpenSim.Framework.Data.SQLite</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -58,12 +58,12 @@
    <NoWarn></NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" >
+    <Reference Include="libsecondlife.dll" >
-      <HintPath>System.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System" >
-      <HintPath>System.Xml.dll</HintPath>
+      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System.Data" >
@@ -71,27 +71,27 @@
      <Private>False</Private>
    </Reference>
    <Reference Include="System.Data.SQLite.dll" >
-      <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\..\..\bin\System.Data.SQLite.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="System.Xml" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index 79b0edf..e28d0a6 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.SQLite" default="build">
+<project name="OpenSim.Framework.Data.SQLite" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="SQLiteGridData.cs" />
@@ -20,17 +20,17 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
-                <include name="../../bin/System.Data.SQLite.dll" />
+                <include name="../../../bin/System.Data.SQLite.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 57c4bae..f811825 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.SQLite")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.SQLite")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index d7a5a69..800e26c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.SQLite
+namespace OpenSim.Framework.Data.SQLite
 {
    /// <summary>
    /// A Grid Interface to the SQLite database
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 9689356..b67b79c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -32,9 +32,9 @@ using System.Data;
 using System.Data.SQLite;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.SQLite
+namespace OpenSim.Framework.Data.SQLite
 {
    class SQLiteManager
    {
diff --git a/Common/OpenGrid.Framework.Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
index b2cce78..7f8fdaf 100644
--- a/Common/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    public enum DataResponse
    {
diff --git a/Common/OpenGrid.Framework.Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs
index 2ac0bfe..ccb3b84 100644
--- a/Common/OpenGrid.Framework.Data/ILogData.cs
+++ b/OpenSim/Framework/Data/ILogData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    /// <summary>
    /// The severity of an individual log message
diff --git a/Common/OpenGrid.Framework.Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
index d17afac..2f002c1 100644
--- a/Common/OpenGrid.Framework.Data/IniConfig.cs
+++ b/OpenSim/Framework/Data/IniConfig.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
 http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
 */
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    /// <summary>
    /// Parse settings from ini-like files
diff --git a/Common/OpenGrid.Framework.Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index 12f559b..8a3a664 100644
--- a/Common/OpenGrid.Framework.Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    /// <summary>
    /// Inventory Item - contains all the properties associated with an individual inventory piece.
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 048722a..dcafbcd 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
+    <AssemblyName>OpenSim.Framework.Data</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
+    <RootNamespace>OpenSim.Framework.Data</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index 764e871..aefb02b 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data" default="build">
+<project name="OpenSim.Framework.Data" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="GridData.cs" />
@@ -26,15 +26,15 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 1446673..7d749d5 100644
--- a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Common/OpenGrid.Framework.Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index 89c6105..f404ebd 100644
--- a/Common/OpenGrid.Framework.Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -31,7 +31,7 @@ using System.Text;
 using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    public class ReservationData
    {
diff --git a/Common/OpenGrid.Framework.Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index a3e7cb7..201aa01 100644
--- a/Common/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    /// <summary>
    /// A class which contains information known to the grid server about a region
diff --git a/Common/OpenGrid.Framework.Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
index c2d5a72..2e15b47 100644
--- a/Common/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenSim/Framework/Data/UserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    /// <summary>
    /// An interface for connecting to user storage servers.
diff --git a/Common/OpenGrid.Framework.Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
index 82633e1..00d422d 100644
--- a/Common/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
 {
    /// <summary>
    /// Information about a particular user known to the userserver
diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index fbf4d23..fbf4d23 100644
--- a/Common/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
diff --git a/Common/OpenSim.Framework/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
index 73dd3e2..73dd3e2 100644
--- a/Common/OpenSim.Framework/AuthenticateSessionBase.cs
+++ b/OpenSim/Framework/General/AuthenticateSessionBase.cs
diff --git a/Common/OpenSim.Framework/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
index 667b8d8..667b8d8 100644
--- a/Common/OpenSim.Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/General/BlockingQueue.cs
diff --git a/Common/OpenSim.Framework/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 0e80941..0e80941 100644
--- a/Common/OpenSim.Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
diff --git a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
index 462e2c5..462e2c5 100644
--- a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
+++ b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
index 13980fe..13980fe 100644
--- a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
index 0fafe1a..0fafe1a 100644
--- a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
index 2f4b340..2f4b340 100644
--- a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index 826392d..826392d 100644
--- a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 009648c..4e8ac1a 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces
    public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
+    public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
    public interface IClientAPI
    {
        event ChatFromViewer OnChatFromViewer;
@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces
        event NewAvatar OnNewAvatar;
        event GenericCall6 OnRemoveAvatar;
+        event UUIDNameRequest OnNameFromUUIDRequest;
        event ParcelPropertiesRequest OnParcelPropertiesRequest;
        event ParcelDivideRequest OnParcelDivideRequest;
        event ParcelJoinRequest OnParcelJoinRequest;
diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index 4987d10..4987d10 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
index c6e2223..c6e2223 100644
--- a/Common/OpenSim.Framework/Interfaces/IUserServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserServer.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
index 4857417..4857417 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/OpenSim/Framework/General/Interfaces/IWorld.cs
diff --git a/Common/OpenSim.Framework/Logger.cs b/OpenSim/Framework/General/Logger.cs
index e7eaa03..e7eaa03 100644
--- a/Common/OpenSim.Framework/Logger.cs
+++ b/OpenSim/Framework/General/Logger.cs
diff --git a/Common/OpenSim.Framework/LoginService.cs b/OpenSim/Framework/General/LoginService.cs
index f14754f..f14754f 100644
--- a/Common/OpenSim.Framework/LoginService.cs
+++ b/OpenSim/Framework/General/LoginService.cs
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 7ebe0ee..48db634 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
    <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
-    </ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
    <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -16,11 +15,9 @@
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
-    <AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
-    </AppDesignerFolder>
    <RootNamespace>OpenSim.Framework</RootNamespace>
-    <StartupObject>
+    <StartupObject></StartupObject>
-    </StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
  </PropertyGroup>
@@ -31,18 +28,16 @@
    <ConfigurationOverrideFile>
    </ConfigurationOverrideFile>
    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
+    <DocumentationFile></DocumentationFile>
-    </DocumentationFile>
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
    <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,49 +46,45 @@
    <ConfigurationOverrideFile>
    </ConfigurationOverrideFile>
    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
+    <DocumentationFile></DocumentationFile>
-    </DocumentationFile>
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
    <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
-      <Name>XMLRPC</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
@@ -109,9 +100,6 @@
    <Compile Include="IRegionCommsListener.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDHelpers.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Logger.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -160,12 +148,6 @@
    <Compile Include="Interfaces\Config\IUserConfig.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -219,4 +201,4 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index afe1aea..a18838b 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -15,15 +15,12 @@
                <include name="AuthenticateSessionBase.cs" />
                <include name="BlockingQueue.cs" />
                <include name="IRegionCommsListener.cs" />
-                <include name="LLSDHelpers.cs" />
                <include name="Logger.cs" />
                <include name="LoginService.cs" />
                <include name="RegionCommsListener.cs" />
                <include name="Remoting.cs" />
                <include name="SimProfile.cs" />
                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
                <include name="Util.cs" />
                <include name="Interfaces/AuthenticateResponse.cs" />
                <include name="Interfaces/IAssetServer.cs" />
@@ -34,8 +31,6 @@
                <include name="Interfaces/Config/IGenericConfig.cs" />
                <include name="Interfaces/Config/IGridConfig.cs" />
                <include name="Interfaces/Config/IUserConfig.cs" />
-                <include name="Interfaces/Scripting/IScriptAPI.cs" />
-                <include name="Interfaces/Scripting/IScriptEngine.cs" />
                <include name="Properties/AssemblyInfo.cs" />
                <include name="Types/AgentCiruitData.cs" />
                <include name="Types/AgentWearable.cs" />
@@ -57,17 +52,17 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
index 86f5cdb..86f5cdb 100644
--- a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index bba928f..5fa2f58 100644
--- a/Common/OpenSim.Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework
        {
            if(OnExpectUser != null)
            {
+                
                OnExpectUser(regionHandle, agent);
                return true;
            }
diff --git a/Common/OpenSim.Framework/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
index e6fdf70..e6fdf70 100644
--- a/Common/OpenSim.Framework/Remoting.cs
+++ b/OpenSim/Framework/General/Remoting.cs
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
index cfa5e50..cfa5e50 100644
--- a/Common/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim/Framework/General/SimProfile.cs
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
index a650343..a650343 100644
--- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs
+++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 4c93da7..4c93da7 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index 86586a6..86586a6 100644
--- a/Common/OpenSim.Framework/Types/AssetBase.cs
+++ b/OpenSim/Framework/General/Types/AssetBase.cs
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
index 8a10b70..8a10b70 100644
--- a/Common/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/OpenSim/Framework/General/Types/AssetLandmark.cs
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
index 8cac23a..8cac23a 100644
--- a/Common/OpenSim.Framework/Types/AssetStorage.cs
+++ b/OpenSim/Framework/General/Types/AssetStorage.cs
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 778c893..778c893 100644
--- a/Common/OpenSim.Framework/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index 3180a16..3180a16 100644
--- a/Common/OpenSim.Framework/Types/Login.cs
+++ b/OpenSim/Framework/General/Types/Login.cs
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
index 2e6f56e..2e6f56e 100644
--- a/Common/OpenSim.Framework/Types/MapBlockData.cs
+++ b/OpenSim/Framework/General/Types/MapBlockData.cs
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
index 310fd1c..310fd1c 100644
--- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d7811..c6b81a7 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
                        this.GridRecvKey = attri;
                    }
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("UserServerURL");
+                    if (attri == "")
+                    {
+                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+                        configData.SetAttribute("UserServerURL", this.UserURL);
+                    }
+                    else
+                    {
+                        this.UserURL = attri;
+                    }
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserSendKey");
+                    if (attri == "")
+                    {
+                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+                        configData.SetAttribute("UserSendKey", this.UserSendKey);
+                    }
+                    else
+                    {
+                        this.UserSendKey = attri;
+                    }
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserRecvKey");
+                    if (attri == "")
+                    {
+                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+                        configData.SetAttribute("GridRecvKey", this.UserRecvKey);
+                    }
+                    else
+                    {
+                        this.UserRecvKey = attri;
+                    }
                    attri = "";
                    attri = configData.GetAttribute("AssetServerURL");
                    if (attri == "")
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 40f128a..40f128a 100644
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
index f84ae3e..f84ae3e 100644
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ b/OpenSim/Framework/General/Types/PrimData.cs
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 1271d04..1271d04 100644
--- a/Common/OpenSim.Framework/Types/RegionHandle.cs
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 48e6922..0fba6ca 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
                attri = configData.GetAttribute("SimLocationX");
                if (attri == "")
                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
                    configData.SetAttribute("SimLocationX", location);
                    this.RegionLocX = (uint)Convert.ToUInt32(location);
                }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
                attri = configData.GetAttribute("SimLocationY");
                if (attri == "")
                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
                    configData.SetAttribute("SimLocationY", location);
                    this.RegionLocY = (uint)Convert.ToUInt32(location);
                }
diff --git a/Common/OpenSim.Framework/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 04ff20b..263dba2 100644
--- a/Common/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
        {
            Circuits = new Dictionary<LLUUID, uint>();
            Inventory = new AgentInventory();
-            homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
+            homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
            homepos = new LLVector3();
            homelookat = new LLVector3();
        }
diff --git a/Common/OpenSim.Framework/Util.cs b/OpenSim/Framework/General/Util.cs
index 8c34c9b..8c34c9b 100644
--- a/Common/OpenSim.Framework/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
index df68722..aae8cd2 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E88EF749-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{C74E4A30-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.GenericConfig.Xml</AssemblyName>
+    <AssemblyName>OpenSim.Framework.GenericConfig.Xml</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.GenericConfig.Xml</RootNamespace>
+    <RootNamespace>OpenSim.Framework.GenericConfig.Xml</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -68,7 +68,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
index 7717545..a4617cc 100644
--- a/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Caches" default="build">
+<project name="OpenSim.Framework.GenericConfig.Xml" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,10 +8,10 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Caches" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.GenericConfig.Xml" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="AssetCache.cs" />
+                <include name="XmlConfig.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
@@ -19,15 +19,14 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
index de5f48d..de5f48d 100644
--- a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
index c526aec..c526aec 100644
--- a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index e55e33c..8c8204a 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -31,12 +31,11 @@ using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-//using OpenSim.CAPS;
 using Nwc.XmlRpc;
 using System.Collections;
 using OpenSim.Framework.Console;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
    public class BaseHttpServer
    {
@@ -171,7 +170,7 @@ namespace OpenSim.Servers
        protected virtual string ParseLLSDXML(string requestBody)
        {
            // dummy function for now - IMPLEMENT ME!
-            Console.WriteLine("LLSD request "+requestBody);
+            //Console.WriteLine("LLSD request "+requestBody);
            string resp = "";
            if (firstcaps)
            {
@@ -195,7 +194,7 @@ namespace OpenSim.Servers
            }
            catch (Exception e)
            {
-                Console.WriteLine(e.ToString());
+                //Console.WriteLine(e.ToString());
            }
            return responseString;
        }
@@ -273,7 +272,7 @@ namespace OpenSim.Servers
            }
            catch (Exception e)
            {
-                Console.WriteLine(e.ToString());
+                //Console.WriteLine(e.ToString());
            }
        }
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index a359205..6aeb58c 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -40,7 +40,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Console;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
 /*    public class CheckSumServer : UDPServerBase
    {
diff --git a/Common/OpenSim.Servers/IRestHandler.cs b/OpenSim/Framework/Servers/IRestHandler.cs
index 3aa508c..a2b6bf0 100644
--- a/Common/OpenSim.Servers/IRestHandler.cs
+++ b/OpenSim/Framework/Servers/IRestHandler.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
    public delegate string RestMethod( string request, string path, string param );
 }
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
new file mode 100644
index 0000000..399f456
--- /dev/null
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -0,0 +1,116 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2CC71860-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Servers</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Servers</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseHttpServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CheckSumServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IRestHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UDPServerBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcMethod.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 7c3eb68..7401b07 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.GridInterfaces.Remote" default="build">
+<project name="OpenSim.Framework.Servers" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,11 +8,14 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
+            <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="BaseHttpServer.cs" />
-                <include name="RemoteAssetServer.cs" />
+                <include name="CheckSumServer.cs" />
+                <include name="IRestHandler.cs" />
+                <include name="UDPServerBase.cs" />
+                <include name="XmlRpcMethod.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/Common/OpenSim.Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index b472c97..610d23b 100644
--- a/Common/OpenSim.Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -38,7 +38,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
    public class UDPServerBase
    {
diff --git a/Common/OpenSim.Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
index 05cbf2e..51b3303 100644
--- a/Common/OpenSim.Servers/XmlRpcMethod.cs
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -28,7 +28,7 @@
 using System;
 using Nwc.XmlRpc;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
    public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    
 }
diff --git a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 514ebef..d1cd8cf 100644
--- a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -9,7 +9,7 @@ using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Interfaces;
 using Nwc.XmlRpc;
-namespace OpenGrid.Framework.UserManagement
+namespace OpenSim.Framework.UserManagement
 {
    /// <summary>
@@ -124,7 +124,7 @@ namespace OpenGrid.Framework.UserManagement
                this.ErrorReason = "key";
                this.welcomeMessage = "Welcome to OpenSim!";
                this.seedCapability = "";
-                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
+                this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
                this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
                this.RegionX = (uint)255232;
                this.RegionY = (uint)254976;
@@ -227,6 +227,7 @@ namespace OpenGrid.Framework.UserManagement
                responseData["sim_port"] =(Int32) this.SimPort;
                responseData["sim_ip"] = this.SimAddress;
+                Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
                responseData["agent_id"] = this.AgentID.ToStringHyphenated();
                responseData["session_id"] = this.SessionID.ToStringHyphenated();
                responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 9a3cdba..02aa3f3 100644
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DA9A7391-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{586E2916-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.UserManagement</AssemblyName>
+    <AssemblyName>OpenSim.Framework.UserManagement</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.UserManagement</RootNamespace>
+    <RootNamespace>OpenSim.Framework.UserManagement</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="OpenSim.Framework" >
@@ -74,12 +74,12 @@
      <HintPath>OpenSim.Framework.Console.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers" >
+    <Reference Include="OpenSim.Framework.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -94,15 +94,15 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>XMLRPC.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
new file mode 100644
index 0000000..d2f4345
--- /dev/null
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.UserManagement" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="LoginResponse.cs" />
+                <include name="UserManagerBase.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 01fbf3a..d06059e 100644
--- a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
 using System.Reflection;
@@ -41,7 +41,7 @@ using OpenSim.Framework.Utilities;
 using System.Security.Cryptography;
-namespace OpenGrid.Framework.UserManagement
+namespace OpenSim.Framework.UserManagement
 {
    public class UserManagerBase
    {
@@ -468,17 +468,16 @@ namespace OpenGrid.Framework.UserManagement
                    }
                    catch (Exception e)
                    {
-                        Console.WriteLine(e.ToString());
+                        System.Console.WriteLine(e.ToString());
                        return logResponse.CreateDeadRegionResponse();
                    }
                    CommitAgent(ref TheUser);
                    return logResponse.ToXmlRpcResponse();
                }
                catch (Exception E)
                {
-                    Console.WriteLine(E.ToString());
+                    System.Console.WriteLine(E.ToString());
                }
                //}
            }
@@ -537,27 +536,15 @@ namespace OpenGrid.Framework.UserManagement
        /// Returns an error message that the user could not be found in the database
        /// </summary>
        /// <returns>XML string consisting of a error element containing individual error(s)</returns>
-        public string CreateUnknownUserErrorResponse()
+        public XmlRpcResponse CreateUnknownUserErrorResponse()
        {
-            System.IO.StringWriter sw = new System.IO.StringWriter();
+            XmlRpcResponse response = new XmlRpcResponse();
-            XmlTextWriter xw = new XmlTextWriter(sw);
+            Hashtable responseData = new Hashtable();
+            responseData["error_type"] = "unknown_user";
-            // Header
+            responseData["error_desc"] = "The user requested is not in the database";
-            xw.Formatting = Formatting.Indented;
-            xw.WriteStartDocument();
-            xw.WriteDocType("error", null, null, null);
-            xw.WriteComment("An error occured");
-            xw.WriteStartElement("error");
-            // User
-            xw.WriteElementString("unknownuser", "Unable to find a user with that name");
-            // Footer
-            xw.WriteEndElement();
-            xw.Flush();
-            xw.Close();
-            return sw.ToString();
+            response.Value = responseData;
+            return response;
        }
        /// <summary>
@@ -565,75 +552,81 @@ namespace OpenGrid.Framework.UserManagement
        /// </summary>
        /// <param name="profile">The user profile</param>
        /// <returns>A string containing an XML Document of the user profile</returns>
-        public string ProfileToXml(UserProfileData profile)
+        public XmlRpcResponse ProfileToXmlRPCResponse(UserProfileData profile)
        {
-            System.IO.StringWriter sw = new System.IO.StringWriter();
+            XmlRpcResponse response = new XmlRpcResponse();
-            XmlTextWriter xw = new XmlTextWriter(sw);
+            Hashtable responseData = new Hashtable();
-            // Header
-            xw.Formatting = Formatting.Indented;
-            xw.WriteStartDocument();
-            xw.WriteDocType("userprofile", null, null, null);
-            xw.WriteComment("Found user profiles matching the request");
-            xw.WriteStartElement("users");
-            // User
-            xw.WriteStartElement("user");
            // Account information
-            xw.WriteAttributeString("firstname", profile.username);
+            responseData["firstname"] = profile.username;
-            xw.WriteAttributeString("lastname", profile.surname);
+            responseData["lastname"]  = profile.surname;
-            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
+            responseData["uuid"]  = profile.UUID.ToStringHyphenated();
            // Server Information
-            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
+            responseData["server_inventory"]  = profile.userInventoryURI;
-            xw.WriteAttributeString("server_asset", profile.userAssetURI);
+            responseData["server_asset"]  = profile.userAssetURI;
            // Profile Information
-            xw.WriteAttributeString("profile_about", profile.profileAboutText);
+            responseData["profile_about"]  = profile.profileAboutText;
-            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
+            responseData["profile_firstlife_about"]  = profile.profileFirstText;
-            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
+            responseData["profile_firstlife_image"]  = profile.profileFirstImage.ToStringHyphenated();
-            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
+            responseData["profile_can_do"]  = profile.profileCanDoMask.ToString();
-            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
+            responseData["profile_want_do"]  = profile.profileWantDoMask.ToString();
-            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
+            responseData["profile_image"]  = profile.profileImage.ToStringHyphenated();
-            xw.WriteAttributeString("profile_created",profile.created.ToString());
+            responseData["profile_created"] = profile.created.ToString();
-            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
+            responseData["profile_lastlogin"] = profile.lastLogin.ToString();
            // Home region information
-            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
+            responseData["home_coordinates"]  = profile.homeLocation.ToString();
-            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
+            responseData["home_region"]  = profile.homeRegion.ToString();
-            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
+            responseData["home_look"]  = profile.homeLookAt.ToString();
-            xw.WriteEndElement();
-            // Footer
+            response.Value = responseData;
-            xw.WriteEndElement();
+            return response;
-            xw.Flush();
-            xw.Close();
-            return sw.ToString();
        }
-        #region REST Methods 
+        #region XMLRPC User Methods 
        //should most likely move out of here and into the grid's userserver sub class
-        public string RestGetUserMethodName(string request, string path, string param)
+        public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request)
        {
-            UserProfileData userProfile = getUserProfile(param.Trim());
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+            UserProfileData userProfile;
-            if (userProfile == null)
+            if (requestData.Contains("avatar_name"))
+            {
+                userProfile = getUserProfile((string)requestData["avatar_name"]);
+                if (userProfile == null)
+                {
+                    return CreateUnknownUserErrorResponse();
+                }
+            }
+            else
            {
                return CreateUnknownUserErrorResponse();
            }
+            
-            return ProfileToXml(userProfile);
+            return ProfileToXmlRPCResponse(userProfile);
        }
-        public string RestGetUserMethodUUID(string request, string path, string param)
+        public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request)
        {
-            UserProfileData userProfile = getUserProfile(new LLUUID(param));
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
-            if (userProfile == null)
+            UserProfileData userProfile;
+            if (requestData.Contains("avatar_uuid"))
+            {
+                userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);
+                if (userProfile == null)
+                {
+                    return CreateUnknownUserErrorResponse();
+                }
+            }
+            else
            {
                return CreateUnknownUserErrorResponse();
            }
-            return ProfileToXml(userProfile);
+            return ProfileToXmlRPCResponse(userProfile);
        }
        #endregion
diff --git a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 6fc6bf8..ad8733f 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -35,9 +35,9 @@ using System.Threading;
 using Nwc.XmlRpc;
 using System.Collections;
 using OpenSim.Framework.Console;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
-namespace OpenGridServices.AssetServer
+namespace OpenSim.Grid.AssetServer
 {
    /// <summary>
    /// An HTTP server for sending assets
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 96c9dba..d06998d 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
-namespace OpenGridServices.AssetServer
+namespace OpenSim.Grid.AssetServer
 {
    /// <summary>
    /// An asset server
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 7470499..caebca3 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0021261B-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{E5F1A03B-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.AssetServer</AssemblyName>
+    <AssemblyName>OpenSim.Grid.AssetServer</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Exe</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.AssetServer</RootNamespace>
+    <RootNamespace>OpenSim.Grid.AssetServer</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="OpenSim.Framework" >
@@ -74,8 +74,8 @@
      <HintPath>OpenSim.Framework.Console.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers" >
+    <Reference Include="OpenSim.Framework.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -90,8 +90,8 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>XMLRPC.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 385d85d..0f9540e 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGridServices.AssetServer" default="build">
+<project name="OpenSim.Grid.AssetServer" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >
+            <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssetHttpServer.cs" />
@@ -20,20 +20,20 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index f9a18a8..f9a18a8 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index dfc572a..3f5d7dd 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -27,12 +27,12 @@
 */
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
-namespace OpenGrid.Framework.Manager
+namespace OpenSim.Framework.Manager
 {
    /// <summary>
    /// Used to pass messages to the gridserver
@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
            Hashtable requestData = (Hashtable)request.Params[0];
            Hashtable responseData = new Hashtable();
-            // TODO: Switch this over to using OpenGrid.Framework.Data
+            // TODO: Switch this over to using OpenSim.Framework.Data
            if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
            {
                response.IsFault = false;
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index e276556..d5eaf6f 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -33,7 +33,7 @@ using Nwc.XmlRpc;
 using System.Threading;
 using libsecondlife;
-namespace OpenGrid.Framework.Manager {
+namespace OpenSim.Framework.Manager {
    /// <summary>
    /// A remote management system for the grid server
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index e1c9f42..9a98ff4 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7924FD35-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{4B7BFD1C-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Manager</AssemblyName>
+    <AssemblyName>OpenSim.Grid.Framework.Manager</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Manager</RootNamespace>
+    <RootNamespace>OpenSim.Grid.Framework.Manager</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,23 +59,23 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="OpenSim.Framework" >
      <HintPath>OpenSim.Framework.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers" >
+    <Reference Include="OpenSim.Framework.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>XMLRPC.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
new file mode 100644
index 0000000..119967d
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.Framework.Manager" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Grid.Framework.Manager" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="GridManagementAgent.cs" />
+                <include name="GridServerManager.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
index c9701d6..c9701d6 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
index 2218004..2218004 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
index ddb48af..24e845c 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0027747-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{1442B635-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Config.GridConfigDb4o</AssemblyName>
+    <AssemblyName>OpenSim.Grid.GridServer.Config</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Config.GridConfigDb4o</RootNamespace>
+    <RootNamespace>OpenSim.Grid.GridServer.Config</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
index 075593b..ff57dac 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Config.GridConfigDb4o" default="build">
+<project name="OpenSim.Grid.GridServer.Config" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" >
+            <resources prefix="OpenSim.Grid.GridServer.Config" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -21,8 +21,8 @@
                </lib>
                <include name="../../../bin/Db4objects.Db4o.dll" />
                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll.dll" />
                <include name="System.Xml.dll" />
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index bf80652..c78d14a 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.Reflection;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Sims;
@@ -38,7 +38,7 @@ using libsecondlife;
 using Nwc.XmlRpc;
 using System.Xml;
-namespace OpenGridServices.GridServer
+namespace OpenSim.Grid.GridServer
 {
    class GridManager
    {
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b948fd6..b225214 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,22 +34,22 @@ using System.Net;
 using System.Threading;
 using System.Reflection;
 using libsecondlife;
-using OpenGrid.Framework.Manager;
+using OpenSim.Framework.Manager;
 using OpenSim.Framework;
 using OpenSim.Framework.Sims;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.GenericConfig;
-namespace OpenGridServices.GridServer
+namespace OpenSim.Grid.GridServer
 {
    /// <summary>
    /// </summary>
    public class OpenGrid_Main : conscmd_callback
    {
        private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
-        private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
+        private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
        public GridConfig Cfg;
        public static OpenGrid_Main thegrid;
@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
                attri = configData.GetAttribute("DataBaseProvider");
                if (attri == "")
                {
-                    GridDll = "OpenGrid.Framework.Data.DB4o.dll";
+                    GridDll = "OpenSim.Framework.Data.DB4o.dll";
-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
                }
                else
                {
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
index 291f997..424072e 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{21BFC8E2-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{60FCC3A6-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.GridServer</AssemblyName>
+    <AssemblyName>OpenSim.Grid.GridServer</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Exe</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.GridServer</RootNamespace>
+    <RootNamespace>OpenSim.Grid.GridServer</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="OpenSim.Framework" >
@@ -74,12 +74,12 @@
      <HintPath>OpenSim.Framework.Console.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers" >
+    <Reference Include="OpenSim.Framework.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -94,21 +94,21 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>XMLRPC.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj">
+    <ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj">
-      <Name>OpenGrid.Framework.Manager</Name>
+      <Name>OpenSim.Grid.Framework.Manager</Name>
-      <Project>{7924FD35-0000-0000-0000-000000000000}</Project>
+      <Project>{4B7BFD1C-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
index 087922b..3573e89 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="SimpleApp" default="build">
+<project name="OpenSim.Grid.GridServer" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,11 +8,11 @@
            </fileset>
        </copy>
        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="SimpleApp" dynamicprefix="true" >
+            <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="MyWorld.cs" />
+                <include name="GridManager.cs" />
-                <include name="Program.cs" />
+                <include name="Main.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
@@ -20,18 +20,16 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenGrid.Framework.Communications.dll" />
+                <include name="OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Caches.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.GenericConfig.Xml.dll" />
-                <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
-                <include name="../../../bin/OpenSim.LocalCommunications.dll" />
+                <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" />
-                <include name="../../../bin/OpenSim.Region.dll" />
-                <include name="../../../bin/OpenSim.RegionServer.dll" />
-                <include name="../../../bin/OpenSim.Servers.dll" />
                <include name="System.dll" />
-                <include name="System.Data.dll.dll" />
+                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
                <include name="../../../bin/XMLRPC.dll" />
            </references>
diff --git a/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 303dddf..303dddf 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index 9ca9b5e..9ca9b5e 100644
--- a/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index f479a79..f479a79 100644
--- a/OpenGridServices/OpenGridServices.InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
index ed7bc24..ed7bc24 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
index f221509..f221509 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
index d887d0e..d887d0e 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
index af4e275..af4e275 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
index 83685fc..83685fc 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs
index 0d509ef..0d509ef 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
index 8a80b1d..8a80b1d 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index 6b632d6..6b632d6 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
index 42e09e0..42e09e0 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
index 1db38f0..1db38f0 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
index cfdc085..cfdc085 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
index 44e7a61..44e7a61 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
Binary files differ
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
index 00f7c65..00f7c65 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
index 5bf7ff9..5bf7ff9 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
index da6739e..da6739e 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 8798dac..8798dac 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index dd4abdd..dd4abdd 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
index c883f08..c883f08 100644
--- a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
index 25e0211..25e0211 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 770a6b9..770a6b9 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
index a89a38d..1ae9589 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7E494328-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{08F87229-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenUser.Config.UserConfigDb4o</AssemblyName>
+    <AssemblyName>OpenSim.Grid.UserServer.Config</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenUser.Config.UserConfigDb4o</RootNamespace>
+    <RootNamespace>OpenSim.Grid.UserServer.Config</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
index bd5d49f..fc7e00b 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenUser.Config.UserConfigDb4o" default="build">
+<project name="OpenSim.Grid.UserServer.Config" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" >
+            <resources prefix="OpenSim.Grid.UserServer.Config" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -21,8 +21,8 @@
                </lib>
                <include name="../../../bin/Db4objects.Db4o.dll" />
                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll.dll" />
                <include name="System.Xml.dll" />
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 5c27d57..640f91a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -38,18 +38,18 @@ using OpenSim.Framework.Sims;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Console;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework.Utilities;
 using OpenSim.GenericConfig;
-namespace OpenGridServices.UserServer
+namespace OpenSim.Grid.UserServer
 {
    /// <summary>
    /// </summary>
    public class OpenUser_Main :  conscmd_callback
    {
-        private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
+        private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll";
-        private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";
+        private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
        private UserConfig Cfg;
        protected IGenericConfig localXMLConfig;
@@ -107,8 +107,8 @@ namespace OpenGridServices.UserServer
            httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
-            httpServer.AddRestHandler("GET", "/user/name/", m_userManager.RestGetUserMethodName);
+            httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
-            httpServer.AddRestHandler("GET", "/user/uuid/", m_userManager.RestGetUserMethodUUID);
+            httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);
            httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer
                attri = configData.GetAttribute("DataBaseProvider");
                if (attri == "")
                {
-                    StorageDll = "OpenGrid.Framework.Data.DB4o.dll";
+                    StorageDll = "OpenSim.Framework.Data.DB4o.dll";
-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
                }
                else
                {
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index ad0080a..1146b17 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{66591469-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{2FC96F92-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.UserServer</AssemblyName>
+    <AssemblyName>OpenSim.Grid.UserServer</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Exe</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.UserServer</RootNamespace>
+    <RootNamespace>OpenSim.Grid.UserServer</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,15 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenGrid.Framework.UserManager" >
-      <HintPath>OpenGrid.Framework.UserManager.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="OpenSim.Framework" >
@@ -78,12 +74,12 @@
      <HintPath>OpenSim.Framework.Console.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers" >
+    <Reference Include="OpenSim.Framework.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -98,15 +94,21 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>XMLRPC.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index d262947..8bc1fc1 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGridServices.UserServer" default="build">
+<project name="OpenSim.Grid.UserServer" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
+            <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="Main.cs" />
@@ -20,23 +20,23 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="OpenSim.Framework.dll" />
-                <include name="OpenGrid.Framework.UserManager.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.GenericConfig.Xml.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
+                <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 0704de1..c99cf87 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
 using System.Reflection;
@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Sims;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
-using OpenGrid.Framework.UserManagement;
+using OpenSim.Framework.UserManagement;
 using System.Security.Cryptography;
-namespace OpenGridServices.UserServer
+namespace OpenSim.Grid.UserServer
 {
    public class UserManager : UserManagerBase
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
deleted file mode 100644
index 7b53388..0000000
--- a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-namespace OpenSim.Region.Scenes
-{
-    public partial class Scene
-    {
-        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
-        /// <summary>
-        /// 
-        /// </summary>
-        private void LoadScriptEngines()
-        {
-            this.LoadScriptPlugins();
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public void LoadScriptPlugins()
-        {
-            string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
-            string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-            for (int i = 0; i < pluginFiles.Length; i++)
-            {
-                this.AddPlugin(pluginFiles[i]);
-            }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="FileName"></param>
-        private void AddPlugin(string FileName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
-                        if (typeInterface != null)
-                        {
-                            IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            plug.Init(this);
-                            this.scriptEngines.Add(plug.GetName(), plug);
-                        }
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="scriptType"></param>
-        /// <param name="scriptName"></param>
-        /// <param name="script"></param>
-        /// <param name="ent"></param>
-        public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
-        {
-            if(this.scriptEngines.ContainsKey(scriptType))
-            {
-                this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.LocalId);
-            }
-        }
-        #region IScriptAPI Methods
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <returns></returns>
-        public LLVector3 GetEntityPosition(uint localID)
-        {
-            LLVector3 res = new LLVector3();
-           // Console.WriteLine("script-  getting entity " + localID + " position");
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity.LocalId == localID)
-                {
-                    res.X = entity.Pos.X;
-                    res.Y = entity.Pos.Y;
-                    res.Z = entity.Pos.Z;
-                }
-            }
-            return res;
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="z"></param>
-        public void SetEntityPosition(uint localID, float x , float y, float z)
-        {
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity.LocalId == localID && entity is Primitive)
-                {
-                    LLVector3 pos = entity.Pos;
-                    pos.X = x;
-                    pos.Y = y;
-                   Primitive prim = entity as Primitive;
-                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
-                   //prim.UpdatePosition(pos);
-                   // Console.WriteLine("script- setting entity " + localID + " positon");
-                }
-            }
-           
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public uint GetRandomAvatarID()
-        {
-            //Console.WriteLine("script- getting random avatar id");
-            uint res = 0;
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity is ScenePresence)
-                {
-                    res = entity.LocalId;
-                }
-            }
-            return res;
-        }
-        #endregion
-    }
-}
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneEvents.cs b/OpenSim/OpenSim.Region/Scenes/SceneEvents.cs
deleted file mode 100644
index 4b39e51..0000000
--- a/OpenSim/OpenSim.Region/Scenes/SceneEvents.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-namespace OpenSim.Region.Scenes
-{
-    /// <summary>
-    /// A class for triggering remote scene events.
-    /// </summary>
-    public class EventManager
-    {
-        public delegate void OnFrameDelegate();
-        public event OnFrameDelegate OnFrame;
-        public delegate void OnNewPresenceDelegate(ScenePresence presence);
-        public event OnNewPresenceDelegate OnNewPresence;
-        public delegate void OnNewPrimitiveDelegate(Primitive prim);
-        public event OnNewPrimitiveDelegate OnNewPrimitive;
-        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
-        public event OnRemovePresenceDelegate OnRemovePresence;
-        public void TriggerOnFrame()
-        {
-            if (OnFrame != null)
-            {
-                OnFrame();
-            }
-        }
-        public void TriggerOnNewPrimitive(Primitive prim)
-        {
-            if (OnNewPrimitive != null)
-                OnNewPrimitive(prim);
-        }
-        public void TriggerOnNewPresence(ScenePresence presence)
-        {
-            if (OnNewPresence != null)
-                OnNewPresence(presence);
-        }
-        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
-        {
-            if (OnRemovePresence != null)
-            {
-                OnRemovePresence(uuid);
-            }
-        }
-    }
-}
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JSharpScriptEngine.cs
deleted file mode 100644
index b33b55d..0000000
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JSharpScriptEngine.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-// Compilation stuff
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using Microsoft.VJSharp;
-namespace OpenSim.Scripting
-{
-    public class JSharpScriptEngine : IScriptCompiler
-    {
-        public string FileExt()
-        {
-            return ".jsl";
-        }
-        private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename)
-        {
-            CompilerParameters compilerParams = new CompilerParameters();
-            CompilerResults compilerResults;
-            compilerParams.GenerateExecutable = false;
-            compilerParams.GenerateInMemory = true;
-            compilerParams.IncludeDebugInformation = false;
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");
-            compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");
-            compilerParams.ReferencedAssemblies.Add("System.dll");
-            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
-            if (compilerResults.Errors.Count > 0)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
-                foreach (CompilerError error in compilerResults.Errors)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
-                }
-            }
-            else
-            {
-                Dictionary<string, IScript> scripts = new Dictionary<string, IScript>();
-                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
-                {
-                    Type testInterface = pluginType.GetInterface("IScript", true);
-                    if (testInterface != null)
-                    {
-                        IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
-                        string scriptName = "J#/" + script.getName();
-                        Console.WriteLine("Script: " + scriptName + " loaded.");
-                        if (!scripts.ContainsKey(scriptName))
-                        {
-                            scripts.Add(scriptName, script);
-                        }
-                        else
-                        {
-                            scripts[scriptName] = script;
-                        }
-                    }
-                }
-                return scripts;
-            }
-            return null;
-        }
-        public Dictionary<string, IScript> compile(string filename)
-        {
-            VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider();
-            return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename);
-        }
-    }
-}
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
deleted file mode 100644
index 13ca938..0000000
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenSim" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="Application.cs" />
-                <include name="OpenSimMain.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Communications.dll" />
-                <include name="../../bin/OpenGrid.Framework.Communications.OGS1.dll" />
-                <include name="../../bin/OpenGrid.Framework.UserManagement.dll" />
-                <include name="../../bin/OpenSim.Caches.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
-                <include name="../../bin/OpenSim.LocalCommunications.dll" />
-                <include name="../../bin/OpenSim.Physics.Manager.dll" />
-                <include name="../../bin/OpenSim.Region.dll" />
-                <include name="../../bin/OpenSim.RegionServer.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/Region/Application/Application.cs
index 40701b0..1dcd99b 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework.Console;
+using OpenSim.Region.ClientStack;
 namespace OpenSim
 {
@@ -108,7 +109,7 @@ namespace OpenSim
            sim.m_sandbox = sandBoxMode;
            sim.user_accounts = userAccounts;
            sim.gridLocalAsset = gridLocalAsset;
-            OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+            OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
            sim.StartUp();
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 222e2f7..bec85cc 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,15 +59,15 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -78,89 +78,93 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenGrid.Framework.Communications</Name>
+      <Name>OpenSim.Framework</Name>
-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj">
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenGrid.Framework.Communications.OGS1</Name>
+      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{17442AF1-0000-0000-0000-000000000000}</Project>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenGrid.Framework.UserManagement</Name>
+      <Name>OpenSim.Framework.Console</Name>
-      <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Caches</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
-      <Name>OpenSim.Framework</Name>
+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.Framework.Console</Name>
+      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
-      <Name>OpenSim.GenericConfig.Xml</Name>
+      <Name>OpenSim.Framework.UserManagement</Name>
-      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj">
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
-      <Name>OpenSim.LocalCommunications</Name>
+      <Name>OpenSim.Region.Caches</Name>
-      <Project>{79CED992-0000-0000-0000-000000000000}</Project>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.ClientStack</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj">
+    <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
-      <Name>OpenSim.Region</Name>
+      <Name>OpenSim.Region.Communications.Local</Name>
-      <Project>{196916AF-0000-0000-0000-000000000000}</Project>
+      <Project>{BFB5D807-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
+    <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj">
-      <Name>OpenSim.RegionServer</Name>
+      <Name>OpenSim.Region.Communications.OGS1</Name>
-      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
+      <Project>{4806E378-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
+    <ProjectReference Include="..\Environment\OpenSim.Region.Environment.csproj">
-      <Name>OpenSim.Servers</Name>
+      <Name>OpenSim.Region.Environment</Name>
-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Terrain.BasicTerrain</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
-      <Name>XMLRPC</Name>
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
@@ -172,6 +176,9 @@
    <Compile Include="OpenSimMain.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
new file mode 100644
index 0000000..6c7d7ac
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -0,0 +1,60 @@
+<?xml version="1.0" ?>
+<project name="OpenSim" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="OpenSim" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Application.cs" />
+                <include name="OpenSimMain.cs" />
+                <include name="VersionInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="../../../bin/OpenSim.Region.ClientStack.dll" />
+                <include name="../../../bin/OpenSim.Region.Communications.Local.dll" />
+                <include name="../../../bin/OpenSim.Region.Communications.OGS1.dll" />
+                <include name="../../../bin/OpenSim.Region.Environment.dll" />
+                <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index b7ec9e6..fcb2493 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -38,30 +38,34 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Region;
+using OpenSim.Region.Environment;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Physics.Manager;
 using Nwc.XmlRpc;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.GenericConfig;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
-using OpenSim.LocalCommunications;
+using OpenSim.Region.Communications.OGS1;
-using OpenGrid.Framework.Communications.OGS1;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.ClientStack;
 namespace OpenSim
 {
    public class OpenSimMain : RegionApplicationBase, conscmd_callback
    {
-      //  private CheckSumServer checkServer;
        protected CommunicationsManager commsManager;
+      //  private CheckSumServer checkServer;
        private bool m_silent;
        private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -102,19 +106,17 @@ namespace OpenSim
            ClientView.TerrainManager = new TerrainManager(new SecondLife());
-            CommunicationsLocal sandboxCommunications = null;
            if (m_sandbox)
            {
                this.SetupLocalGridServers();
              //  this.checkServer = new CheckSumServer(12036);
              //  this.checkServer.ServerListener();
-                sandboxCommunications = new CommunicationsLocal(this.serversData);
+                this.commsManager = new CommunicationsLocal(this.serversData);
-                this.commsManager = sandboxCommunications;
            }
            else
            {
                this.SetupRemoteGridServers();
-                this.commsManager = new GridCommsManager(this.serversData);
+                this.commsManager = new CommunicationsOGS1(this.serversData);
            }
            startuptime = DateTime.Now;
@@ -132,7 +134,7 @@ namespace OpenSim
            if (m_sandbox)
            {
-                httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
+                httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
            }
            //Start http server
@@ -152,7 +154,7 @@ namespace OpenSim
        {
            try
            {
-                AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
                InventoryCache = new InventoryCache();
            }
            catch (Exception e)
@@ -167,7 +169,7 @@ namespace OpenSim
        {
            try
            {
-                AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
                InventoryCache = new InventoryCache();
            }
            catch (Exception e)
@@ -241,14 +243,21 @@ namespace OpenSim
                udpServer.LocalWorld = LocalWorld;
-                LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+                LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
                LocalWorld.LoadWorldMap();
                m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
                LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
                LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
                LocalWorld.LoadPrimsFromStorage();
-                LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+                //Master Avatar Setup
+                UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
+                if (masterAvatar != null)
+                {
+                    LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+                }
                LocalWorld.StartTimer();
@@ -358,23 +367,23 @@ namespace OpenSim
                case "":
                    this.m_physicsEngine = "basicphysics";
                    configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
                    break;
                case "basicphysics":
                    this.m_physicsEngine = "basicphysics";
                    configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
                    break;
                case "RealPhysX":
                    this.m_physicsEngine = "RealPhysX";
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
                    break;
                case "OpenDynamicsEngine":
                    this.m_physicsEngine = "OpenDynamicsEngine";
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
                    break;
            }
@@ -433,13 +442,6 @@ namespace OpenSim
                    }
                    break;
-                case "script":
-                    for (int i = 0; i < m_localWorld.Count; i++)
-                    {
-                        ((Scene)m_localWorld[i]).scriptManager.RunScriptCmd(cmdparams);
-                    }
-                    break;
                case "shutdown":
                    Shutdown();
                    break;
@@ -463,7 +465,7 @@ namespace OpenSim
                    m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
                    break;
                case "users":
-                    OpenSim.Region.Scenes.ScenePresence TempAv;
+                    OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
                    m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
                    /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
                     {
diff --git a/OpenSim/OpenSim.RegionServer/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
index 5d1354e..5d1354e 100644
--- a/OpenSim/OpenSim.RegionServer/VersionInfo.cs
+++ b/OpenSim/Region/Application/VersionInfo.cs
diff --git a/OpenSim/OpenSim.Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs
index d0cc370..6cf921b 100644
--- a/OpenSim/OpenSim.Caches/AssetCache.cs
+++ b/OpenSim/Region/Caches/AssetCache.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-namespace OpenSim.Caches
+namespace OpenSim.Region.Caches
 {
    public delegate void DownloadComplete(AssetCache.TextureSender sender);
diff --git a/OpenSim/OpenSim.Caches/OpenSim.Caches.csproj b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
index 07e4960..4a73d08 100644
--- a/OpenSim/OpenSim.Caches/OpenSim.Caches.csproj
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1938EB12-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{61FCCDB3-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Caches</AssemblyName>
+    <AssemblyName>OpenSim.Region.Caches</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Caches</RootNamespace>
+    <RootNamespace>OpenSim.Region.Caches</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,7 +72,7 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
index 075ea7f..3ca89e8 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.GenericConfig.Xml" default="build">
+<project name="OpenSim.Region.Caches" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,10 +8,10 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Caches" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="XmlConfig.cs" />
+                <include name="AssetCache.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
@@ -19,6 +19,7 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
                <include name="../../../bin/OpenSim.Framework.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
diff --git a/OpenSim/OpenSim.Caches/Properties/AssemblyInfo.cs b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
index 00f5dfe..5e6ecbb 100644
--- a/OpenSim/OpenSim.Caches/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Caches")]
+[assembly: AssemblyTitle("OpenSim.Region.Caches")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Caches")]
+[assembly: AssemblyProduct("OpenSim.Region.Caches")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 13a351d..416a6bc 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -1,17 +1,44 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using System.Xml;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Types;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
-namespace OpenSim.Region
+namespace OpenSim.Region.Capabilities
 {
    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
@@ -126,14 +153,8 @@ namespace OpenSim.Region
        public string ProcessEventQueue(string request, string path, string param)
        {
-            //  Console.WriteLine("event queue request " + request);
            string res = "";
-            int timer = 0;
+            
-            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
-             {
-                 timer++;
-             }*/
            if (this.CapsEventQueue.Count > 0)
            {
                lock (this.CapsEventQueue)
diff --git a/OpenSim/Region/Capabilities/LLSDArray.cs b/OpenSim/Region/Capabilities/LLSDArray.cs
new file mode 100644
index 0000000..76d5a2c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDArray.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("ARRAY")]
+    public class LLSDArray
+    {
+        public ArrayList Array = new ArrayList();
+        public LLSDArray()
+        {
+        }
+    }
+}
diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
index ca50be0..d47d25c 100644
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
+++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
@@ -29,13 +29,17 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Region.Capabilities
 {
-    public interface IScriptEngine
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
    {
-        bool Init(IScriptAPI api);
+        public int id = 0;
-        string GetName();
+        public LLSDArray events = new LLSDArray();
-        void LoadScript(string script, string scriptName, uint entityID);
-        void OnFrame();
+        public LLSDCapEvent()
+        {
+        }
    }
 }
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
new file mode 100644
index 0000000..d6db606
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapsDetails
+    {
+        public string MapLayer = "";
+        public string NewFileAgentInventory = "";
+        //public string EventQueueGet = "";
+        public LLSDCapsDetails()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Region/Capabilities/LLSDEmpty.cs
new file mode 100644
index 0000000..68f1ce9
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDEmpty.cs
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+        }
+    }
+}
diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
index 051520c..76d9345 100644
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -1,3 +1,30 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,7 +33,7 @@ using System.IO;
 using System.Xml;
 using libsecondlife;
-namespace OpenSim.Framework
+namespace OpenSim.Region.Capabilities
 {
    public class LLSDHelpers
    {
@@ -46,7 +73,6 @@ namespace OpenSim.Framework
                            }
                            else
                            {
-                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
                                writer.WriteStartElement(String.Empty, "key", String.Empty);
                                writer.WriteString(fields[i].Name);
                                writer.WriteEndElement();
@@ -59,12 +85,15 @@ namespace OpenSim.Framework
                        // LLSDArray arrayObject = obj as LLSDArray;
                        // ArrayList a = arrayObject.Array;
                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
-                        writer.WriteStartElement(String.Empty, "array", String.Empty);
+                        if (a != null)
-                        foreach (object item in a)
                        {
-                            SerializeLLSDType(writer, item);
+                            writer.WriteStartElement(String.Empty, "array", String.Empty);
+                            foreach (object item in a)
+                            {
+                                SerializeLLSDType(writer, item);
+                            }
+                            writer.WriteEndElement();
                        }
-                        writer.WriteEndElement();
                        break;
                }
            }
@@ -115,132 +144,22 @@ namespace OpenSim.Framework
        }
    }
-    [LLSDType("MAP")]
+    
-    public class LLSDMapLayerResponse
-    {
-        public LLSDMapRequest AgentData = new LLSDMapRequest();
-        public LLSDArray LayerData = new LLSDArray();
-        public LLSDMapLayerResponse()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDCapsDetails
-    {
-        public string MapLayer = "";
-        public string NewFileAgentInventory = "";
-        //public string EventQueueGet = "";
-        public LLSDCapsDetails()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDMapLayer
-    {
-        public int Left = 0;
-        public int Right = 0;
-        public int Top = 0;
-        public int Bottom = 0;
-        public LLUUID ImageID = LLUUID.Zero;
-        public LLSDMapLayer()
+    
-        {
-           
-        }
-    }
-    [LLSDType("ARRAY")]
+   
-    public class LLSDArray
-    {
-        public ArrayList Array = new ArrayList();
-        public LLSDArray()
+    
-        {
-        }
+    
-    }
-    [LLSDType("MAP")]
+    
-    public class LLSDMapRequest
-    {
-        public int Flags = 0;
-        public LLSDMapRequest()
+    
-        {
-        }
-    }
-    [LLSDType("MAP")]
+    
-    public class LLSDUploadReply
-    {
-        public string new_asset = "";
-        public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
-        public LLSDUploadReply()
-        {
-        }
+    
-    }
-    [LLSDType("MAP")]
-    public class LLSDCapEvent
-    {
-        public int id = 0;
-        public LLSDArray events = new LLSDArray();
-        public LLSDCapEvent()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDEmpty
-    {
-        public LLSDEmpty()
-        {
-        }
-    }
-    [LLSDType("MAP")]
-    public class LLSDTest
-    {
-        public int Test1 = 20;
-        public int Test2 = 10;
-        public LLSDTest()
-        {
-        }
-    }
-    [AttributeUsage(AttributeTargets.Class)]
-    public class LLSDType : Attribute
-    {
-        private string myType;
-        public LLSDType(string type)
-        {
-            myType = type;
-        }
-        public string ObjectType
-        {
-            get
-            {
-                return myType;
-            }
-        }
-    }
 }
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayer.cs b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
new file mode 100644
index 0000000..b097ec3
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public LLUUID ImageID = LLUUID.Zero;
+        public LLSDMapLayer()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
new file mode 100644
index 0000000..ee37a5b
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDArray LayerData = new LLSDArray();
+        public LLSDMapLayerResponse()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
new file mode 100644
index 0000000..b15f1be
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+        public LLSDMapRequest()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Region/Capabilities/LLSDTest.cs
new file mode 100644
index 0000000..3948f2c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDTest.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+        public LLSDTest()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Region/Capabilities/LLSDType.cs
new file mode 100644
index 0000000..7da5861
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDType.cs
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Capabilities
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDType : Attribute
+    {
+        private string myType;
+        public LLSDType(string type)
+        {
+            myType = type;
+        }
+        public string ObjectType
+        {
+            get
+            {
+                return myType;
+            }
+        }
+    }
+}
diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
index 0c1627b..83cf166 100644
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
+++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
@@ -28,15 +28,20 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenSim.Framework.Types;
 using libsecondlife;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Region.Capabilities
 {
-    public interface IScriptAPI
+    [LLSDType("MAP")]
+    public class LLSDUploadReply
    {
-        LLVector3 GetEntityPosition(uint localID);
+        public string new_asset = "";
-        void SetEntityPosition(uint localID, float x, float y, float z);
+        public LLUUID new_inventory_item = LLUUID.Zero;
-        uint GetRandomAvatarID();
+        public string state = "";
+        public LLSDUploadReply()
+        {
+        }
    }
 }
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
new file mode 100644
index 0000000..4667d52
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -0,0 +1,143 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{39038E85-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Capabilities</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Capabilities</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDArray.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDCapEvent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDCapsDetails.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDEmpty.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayerResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDType.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDUploadReply.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
new file mode 100644
index 0000000..a091b5c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Capabilities" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Caps.cs" />
+                <include name="LLSDArray.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDCapsDetails.cs" />
+                <include name="LLSDEmpty.cs" />
+                <include name="LLSDHelpers.cs" />
+                <include name="LLSDMapLayer.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapRequest.cs" />
+                <include name="LLSDTest.cs" />
+                <include name="LLSDType.cs" />
+                <include name="LLSDUploadReply.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c..da74f85 100644
--- a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Region.ClientStack;
 namespace OpenSim.Assets
 {
diff --git a/OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 7552195..f99cf79 100644
--- a/OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
 using libsecondlife;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public interface ClientStackNetworkHandler
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c7..9650b42 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
 using libsecondlife;
 using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    partial class ClientView
    {
@@ -68,6 +68,8 @@ namespace OpenSim
        public event GenericCall6 OnRemoveAvatar;
        public event RequestMapBlocks OnRequestMapBlocks;
        public event TeleportLocationRequest OnTeleportLocationRequest;
+        
+        public event UUIDNameRequest OnNameFromUUIDRequest;
        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
        public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim
        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
        public event EstateOwnerMessageRequest OnEstateOwnerMessage;
        /// <summary>
        /// 
        /// </summary>
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a..bc6cc21 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
 using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    partial class ClientView
    {
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed02..0456e3c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public partial class ClientView
    {
@@ -192,7 +192,5 @@ namespace OpenSim
            this.OutPacket(mbReply);
             */
        }
-       
    }
 }
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef21..794ce79 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public partial class ClientView
    {
@@ -492,7 +492,13 @@ namespace OpenSim
                    case PacketType.MoneyBalanceRequest:
                        this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
                        break;
+                    case PacketType.UUIDNameRequest:
+                        UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
+                        foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
+                        {
+                            OnNameFromUUIDRequest(UUIDBlock.ID, this);
+                        }
+                        break;
                    #region Parcel related packets
                    case PacketType.ParcelPropertiesRequest:
                        ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 312da9d..9c4462d 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public delegate bool PacketMethod(ClientView simClient, Packet packet);
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0..7d39405 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Interfaces;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public class ClientViewBase 
    {
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index b1ce3eb..3093eb0 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{DC3698B2-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.RegionServer</AssemblyName>
+    <AssemblyName>OpenSim.Region.ClientStack</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.RegionServer</RootNamespace>
+    <RootNamespace>OpenSim.Region.ClientStack</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,15 +59,15 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -78,59 +78,45 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenSim.Caches</Name>
-      <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.GenericConfig.Xml</Name>
+      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Caches</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj">
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Region</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{196916AF-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
-      <Name>OpenSim.Servers</Name>
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
-      <Name>OpenSim.Terrain.BasicTerrain</Name>
-      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
-      <Name>XMLRPC</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
@@ -166,9 +152,6 @@
    <Compile Include="UDPServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Assets\InventoryCache.cs">
      <SubType>Code</SubType>
    </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 12dca8a..f76a4c8 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.RegionServer" default="build">
+<project name="OpenSim.Region.ClientStack" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="ClientStackNetworkHandler.cs" />
@@ -21,7 +21,6 @@
                <include name="PacketServer.cs" />
                <include name="RegionApplicationBase.cs" />
                <include name="UDPServer.cs" />
-                <include name="VersionInfo.cs" />
                <include name="Assets/InventoryCache.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
@@ -29,25 +28,23 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Caches.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
-                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
-                <include name="../../bin/OpenSim.Region.dll" />
+                <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 229570c..ffd254e 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
 using System.Net;
 using System.Net.Sockets;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public class PacketServer
    {
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 68a140b..94db8ee 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,19 +37,18 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Physics.Manager;
 using Nwc.XmlRpc;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.GenericConfig;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public class RegionApplicationBase
    {
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9..259352c 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -37,18 +37,17 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework;
 using Nwc.XmlRpc;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.GenericConfig;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
    public class UDPServer : ClientStackNetworkHandler
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 743b9b4..bacaa3e 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -33,10 +33,9 @@ using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.Local
-namespace OpenSim.LocalCommunications
 {
    public class CommunicationsLocal : CommunicationsManager
    {
@@ -46,8 +45,8 @@ namespace OpenSim.LocalCommunications
        public CommunicationsLocal(NetworkServersInfo serversInfo)
            : base(serversInfo)
        {
-            UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
+            UserServices = new LocalUserServices(this,this.ServersInfo.DefaultHomeLocX,this.ServersInfo.DefaultHomeLocY);
-            UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
+            UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
            UserServer = UserServices;
            GridServer = SandBoxServices;
            InterRegion = SandBoxServices;
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ce48c6e..26834be 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -28,12 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Communications;
 using libsecondlife;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
-namespace OpenSim.LocalCommunications
+namespace OpenSim.Region.Communications.Local
 {
    public class LocalBackEndServices : IGridServices, IInterRegionCommunications
@@ -182,7 +182,6 @@ namespace OpenSim.LocalCommunications
        /// <returns></returns>
        public bool AddNewSession(ulong regionHandle, Login loginData)
        {
-            //Console.WriteLine(" comms manager been told to expect new user");
            AgentCircuitData agent = new AgentCircuitData();
            agent.AgentID = loginData.Agent;
            agent.firstname = loginData.First;
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index a7f7aa4..6cf254b 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -3,16 +3,16 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
 //using OpenSim.Framework.User;
-using OpenGrid.Framework.UserManagement;
+using OpenSim.Framework.UserManagement;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 using libsecondlife;
-namespace OpenSim.LocalCommunications
+namespace OpenSim.Region.Communications.Local
 {
    public class LocalUserServices : UserManagerBase, IUserServices
    {
@@ -36,6 +36,7 @@ namespace OpenSim.LocalCommunications
        {
            return this.getUserProfile(name);
        }
        public UserProfileData GetUserProfile(LLUUID avatarID)
        {
            return this.getUserProfile(avatarID);
@@ -87,7 +88,7 @@ namespace OpenSim.LocalCommunications
                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
                string capsPath = Util.GetRandomCapsPath();
-                response.SimAddress = reg.CommsIPListenAddr;
+                response.SimAddress = reg.CommsExternalAddress;
                response.SimPort = (Int32)reg.CommsIPListenPort;
                response.RegionX = reg.RegionLocX ;
                response.RegionY = reg.RegionLocY ;
@@ -114,5 +115,31 @@ namespace OpenSim.LocalCommunications
        }
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            return SetupMasterUser(firstName, lastName, "");
+        }
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            UserProfileData profile = getUserProfile(firstName, lastName);
+            if (profile != null)
+            {
+                return profile;
+            }
+            Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
+            this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);
+            profile = getUserProfile(firstName, lastName);
+            if (profile == null)
+            {
+                Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
+            }
+            return profile;
+        }
    }
 }
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 3cb36da..0a15a49 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{79CED992-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{BFB5D807-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.LocalCommunications</AssemblyName>
+    <AssemblyName>OpenSim.Region.Communications.Local</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.LocalCommunications</RootNamespace>
+    <RootNamespace>OpenSim.Region.Communications.Local</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,27 +72,27 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenGrid.Framework.Communications</Name>
+      <Name>OpenSim.Framework</Name>
-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">
+    <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.UserManagement</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
-      <Name>OpenSim.Framework</Name>
+      <Name>OpenSim.Framework.UserManagement</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 2b72e2d..3cac9d3 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.LocalCommunications" default="build">
+<project name="OpenSim.Region.Communications.Local" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.LocalCommunications" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="CommunicationsLocal.cs" />
@@ -21,18 +21,18 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenGrid.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
-                <include name="../../bin/OpenGrid.Framework.UserManagement.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.LocalCommunications/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 8e6e711..1eb7107 100644
--- a/OpenSim/OpenSim.LocalCommunications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.LocalCommunications")]
+[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.LocalCommunications")]
+[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
new file mode 100644
index 0000000..870f577
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class CommunicationsOGS1 : CommunicationsManager
+    {
+        private OGS1GridServices gridInterComms = new OGS1GridServices();
+        public CommunicationsOGS1(NetworkServersInfo serversInfo) :base(serversInfo)
+        {
+            GridServer = gridInterComms;
+            InterRegion = gridInterComms;
+            UserServer = new OGS1UserServices(this);
+        }
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index db64f0c..5f0c80c 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -6,15 +6,15 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework;
 using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
 using Nwc.XmlRpc;
 using libsecondlife;
-namespace OpenGrid.Framework.Communications.OGS1
+namespace OpenSim.Region.Communications.OGS1
 {
    public class OGS1GridServices : IGridServices, IInterRegionCommunications
    {
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 3d74e2f..51b33e9 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
-namespace OpenGrid.Framework.Communications.OGS1
+namespace OpenSim.Region.Communications.OGS1
 {
    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
new file mode 100644
index 0000000..856c447
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using libsecondlife;
+using Nwc.XmlRpc;
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class OGS1UserServices :IUserServices
+    {
+        CommunicationsOGS1 m_parent;
+        public OGS1UserServices(CommunicationsOGS1 parent)
+        {
+            m_parent = parent;
+        }
+        public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
+        {
+            if (data.Contains("error_type"))
+            {
+                Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);
+                return null;
+            }
+            UserProfileData userData = new UserProfileData();
+            userData.username = (string)data["firstname"];
+            userData.surname = (string)data["lastname"];
+            userData.UUID = new LLUUID((string)data["uuid"]);
+            userData.userInventoryURI = (string)data["server_inventory"];
+            userData.userAssetURI = (string)data["server_asset"];
+            userData.profileFirstText = (string)data["profile_firstlife_about"];
+            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
+            userData.profileCanDoMask = (uint)data["profile_can_do"];
+            userData.profileWantDoMask = (uint)data["profile_want_do"];
+            userData.profileImage = new LLUUID((string)data["profile_image"]);
+            userData.lastLogin = (int)data["profile_lastlogin"];
+            userData.homeLocation = new LLVector3();
+            userData.homeLookAt = new LLVector3();
+            return userData;
+        }
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return GetUserProfile(firstName + " " + lastName);
+        }
+        public UserProfileData GetUserProfile(string name)
+        {
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["avatar_name"] = name;
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+            }
+            return null;
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["avatar_uuid"] = avatarID.ToString();
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+            }
+            return null;
+        }
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            return SetupMasterUser(firstName, lastName, "");
+        }
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            UserProfileData profile = GetUserProfile(firstName, lastName);
+            if (profile == null)
+            {
+                Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
+            }
+            return null;
+        }
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 804ddba..d6abd13 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
+    <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
+    <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -78,56 +78,54 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenGrid.Framework.Communications</Name>
+      <Name>OpenSim.Framework</Name>
-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Framework</Name>
+      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
+    <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Servers</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
+    <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>XMLRPC</Name>
+      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="CommunicationsOGS1.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="OGS1GridServices.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="OGSInterSimComms.cs">
+    <Compile Include="OGS1InterSimComms.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="OGSUserServices.cs">
+    <Compile Include="OGS1UserServices.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
new file mode 100644
index 0000000..04d61b9
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Communications.OGS1" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="CommunicationsOGS1.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="OGS1InterSimComms.cs" />
+                <include name="OGS1UserServices.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Runtime.Remoting.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 0c6f965..0c6f965 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Region/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index dcb5564..c2c1ecf 100644
--- a/OpenSim/OpenSim.Region/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Region;
+using OpenSim.Region.Environment;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim;
 using libsecondlife;
 using libsecondlife.Packets;
-using Avatar = OpenSim.Region.Scenes.ScenePresence;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
    /// <summary>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 79f204d..428f381 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{196916AF-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Region</AssemblyName>
+    <AssemblyName>OpenSim.Region.Environment</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Region</RootNamespace>
+    <RootNamespace>OpenSim.Region.Environment</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,15 +59,15 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Microsoft.JScript" >
@@ -82,71 +82,68 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="VJSharpCodeProvider" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>VJSharpCodeProvider.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenGrid.Framework.Communications</Name>
+      <Name>OpenSim.Framework</Name>
-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Caches</Name>
+      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework</Name>
+      <Name>OpenSim.Framework.Console</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
-      <Name>OpenSim.Framework.Console</Name>
+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.GenericConfig.Xml</Name>
+      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Caches</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
+    <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj">
-      <Name>OpenSim.Servers</Name>
+      <Name>OpenSim.Region.Capabilities</Name>
-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Project>{39038E85-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Terrain.BasicTerrain</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
-      <Name>XMLRPC</Name>
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Caps.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="EstateManager.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -171,9 +168,6 @@
    <Compile Include="Scenes\Scene.PacketHandlers.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\Scene.Scripting.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Scenes\SceneBase.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -207,9 +201,6 @@
    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
-      <SubType>Code</SubType>
-    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 926b9ed..2fa5e76 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Region" default="build">
+<project name="OpenSim.Region.Environment" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,10 +8,9 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Region" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="Caps.cs" />
                <include name="EstateManager.cs" />
                <include name="ParcelManager.cs" />
                <include name="RegionManager.cs" />
@@ -20,7 +19,6 @@
                <include name="Scenes/Primitive.cs" />
                <include name="Scenes/Scene.cs" />
                <include name="Scenes/Scene.PacketHandlers.cs" />
-                <include name="Scenes/Scene.Scripting.cs" />
                <include name="Scenes/SceneBase.cs" />
                <include name="Scenes/SceneEvents.cs" />
                <include name="Scenes/SceneObject.cs" />
@@ -32,34 +30,33 @@
                <include name="Scenes/scripting/ScriptManager.cs" />
                <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
-                <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
                <include name="Microsoft.JScript.dll" />
-                <include name="../../bin/OpenGrid.Framework.Communications.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Caches.dll" />
+                <include name="../../../bin/OpenSim.Framework.Communications.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
-                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
+                <include name="../../../bin/OpenSim.Region.Capabilities.dll" />
-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
+                <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
-                <include name="VJSharpCodeProvider.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
-                <include name="../../bin/XMLRPC.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index d15d77d..1cab4ab 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -32,10 +32,10 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
-using Avatar = OpenSim.Region.Scenes.ScenePresence;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
@@ -420,7 +420,7 @@ namespace OpenSim.Region
            {
                for (y = 0; y < inc_y; y++)
                {
-                    OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+                    OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
                    if (!temp.Contains(currentParcel))
                    {
                        currentParcel.forceUpdateParcelInfo();
diff --git a/OpenSim/OpenSim.Region/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
index a317f0f..4ff55a8 100644
--- a/OpenSim/OpenSim.Region/RegionManager.cs
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework;
 using OpenSim.Framework.Types;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Capabilities;
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
    public class RegionManager //needs renaming , but first we need to rename the namespace
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index 77f8854..db5070d 100644
--- a/OpenSim/OpenSim.Region/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -32,7 +32,7 @@ using Axiom.MathLib;
 using OpenSim.Physics.Manager;
 using libsecondlife;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public abstract class Entity
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 65077e6..36023d0 100644
--- a/OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public interface IScenePresenceBody
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index e04c711..0f649b2 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public class Primitive : Entity
    {
@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
            dataArrays.Add(primData.ToBytes());
            foreach (Entity child in children)
            {
-                if (child is OpenSim.Region.Scenes.Primitive)
+                if (child is OpenSim.Region.Environment.Scenes.Primitive)
                {
-                    dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());
+                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
                }
            }
            byte[] primstart = Helpers.StringToField("<Prim>");
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index d1a2717..1d55c4d 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public partial class Scene
    {
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
            {
                if (ent.LocalId == primLocalID)
                {
-                    ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
                    break;
                }
            }
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
            {
                if (ent.LocalId == localID)
                {
-                    ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
                    break;
                }
            }
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f7d90fa..8c912d0 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -39,18 +39,20 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-using OpenSim.Region;
+using OpenSim.Region.Environment;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.Scripting;
+using OpenSim.Region.Enviorment.Scripting;
+using OpenSim.Region.Capabilities;
-namespace OpenSim.Region.Scenes
+using Caps = OpenSim.Region.Capabilities.Caps;
+namespace OpenSim.Region.Environment.Scenes
 {
    public delegate bool FilterAvatarList(ScenePresence avatar);
-    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
+    public partial class Scene : SceneBase, ILocalStorageReceiver
    {
        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
        protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
@@ -66,7 +68,7 @@ namespace OpenSim.Region.Scenes
        protected RegionCommsListener regionCommsHost;
        protected CommunicationsManager commsManager;
-        protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
+        protected Dictionary<LLUUID,Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
        protected BaseHttpServer httpListener;
        public ParcelManager parcelManager;
@@ -503,6 +505,7 @@ namespace OpenSim.Region.Scenes
            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
           //remoteClient.OnObjectSelect += this.SelectPrim;
            remoteClient.OnGrapUpdate += this.MoveObject;
+            remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -510,7 +513,7 @@ namespace OpenSim.Region.Scenes
            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
            */
+            
            ScenePresence newAvatar = null;
            try
            {
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5275fcf..50d3b82 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -37,10 +37,10 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public abstract class SceneBase :  IWorld 
    {
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
new file mode 100644
index 0000000..fa1bacb
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.Region.Environment.Scenes
+{
+    /// <summary>
+    /// A class for triggering remote scene events.
+    /// </summary>
+    public class EventManager
+    {
+        public delegate void OnFrameDelegate();
+        public event OnFrameDelegate OnFrame;
+        public delegate void OnNewPresenceDelegate(ScenePresence presence);
+        public event OnNewPresenceDelegate OnNewPresence;
+        public delegate void OnNewPrimitiveDelegate(Primitive prim);
+        public event OnNewPrimitiveDelegate OnNewPrimitive;
+        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
+        public event OnRemovePresenceDelegate OnRemovePresence;
+        public void TriggerOnFrame()
+        {
+            if (OnFrame != null)
+            {
+                OnFrame();
+            }
+        }
+        public void TriggerOnNewPrimitive(Primitive prim)
+        {
+            if (OnNewPrimitive != null)
+                OnNewPrimitive(prim);
+        }
+        public void TriggerOnNewPresence(ScenePresence presence)
+        {
+            if (OnNewPresence != null)
+                OnNewPresence(presence);
+        }
+        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
+        {
+            if (OnRemovePresence != null)
+            {
+                OnRemovePresence(uuid);
+            }
+        }
+    }
+}
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 5df87bf..88fb160 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public class SceneObject : Entity
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index f0a8721..2caabc2 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
 using libsecondlife;
 using System.Xml;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    partial class ScenePresence
    {
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
                {
                    AnimsNames.Add(kp.Value, kp.Key);
                }
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index d21b11f..2c81d2a 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    partial class ScenePresence
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 45d3fed..b90004e 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using Axiom.MathLib;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public partial class ScenePresence : Entity
    {
@@ -66,6 +66,17 @@ namespace OpenSim.Region.Scenes
        protected RegionInfo m_regionInfo;
+        private Vector3[] Dir_Vectors = new Vector3[6];
+        private enum Dir_ControlFlags
+        {
+            DIR_CONTROL_FLAG_FOWARD = MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS,
+            DIR_CONTROL_FLAG_BACK = MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG,
+            DIR_CONTROL_FLAG_LEFT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_POS,
+            DIR_CONTROL_FLAG_RIGHT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_NEG,
+            DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS,
+            DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG
+        }
        #region Properties
        /// <summary>
        /// 
@@ -125,6 +136,13 @@ namespace OpenSim.Region.Scenes
            // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
            //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
+            Dir_Vectors[0] = new Vector3(1, 0, 0);  //FOWARD
+            Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK
+            Dir_Vectors[2] = new Vector3(0, 1, 0);  //LEFT
+            Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT
+            Dir_Vectors[4] = new Vector3(0, 0, 1);  //UP
+            Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN
        }
        #endregion
@@ -216,40 +234,46 @@ namespace OpenSim.Region.Scenes
        /// </summary>
        /// <param name="pack"></param>
        public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
-        {  
+        {
-            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
+            int i = 0;
+            bool update_movementflag = false;
+            bool update_rotation = false;
+            bool DCFlagKeyPressed = false;
+            Vector3 agent_control_v3 = new Vector3(0, 0, 0);
+            Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+            this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
+            if (q != this.bodyRot)
            {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+                this.bodyRot = q;
-                if (((movementflag & 1) == 0) || (q != this.bodyRot))
+                update_rotation = true;
-                {
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
-                    this.AddNewMovement(v3, q);
-                    movementflag = 1;
-                    this.bodyRot = q;
-                }
            }
-            else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
+            foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof(Dir_ControlFlags)))
            {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+                if ((flags & (uint)DCF) != 0)
-                if (((movementflag & 2) == 0) || (q != this.bodyRot))
+                {
-                {  
+                    DCFlagKeyPressed = true;
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
+                    agent_control_v3 += Dir_Vectors[i];
-                    this.AddNewMovement(v3, q);
+                    if ((movementflag & (uint)DCF) == 0)
-                    movementflag = 2;
+                    {
-                    this.bodyRot = q;
+                        movementflag += (byte)(uint)DCF;
+                        update_movementflag = true;
+                    }
                }
-            }
+                else
-            else
-            {
-                if ((movementflag) != 0)
                {
-                    NewForce newVelocity = new NewForce();
+                    if ((movementflag & (uint)DCF) != 0)
-                    newVelocity.X = 0;
+                    {
-                    newVelocity.Y = 0;
+                        movementflag -= (byte)(uint)DCF;
-                    newVelocity.Z = 0;
+                        update_movementflag = true;
-                    this.forcesList.Add(newVelocity);
+                    }
-                    movementflag = 0;
                }
+                i++;
+            }
+            if ((update_movementflag) || (update_rotation && DCFlagKeyPressed))
+            {
+                this.AddNewMovement(agent_control_v3, q);
            }
        }
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index 870303f..a232b65 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
    public class CSharpScriptEngine : IScriptCompiler
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index ffae1d7..2d44223 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.JScript;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
    public class JScriptEngine : IScriptCompiler
    {
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 56bd1db..1e64675 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -31,10 +31,10 @@ using System.Text;
 using OpenSim.Framework.Console;
 using OpenSim.Framework;
-using OpenSim.Region;
+using OpenSim.Region.Environment;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
    public interface IScript
    {
@@ -54,7 +54,7 @@ namespace OpenSim.Scripting
        public void Initialise(ScriptInfo scriptInfo)
        {
            script = scriptInfo;
-            script.events.OnFrame += new OpenSim.Region.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+            script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
            script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);
        }
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index cf627dd..522a572 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -29,10 +29,10 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Console;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
    /// <summary>
    /// Class which provides access to the world
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index abffffa..eb1c1d9 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -29,12 +29,12 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
    public class ScriptManager
    {
        List<IScript> scripts = new List<IScript>();
-        OpenSim.Region.Scenes.Scene scene;
+        OpenSim.Region.Environment.Scenes.Scene scene;
        Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
        private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)
@@ -49,7 +49,7 @@ namespace OpenSim.Scripting
            OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
        }
-        public ScriptManager(OpenSim.Region.Scenes.Scene world)
+        public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)
        {
            scene = world;
@@ -59,9 +59,6 @@ namespace OpenSim.Scripting
            JScriptEngine jscriptCompiler = new JScriptEngine();
            compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
-            JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();
-            compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler);
        }
        public void Compile(string filename)
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 01e0c59..89f39d3 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
 using libsecondlife;
-using OpenSim.Region;
+using OpenSim.Region.Environment;
-using Avatar=OpenSim.Region.Scenes.ScenePresence;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 namespace SimpleApp
 {
    public class MyWorld : Scene
    {
        private RegionInfo m_regionInfo;
-        private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
+        private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;
        public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
            : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
@@ -76,7 +76,7 @@ namespace SimpleApp
            client.SendRegionHandshake(m_regionInfo);
-            OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
+            OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
            
        }
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e1465d1..4060d68 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -2,17 +2,18 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim;
-using OpenSim.GridInterfaces.Local;
+using OpenSim.Region.GridInterfaces.Local;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
 using OpenSim.Assets;
 using libsecondlife;
-using OpenSim.Servers;
 using OpenSim.Framework;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
-using OpenSim.LocalCommunications;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.ClientStack;
 namespace SimpleApp
 {
diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
index 0f9bf0f..0f9bf0f 100644
--- a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 00af44a..0a82172 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -67,72 +67,70 @@
      <Private>False</Private>
    </Reference>
    <Reference Include="System.Data.dll" >
-      <HintPath>..\..\..\bin\System.Data.dll</HintPath>
+      <HintPath>..\..\..\..\bin\System.Data.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System.Xml" >
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenGrid.Framework.Communications</Name>
+      <Name>OpenSim.Framework</Name>
-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj">
-      <Name>OpenSim.Caches</Name>
-      <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Framework</Name>
+      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">
+    <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.GridInterfaces.Local</Name>
+      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{546099CD-0000-0000-0000-000000000000}</Project>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj">
+    <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
-      <Name>OpenSim.LocalCommunications</Name>
+      <Name>OpenSim.Region.Caches</Name>
-      <Project>{79CED992-0000-0000-0000-000000000000}</Project>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.Region\OpenSim.Region.csproj">
+    <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
-      <Name>OpenSim.Region</Name>
+      <Name>OpenSim.Region.ClientStack</Name>
-      <Project>{196916AF-0000-0000-0000-000000000000}</Project>
+      <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
+    <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
-      <Name>OpenSim.RegionServer</Name>
+      <Name>OpenSim.Region.Communications.Local</Name>
-      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
+      <Project>{BFB5D807-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
+    <ProjectReference Include="..\..\Environment\OpenSim.Region.Environment.csproj">
-      <Name>OpenSim.Servers</Name>
+      <Name>OpenSim.Region.Environment</Name>
-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
+    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
-      <Name>XMLRPC</Name>
+      <Name>OpenSim.Region.GridInterfaces.Local</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index 60c0f85..f8896fa 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGridServices.GridServer" default="build">
+<project name="SimpleApp" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,11 +8,11 @@
            </fileset>
        </copy>
        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
+            <resources prefix="SimpleApp" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="GridManager.cs" />
+                <include name="MyWorld.cs" />
-                <include name="Main.cs" />
+                <include name="Program.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
@@ -20,23 +20,25 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
-                <include name="../../bin/OpenGrid.Framework.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Region.Caches.dll" />
-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />
-                <include name="../../bin/OpenSim.Servers.dll" />
+                <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
+                <include name="../../../../bin/OpenSim.Region.Environment.dll" />
+                <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
                <include name="System.dll" />
-                <include name="System.Data.dll" />
+                <include name="System.Data.dll.dll" />
                <include name="System.Xml.dll" />
-                <include name="../../bin/XMLRPC.dll" />
+                <include name="../../../../bin/XMLRPC.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
index 52ecd6b..52ecd6b 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
+++ b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 87eff49..95d03f1 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -38,7 +38,7 @@ using libsecondlife;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
-namespace OpenSim.GridInterfaces.Local
+namespace OpenSim.Region.GridInterfaces.Local
 {
    public class LocalAssetPlugin : IAssetPlugin
    {
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
index 77c76e3..484a205 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{546099CD-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{241A8CDD-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.GridInterfaces.Local</AssemblyName>
+    <AssemblyName>OpenSim.Region.GridInterfaces.Local</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.GridInterfaces.Local</RootNamespace>
+    <RootNamespace>OpenSim.Region.GridInterfaces.Local</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -76,13 +76,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
new file mode 100644
index 0000000..4770e6d
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.GridInterfaces.Local" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.GridInterfaces.Local" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="LocalAssetServer.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
index 51596d0..51596d0 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
index 0a918bd..793fde2 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B55C0B5D-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{98C7B681-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.GridInterfaces.Remote</AssemblyName>
+    <AssemblyName>OpenSim.Region.GridInterfaces.Remote</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.GridInterfaces.Remote</RootNamespace>
+    <RootNamespace>OpenSim.Region.GridInterfaces.Remote</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -70,26 +70,24 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
-      <Name>XMLRPC</Name>
-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AssemblyInfo.cs">
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
new file mode 100644
index 0000000..0bf1b86
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.GridInterfaces.Remote" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.GridInterfaces.Remote" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="RemoteAssetServer.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
index ca01c68..4652f70 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-namespace OpenSim.GridInterfaces.Remote
+namespace OpenSim.Region.GridInterfaces.Remote
 {
    public class RemoteAssetServer : IAssetServer
    {
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 177c49d..177c49d 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 341ffbb..dcb8f3b 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenSim.Physics.Manager;
-namespace OpenSim.Physics.BasicPhysicsPlugin
+namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 {
        /// <summary>
        /// Will be the PhysX plugin but for now will be a very basic physics engine
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
index f88eb32..7dad533 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4F874463-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{15B4FEF3-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.BasicPhysicsPlugin</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.BasicPhysicsPlugin</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.BasicPhysicsPlugin</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.BasicPhysicsPlugin</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -68,9 +68,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
index 00ca3f9..6cf26ca 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build">
+<project name="OpenSim.Region.Physics.BasicPhysicsPlugin" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -19,14 +19,14 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 132f64a..132f64a 100644
--- a/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
index 347a649..f340400 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8BE16150-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{F4FF31EB-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.Manager</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.Manager</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.Manager</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.Manager</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,13 +72,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
index fc3e1e6..4b7ce81 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.Manager" default="build">
+<project name="OpenSim.Region.Physics.Manager" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.Manager" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -22,16 +22,16 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 6366fb8..6366fb8 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index efccb36..efccb36 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 0901c2f..0901c2f 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
index 888dbb5..888dbb5 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
index b49c8da..b49c8da 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 5233042..8aca851 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Physics.Manager;
 using Ode.NET;
-namespace OpenSim.Physics.OdePlugin
+namespace OpenSim.Region.Physics.OdePlugin
 {
    /// <summary>
    /// ODE plugin 
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
index 08f54aa..490c681 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{63A05FE9-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{90620634-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.OdePlugin</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.OdePlugin</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.OdePlugin</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.OdePlugin</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Ode.NET.dll" >
-      <HintPath>..\..\..\bin\Ode.NET.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Ode.NET.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,9 +72,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
index c93c0c2..07b9386 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.OdePlugin" default="build">
+<project name="OpenSim.Region.Physics.OdePlugin" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.OdePlugin" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -19,15 +19,15 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/Ode.NET.dll" />
+                <include name="../../../../bin/Ode.NET.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
index b49c8da..b49c8da 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
index aa89cc1..77da908 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{988F0AC4-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{A6D191D8-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.PhysXPlugin</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.PhysXPlugin</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="PhysX_Wrapper_Dotnet.dll" >
-      <HintPath>..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
+      <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,9 +72,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
index be7a847..c1a9608 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.PhysXPlugin" default="build">
+<project name="OpenSim.Region.Physics.PhysXPlugin" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.PhysXPlugin" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -19,15 +19,15 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
-                <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" />
+                <include name="../../../../bin/PhysX_Wrapper_Dotnet.dll" />
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 200b232..8bf794b 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Physics.Manager;
 using PhysXWrapper;
-namespace OpenSim.Physics.PhysXPlugin
+namespace OpenSim.Region.Physics.PhysXPlugin
 {
        /// <summary>
        /// Will be the PhysX plugin but for now will be a very basic physics engine
diff --git a/libraries/libLSL/Properties/AssemblyInfo.cs b/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
index 205dd95..f5da4c0 100644
--- a/libraries/libLSL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("libLSL")]
+[assembly: AssemblyTitle("OpenSim.Scripting")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("libLSL")]
+[assembly: AssemblyProduct("OpenSim.Scripting")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("65895724-efca-49f8-8efc-211594b4c716")]
+[assembly: Guid("61eae1ad-82aa-4c77-8bc5-b5a8c9522b18")]
 // Version information for an assembly consists of the following four values:
 //
diff --git a/OpenSim/Region/Scripting/Script.cs b/OpenSim/Region/Scripting/Script.cs
new file mode 100644
index 0000000..0f4af00
--- /dev/null
+++ b/OpenSim/Region/Scripting/Script.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Console;
+using OpenSim.Framework;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+namespace OpenSim.Scripting
+{
+    public interface IScript
+    {
+        void Initialise(ScriptInfo scriptInfo);
+    }
+    public class TestScript : IScript
+    {
+        ScriptInfo script;
+        public void Initialise(ScriptInfo scriptInfo)
+        {
+            script = scriptInfo;
+            script.events.OnFrame += new OpenSim.Region.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+        }
+        void events_OnFrame()
+        {
+            script.logger.Verbose("Hello World!");
+        }
+    }
+}
diff --git a/OpenSim/Region/Scripting/ScriptAccess.cs b/OpenSim/Region/Scripting/ScriptAccess.cs
new file mode 100644
index 0000000..a9fede5
--- /dev/null
+++ b/OpenSim/Region/Scripting/ScriptAccess.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Region.Scenes;
+using OpenSim.Framework.Console;
+namespace OpenSim.Scripting
+{
+    /// <summary>
+    /// Class which provides access to the world
+    /// </summary>
+    public class ScriptInfo
+    {
+        // Reference to world.eventsManager provided for convenience
+        public EventManager events;
+        // The main world
+        public Scene world;
+        // The console
+        public LogBase logger;
+        public ScriptInfo(Scene scene)
+        {
+            world = scene;
+            events = world.eventManager;
+            logger = OpenSim.Framework.Console.MainLog.Instance;
+        }
+    }
+}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index ab3c34c..3bc6f25 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -39,7 +39,7 @@ using BerkeleyDb;
 using Kds.Serialization;
 using Kds.Serialization.Buffer;
-namespace OpenSim.Storage.LocalStorageBDB
+namespace OpenSim.Region.Storage.LocalStorageBDB
 {
    public class BDBLocalStorage : ILocalStorage
    {
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
index 417643f..b956c9b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EE9E5D96-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{A4691E59-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName>
+    <AssemblyName>OpenSim.Region.Storage.LocalStorageBerkeleyDB</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</RootNamespace>
+    <RootNamespace>OpenSim.Region.Storage.LocalStorageBerkeleyDB</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,15 +59,15 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Kds.Serialization.dll" >
-      <HintPath>..\..\..\bin\Kds.Serialization.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Kds.Serialization.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libdb_dotNET43.dll" >
-      <HintPath>..\..\..\bin\libdb_dotNET43.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libdb_dotNET43.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -84,13 +84,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
new file mode 100644
index 0000000..20f5171
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Storage.LocalStorageBerkeleyDB" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="BDBLocalStorage.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Kds.Serialization.dll" />
+                <include name="../../../../bin/libdb_dotNET43.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index bc2d8ec..bc2d8ec 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
index ea2b62e..ea2b62e 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 8e6b04d..5cb4861 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
    /// <summary>
    /// 
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
index 56387ac..22f3392 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
    public class MapStorage
    {
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 5b8f1c1..147158c 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{43DB702D-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName>
+    <AssemblyName>OpenSim.Region.Storage.LocalStorageDb4o</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace>
+    <RootNamespace>OpenSim.Region.Storage.LocalStorageDb4o</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -76,13 +76,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index 739b98c..fc9f055 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageDb4o" default="build">
+<project name="OpenSim.Region.Storage.LocalStorageDb4o" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Storage.LocalStorageDb4o" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -22,17 +22,17 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../../bin/Db4objects.Db4o.dll" />
-                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
index d24fb5f..dcbe639 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
    public class UUIDParcelQuery : Predicate
    {
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
index b2e8a91..23de6dd 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
    public class UUIDPrimQuery : Predicate
    {
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
index ff93a8f..d1353a5 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B20B603-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{477B9270-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageSQLite</AssemblyName>
+    <AssemblyName>OpenSim.Region.Storage.LocalStorageSQLite</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageSQLite</RootNamespace>
+    <RootNamespace>OpenSim.Region.Storage.LocalStorageSQLite</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -71,7 +71,7 @@
      <Private>False</Private>
    </Reference>
    <Reference Include="System.Data.SQLite.dll" >
-      <HintPath>..\..\..\bin\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\..\..\..\bin\System.Data.SQLite.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System.Xml" >
@@ -80,13 +80,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
index d82d751..9d12c33 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenGrid.Framework.Data.DB4o" default="build">
+<project name="OpenSim.Region.Storage.LocalStorageSQLite" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,12 +8,10 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Storage.LocalStorageSQLite" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="DB4oGridData.cs" />
+                <include name="SQLiteLocalStorage.cs" />
-                <include name="DB4oManager.cs" />
-                <include name="DB4oUserData.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
@@ -21,17 +19,18 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
+                <include name="../../../../bin/System.Data.SQLite.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index bd4c731..bd4c731 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index b45debf..80158d5 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyTitle("OpenSim.Region.Storage.LocalStorageSQLite")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyProduct("OpenSim.Region.Storage.LocalStorageSQLite")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8a7893e..b407be4 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -37,7 +37,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageSQLite
+namespace OpenSim.Region.Storage.LocalStorageSQLite
 {
    public class SQLiteLocalStorage : ILocalStorage
    {
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
index 0469efe..24667e5 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2270B8FE-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{C9E0F891-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Terrain.BasicTerrain</AssemblyName>
+    <AssemblyName>OpenSim.Region.Terrain.BasicTerrain</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Terrain.BasicTerrain</RootNamespace>
+    <RootNamespace>OpenSim.Region.Terrain.BasicTerrain</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="libTerrain-BSD.dll" >
-      <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath>
+      <HintPath>..\..\..\bin\libTerrain-BSD.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Microsoft.JScript" >
@@ -67,7 +67,7 @@
      <Private>False</Private>
    </Reference>
    <Reference Include="openjpegnet.dll" >
-      <HintPath>..\..\bin\openjpegnet.dll</HintPath>
+      <HintPath>..\..\..\bin\openjpegnet.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
index 91dd6f5..dc7203a 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Terrain.BasicTerrain" default="build">
+<project name="OpenSim.Region.Terrain.BasicTerrain" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </fileset>
        </copy>
        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Terrain.BasicTerrain" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="TerrainEngine.cs" />
@@ -20,18 +20,18 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../bin/libTerrain-BSD.dll" />
+                <include name="../../../bin/libTerrain-BSD.dll" />
                <include name="Microsoft.JScript.dll" />
-                <include name="../../bin/openjpegnet.dll" />
+                <include name="../../../bin/openjpegnet.dll" />
                <include name="System.dll" />
                <include name="System.Data.dll" />
                <include name="System.Drawing.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../../bin/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index 827c68f..7d10ae3 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyTitle("OpenSim.Region.Terrain.BasicTerrain")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 4f989fa..c2d7e86 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -32,7 +32,7 @@ using System.Drawing;
 using libTerrain;
 using OpenJPEGNet;
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
 {
    public class TerrainCommand
    {
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index 5baf87f..e0ae586 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -36,7 +36,7 @@ using Microsoft.JScript;
 using libTerrain;
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
 {
    public interface ITerrainFilter
    {