This changeset is the step 1 of 2 in refactoring

OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.

The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.

I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!

83 files changed, 292 insertions, 261 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index 43c733d..49a5dd0 100644
--- a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -27,9 +27,10 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IAgentAssetTransactions
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
index a722833..b533206 100644
--- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
@@ -27,9 +27,9 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IAvatarFactory
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
index 8a2c549..bac0b2e 100644
--- a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
@@ -31,7 +31,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ICapabilitiesModule
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ICommand.cs b/OpenSim/Region/Framework/Interfaces/ICommand.cs
index c1da2c3..1551b58 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommand.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommand.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public enum CommandIntentions
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs
index c4ed942..5d6660d 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ICommandableModule
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs
index a61ce490..17a2e4a 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ICommander
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 755aa27..7247d52 100644
--- a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IDialogModule
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
index c54c697..e119bc3 100644
--- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
@@ -28,7 +28,7 @@
 using System.IO;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IDynamicTextureManager
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index 5f1bcf3..b5f885a 100644
--- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public class Email
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
index f45e959..1a6e626 100644
--- a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs
@@ -27,9 +27,9 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces    
+namespace OpenSim.Region.Framework.Interfaces    
 {
     /// <summary>
     /// Interface to a class that is capable of creating entities
diff --git a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index a270293..20fe090 100644
--- a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -32,11 +32,10 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes.Scripting;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Scripting;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// Interface to an entity's (SceneObjectPart's) inventory
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index f2d14a6..4da115e 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IEstateDataStore
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index d84af20..f169f61 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IEstateModule : IRegionModule
     {
diff --git a/OpenSim/Region/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 5c327d9..cf609ae 100644
--- a/OpenSim/Region/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -26,16 +26,39 @@
  */
 
 using System;
+using System.Net;
 using OpenSim.Framework;
 using OpenMetaverse;
+using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Region.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IEventQueue
     {
         bool Enqueue(OSD o, UUID avatarID);
+
+        // These are required to decouple Scenes from EventQueueHelper
+        void DisableSimulator(ulong handle, UUID avatarID);
+        void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID);
+        void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, 
+                                         string capsPath);
+        void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
+                                 IPEndPoint regionExternalEndPoint,
+                                 uint locationID, uint flags, string capsURL, 
+                                 UUID agentID);
+        void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
+                         IPEndPoint newRegionExternalEndPoint,
+                         string capsURL, UUID avatarID, UUID sessionID);
+        void ChatterboxInvitation(UUID sessionID, string sessionName,
+                                  UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
+                                  uint timeStamp, bool offline, int parentEstateID, Vector3 position,
+                                  uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket);
+        void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
+                                               bool isModerator, bool textMute);
+        void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID);
+        void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index 5d3376c..0bdfb8f 100644
--- a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {       
     public interface IFriendsModule
     {
diff --git a/OpenSim/Region/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index c3f901a..16527d1 100644
--- a/OpenSim/Region/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate void NewGroupNotice(UUID groupID, UUID noticeID);
 
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index 216782b..fd49757 100644
--- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -25,18 +25,27 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
+using System.Net;
 using OpenMetaverse;
-using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IHttpRequests
+    public enum HttpRequestConstants
+    {
+        HTTP_METHOD = 0,
+        HTTP_MIMETYPE = 1,
+        HTTP_BODY_MAXLENGTH = 2,
+        HTTP_VERIFY_CERT = 3,
+    }
+
+    public interface IHttpRequestModule
     {
         UUID MakeHttpRequest(string url, string parameters, string body);
         UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
         void StopHttpRequest(uint m_localID, UUID m_itemID);
-        HttpRequestClass GetNextCompletedRequest();
+        IServiceRequest GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index 7aeef15..783b3f9 100644
--- a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate bool ChildAgentUpdateReceived(AgentData data);
 
diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
index ee170b9..4314271 100644
--- a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
@@ -27,10 +27,9 @@
 
 using System.Collections.Generic;
 using OpenMetaverse;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Framework
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// An interface for a module that manages inter-agent inventory offers and transfers.
diff --git a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
index 2a37195..1d10896 100644
--- a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     
     public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers);
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index a8a58ef..35c2fc1 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -28,9 +28,9 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ILandChannel
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
index 6fcf74b..52cc6cf 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
@@ -28,9 +28,9 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj);
     public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj);
diff --git a/OpenSim/Region/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index ecaeceb..f0a5473 100644
--- a/OpenSim/Region/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate void MessageResultNotification(bool success);
 
diff --git a/OpenSim/Region/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index 23cf064..011f8bb 100644
--- a/OpenSim/Region/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public struct PresenceInfo
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 559d2a6..97afe8d 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -27,7 +27,7 @@
 
 using System.IO;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// Interface to region archive functionality
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
index 78fc626..46d81ce 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
@@ -28,9 +28,9 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IRegionDataStore
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
index ffa4f32..6a45017 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
@@ -26,9 +26,9 @@
  */
 
 using Nini.Config;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index b89f869..40e4c99 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -28,9 +28,9 @@
 using OpenMetaverse;
 using System.Collections.Generic;
 using System.IO;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IRegionSerialiserModule
     {
diff --git a/OpenSim/Region/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 9dca862..65620d3 100644
--- a/OpenSim/Region/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IScriptModule
     {
diff --git a/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs b/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs
new file mode 100644
index 0000000..f3283c4
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IServiceRequest.cs
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.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 OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IServiceRequest
+    {
+        // Status
+        bool Finished { get; }
+
+        // Request info
+        UUID ItemID { get; set; }
+        uint LocalID { get; set; }
+        UUID ReqID { get; set; }
+
+        void Process();
+        void SendRequest();
+        void Stop();
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 3bb4c57..91c80e3 100644
--- a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -29,7 +29,7 @@ using System;
 using Nini.Config;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.Framework.Interfaces
 {       
     public interface ISoundModule
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Framework/Interfaces/ITerrain.cs
index d5e1540..6e9c98d 100644
--- a/OpenSim/Region/Environment/Interfaces/ITerrain.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrain.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ITerrain
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
index 4bcb14b..fc4ced2 100644
--- a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ITerrainChannel
     {
diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs
index ece1953..aab3d26 100644
--- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// Interface for an object which can send texture information to a client
diff --git a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
index c411993..537a8dc 100644
--- a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs
@@ -26,9 +26,9 @@
  */
 
 using OpenMetaverse;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {        
     public interface IVegetationModule : IEntityCreator
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
index 9896c56..96b303f 100644
--- a/OpenSim/Region/Environment/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IWindModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 1a33450..24865db 100644
--- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -28,21 +28,37 @@
 using System;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
+// using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
+    public interface IWorldCommListenerInfo
+    {
+        Object[] GetSerializationData();
+        UUID GetItemID();
+        UUID GetHostID();
+        int GetChannel();
+        uint GetLocalID();
+        int GetHandle();
+        string GetMessage();
+        string GetName();
+        bool IsActive();
+        void Deactivate();
+        void Activate();
+        UUID GetID();
+    }
+
     public interface IWorldComm
     {
         int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg);
         void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg);
         bool HasMessages();
-        ListenerInfo GetNextMessage();
+        IWorldCommListenerInfo GetNextMessage();
         void ListenControl(UUID itemID, int handle, int active);
         void ListenRemove(UUID itemID, int handle);
         void DeleteListener(UUID itemID);
         Object[] GetSerializationData(UUID itemID);
         void CreateFromData(uint localID, UUID itemID, UUID hostID,
-                        Object[] data);
+                            Object[] data);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index 88e9ab5..6570b0a 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -26,10 +26,28 @@
  */
 
 using OpenMetaverse;
-using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
+using Nwc.XmlRpc;
 
-namespace OpenSim.Region.Environment.Interfaces
+// using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
+
+namespace OpenSim.Region.Framework.Interfaces
 {
+    public interface IXmlRpcRequestInfo
+    {
+        bool IsProcessed();
+        UUID GetChannelKey();
+        void SetProcessed(bool processed);
+        void SetStrRetval(string resp);
+        string GetStrRetval();
+        void SetIntRetval(int resp);
+        int GetIntRetval();
+        uint GetLocalID();
+        UUID GetItemID();
+        string GetStrVal();
+        int GetIntValue();
+        UUID GetMessageID();
+    }
+
     public interface IXMLRPC
     {
         UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID);
@@ -37,11 +55,11 @@ namespace OpenSim.Region.Environment.Interfaces
         bool hasRequests();
         void RemoteDataReply(string channel, string message_id, string sdata, int idata);
         bool IsEnabled();
-        RPCRequestInfo GetNextCompletedRequest();
+        IXmlRpcRequestInfo GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
         void DeleteChannels(UUID itemID);
         UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata);
-        SendRemoteDataRequest GetNextCompletedSRDRequest();
+        IServiceRequest GetNextCompletedSRDRequest();
         void RemoveCompletedSRDRequest(UUID id);
         void CancelSRDRequests(UUID itemID);
     }
diff --git a/OpenSim/Region/Environment/Interfaces/IXfer.cs b/OpenSim/Region/Framework/Interfaces/IXfer.cs
index bad1833..a83f166 100644
--- a/OpenSim/Region/Environment/Interfaces/IXfer.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXfer.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IXfer
     {
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index f06fa0f..d393919 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -31,18 +31,10 @@ using System.IO;
 using System.Reflection;
 using log4net;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
-using OpenSim.Region.Environment.Modules.Avatar.Chat;
-using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
-using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
-using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
-using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 
-//TODO: Why do we reference InstantMessageModule here?
-
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.Framework
 {
     public class ModuleLoader
     {
@@ -81,83 +73,19 @@ namespace OpenSim.Region.Environment
             return modules;
         }
 
-        public void LoadDefaultSharedModules()
+        public void LoadDefaultSharedModule(IRegionModule module)
         {
-            DynamicTextureModule dynamicModule = new DynamicTextureModule();
-            if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(dynamicModule.Name, dynamicModule);
-            }
-
-            // ChatModule chat = new ChatModule();
-            // if (m_loadedSharedModules.ContainsKey(chat.Name))
-            // {
-            //     m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
-            // }
-            // else
-            // {
-            //     m_loadedSharedModules.Add(chat.Name, chat);
-            // }
-
-            InstantMessageModule imMod = new InstantMessageModule();
-            if (m_loadedSharedModules.ContainsKey(imMod.Name))
+            if (m_loadedSharedModules.ContainsKey(module.Name))
             {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module not added!", module.Name);
             }
             else
             {
-                m_loadedSharedModules.Add(imMod.Name, imMod);
-            }
-
-            LoadImageURLModule loadMod = new LoadImageURLModule();
-            if (m_loadedSharedModules.ContainsKey(loadMod.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(loadMod.Name, loadMod);
-            }
-
-           // AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
-           // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
-           // {
-           //     m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
-           // }
-           // else
-           // {
-           //     m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
-           // }
-
-            XMLRPCModule xmlRpcMod = new XMLRPCModule();
-            if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(xmlRpcMod.Name, xmlRpcMod);
-            }
-            //TextureDownloadModule textureModule = new TextureDownloadModule();
-
-            //LoadedSharedModules.Add(textureModule.Name, textureModule);
-
-            AssetTransactionModule transactionsModule = new AssetTransactionModule();
-            if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule);
+                m_loadedSharedModules.Add(module.Name, module);
             }
-
         }
 
+
         public void InitialiseSharedModules(Scene scene)
         {
             foreach (IRegionModule module in m_loadedSharedModules.Values)
diff --git a/OpenSim/Region/Environment/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index 2854e06..3504717 100644
--- a/OpenSim/Region/Environment/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -28,7 +28,7 @@
 using System;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class Animation
     {
diff --git a/OpenSim/Region/Environment/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index df25173..f53bb78 100644
--- a/OpenSim/Region/Environment/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class AnimationSet
     {
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 1429452..178f1f7 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {        
     class DeleteToInventoryHolder
     {
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
index d4dd0db..562fcf9 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.Xml;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class AvatarAnimations
     {
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 3ae8cde..5055e44 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -30,7 +30,7 @@ using System.Runtime.Serialization;
 using System.Security.Permissions;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     [Serializable]
     public abstract class EntityBase : ISerializable
diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index f89d361..a322766 100644
--- a/OpenSim/Region/Environment/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -33,7 +33,7 @@ using log4net;
 using OpenMetaverse;
 
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class EntityManager : IEnumerable<EntityBase>
     {
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index bba7eed..23e1278 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -29,11 +29,12 @@ using System;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
-using OpenSim.Region.Environment.Interfaces;
-using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 using System.Collections.Generic;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     /// <summary>
     /// A class for triggering remote scene events.
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 73a5a3a..bd9c260 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -40,13 +40,13 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Scenes;
 
 //using HyperGrid.Framework;
 //using OpenSim.Region.Communications.Hypergrid;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public class HGAssetMapper
     {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index bdb90d8..f36075e 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -40,10 +40,10 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public partial class HGScene : Scene
     {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index ca644a6..a52fdc6 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -34,11 +34,11 @@ using OpenMetaverse;
 using OpenSim.Framework;
 
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Scenes;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public partial class HGScene : Scene
     {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 5e3e03f..d0dc4f7 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -38,11 +38,11 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public class HGSceneCommunicationService : SceneCommunicationService
     {
@@ -208,16 +208,14 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
 
                             if (eq != null)
                             {
-                                OSD Item = EventQueueHelper.EnableSimulator(realHandle, endPoint);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EnableSimulator(realHandle, endPoint, avatar.UUID);
 
                                 // ES makes the client send a UseCircuitCode message to the destination, 
                                 // which triggers a bunch of things there.
                                 // So let's wait
                                 Thread.Sleep(2000);
 
-                                Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
                             }
                             else
                             {
@@ -267,9 +265,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
                         ///
                         if (eq != null)
                         {
-                            OSD Item = EventQueueHelper.TeleportFinishEvent(realHandle, 13, endPoint,
-                                                                             4, teleportFlags, capsPath, avatar.UUID);
-                            eq.Enqueue(Item, avatar.UUID);
+                            eq.TeleportFinishEvent(realHandle, 13, endPoint,
+                                                   4, teleportFlags, capsPath, avatar.UUID);
                         }
                         else
                         {
diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs
index 9a4c72f..bd5ad33 100644
--- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public interface IScenePresenceBody
     {
diff --git a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs
index 898baab..43d07f5 100644
--- a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs
+++ b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs
@@ -27,7 +27,7 @@
 
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public struct ReturnInfo
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bc80d56..e366c79 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -34,10 +34,10 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public partial class Scene
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3334e81..039b81b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public partial class Scene
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 0872128..6aa617f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using System.Text;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class ScenePermissions
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f798a0e..f07391d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -40,10 +40,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes.Scripting;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
 using Nini.Config;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
@@ -52,7 +50,7 @@ using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 using Timer = System.Timers.Timer;
 using OSD = OpenMetaverse.StructuredData.OSD;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate bool FilterAvatarList(ScenePresence avatar);
 
@@ -123,7 +121,12 @@ namespace OpenSim.Region.Environment.Scenes
         protected IInterregionCommsOut m_interregionCommsOut;
         protected IInterregionCommsIn m_interregionCommsIn;
         protected IDialogModule m_dialogModule;
-        protected internal ICapabilitiesModule CapsModule;
+
+        protected ICapabilitiesModule m_capsModule;
+        public ICapabilitiesModule CapsModule
+        {
+            get { return m_capsModule; }
+        }
 
         // Central Update Loop
 
@@ -747,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>();
             m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>();
             m_dialogModule = RequestModuleInterface<IDialogModule>();
-            CapsModule = RequestModuleInterface<ICapabilitiesModule>();
+            m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
         }
 
         #endregion
@@ -972,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// Perform delegate action on all clients subscribing to updates from this region.
         /// </summary>
         /// <returns></returns>
-        internal void Broadcast(Action<IClientAPI> whatToDo)
+        public void Broadcast(Action<IClientAPI> whatToDo)
         {
             ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); });
         }
@@ -2965,8 +2968,7 @@ namespace OpenSim.Region.Environment.Scenes
                     IEventQueue eq = RequestModuleInterface<IEventQueue>();
                     if (eq != null)
                     {
-                        OSD Item = EventQueueHelper.DisableSimulator(RegionInfo.RegionHandle);
-                        eq.Enqueue(Item, agentID);
+                        eq.DisableSimulator(RegionInfo.RegionHandle, agentID);
                     }
                     else
                         presence.ControllingClient.SendShutdownConnectionNotice();
@@ -3792,12 +3794,12 @@ namespace OpenSim.Region.Environment.Scenes
             return m_sceneGraph.GetSceneObjectPart(fullID);
         }
 
-        internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
+        public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
         {
             return m_sceneGraph.TryGetAvatar(avatarId, out avatar);
         }
 
-        internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
+        public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
         {
             return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar);
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 5b78617..6d61e9f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public abstract class SceneBase : IScene
     {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9935512..a2b2537 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -33,14 +33,13 @@ using System.Threading;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using log4net;
-using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using OSD = OpenMetaverse.StructuredData.OSD;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void KiPrimitiveDelegate(uint localID);
 
@@ -305,13 +304,10 @@ namespace OpenSim.Region.Environment.Scenes
                 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
                 if (eq != null)
                 {
-                    OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint);
-                    eq.Enqueue(Item, avatar.UUID);
-
-                    Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath);
-                    eq.Enqueue(Item, avatar.UUID);
-
-                    m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
+                    eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
+                    eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
+                    m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", 
+                                      capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
                 }
                 else
                 {
@@ -806,16 +802,14 @@ namespace OpenSim.Region.Environment.Scenes
 
                             if (eq != null)
                             {
-                                OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
 
                                 // ES makes the client send a UseCircuitCode message to the destination, 
                                 // which triggers a bunch of things there.
                                 // So let's wait
                                 Thread.Sleep(2000);
 
-                                Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
                             }
                             else
                             {
@@ -860,9 +854,8 @@ namespace OpenSim.Region.Environment.Scenes
                         
                         if (eq != null)
                         {
-                            OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, endPoint,
-                                                                             4, teleportFlags, capsPath, avatar.UUID);
-                            eq.Enqueue(Item, avatar.UUID);
+                            eq.TeleportFinishEvent(reg.RegionHandle, 13, endPoint,
+                                                   4, teleportFlags, capsPath, avatar.UUID);
                         }
                         else
                         {
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 24eaad1..2877dcd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -32,10 +32,10 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Types;
+using OpenSim.Region.Framework.Scenes.Types;
 using OpenSim.Region.Physics.Manager;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void PhysicsCrash();
 
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// Delete an object from the scene
         /// </summary>
         /// <returns>true if the object was deleted, false if there was no object to delete</returns>
-        protected internal bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
+        public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
         {
             if (Entities.ContainsKey(uuid))
             {
@@ -797,8 +797,11 @@ namespace OpenSim.Region.Environment.Scenes
         /// suitable solution).
         /// </summary>
         /// <param name="agentId"></param>
-        /// <returns>null if either the avatar wasn't in the scene, or they do not have a controlling client</returns>
-        protected internal IClientAPI GetControllingClient(UUID agentId)
+        /// <returns>null if either the avatar wasn't in the scene, or
+        /// they do not have a controlling client</returns>
+        /// <remarks>this used to be protected internal, but that
+        /// prevents CapabilitiesModule from accessing it</remarks>
+        public IClientAPI GetControllingClient(UUID agentId)
         {
             ScenePresence presence = GetScenePresence(agentId);
 
@@ -1034,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes
             return Entities.GetEntities();
         }
 
-        protected internal Dictionary<uint, float> GetTopScripts()
+        public Dictionary<uint, float> GetTopScripts()
         {
             Dictionary<uint, float> topScripts = new Dictionary<uint, float>();
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index b28eef2..180f8a1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -32,9 +32,9 @@ using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void RestartSim(RegionInfo thisregion);
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 053e0da..5fa6609 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -31,11 +31,11 @@ using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using System.Collections.Generic;
 using System.Xml;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public partial class SceneObjectGroup : EntityBase
     {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5ae95ee..57d9ce4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -34,10 +34,10 @@ using System.Xml.Serialization;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Physics.Manager;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     [Flags]
     public enum scriptEvents
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 256d6f8..dfa9318 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -37,11 +37,11 @@ using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes.Scripting;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {       
     #region Enumerations
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8137a53..efd486d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -32,11 +32,10 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes.Scripting;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Scripting;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class SceneObjectPartInventory : IEntityInventory
     {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ed455f4..36cd862 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -36,13 +36,12 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Types;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Types;
 using OpenSim.Region.Physics.Manager;
 using OSD = OpenMetaverse.StructuredData.OSD;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     enum ScriptControlled : uint
     {
@@ -2474,10 +2473,9 @@ namespace OpenSim.Region.Environment.Scenes
 
                     IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>();
                     if (eq != null)
-                    {                        
-                        OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
-                                                    capsPath, UUID, ControllingClient.SessionId);
-                        eq.Enqueue(Item, UUID);
+                    {   
+                        eq.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
+                                       capsPath, UUID, ControllingClient.SessionId);
                     }
                     else
                     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
index 2e9c551..7d9d247 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
@@ -35,7 +35,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     /// <summary>
     /// Static methods to serialize and deserialize scene objects to and from XML
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
index 152825f..440820b 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
@@ -27,7 +27,7 @@
 
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes.Scripting
+namespace OpenSim.Region.Framework.Scenes.Scripting
 {
     public interface IScriptHost
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
index 37f5d43..fd7ff96 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
@@ -28,7 +28,7 @@
 using System;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes.Scripting
+namespace OpenSim.Region.Framework.Scenes.Scripting
 {
     public class NullScriptHost : IScriptHost
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs
index b1ee519..d358187 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs
@@ -27,7 +27,7 @@
 
 //TODO: WHERE TO PLACE THIS?
 
-namespace OpenSim.Region.Environment.Scenes.Scripting
+namespace OpenSim.Region.Framework.Scenes.Scripting
 {
     public interface ScriptEngineInterface
     {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
index 6216e2c..58228cc 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
@@ -31,7 +31,7 @@ using System.IO;
 using System.Reflection;
 using log4net;
 
-namespace OpenSim.Region.Environment.Scenes.Scripting
+namespace OpenSim.Region.Framework.Scenes.Scripting
 {
     public class ScriptEngineLoader
     {
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index efda140..b2cea5d 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -31,9 +31,9 @@ using System.Timers;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Statistics;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class SimStatsReporter
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 1534c4b..55c5181 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -26,14 +26,14 @@
  */
 
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using System;
 using System.Text;
 using System.Xml;
 using System.IO;
 using System.Xml.Serialization;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Framework.Scenes
 {
     /// <summary>
     /// A new version of the old Channel class, simplified
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs
index b20ff42..318a682 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs
@@ -26,9 +26,9 @@
  */
 
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.Framework.Scenes
 {
     public static class TerrainUtil
     {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 0155966..2c6ccc8 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -35,10 +35,10 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.Environment.Scenes.Tests
+namespace OpenSim.Region.Framework.Scenes.Tests
 {
     [TestFixture]
     public class EntityManagerTests
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index d063eae..d063eae 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 30b0987..30b0987 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index d66c365..dc8df32 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -34,14 +34,14 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Environment.Modules.Communications.Local;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.Environment.Scenes.Tests
+namespace OpenSim.Region.Framework.Scenes.Tests
 {
     /// <summary>
     /// Scene presence tests
diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 221d97f..a78faa6 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -32,12 +32,12 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Environment.Modules.Communications.REST;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.Environment.Scenes.Tests
+namespace OpenSim.Region.Framework.Scenes.Tests
 {
     /// <summary>
     /// Teleport tests in a standalone OpenSim
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
index 24ce94b..9fbbb15 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
@@ -27,9 +27,9 @@
 
 using System;
 using System.Collections.Generic;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Types
+namespace OpenSim.Region.Framework.Scenes.Types
 {
     public class BasicQuadTreeNode
     {
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 0c86df2..452ada9 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
 using OpenMetaverse;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Types
+namespace OpenSim.Region.Framework.Scenes.Types
 {
     [Serializable]
     public class UpdateQueue : ISerializable
diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index d828d8d..3d48229 100644
--- a/OpenSim/Region/Environment/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,7 +27,7 @@
 
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public class UndoState
     {
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs
index c9057f2..db9359f 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Framework/StorageManager.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Reflection;
 using log4net;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.Framework
 {
     public class StorageManager
     {