169 files changed, 211 insertions, 272 deletions

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index b9a0a64..bd98045 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -34,10 +34,10 @@ using OpenSim.Framework;
 using OpenSim.Framework.RegionLoader.Filesystem;
 using OpenSim.Framework.RegionLoader.Web;
 
-using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
-using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
-using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
-using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
+using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
+using OpenSim.Region.CoreModules.Avatar.InstantMessage;
+using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
+using OpenSim.Region.CoreModules.Scripting.XMLRPC;
 using OpenSim.Region.CoreModules.Agent.AssetTransaction;
 
 namespace OpenSim.ApplicationPlugins.LoadRegions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index a036371..43ae818 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain;
 using System.Collections.Generic;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 70d8f8a..d60dadd 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Data;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Land;
+using OpenSim.Region.CoreModules.World.Land;
 using OpenMetaverse;
 
 namespace OpenSim.Data.Tests
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index c0f57f1..458c6af 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -43,7 +43,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.Hypergrid;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1c7751d..db6c0f1 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -41,8 +41,8 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver;
-using Timer=System.Timers.Timer;
+using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
+using Timer = System.Timers.Timer;
 
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f2ea81d..aab80d9 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -44,7 +44,7 @@ using OpenSim.Framework.Statistics;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 6cad7c9..f947d06 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.ClientStack;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.ClientStack
 {
     public class ClientStackManager
     {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f53174a..a1263a1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -798,7 +798,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         /// <summary>
         /// Starts up the timers to check the client and resend unacked packets
-        /// Adds the client to the OpenSim.Region.Environment.Scenes.Scene
+        /// Adds the client to the OpenSim.Region.Framework.Scenes.Scene
         /// </summary>
         protected virtual void InitNewClient()
         {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 18d8c5c..24ebd7e 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 1ac0807..d084dbd 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
+namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
     public class AvatarFactoryModule : IAvatarFactory, IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index f234b75..f036faf 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Chat
+namespace OpenSim.Region.CoreModules.Avatar.Chat
 {
     public class ChatModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index f032319..1ed608a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework.Communications.Cache;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule
+namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
 {
     public class CombatModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 1ec5e9b..0a1de44 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
+namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
 {
     /// <summary>
     /// Demo Economy/Money Module.  This is not a production quality money/economy module!
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index d3ac2c0..7326373 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
+namespace OpenSim.Region.CoreModules.Avatar.Dialog
 {
     public class DialogModule : IRegionModule, IDialogModule
     { 
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 0ed962e..fb4d08a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Friends
+namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
     /*
         This module handles adding/removing friends, and the the presence
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 969c1d8..a3a642f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using System.Reflection;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
+namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
     public class GesturesModule : IRegionModule
     { 
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index e654912..92d0fdd 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Groups
+namespace OpenSim.Region.CoreModules.Avatar.Groups
 {
     public class GroupsModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 3a1b282..3ad2c91 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
+namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class InstantMessageModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 347c305..91c22eb 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
+namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class MessageTransferModule : IRegionModule, IMessageTransferModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index c84d3d5..49fd70a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
+namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class PresenceModule : IRegionModule, IPresenceModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 3a58202..49006a2 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -33,15 +33,15 @@ using System.Reflection;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Archiver;
+using OpenSim.Region.CoreModules.World.Archiver;
+using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using log4net;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
 
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
+namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
     public class InventoryArchiveReadRequest
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index e23f2a8..f548296 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -33,14 +33,14 @@ using System.Reflection;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Archiver;
+using OpenSim.Region.CoreModules.World.Archiver;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using log4net;
 
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
+namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {        
     public class InventoryArchiveWriteRequest
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 62fb3a2..d2cf6c9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework.Communications.Cache;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
+namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
     public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 79d5409..ebf4f0a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Lure
+namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
     public class LureModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index c853582..193307d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps
+namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
 {
     public class ObjectAdd : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index a7e9849..6ea5b56 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
+namespace OpenSim.Region.CoreModules.Avatar.Profiles
 {
     public class AvatarProfilesModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 33ccbf4..3a9df4a 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -41,7 +41,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Communications.Local
+namespace OpenSim.Region.CoreModules.Communications.Local
 {
     public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
     {
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 95b95ee..b4f4814 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -45,9 +45,9 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenSim.Region.Environment.Modules.Communications.Local;
+using OpenSim.Region.CoreModules.Communications.Local;
 
-namespace OpenSim.Region.Environment.Modules.Communications.REST
+namespace OpenSim.Region.CoreModules.Communications.REST
 {
     public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
     {
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index fb30321..e81466a 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -52,7 +52,7 @@ using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
 
-namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
+namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
     public struct QueueItem
     {
@@ -617,7 +617,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
 
         public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID)
         {
-            OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
+            OSD item = EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
             Enqueue(item, avatarID);
         }
 
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index b38ddba..80f6fce 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -31,7 +31,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
 
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
     public class EventQueueHelper
     {
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index b6114e8..fe29e0c 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
+namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
     /// <summary>
     /// A single function call encapsulated in a class which enforces arguments when passing around as Object[]'s.
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index cd66295..cd905ab 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -33,7 +33,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
+namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
     /// <summary>
     /// A class to enable modules to register console and script commands, which enforces typing and valid input.
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 4cb1c20..13efe6b 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Grid.AssetServer;
 using OpenSim.Data;
 
-namespace OpenSim.Region.Environment.Modules.Hypergrid
+namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGStandaloneAssetService : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index 54ba761..dfc859e 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Hypergrid
+namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGStandaloneInventoryService : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 1d9182e..5540cc3 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -50,14 +50,14 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Types;
-using OpenSim.Region.Environment.Modules.World.WorldMap;
+using OpenSim.Region.CoreModules.World.WorldMap;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 
 using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 
-namespace OpenSim.Region.Environment.Modules.Hypergrid
+namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGWorldMapModule : WorldMapModule, IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 12a76de8..2e1675b 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -51,7 +51,7 @@ using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 
-namespace OpenSim.Region.Environment.Modules.InterGrid
+namespace OpenSim.Region.CoreModules.InterGrid
 {
     public struct OGPState
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index f498f9a..e6a12a4 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
+namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
     public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 81ce761..c23ff1e 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -38,7 +38,7 @@ using Nini.Config;
 using DotNetOpenMail;
 using DotNetOpenMail.SmtpAuth;
 
-namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
+namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
     public class EmailModule : IEmailModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index faa6f3c..9f3bd09 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -82,7 +82,7 @@ using System.Collections;
  *
  * **************************************************/
 
-namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
+namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 {
     public class HttpRequestModule : IRegionModule, IHttpRequestModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 0112ee6..afcaff1 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -35,7 +35,7 @@ using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
+namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 {
     public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 60806a7..0c709b5 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Scenes;
 
 //using Cairo;
 
-namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender
+namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 {
     public class VectorRenderModule : IRegionModule, IDynamicTextureRender
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 258734d..c363940 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -83,7 +83,7 @@ using OpenSim.Region.Framework.Scenes;
  *
  * **************************************************/
 
-namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
+namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 {
     public class WorldCommModule : IRegionModule, IWorldComm
     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index fb86731..942c130 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -73,7 +73,7 @@ using OpenSim.Region.Framework.Scenes;
  *
  * **************************************************/
 
-namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
+namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 {
     public class XMLRPCModule : IRegionModule, IXMLRPC
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
index 4151c88..179d1a2 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Constants for the archiving module
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index b507c52..3218abc 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -38,9 +38,9 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Handles an individual archive read request
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index 9a06bf7..d3c2cd1 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -35,10 +35,10 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Method called when all the necessary assets for an archive request have been received.
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 56604d6..ee0ec69 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -29,8 +29,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -42,7 +42,7 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Prepare to write out an archive.
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index cd81169..c1f5b18 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -35,9 +35,9 @@ using Nini.Config;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Serialiser;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// This module loads and saves OpenSimulator archives
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 36a60f3..76d27ce 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -33,7 +33,7 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Archives assets
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 95ff468..f9909d9 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -35,7 +35,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Dearchives assets
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index b7fd170..8971b6e 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Encapsulate the asynchronous requests for the assets required for an archive operation
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
index e12d0ec..2580316 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
@@ -32,7 +32,7 @@ using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Serialize and deserialize region settings for an archive file format.
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
index 3862546..506d770 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
@@ -31,7 +31,7 @@ using System.Reflection;
 using System.Text;
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Temporary code to do the bare minimum required to read a tar archive for our purposes
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
index 8fd247c..437939e 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
@@ -32,7 +32,7 @@ using System.Text;
 using System.Reflection;
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
     /// Temporary code to produce a tar archive in tar v7 format
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index e265252..a14e0f6 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -33,13 +33,13 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Archiver;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Archiver;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests
+namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 {
     [TestFixture]
     public class ArchiverTests
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 6b74c83..8b15308 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Estate
+namespace OpenSim.Region.CoreModules.World.Estate
 {
     public class EstateManagementModule : IEstateModule
     {
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
                 TerrainUploader = null;
             }
             remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
-            OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>();
+            OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
 
             if (terr != null)
             {
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
         private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
         {
             // Save terrain here
-            OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>();
+            OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
             
             if (terr != null)
             {
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index 267178e..94a4072 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Scenes;
 
 
-namespace OpenSim.Region.Environment.Modules.World.Estate
+namespace OpenSim.Region.CoreModules.World.Estate
 {
 
     public class EstateTerrainXferHandler
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 76555d2..41163a0 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -32,7 +32,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Land
+namespace OpenSim.Region.CoreModules.World.Land
 {
     public class LandChannel : ILandChannel
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 58176e4..6ae6576 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Region.Physics.Manager;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 
-namespace OpenSim.Region.Environment.Modules.World.Land
+namespace OpenSim.Region.CoreModules.World.Land
 {
     // used for caching
     internal class ExtendedLandData {
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index b5f7225..fc5bef1 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Land
+namespace OpenSim.Region.CoreModules.World.Land
 {
     /// <summary>
     /// Keeps track of a specific piece of land's information
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 8838e39..1469f5d 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -36,10 +36,10 @@ using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.Framework;
+using OpenSim.Region.CoreModules.Framework;
 using OpenSim.Framework.Communications.Cache;
 
-namespace OpenSim.Region.Environment.Modules.World.Permissions
+namespace OpenSim.Region.CoreModules.World.Permissions
 {
     public class PermissionsModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
index afad3cf..acc7bb8 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Serialiser
+namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     internal interface IFileSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index 8b3f2ce..ed6448f 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -32,7 +32,7 @@ using System.Text;
 using System.Xml;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Serialiser
+namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     internal class SerialiseObjects : IFileSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
index d0ce3d8..924218a 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
+using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Serialiser
+namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     internal class SerialiseTerrain : IFileSerialiser
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index 0e7873c..7080d5f 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -32,9 +32,9 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 
-namespace OpenSim.Region.Environment.Modules.World.Serialiser
+namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     public class SerialiserModule : IRegionModule, IRegionSerialiserModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 1713797..ffd6b8d 100644
--- a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.World.Sound
+namespace OpenSim.Region.CoreModules.World.Sound
 {        
     public class SoundModule : IRegionModule, ISoundModule
     {        
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index ee96d58..b36684c 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.CoreModules
 {
     public class SunModule : IRegionModule
     {
diff --git a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
index 8dd7478..f96ab88 100644
--- a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
@@ -27,8 +27,8 @@
 
 using System;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
+using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
 
 namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index 83246fb..cb8112c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -27,9 +27,9 @@
 using System;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
+namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
     internal class CookieCutter : ITerrainEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index 2082137..da6ee12 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -28,7 +28,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
+namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
     internal class DefaultTerrainGenerator : ITerrainEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index a8e79d0..4f395b5 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -30,7 +30,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     /// <summary>
     /// A generic windows bitmap loader.
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index b76fe05..cff82d1 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -30,7 +30,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     internal class GIF : GenericSystemDrawing
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 80873d9..477c73c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -32,7 +32,7 @@ using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     /// <summary>
     /// A virtual class designed to have methods overloaded,
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index bea504d..f8e31f8 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -31,7 +31,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     public class JPEG : ITerrainLoader
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index e323e28..a86ae00 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -30,7 +30,7 @@ using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     public class LLRAW : ITerrainLoader
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index 25967f3..0dea282 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -30,7 +30,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     internal class PNG : GenericSystemDrawing
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
index 7aff56a..178104f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
@@ -29,7 +29,7 @@ using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     public class RAW32 : ITerrainLoader
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index 0503487..220431f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -30,7 +30,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     internal class TIFF : GenericSystemDrawing
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 44d03e3..426708d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -31,7 +31,7 @@ using System.Text;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
+namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     /// <summary>
     /// Terragen File Format Loader
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
index 4d49a70..fe79c0b 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class FlattenArea : ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
index 64f9014..5c0aace 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class LowerArea : ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
index 2d44a3a..02f2b53 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -29,7 +29,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class NoiseArea : ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
index 0c7d016..768b31f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class RaiseArea : ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
index 3f06d82..66b9055 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class RevertArea : ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
index 3881264..a75dde1 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class SmoothArea : ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
index 4533e9e..40b9f5a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index 5bae84b..eee7a83 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -28,7 +28,7 @@
 using System;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainFloodEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index 21bda58..c62b897 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -28,7 +28,7 @@
 using System.IO;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainLoader
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
index 91bc31f..8c5d1d9 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
@@ -30,7 +30,7 @@ using System.IO;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
index 7461560..15d9f6e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
@@ -27,7 +27,7 @@
 
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 4d694cc..6ce6994 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     /// <summary>
     /// Hydraulic Erosion Brush
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 91c030d..928a595 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class FlattenSphere : ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index d391e94..8c40088 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -28,7 +28,7 @@
 using System;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class LowerSphere : ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 32a6869..95a8c33 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -30,7 +30,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class NoiseSphere : ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 86d01d3..1a2528a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     /// <summary>
     /// Speed-Optimised Hybrid Erosion Brush
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index a0ff262..c53bb7d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class RaiseSphere : ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index af6d94d..4ed8a13 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -29,7 +29,7 @@ using System;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class RevertSphere : ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index fe270f7..6636d8f 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -28,7 +28,7 @@
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class SmoothSphere : ITerrainPaintableEffect
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
index faba119..6b00cc8 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -28,7 +28,7 @@
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
+namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     /// <summary>
     /// Thermal Weathering Paint Brush
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
index 2411de0..ff9b8ec 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainException.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
@@ -27,7 +27,7 @@
 
 using System;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public class TerrainException : Exception
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index bc601dc..9de7338 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -35,12 +35,12 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
-using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
-using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
+using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
+using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index 2acd5bc..e7f92d7 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -28,9 +28,9 @@
 using System;
 using NUnit.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
 
-namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests
+namespace OpenSim.Region.CoreModules.World.Terrain.Tests
 {
     [TestFixture]
     public class TerrainTest
diff --git a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 4c4ca0d..8b2bb1e 100644
--- a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation
+namespace OpenSim.Region.CoreModules.Avatar.Vegetation
 {
     public class VegetationModule : IRegionModule, IVegetationModule
     { 
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 8e54fd9..b8bd605 100644
--- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.CoreModules
 {
     public class WindModule : IWindModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
index cb0ac8c..3684df0 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
@@ -29,7 +29,7 @@ using System.Drawing;
 using OpenSim.Region.Framework.Scenes;
 using Nini.Config;
 
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public interface IMapTileTerrainRenderer
     {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index a806c7d..eea6cf6 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Modules.World.WorldMap
+namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public enum DrawRoutine
     {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 43ed1e4..45a99a9 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -36,7 +36,7 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 
-namespace OpenSim.Region.Environment.Modules.World.WorldMap
+namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public class MapSearchModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
index 7fe538e..b783d7c 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
@@ -39,7 +39,7 @@ using log4net;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.WorldMap
+namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public class ShadedMapTileRenderer : IMapTileTerrainRenderer
     {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index d23c352..537644a 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -39,9 +39,9 @@ using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain;
 
-namespace OpenSim.Region.Environment.Modules.World.WorldMap
+namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     // Hue, Saturation, Value; used for color-interpolation
     struct HSV {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 37b4547..376e365 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -52,7 +52,7 @@ using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 
-namespace OpenSim.Region.Environment.Modules.World.WorldMap
+namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public class WorldMapModule : IRegionModule
     {
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index bfc45fc..52659e4 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -34,7 +34,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Land;
+using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse.Packets;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 6f7ff6b..949cc38 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -33,7 +33,7 @@ using log4net;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Land;
+using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Framework;
 using OpenMetaverse;
 
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 24865db..73bbb4c 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -28,7 +28,6 @@
 using System;
 using OpenMetaverse;
 using OpenSim.Framework;
-// using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index 6570b0a..cdd2b7c 100644
--- a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -28,8 +28,6 @@
 using OpenMetaverse;
 using Nwc.XmlRpc;
 
-// using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
-
 namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IXmlRpcRequestInfo
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index bd9c260..cc82a48 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-// using OpenSim.Region.Environment;
 using OpenSim.Region.Framework.Scenes;
 
 //using HyperGrid.Framework;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index ba81270..c6d2bfc 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-// using OpenSim.Region.Environment;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index a52fdc6..1cb98db 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -34,7 +34,6 @@ using OpenMetaverse;
 using OpenSim.Framework;
 
 using OpenSim.Framework.Communications.Cache;
-// using OpenSim.Region.Environment;
 using OpenSim.Region.Framework.Scenes;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index d0dc4f7..a17df71 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -39,7 +39,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Region.Framework.Scenes;
-// using OpenSim.Region.Environment;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index dc27a55..096b2cb 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.Environment.Scenes.Tests
+namespace OpenSim.Region.CoreModules.Scenes.Tests
 {
     /// <summary>
     /// Basic scene object tests (create, read and delete but not update).
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 3efb886..3e0f48f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.Environment.Scenes.Tests
+namespace OpenSim.Region.CoreModules.Scenes.Tests
 {
     /// <summary>
     /// Linking tests
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index ec36be9..2053c8f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -36,8 +36,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 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.Region.CoreModules.Communications.Local;
+using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 0b9937a..5d2839c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -32,7 +32,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.Communications.REST;
+using OpenSim.Region.CoreModules.Communications.REST;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
diff --git a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs
deleted file mode 100644
index 63e574a..0000000
--- a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 System.Reflection;
-using System.Runtime.CompilerServices;
-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("Python")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Python")]
-[assembly: AssemblyCopyright("Copyright (c) 2008")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5bd55f67-385d-4a43-893a-b5d2ea43f07d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index dfa1caa..167f0cc 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Chat
+namespace OpenSim.Region.OptionalModules.Avatar.Chat
 {
 
     // An instance of this class exists for each unique combination of 
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index ccd81c7..0facc14 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Chat
+namespace OpenSim.Region.OptionalModules.Avatar.Chat
 {
     public class IRCBridgeModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index c3cafb0..f5c324d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Chat
+namespace OpenSim.Region.OptionalModules.Avatar.Chat
 {
     public class IRCConnector
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index 78f4265..6733120 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Chat
+namespace OpenSim.Region.OptionalModules.Avatar.Chat
 {
     //    An instance of this class exists for every active region
 
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 5ac5dbe..bb46b11 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -43,9 +43,9 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.Avatar.Chat;
+using OpenSim.Region.CoreModules.Avatar.Chat;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
+namespace OpenSim.Region.OptionalModules.Avatar.Concierge
 {
     public class ConciergeModule : ChatModule, IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py
index 1c088fb..1c088fb 100755
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index 33d7135..c827214 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
+namespace OpenSim.Region.OptionalModules.Avatar.Voice.AsterixVoice
 {
     public class AsteriskVoiceModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
index e4d9b7c..3e8a433 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
-namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice
+namespace OpenSim.Region.OptionalModules.Avatar.Voice.SIPVoice
 {
     public class SIPVoiceModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs
index 9695fb8..d4acc34 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class AuraMetaEntity : PointMetaEntity
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs
index 3b1a45e..c0a0603 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class BeamMetaEntity : PointMetaEntity
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
index 5a86d48..80989a7 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     /// <summary>
     /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread,
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
index cfd5cde..d5cf596 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
@@ -52,7 +52,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class CMEntityCollection
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 6399608..761dca9 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class CMModel
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
index e5c9bb3..a1a4d94 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class CMView
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
index 2ea5ebc..4d65038 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class ContentManagementEntity : MetaEntity
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs
index 417cbce..21bc8b2 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class ContentManagementModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs
index 65db153..6a50906 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs
@@ -47,13 +47,13 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class FileSystemDatabase : IContentDatabase
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs
index 4209dab..d24747c 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs
@@ -48,13 +48,13 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     /// <summary>
     /// Just a stub :-(
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs
index 79dc86e..7a25fa5 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs
@@ -40,7 +40,7 @@ using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 using Nini.Config;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public interface IContentDatabase
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index c8f8c2f..63c74e1 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class MetaEntity
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
index d6ba92f..22f09fd 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     public class PointMetaEntity : MetaEntity
     {
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README b/OpenSim/Region/OptionalModules/ContentManagementSystem/README
index 1a69fef..1a69fef 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/README
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
index 225a682..8957e8f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager;
 
 using log4net;
 
-namespace OpenSim.Region.Environment.Modules.ContentManagement
+namespace OpenSim.Region.OptionalModules.ContentManagement
 {
     #region Enumerations
 
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs
index edf1231..a2c98a4 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
+++ b/OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs
@@ -28,7 +28,7 @@
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Grid.Interregion
+namespace OpenSim.Region.CoreModules.Grid.Interregion
 {
     public interface IInterregionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs
index cb571e4..21df83c 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.Grid.Interregion
+namespace OpenSim.Region.CoreModules.Grid.Interregion
 {
     public class InterregionModule : IInterregionModule, IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs
index 47357d2..b09c848 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs
+++ b/OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Modules.Grid.Interregion
+namespace OpenSim.Region.CoreModules.Grid.Interregion
 {
     public class RemotingObject : MarshalByRefObject
     {
diff --git a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs b/OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs
index 215a9ad..215a9ad 100644
--- a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs
+++ b/OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs
diff --git a/OpenSim/Region/Modules/Python/PythonModule.cs b/OpenSim/Region/OptionalModules/Python/PythonModule.cs
index 5dedac2..5dedac2 100644
--- a/OpenSim/Region/Modules/Python/PythonModule.cs
+++ b/OpenSim/Region/OptionalModules/Python/PythonModule.cs
diff --git a/OpenSim/Region/OptionalModules/README b/OpenSim/Region/OptionalModules/README
new file mode 100644
index 0000000..0fe7b87
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/README
@@ -0,0 +1,9 @@
+= OpenSim.Region.OptionalModules =
+
+The modules in this part of the OpenSim source tree are candidates for forge. For the time being, until we have reached consensus on 
+
+    (a) what should be core or optional
+    (b) that we have reached a stable API
+    (c) how to maintain optional modules
+
+we will keep these modules in-tree.
\ No newline at end of file
diff --git a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs
index 165fcea..165fcea 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
index 6e3b620..c4fc584 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs
@@ -33,12 +33,12 @@ using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Scenes;
 using PumaCode.SvnDotNet.AprSharp;
 using PumaCode.SvnDotNet.SubversionSharp;
-using Slash=System.IO.Path;
+using Slash = System.IO.Path;
 
 namespace OpenSim.Region.Modules.SvnSerialiser
 {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 9165554..3ba8a97 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -33,7 +33,7 @@ using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.NPC
+namespace OpenSim.Region.OptionalModules.World.NPC
 {
     public class NPCAvatar : IClientAPI
     {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 2e7b16c..9dace33 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -30,7 +30,7 @@ using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.NPC
+namespace OpenSim.Region.OptionalModules.World.NPC
 {
     public class NPCModule : IRegionModule
     {
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 8a49540..94ebcac 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Modules.World.TreePopulator
+namespace OpenSim.Region.OptionalModules.World.TreePopulator
 {
     /// <summary>
     /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later.
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 7eb00a7..cc78b51 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index f1f5f4b..dc7716e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -31,7 +31,7 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules.Framework.EventQueue;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Interfaces;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2429e96..d1006e3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -37,11 +37,11 @@ using OpenMetaverse.Packets;
 using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
-using OpenSim.Region.Environment.Modules.World.Land;
-using OpenSim.Region.Environment.Modules.World.Terrain;
+using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
+using OpenSim.Region.CoreModules.World.Land;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -4168,7 +4168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             LSL_Vector SunDoubleVector3;
             Vector3 SunFloatVector3;
 
-            // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule
+            // sunPosition estate setting is set in OpenSim.Region.CoreModules.SunModule
             // have to convert from Vector3 (float) to LSL_Vector (double)
             SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector;
             SunDoubleVector3.x = (double)SunFloatVector3.X;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
index 4c7dc8d..0654c07 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
@@ -27,7 +27,7 @@
 
 using System;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
+using OpenSim.Region.CoreModules.Scripting.HttpRequest;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
index eba52bf..5c95c66 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
@@ -28,7 +28,7 @@
 using System;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
+using OpenSim.Region.CoreModules.Scripting.WorldComm;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
index bf1a923..893977b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
@@ -27,7 +27,7 @@
 
 using System;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
+using OpenSim.Region.CoreModules.Scripting.XMLRPC;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
index 3cd6b76..feff86a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
@@ -33,7 +33,7 @@
     <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" />
     <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />
     <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" />
-    <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" />
+    <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.CoreModules" />
     <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" />
     <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" />
     <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" />
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 777cb12..4236c2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.ScriptEngine.Shared
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6b04248..a9a2dbf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -41,7 +41,7 @@ using log4net;
 using Nini.Config;
 using Amib.Threading;
 using OpenSim.Framework;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
index 7e8d690..ef3ba9a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
@@ -39,7 +39,7 @@ using log4net;
 using Nini.Config;
 using Amib.Threading;
 using OpenSim.Framework;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 09f751f..2632948 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
+using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2cb18ea..a5570b3 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -41,7 +41,7 @@ using log4net;
 using Nini.Config;
 using Amib.Threading;
 using OpenSim.Framework;
-using OpenSim.Region.Environment;
+using OpenSim.Region.CoreModules.Framework.EventQueue;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;