91 files changed, 790 insertions, 272 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index db1628c..6f82181 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.Environment.Scenes;
 [assembly : Addin]
 [assembly : AddinDependency("OpenSim", "0.5")]
-namespace OpenSim.ApplicationPlugins.LoadRegions
+namespace OpenSim.ApplicationPlugins.RemoteController
 {
    [Extension("/OpenSim/Startup")]
    public class RemoteAdminPlugin : IApplicationPlugin
@@ -611,4 +611,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
index e4f1dc2..15ddd16 100644
--- a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
@@ -32,7 +32,7 @@ using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
-namespace OpenSim.Data.NHibernate
+namespace OpenSim.Data.NHibernate.Types
 {
    [Serializable]
    public class LLUUIDUserType: IUserType 
@@ -102,4 +102,4 @@ namespace OpenSim.Data.NHibernate
            get { return new SqlType [] { NHibernateUtil.String.SqlType }; }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index c07744c..b6ee04d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -32,11 +32,10 @@ using System.IO;
 using System.Reflection;
 using libsecondlife;
 using log4net;
-using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    public delegate void UpLoadedAsset(
        string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder,
@@ -54,8 +53,8 @@ namespace OpenSim.Region.Capabilities
                                                   bool isScriptRunning, byte[] data);
    public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID,
-                                                   bool fetchFolders, bool fetchItems, int sortOrder);
+                                                                          bool fetchFolders, bool fetchItems, int sortOrder);
-    
    /// <summary>
    /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that
    /// we can popup a message on the user's client if the inventory service has permanently failed).  But I didn't want
@@ -397,7 +396,7 @@ namespace OpenSim.Region.Capabilities
        /// <returns></returns>
        public string RequestTexture(string request, string path, string param)
        {
-            Console.WriteLine("texture request " + request);
+            System.Console.WriteLine("texture request " + request);
            // Needs implementing (added to remove compiler warning)
            return String.Empty;
        }
@@ -961,4 +960,4 @@ namespace OpenSim.Region.Capabilities
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index f101131..e76a5c5 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -29,7 +29,7 @@ using System.Collections;
 using System.Collections.Generic;
 using OpenSim.Framework.Servers;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    /// <summary>
    /// CapsHandlers is a cap handler container but also takes
@@ -141,4 +141,4 @@ namespace OpenSim.Region.Capabilities
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index b3e841c..13361c7 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -34,7 +34,7 @@ using System.Text;
 using System.Xml;
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    /// <summary>
    /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code. 
@@ -676,4 +676,4 @@ namespace OpenSim.Region.Capabilities
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
index a5cdd73..3579cc2 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
@@ -27,7 +27,7 @@
 using System.Collections;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("ARRAY")]
    public class LLSDArray
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 1393523..6c4db4b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -28,7 +28,7 @@
 using System;
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDAssetUploadComplete
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index e71a73e..289cc93 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -28,7 +28,7 @@
 using System;
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDAssetUploadRequest
@@ -43,4 +43,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index bb293ba..63b3351 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -27,7 +27,7 @@
 using System;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDAssetUploadResponse
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
index c1b15b4..5ff21b8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDCapEvent
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
index 5a44e26..4abdb59 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDEmpty
@@ -34,4 +34,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index a39f5aa..409d2e0 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -31,7 +31,7 @@ using System.IO;
 using System.Reflection;
 using System.Xml;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    public class LLSDHelpers
    {
@@ -160,4 +160,4 @@ namespace OpenSim.Region.Capabilities
            return obj;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index d402579..31896c2 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -27,7 +27,7 @@
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDInventoryItem
@@ -68,15 +68,6 @@ namespace OpenSim.Region.Capabilities
        public string sale_type;
    }
-    /*  [LLSDMap]
-      public class LLSDFolderItem
-      {
-          public LLUUID folder_id;
-          public LLUUID parent_id;
-          public int type;
-          public string name;
-      }*/
    [LLSDMap]
    public class LLSDInventoryDescendents
    {
@@ -103,4 +94,4 @@ namespace OpenSim.Region.Capabilities
        public LLUUID owner___id; // and of course we can't have field names with "-" in 
        public int version;
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 6211c4f..2c4b68f 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -27,7 +27,7 @@
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDItemUpdate
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 0cf82a8..50f5241 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
@@ -27,7 +27,7 @@
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDMapLayer
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
index 205a645..7dabbec 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDMapLayerResponse
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
index 748c5ea..317e35d 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDMapRequest
@@ -36,4 +36,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
index deb9223..55d62ac 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
index 4439346..fb5eaa8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -28,7 +28,7 @@
 using System.Collections;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDParcelVoiceInfoResponse
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 545643a..5e8a08f 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -30,7 +30,7 @@ using System.IO;
 using System.Text;
 using OpenSim.Framework.Servers;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
        where TRequest : new()
@@ -65,4 +65,4 @@ namespace OpenSim.Region.Capabilities
            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
index 22e45f4..ee9ff1b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
@@ -27,7 +27,7 @@
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDTaskInventoryUploadComplete
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities
        /// </summary>
        public string state;
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
index ed7e824..df32d1a 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
@@ -27,7 +27,7 @@
 using libsecondlife;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDTaskScriptUpdate
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities
        /// </summary> 
        public int is_script_running;
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
index d050176..91db060 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDType("MAP")]
    public class LLSDTest
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
index bdc8e79..181a465 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
@@ -27,7 +27,7 @@
 using System;
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [AttributeUsage(AttributeTargets.Class)]
    public class LLSDType : Attribute
@@ -52,4 +52,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
index 941e70e..67064b0 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
@@ -26,7 +26,7 @@
 * 
 */
-namespace OpenSim.Region.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
 {
    [LLSDMap]
    public class LLSDVoiceAccountResponse
diff --git a/OpenSim/Framework/Communications/GenericAsyncResult.cs b/OpenSim/Framework/Communications/GenericAsyncResult.cs
new file mode 100644
index 0000000..ed41614
--- /dev/null
+++ b/OpenSim/Framework/Communications/GenericAsyncResult.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Threading;
+namespace OpenSim.Framework.Communications
+{
+    internal class SimpleAsyncResult : IAsyncResult
+    {
+        private readonly AsyncCallback m_callback;
+        /// <summary>
+        /// Is process completed?
+        /// </summary>
+        /// <remarks>Should really be boolean, but VolatileRead has no boolean method</remarks>
+        private byte m_completed;
+        /// <summary>
+        /// Did process complete synchroneously?
+        /// </summary>
+        /// <remarks>I have a hard time imagining a scenario where this is the case, again, same issue about
+        /// booleans and VolatileRead as m_completed
+        /// </remarks>
+        private byte m_completedSynchronously;
+        private readonly object m_asyncState;
+        private ManualResetEvent m_waitHandle;
+        private Exception m_exception;
+        internal SimpleAsyncResult(AsyncCallback cb, object state)
+        {
+            m_callback = cb;
+            m_asyncState = state;
+            m_completed = 0;
+            m_completedSynchronously = 1;
+        }
+        #region IAsyncResult Members
+        public object AsyncState
+        {
+            get { return m_asyncState; }
+        }
+        public WaitHandle AsyncWaitHandle
+        {
+            get
+            {
+                if (m_waitHandle == null)
+                {
+                    bool done = IsCompleted;
+                    ManualResetEvent mre = new ManualResetEvent(done);
+                    if (Interlocked.CompareExchange(ref m_waitHandle, mre, null) != null)
+                    {
+                        mre.Close();
+                    }
+                    else
+                    {
+                        if (!done && IsCompleted)
+                        {
+                            m_waitHandle.Set();
+                        }
+                    }
+                }
+                return m_waitHandle;
+            }
+        }
+        public bool CompletedSynchronously
+        {
+            get { return Thread.VolatileRead(ref m_completedSynchronously) == 1; }
+        }
+        public bool IsCompleted
+        {
+            get { return Thread.VolatileRead(ref m_completed) == 1; }
+        }
+        #endregion
+        #region class Methods
+        internal void SetAsCompleted(bool completedSynchronously)
+        {
+            m_completed = 1;
+            if (completedSynchronously)
+                m_completedSynchronously = 1;
+            else
+                m_completedSynchronously = 0;
+            SignalCompletion();
+        }
+        internal void HandleException(Exception e, bool completedSynchronously)
+        {
+            m_completed = 1;
+            if (completedSynchronously)
+                m_completedSynchronously = 1;
+            else
+                m_completedSynchronously = 0;
+            m_exception = e;
+            SignalCompletion();
+        }
+        private void SignalCompletion()
+        {
+            if (m_waitHandle != null) m_waitHandle.Set();
+            if (m_callback != null) m_callback(this);
+        }
+        public void EndInvoke()
+        {
+            // This method assumes that only 1 thread calls EndInvoke 
+            if (!IsCompleted)
+            {
+                // If the operation isn't done, wait for it
+                AsyncWaitHandle.WaitOne();
+                AsyncWaitHandle.Close();
+                m_waitHandle = null; // Allow early GC
+            }
+            // Operation is done: if an exception occured, throw it
+            if (m_exception != null) throw m_exception;
+        }
+        #endregion
+    }
+    internal class AsyncResult<T> : SimpleAsyncResult
+    {
+        private T m_result = default(T);
+        public AsyncResult(AsyncCallback asyncCallback, Object state) :
+            base(asyncCallback, state)
+        {
+        }
+        public void SetAsCompleted(T result, bool completedSynchronously)
+        {
+            // Save the asynchronous operation's result
+            m_result = result;
+            // Tell the base class that the operation completed 
+            // sucessfully (no exception)
+            base.SetAsCompleted(completedSynchronously);
+        }
+        public new T EndInvoke()
+        {
+            base.EndInvoke();
+            return m_result;
+        }
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 2b6e0d5..7c243c6 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using libsecondlife;
-namespace OpenSim.Framework
+namespace OpenSim.Framework.Communications
 {
    public interface IUserService
    {
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index a379253..f7989ab 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -34,7 +34,7 @@ using libsecondlife.StructuredData;
 using log4net;
 using Nwc.XmlRpc;
-namespace OpenSim.Framework.UserManagement
+namespace OpenSim.Framework.Communications
 {
    /// <summary>
    /// A temp class to handle login response.
@@ -777,4 +777,4 @@ namespace OpenSim.Framework.UserManagement
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 37c0bd8..db4e2ec 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -40,7 +40,7 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Statistics;
-namespace OpenSim.Framework.UserManagement
+namespace OpenSim.Framework.Communications
 {
    public abstract class LoginService
    {
@@ -122,8 +122,8 @@ namespace OpenSim.Framework.UserManagement
                    lastname = (string) requestData["last"];
                    
                    m_log.InfoFormat(
-                         "[LOGIN BEGIN]: Received login request message from user {0} {1}", 
+                        "[LOGIN BEGIN]: Received login request message from user {0} {1}", 
-                         firstname, lastname);
+                        firstname, lastname);
                    string clientVersion = "Unknown";
                    
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.UserManagement
                    }                    
                    
                    m_log.DebugFormat(
-                         "[LOGIN]: Client is {0}, start location is {1}", clientVersion, startLocationRequest);
+                        "[LOGIN]: Client is {0}, start location is {1}", clientVersion, startLocationRequest);
                    userProfile = GetTheUser(firstname, lastname);
                    if (userProfile == null)
@@ -163,8 +163,8 @@ namespace OpenSim.Framework.UserManagement
                        catch (Exception e)
                        {
                            m_log.InfoFormat(
-                                 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", 
+                                "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", 
-                                 requestData["web_login_key"], firstname, lastname, e);
+                                requestData["web_login_key"], firstname, lastname, e);
                            
                            return logResponse.CreateFailedResponse();
                        }
@@ -201,8 +201,8 @@ namespace OpenSim.Framework.UserManagement
                        // Reject the login
                        
                        m_log.InfoFormat(
-                             "[LOGIN END]: Notifying user {0} {1} that they are already logged in", 
+                            "[LOGIN END]: Notifying user {0} {1} that they are already logged in", 
-                             firstname, lastname);
+                            firstname, lastname);
                        
                        return logResponse.CreateAlreadyLoggedInResponse();
                    }
@@ -286,8 +286,8 @@ namespace OpenSim.Framework.UserManagement
                            StatsManager.UserStats.AddSuccessfulLogin();
                        
                        m_log.DebugFormat(
-                             "[LOGIN END]: Authentication of user {0} {1} successful.  Sending response to client.",
+                            "[LOGIN END]: Authentication of user {0} {1} successful.  Sending response to client.",
-                             firstname, lastname);
+                            firstname, lastname);
                        
                        return logResponse.ToXmlRpcResponse();
                    }
@@ -516,9 +516,9 @@ namespace OpenSim.Framework.UserManagement
                    statuscode = 301;
                    string redirectURL = "about:blank?redirect-http-hack=" +
-                        HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
+                                         HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
-                                                         lastname +
+                                                               lastname +
-                                                         "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
+                                                               "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
                    //m_log.Info("[WEB]: R:" + redirectURL);
                    returnactions["int_response_code"] = statuscode;
                    returnactions["str_redirect_location"] = redirectURL;
@@ -677,7 +677,7 @@ namespace OpenSim.Framework.UserManagement
            //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password);
            passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) 
-                            || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase));
+                               || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase));
            return passwordSuccess;
        }
@@ -792,4 +792,4 @@ namespace OpenSim.Framework.UserManagement
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
new file mode 100644
index 0000000..91284e8
--- /dev/null
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -0,0 +1,368 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Web;
+using log4net;
+namespace OpenSim.Framework.Communications
+{
+    /// <summary>
+    /// Implementation of a generic REST client
+    /// </summary>
+    /// <remarks>
+    /// This class is a generic implementation of a REST (Representational State Transfer) web service. This
+    /// class is designed to execute both synchroneously and asynchroneously.
+    /// 
+    /// Internally the implementation works as a two stage asynchroneous web-client.
+    /// When the request is initiated, RestClient will query asynchroneously for for a web-response,
+    /// sleeping until the initial response is returned by the server. Once the initial response is retrieved
+    /// the second stage of asynchroneous requests will be triggered, in an attempt to read of the response
+    /// object into a memorystream as a sequence of asynchroneous reads.
+    /// 
+    /// The asynchronisity of RestClient is designed to move as much processing into the back-ground, allowing 
+    /// other threads to execute, while it waits for a response from the web-service. RestClient it self, can be
+    /// invoked by the caller in either synchroneous mode or asynchroneous mode.
+    /// </remarks>
+    public class RestClient
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private string realuri;
+        #region member variables
+        /// <summary>
+        /// The base Uri of the web-service e.g. http://www.google.com 
+        /// </summary>
+        private string _url;
+        /// <summary>
+        /// Path elements of the query
+        /// </summary>
+        private List<string> _pathElements = new List<string>();
+        /// <summary>
+        /// Parameter elements of the query, e.g. min=34
+        /// </summary>
+        private Dictionary<string, string> _parameterElements = new Dictionary<string, string>();
+        /// <summary>
+        /// Request method. E.g. GET, POST, PUT or DELETE
+        /// </summary>
+        private string _method;
+        /// <summary>
+        /// Temporary buffer used to store bytes temporarily as they come in from the server
+        /// </summary>
+        private byte[] _readbuf;
+        /// <summary>
+        /// MemoryStream representing the resultiong resource
+        /// </summary>
+        private Stream _resource;
+        /// <summary>
+        /// WebRequest object, held as a member variable
+        /// </summary>
+        private HttpWebRequest _request;
+        /// <summary>
+        /// WebResponse object, held as a member variable, so we can close it
+        /// </summary>
+        private HttpWebResponse _response;
+        /// <summary>
+        /// This flag will help block the main synchroneous method, in case we run in synchroneous mode
+        /// </summary>
+        public static ManualResetEvent _allDone = new ManualResetEvent(false);
+        /// <summary>
+        /// Default time out period
+        /// </summary>
+        private const int DefaultTimeout = 10*1000; // 10 seconds timeout
+        /// <summary>
+        /// Default Buffer size of a block requested from the web-server
+        /// </summary>
+        private const int BufferSize = 4096; // Read blocks of 4 KB.
+        /// <summary>
+        /// if an exception occours during async processing, we need to save it, so it can be 
+        /// rethrown on the primary thread;
+        /// </summary>
+        private Exception _asyncException;
+        #endregion member variables
+        #region constructors
+        /// <summary>
+        /// Instantiate a new RestClient
+        /// </summary>
+        /// <param name="url">Web-service to query, e.g. http://osgrid.org:8003</param>
+        public RestClient(string url)
+        {
+            _url = url;
+            _readbuf = new byte[BufferSize];
+            _resource = new MemoryStream();
+            _request = null;
+            _response = null;
+            _lock = new object();
+        }
+        private object _lock;
+        #endregion constructors
+        /// <summary>
+        /// Add a path element to the query, e.g. assets
+        /// </summary>
+        /// <param name="element">path entry</param>
+        public void AddResourcePath(string element)
+        {
+            if (isSlashed(element))
+                _pathElements.Add(element.Substring(0, element.Length - 1));
+            else
+                _pathElements.Add(element);
+        }
+        /// <summary>
+        /// Add a query parameter to the Url
+        /// </summary>
+        /// <param name="name">Name of the parameter, e.g. min</param>
+        /// <param name="value">Value of the parameter, e.g. 42</param>
+        public void AddQueryParameter(string name, string value)
+        {
+            _parameterElements.Add(HttpUtility.UrlEncode(name), HttpUtility.UrlEncode(value));
+        }
+        /// <summary>
+        /// Add a query parameter to the Url
+        /// </summary>
+        /// <param name="name">Name of the parameter, e.g. min</param>
+        public void AddQueryParameter(string name)
+        {
+            _parameterElements.Add(HttpUtility.UrlEncode(name), null);
+        }
+        /// <summary>
+        /// Web-Request method, e.g. GET, PUT, POST, DELETE
+        /// </summary>
+        public string RequestMethod
+        {
+            get { return _method; }
+            set { _method = value; }
+        }
+        /// <summary>
+        /// True if string contains a trailing slash '/'
+        /// </summary>
+        /// <param name="s">string to be examined</param>
+        /// <returns>true if slash is present</returns>
+        private bool isSlashed(string s)
+        {
+            return s.Substring(s.Length - 1, 1) == "/";
+        }
+        /// <summary>
+        /// Build a Uri based on the initial Url, path elements and parameters
+        /// </summary>
+        /// <returns>fully constructed Uri</returns>
+        private Uri buildUri()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(_url);
+            foreach (string e in _pathElements)
+            {
+                sb.Append("/");
+                sb.Append(e);
+            }
+            bool firstElement = true;
+            foreach (KeyValuePair<string, string> kv in _parameterElements)
+            {
+                if (firstElement)
+                {
+                    sb.Append("?");
+                    firstElement = false;
+                }
+                else
+                    sb.Append("&");
+                sb.Append(kv.Key);
+                if (kv.Value != null && kv.Value.Length != 0)
+                {
+                    sb.Append("=");
+                    sb.Append(kv.Value);
+                }
+            }
+            realuri = sb.ToString();
+            //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
+            return new Uri(sb.ToString());
+        }
+        #region Async communications with server
+        /// <summary>
+        /// Async method, invoked when a block of data has been received from the service
+        /// </summary>
+        /// <param name="ar"></param>
+        private void StreamIsReadyDelegate(IAsyncResult ar)
+        {
+            try
+            {
+                Stream s = (Stream) ar.AsyncState;
+                int read = s.EndRead(ar);
+                if (read > 0)
+                {
+                    _resource.Write(_readbuf, 0, read);
+                    IAsyncResult asynchronousResult =
+                        s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
+                    // TODO! Implement timeout, without killing the server
+                    //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
+                }
+                else
+                {
+                    s.Close();
+                    _allDone.Set();
+                }
+            }
+            catch (Exception e)
+            {
+                _allDone.Set();
+                _asyncException = e;
+            }
+        }
+        #endregion Async communications with server
+        /// <summary>
+        /// Perform synchroneous request
+        /// </summary>
+        public Stream Request()
+        {
+            lock (_lock)
+            {
+                _request = (HttpWebRequest) WebRequest.Create(buildUri());
+                _request.KeepAlive = false;
+                _request.ContentType = "application/xml";
+                _request.Timeout = 200000;
+                _asyncException = null;
+//                IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
+                _response = (HttpWebResponse) _request.GetResponse();
+                Stream src = _response.GetResponseStream();
+                int length = src.Read(_readbuf, 0, BufferSize);
+                while (length > 0)
+                {
+                    _resource.Write(_readbuf, 0, length);
+                    length = src.Read(_readbuf, 0, BufferSize);
+                }
+                // TODO! Implement timeout, without killing the server
+                // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
+                //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
+//                _allDone.WaitOne();
+                if (_response != null)
+                    _response.Close();
+                if (_asyncException != null)
+                    throw _asyncException;
+                if (_resource != null)
+                {
+                    _resource.Flush();
+                    _resource.Seek(0, SeekOrigin.Begin);
+                }
+                return _resource;
+            }
+        }
+        public Stream Request(Stream src)
+        {
+            _request = (HttpWebRequest) WebRequest.Create(buildUri());
+            _request.KeepAlive = false;
+            _request.ContentType = "application/xml";
+            _request.Timeout = 900000;
+            _request.Method = RequestMethod;
+            _asyncException = null;
+            _request.ContentLength = src.Length;
+            m_log.InfoFormat("[REST]: Request Length {0}", _request.ContentLength);
+            m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
+            src.Seek(0, SeekOrigin.Begin);
+            m_log.Info("[REST]: Seek is ok");
+            Stream dst = _request.GetRequestStream();
+            m_log.Info("[REST]: GetRequestStream is ok");
+            byte[] buf = new byte[1024];
+            int length = src.Read(buf, 0, 1024);
+            m_log.Info("[REST]: First Read is ok");
+            while (length > 0)
+            {
+                dst.Write(buf, 0, length);
+                length = src.Read(buf, 0, 1024);
+            }
+            _response = (HttpWebResponse) _request.GetResponse();
+//            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
+            // TODO! Implement timeout, without killing the server
+            // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
+            //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
+            return null;
+        }
+        #region Async Invocation
+        public IAsyncResult BeginRequest(AsyncCallback callback, object state)
+        {
+            /// <summary>
+            /// In case, we are invoked asynchroneously this object will keep track of the state
+            /// </summary>
+            AsyncResult<Stream> ar = new AsyncResult<Stream>(callback, state);
+            ThreadPool.QueueUserWorkItem(RequestHelper, ar);
+            return ar;
+        }
+        public Stream EndRequest(IAsyncResult asyncResult)
+        {
+            AsyncResult<Stream> ar = (AsyncResult<Stream>) asyncResult;
+            // Wait for operation to complete, then return result or 
+            // throw exception
+            return ar.EndInvoke();
+        }
+        private void RequestHelper(Object asyncResult)
+        {
+            // We know that it's really an AsyncResult<DateTime> object
+            AsyncResult<Stream> ar = (AsyncResult<Stream>) asyncResult;
+            try
+            {
+                // Perform the operation; if sucessful set the result
+                Stream s = Request();
+                ar.SetAsCompleted(s, false);
+            }
+            catch (Exception e)
+            {
+                // If operation fails, set the exception
+                ar.HandleException(e, false);
+            }
+        }
+        #endregion Async Invocation
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0f7dc44..e4d8ca2 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -36,7 +36,7 @@ using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Statistics;
-namespace OpenSim.Framework.UserManagement
+namespace OpenSim.Framework.Communications
 {
    /// <summary>
    /// Base class for user management (create, read, etc)
@@ -245,7 +245,7 @@ namespace OpenSim.Framework.UserManagement
            {
                try
                {
-                   plugin.Value.RemoveUserFriend(friendlistowner, friend);
+                    plugin.Value.RemoveUserFriend(friendlistowner, friend);
                }
                catch (Exception e)
                {
@@ -370,7 +370,7 @@ namespace OpenSim.Framework.UserManagement
                    if ((profile.CurrentAgent.Position.X > 0)
                        && (profile.CurrentAgent.Position.Y > 0)
                        && (profile.CurrentAgent.Position.Z > 0)
-                       )
+                        )
                    {
                        // TODO: Right now, currentRegion has not been used in GridServer for requesting region.
                        // TODO: It is only using currentHandle.
@@ -564,7 +564,7 @@ namespace OpenSim.Framework.UserManagement
                catch (Exception e)
                {
                    m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
-                        + " via " + plugin.Key + "(" + e.ToString() + ")");
+                               + " via " + plugin.Key + "(" + e.ToString() + ")");
                    return false;
                }
            }
@@ -596,4 +596,4 @@ namespace OpenSim.Framework.UserManagement
            return false;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index e985c06..4770017 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -31,6 +31,7 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using log4net;
+using OpenSim.Framework.Configuration.XML;
 namespace OpenSim.Framework.Configuration.HTTP
 {
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index c0b4ca0..0a9f751 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -29,7 +29,7 @@ using System;
 using System.IO;
 using System.Xml;
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework.Configuration.XML
 {
    public class XmlConfiguration : IGenericConfig
    {
@@ -135,4 +135,4 @@ namespace OpenSim.Framework.Configuration
            doc = null;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
index 760c4e8..a02429c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Grid.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
 {
    public abstract class RegionBase
    {
@@ -240,4 +240,4 @@ namespace OpenSim.Grid.ScriptServer
            onhttp_response();
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index b815a37..8c31b9b 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -25,9 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Grid.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
 {
-    // Maintains connection and communication to a region
    public class RegionConnectionManager : RegionBase
    {
        private ScriptServerMain m_ScriptServerMain;
@@ -39,4 +38,4 @@ namespace OpenSim.Grid.ScriptServer
            m_Connection = Connection;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index c87352c..8422bea 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -28,10 +28,10 @@
 using System.Collections.Generic;
 using System.Threading;
 using OpenSim.Framework;
+using OpenSim.Grid.ScriptServer.ScriptServer.Region;
-namespace OpenSim.Grid.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer
 {
-    // Waiting for incoming script requests from region
    internal class RegionCommManager
    {
        private Thread listenThread;
@@ -99,4 +99,4 @@ namespace OpenSim.Grid.ScriptServer
            Regions.Add(new RegionConnectionManager(m_ScriptServerMain, null));
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f294dcf..b123b8c 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -34,9 +34,9 @@ using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Data;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.UserManagement;
 namespace OpenSim.Grid.UserServer
 {
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index aa2c959..5d0e1d6 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -34,7 +34,7 @@ using libsecondlife;
 using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Communications;
 namespace OpenSim.Grid.UserServer
 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 3643088..becf7ba 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,6 +37,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
 //using OpenSim.Framework.Console;
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 1e30a7a..1781ef8 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -33,7 +33,7 @@ using System.Text.RegularExpressions;
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Communications;
 namespace OpenSim.Region.Communications.Local
 {
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 29de8fd..2a66edc 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -29,7 +29,6 @@ using System;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.UserManagement;
 namespace OpenSim.Region.Communications.Local
 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 56b0e8c..643d15b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -35,6 +35,7 @@ using libsecondlife;
 using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 namespace OpenSim.Region.Communications.OGS1
 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index f3b50ae..ba23216 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -38,6 +38,7 @@ using libsecondlife;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework.Communications;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 20ba27c..8020713 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Xml;
 using libsecondlife;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
index 8f580fc..9f19b43 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
@@ -29,7 +29,7 @@
 using System.Xml;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.DataSnapshot
+namespace OpenSim.Region.DataSnapshot.Interfaces
 {
    public interface IDataSnapshotProvider
    {
@@ -41,4 +41,4 @@ namespace OpenSim.Region.DataSnapshot
        Scene GetParentScene { get; }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 67abccd..6198e1c 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -33,6 +33,7 @@ using System.Xml;
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.World.Land;
 using OpenSim.Region.Environment.Scenes;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index d48ecfd..c295902 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -28,6 +28,7 @@
 using System.Reflection;
 using System.Xml;
 using log4net;
+using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index e0ea94f..3f8b9ff 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
 using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
 using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
 using OpenSim.Region.Environment.Scenes;
 //TODO: Why do we reference InstantMessageModule here?
 namespace OpenSim.Region.Environment
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index f8f6ec2..2112f91 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -34,11 +34,11 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Capabilities;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
index 1527f1e..feb716e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
@@ -33,11 +33,11 @@ using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Capabilities;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice
 {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
index 95d22f0..b717d59 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
@@ -1,5 +1,4 @@
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Modules.Communications.Interregion;
 using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Grid.Interregion
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
index 651ed60..2ca4df9 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
@@ -6,10 +6,9 @@ using System.Runtime.Remoting.Channels.Tcp;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.Grid.Interregion;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.Communications.Interregion
+namespace OpenSim.Region.Environment.Modules.Grid.Interregion
 {
    public class InterregionModule : IInterregionModule, IRegionModule
    {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
index 77a418f..40568e7 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
@@ -27,7 +27,7 @@
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
    internal interface IFileSerialiser
    {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
index e1721ff..331b460 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
    public interface IRegionSerialiser
    {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
index 40e1771..0d69553 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
@@ -32,7 +32,7 @@ using System.Text;
 using System.Xml;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
    internal class SerialiseObjects : IFileSerialiser
    {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
index dacdbc8..bd85264 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
@@ -29,7 +29,7 @@ using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
    internal class SerialiseTerrain : IFileSerialiser
    {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index 75fc428..4406e17 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.IO;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.ExportSerialiser;
 using OpenSim.Region.Environment.Modules.Framework;
 using OpenSim.Region.Environment.Scenes;
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 85c4cdd..47ce258 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.World.Sun
 {
    public class SunModule : IRegionModule
    {
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index 32e45b7..4b22700 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.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/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 60d6293..3113831 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 using Image=System.Drawing.Image;
 using Timer=System.Timers.Timer;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 769817e..002fc5d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -29,7 +29,7 @@ using System;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using Caps=OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Scenes
 {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
index 43049fc..a06e222 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
@@ -32,7 +32,7 @@ using System.Reflection;
 using log4net;
 using Microsoft.CSharp;
-namespace OpenSim.Region.ExtensionsScriptModule.CSharp
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.CSharp
 {
    public class CSharpScriptEngine : IScriptCompiler
    {
@@ -104,4 +104,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp
            return LoadDotNetScript(csharpProvider, filename);
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index 1b0b6b7..dfe9336 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -27,7 +27,7 @@
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.CSharp.Examples
 {
    public class LSLExportScript : IScript
    {
@@ -72,4 +72,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
            }*/
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
index 52afe3f..0c3d50e 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
@@ -32,7 +32,7 @@ using System.Reflection;
 using log4net;
 using Microsoft.JScript;
-namespace OpenSim.Region.ExtensionsScriptModule.JScript
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JScript
 {
    public class JScriptEngine : IScriptCompiler
    {
@@ -104,4 +104,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JScript
            return LoadDotNetScript(jscriptProvider, filename);
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs
index 41f9da5..b6a0046 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassInstance.cs
@@ -26,9 +26,9 @@
 */
 using System.Collections.Generic;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class ClassInstance : Object
    {
@@ -40,4 +40,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
index 97a4a6b..d1cacd3 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs
@@ -28,10 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class ClassRecord
    {
@@ -645,4 +645,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
        #endregion
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs
index 068fdd7..6507328 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Heap.cs
@@ -27,7 +27,7 @@
 using System.Collections.Generic;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class Heap
    {
@@ -37,4 +37,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs
index a1d977e..f5ffc6f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Logic.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    partial class Thread
    {
@@ -616,4 +616,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index efd01e9..7da2012 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -27,7 +27,7 @@
 using System;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    partial class Thread
    {
@@ -101,4 +101,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs
index e6ec7ba..3ae7b91 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Return.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    partial class Thread
    {
@@ -33,4 +33,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs
index bc08af3..2dd711f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.cs
@@ -26,10 +26,10 @@
 */
 using System;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    partial class Thread
    {
@@ -129,4 +129,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs
index 53fc68f..9d912c4 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MainMemory.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class MainMemory
    {
@@ -38,4 +38,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            HeapArea = new Heap();
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs
index 0d051f1..b482e72 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/MethodMemory.cs
@@ -27,7 +27,7 @@
 using System.Collections.Generic;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class MethodMemory
    {
@@ -41,4 +41,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            MethodBuffer = new byte[20000];
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs
index 3d51558..de89a2a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Object.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class Object
    {
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs
index 69c5fc4..31fa08d 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/OpCodes.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public enum OpCode : byte
    {
@@ -76,4 +76,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
        getstatic = 178,
        putstatic = 179
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs
index 0d06194..eedcb41 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Stack.cs
@@ -27,7 +27,7 @@
 using System.Collections.Generic;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class Stack
    {
@@ -37,4 +37,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs
index cac1606..5d9c75b 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/StackFrame.cs
@@ -26,9 +26,9 @@
 */
 using System.Collections.Generic;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public class StackFrame
    {
@@ -43,4 +43,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            LocalVariables = new BaseType[20];
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs
index 1f5044b..3e9d0f4 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs
@@ -26,10 +26,10 @@
 */
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM
 {
    public partial class Thread
    {
@@ -108,4 +108,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
            return m_Interpreter.Excute();
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs
index ec61dfe..8b6f89c 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JavaEngine.cs
@@ -27,7 +27,7 @@
 using System.Collections.Generic;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine
 {
    public class JavaEngine : IScriptCompiler
    {
@@ -48,4 +48,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
            return returns;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
index f5a8b2e..017b38b 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
@@ -31,9 +31,9 @@ using System.Diagnostics;
 using System.IO;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.JVM;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine
 {
    public class JVMScript : IScript
    {
@@ -163,4 +163,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs
index ff27784..1ef0ff4 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ArrayReference.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
 {
    public class ArrayReference : BaseType
    {
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
index 15f13f8..829a18c 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
@@ -27,9 +27,9 @@
 using System;
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
 {
    public class BaseType : Object
    {
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs
index ac36ef2..bbcde5c 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/ObjectReference.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types
 {
    public class ObjectReference : BaseType
    {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
index 772c286..e732f33 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
    public class Byte : BaseType
    {
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
index d488222..e066454 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
    public class Char : BaseType
    {
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
index f29775f..5d60f65 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
    public class Float : BaseType
    {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
index f25320d..24ee850 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
+namespace OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine.Types.PrimitiveTypes
 {
    public class Int : BaseType
    {
@@ -35,4 +35,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 8c11f7a..48ebf86 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -31,9 +31,9 @@ using log4net;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ExtensionsScriptModule.CSharp;
+using OpenSim.Region.ExtensionsScriptModule.Engines.CSharp;
-using OpenSim.Region.ExtensionsScriptModule.JScript;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JScript;
-using OpenSim.Region.ExtensionsScriptModule.JVMEngine;
+using OpenSim.Region.ExtensionsScriptModule.Engines.JVMEngine;
 namespace OpenSim.Region.ExtensionsScriptModule
 {
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index 50a3b4e..6cca36d 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -6,7 +6,7 @@ using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.ExportSerialiser;
+using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Scenes;
 using PumaCode.SvnDotNet.AprSharp;
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 95acd23..9b541c5 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -217,52 +217,52 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llRound(f);
        }
-        public double llVecMag(LSL_Types.Vector3 v)
+        public double llVecMag(vector v)
        {
            return m_LSL_Functions.llVecMag(v);
        }
-        public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v)
+        public vector llVecNorm(vector v)
        {
            return m_LSL_Functions.llVecNorm(v);
        }
-        public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b)
+        public double llVecDist(vector a, vector b)
        {
            return m_LSL_Functions.llVecDist(a, b);
        }
-        public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r)
+        public vector llRot2Euler(rotation r)
        {
            return m_LSL_Functions.llRot2Euler(r);
        }
-        public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v)
+        public rotation llEuler2Rot(vector v)
        {
            return m_LSL_Functions.llEuler2Rot(v);
        }
-        public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up)
+        public rotation llAxes2Rot(vector fwd, vector left, vector up)
        {
            return m_LSL_Functions.llAxes2Rot(fwd, left, up);
        }
-        public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)
+        public vector llRot2Fwd(rotation r)
        {
            return m_LSL_Functions.llRot2Fwd(r);
        }
-        public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r)
+        public vector llRot2Left(rotation r)
        {
            return m_LSL_Functions.llRot2Left(r);
        }
-        public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r)
+        public vector llRot2Up(rotation r)
        {
            return m_LSL_Functions.llRot2Up(r);
        }
-        public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end)
+        public rotation llRotBetween(vector start, vector end)
        {
            return m_LSL_Functions.llRotBetween(start, end);
        }
@@ -340,22 +340,22 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llDetectedType(number);
        }
-        public LSL_Types.Vector3 llDetectedPos(int number)
+        public vector llDetectedPos(int number)
        {
            return m_LSL_Functions.llDetectedPos(number);
        }
-        public LSL_Types.Vector3 llDetectedVel(int number)
+        public vector llDetectedVel(int number)
        {
            return m_LSL_Functions.llDetectedVel(number);
        }
-        public LSL_Types.Vector3 llDetectedGrab(int number)
+        public vector llDetectedGrab(int number)
        {
            return m_LSL_Functions.llDetectedGrab(number);
        }
-        public LSL_Types.Quaternion llDetectedRot(int number)
+        public rotation llDetectedRot(int number)
        {
            return m_LSL_Functions.llDetectedRot(number);
        }
@@ -378,17 +378,17 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llDie();
        }
-        public double llGround(LSL_Types.Vector3 offset)
+        public double llGround(vector offset)
        {
            return m_LSL_Functions.llGround(offset);
        }
-        public double llCloud(LSL_Types.Vector3 offset)
+        public double llCloud(vector offset)
        {
            return m_LSL_Functions.llCloud(offset);
        }
-        public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset)
+        public vector llWind(vector offset)
        {
            return m_LSL_Functions.llWind(offset);
        }
@@ -403,17 +403,17 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetStatus(status);
        }
-        public void llSetScale(LSL_Types.Vector3 scale)
+        public void llSetScale(vector scale)
        {
            m_LSL_Functions.llSetScale(scale);
        }
-        public LSL_Types.Vector3 llGetScale()
+        public vector llGetScale()
        {
            return m_LSL_Functions.llGetScale();
        }
-        public void llSetColor(LSL_Types.Vector3 color, int face)
+        public void llSetColor(vector color, int face)
        {
            m_LSL_Functions.llSetColor(color, face);
        }
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSetAlpha(alpha, face);
        }
-        public LSL_Types.Vector3 llGetColor(int face)
+        public vector llGetColor(int face)
        {
            return m_LSL_Functions.llGetColor(face);
        }
@@ -461,47 +461,47 @@ namespace OpenSim.Region.ScriptEngine.Common
        //
        // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
        //
-        public void llSetPos(LSL_Types.Vector3 pos)
+        public void llSetPos(vector pos)
        {
            m_LSL_Functions.llSetPos(pos);
        }
-        public LSL_Types.Vector3 llGetPos()
+        public vector llGetPos()
        {
            return m_LSL_Functions.llGetPos();
        }
-        public LSL_Types.Vector3 llGetLocalPos()
+        public vector llGetLocalPos()
        {
            return m_LSL_Functions.llGetLocalPos();
        }
-        public void llSetRot(LSL_Types.Quaternion rot)
+        public void llSetRot(rotation rot)
        {
            m_LSL_Functions.llSetRot(rot);
        }
-        public LSL_Types.Quaternion llGetRot()
+        public rotation llGetRot()
        {
            return m_LSL_Functions.llGetRot();
        }
-        public LSL_Types.Quaternion llGetLocalRot()
+        public rotation llGetLocalRot()
        {
            return m_LSL_Functions.llGetLocalRot();
        }
-        public void llSetForce(LSL_Types.Vector3 force, int local)
+        public void llSetForce(vector force, int local)
        {
            m_LSL_Functions.llSetForce(force, local);
        }
-        public LSL_Types.Vector3 llGetForce()
+        public vector llGetForce()
        {
            return m_LSL_Functions.llGetForce();
        }
-        public int llTarget(LSL_Types.Vector3 position, double range)
+        public int llTarget(vector position, double range)
        {
            return m_LSL_Functions.llTarget(position, range);
        }
@@ -511,7 +511,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llTargetRemove(number);
        }
-        public int llRotTarget(LSL_Types.Quaternion rot, double error)
+        public int llRotTarget(rotation rot, double error)
        {
            return m_LSL_Functions.llRotTarget(rot, error);
        }
@@ -521,7 +521,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llRotTargetRemove(number);
        }
-        public void llMoveToTarget(LSL_Types.Vector3 target, double tau)
+        public void llMoveToTarget(vector target, double tau)
        {
            m_LSL_Functions.llMoveToTarget(target, tau);
        }
@@ -531,7 +531,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llStopMoveToTarget();
        }
-        public void llApplyImpulse(LSL_Types.Vector3 force, int local)
+        public void llApplyImpulse(vector force, int local)
        {
            m_LSL_Functions.llApplyImpulse(force, local);
        }
@@ -539,37 +539,37 @@ namespace OpenSim.Region.ScriptEngine.Common
        //
        // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
        //
-        public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local)
+        public void llApplyRotationalImpulse(vector force, int local)
        {
            m_LSL_Functions.llApplyRotationalImpulse(force, local);
        }
-        public void llSetTorque(LSL_Types.Vector3 torque, int local)
+        public void llSetTorque(vector torque, int local)
        {
            m_LSL_Functions.llSetTorque(torque, local);
        }
-        public LSL_Types.Vector3 llGetTorque()
+        public vector llGetTorque()
        {
            return m_LSL_Functions.llGetTorque();
        }
-        public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local)
+        public void llSetForceAndTorque(vector force, vector torque, int local)
        {
            m_LSL_Functions.llSetForceAndTorque(force, torque, local);
        }
-        public LSL_Types.Vector3 llGetVel()
+        public vector llGetVel()
        {
            return m_LSL_Functions.llGetVel();
        }
-        public LSL_Types.Vector3 llGetAccel()
+        public vector llGetAccel()
        {
            return m_LSL_Functions.llGetAccel();
        }
-        public LSL_Types.Vector3 llGetOmega()
+        public vector llGetOmega()
        {
            return m_LSL_Functions.llGetOmega();
        }
@@ -697,12 +697,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llMakeFire();
        }
-        public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param)
+        public void llRezObject(string inventory, vector pos, rotation rot, int param)
        {
            m_LSL_Functions.llRezObject(inventory, pos, rot, param);
        }
-        public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)
+        public void llLookAt(vector target, double strength, double damping)
        {
            m_LSL_Functions.llLookAt(target, strength, damping);
        }
@@ -815,7 +815,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSoundPreload();
        }
-        public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping)
+        public void llRotLookAt(rotation target, double strength, double damping)
        {
            m_LSL_Functions.llRotLookAt(target, strength, damping);
        }
@@ -848,7 +848,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llStopPointAt();
        }
-        public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain)
+        public void llTargetOmega(vector axis, double spinrate, double gain)
        {
            m_LSL_Functions.llTargetOmega(axis, spinrate, gain);
        }
@@ -858,7 +858,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetStartParameter();
        }
-        public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos)
+        public void llGodLikeRezObject(string inventory, vector pos)
        {
            m_LSL_Functions.llGodLikeRezObject(inventory, pos);
        }
@@ -883,7 +883,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetLinkNumber();
        }
-        public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face)
+        public void llSetLinkColor(int linknumber, vector color, int face)
        {
            m_LSL_Functions.llSetLinkColor(linknumber, color, face);
        }
@@ -946,12 +946,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llRemoveInventory(item);
        }
-        public void llSetText(string text, LSL_Types.Vector3 color, double alpha)
+        public void llSetText(string text, vector color, double alpha)
        {
            m_LSL_Functions.llSetText(text, color, alpha);
        }
-        public double llWater(LSL_Types.Vector3 offset)
+        public double llWater(vector offset)
        {
            return m_LSL_Functions.llWater(offset);
        }
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llMessageLinked(linknum, num, str, id);
        }
-        public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local)
+        public void llPushObject(string target, vector impulse, vector ang_impulse, int local)
        {
            m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local);
        }
@@ -1034,17 +1034,17 @@ namespace OpenSim.Region.ScriptEngine.Common
        //
        // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
        //
-        public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle)
+        public rotation llAxisAngle2Rot(vector axis, double angle)
        {
            return m_LSL_Functions.llAxisAngle2Rot(axis, angle);
        }
-        public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot)
+        public vector llRot2Axis(rotation rot)
        {
            return m_LSL_Functions.llRot2Axis(rot);
        }
-        public double llRot2Angle(LSL_Types.Quaternion rot)
+        public double llRot2Angle(rotation rot)
        {
            return m_LSL_Functions.llRot2Angle(rot);
        }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llAsin(val);
        }
-        public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b)
+        public double llAngleBetween(rotation a, rotation b)
        {
            return m_LSL_Functions.llAngleBetween(a, b);
        }
@@ -1074,17 +1074,17 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llAllowInventoryDrop(add);
        }
-        public LSL_Types.Vector3 llGetSunDirection()
+        public vector llGetSunDirection()
        {
            return m_LSL_Functions.llGetSunDirection();
        }
-        public LSL_Types.Vector3 llGetTextureOffset(int face)
+        public vector llGetTextureOffset(int face)
        {
            return m_LSL_Functions.llGetTextureOffset(face);
        }
-        public LSL_Types.Vector3 llGetTextureScale(int side)
+        public vector llGetTextureScale(int side)
        {
            return m_LSL_Functions.llGetTextureScale(side);
        }
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetOwnerKey(id);
        }
-        public LSL_Types.Vector3 llGetCenterOfMass()
+        public vector llGetCenterOfMass()
        {
            return m_LSL_Functions.llGetCenterOfMass();
        }
@@ -1142,12 +1142,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llList2Key(src, index);
        }
-        public LSL_Types.Vector3 llList2Vector(LSL_Types.list src, int index)
+        public vector llList2Vector(LSL_Types.list src, int index)
        {
            return m_LSL_Functions.llList2Vector(src, index);
        }
-        public LSL_Types.Quaternion llList2Rot(LSL_Types.list src, int index)
+        public rotation llList2Rot(LSL_Types.list src, int index)
        {
            return m_LSL_Functions.llList2Rot(src, index);
        }
@@ -1187,7 +1187,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llList2ListStrided(src, start, end, stride);
        }
-        public LSL_Types.Vector3 llGetRegionCorner()
+        public vector llGetRegionCorner()
        {
            return m_LSL_Functions.llGetRegionCorner();
        }
@@ -1217,7 +1217,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetDate();
        }
-        public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir)
+        public int llEdgeOfWorld(vector pos, vector dir)
        {
            return m_LSL_Functions.llEdgeOfWorld(pos, dir);
        }
@@ -1255,7 +1255,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate);
        }
-        public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west)
+        public void llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west)
        {
            m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west);
        }
@@ -1275,7 +1275,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llOverMyLand(id);
        }
-        public string llGetLandOwnerAt(LSL_Types.Vector3 pos)
+        public string llGetLandOwnerAt(vector pos)
        {
            return m_LSL_Functions.llGetLandOwnerAt(pos);
        }
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetNotecardLine(name, line);
        }
-        public LSL_Types.Vector3 llGetAgentSize(string id)
+        public vector llGetAgentSize(string id)
        {
            return m_LSL_Functions.llGetAgentSize(id);
        }
@@ -1300,17 +1300,17 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llUnSit(id);
        }
-        public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset)
+        public vector llGroundSlope(vector offset)
        {
            return m_LSL_Functions.llGroundSlope(offset);
        }
-        public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset)
+        public vector llGroundNormal(vector offset)
        {
            return m_LSL_Functions.llGroundNormal(offset);
        }
-        public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset)
+        public vector llGroundContour(vector offset)
        {
            return m_LSL_Functions.llGroundContour(offset);
        }
@@ -1368,12 +1368,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSetVehicledoubleParam(param, value);
        }
-        public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec)
+        public void llSetVehicleVectorParam(int param, vector vec)
        {
            m_LSL_Functions.llSetVehicleVectorParam(param, vec);
        }
-        public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot)
+        public void llSetVehicleRotationParam(int param, rotation rot)
        {
            m_LSL_Functions.llSetVehicleRotationParam(param, rot);
        }
@@ -1388,7 +1388,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llRemoveVehicleFlags(flags);
        }
-        public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot)
+        public void llSitTarget(vector offset, rotation rot)
        {
            m_LSL_Functions.llSitTarget(offset, rot);
        }
@@ -1413,12 +1413,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSetSitText(text);
        }
-        public void llSetCameraEyeOffset(LSL_Types.Vector3 offset)
+        public void llSetCameraEyeOffset(vector offset)
        {
            m_LSL_Functions.llSetCameraEyeOffset(offset);
        }
-        public void llSetCameraAtOffset(LSL_Types.Vector3 offset)
+        public void llSetCameraAtOffset(vector offset)
        {
            m_LSL_Functions.llSetCameraAtOffset(offset);
        }
@@ -1428,7 +1428,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llDumpList2String(src, seperator);
        }
-        public int llScriptDanger(LSL_Types.Vector3 pos)
+        public int llScriptDanger(vector pos)
        {
            return m_LSL_Functions.llScriptDanger(pos);
        }
@@ -1545,12 +1545,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSetParcelMusicURL(url);
        }
-        public LSL_Types.Vector3 llGetRootPosition()
+        public vector llGetRootPosition()
        {
            return m_LSL_Functions.llGetRootPosition();
        }
-        public LSL_Types.Quaternion llGetRootRotation()
+        public rotation llGetRootRotation()
        {
            return m_LSL_Functions.llGetRootRotation();
        }
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetBoundingBox(obj);
        }
-        public LSL_Types.Vector3 llGetGeometricCenter()
+        public vector llGetGeometricCenter()
        {
            return m_LSL_Functions.llGetGeometricCenter();
        }
@@ -1628,7 +1628,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetSimulatorHostname();
        }
-        public void llSetLocalRot(LSL_Types.Quaternion rot)
+        public void llSetLocalRot(rotation rot)
        {
            m_LSL_Functions.llSetLocalRot(rot);
        }
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers);
        }
-        public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param)
+        public void llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, int param)
        {
            m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param);
        }
@@ -1726,12 +1726,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons);
        }
-        public LSL_Types.Vector3 llGetCameraPos()
+        public vector llGetCameraPos()
        {
            return m_LSL_Functions.llGetCameraPos();
        }
-        public LSL_Types.Quaternion llGetCameraRot()
+        public rotation llGetCameraRot()
        {
            return m_LSL_Functions.llGetCameraRot();
        }
@@ -1756,7 +1756,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llUnescapeURL(url);
        }
-        public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at)
+        public void llMapDestination(string simname, vector pos, vector look_at)
        {
            m_LSL_Functions.llMapDestination(simname, pos, look_at);
        }
@@ -1796,7 +1796,7 @@ namespace OpenSim.Region.ScriptEngine.Common
            return m_LSL_Functions.llGetUnixTime();
        }
-        public int llGetParcelFlags(LSL_Types.Vector3 pos)
+        public int llGetParcelFlags(vector pos)
        {
            return m_LSL_Functions.llGetParcelFlags(pos);
        }
@@ -1826,12 +1826,12 @@ namespace OpenSim.Region.ScriptEngine.Common
            m_LSL_Functions.llResetLandPassList();
        }
-        public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide)
+        public int llGetParcelPrimCount(vector pos, int category, int sim_wide)
        {
            return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide);
        }
-        public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos)
+        public LSL_Types.list llGetParcelPrimOwners(vector pos)
        {
            return m_LSL_Functions.llGetParcelPrimOwners(pos);
        }
@@ -1844,12 +1844,12 @@ namespace OpenSim.Region.ScriptEngine.Common
        //
        // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
        //
-        public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide)
+        public int llGetParcelMaxPrims(vector pos, int sim_wide)
        {
            return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide);
        }
-        public LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param)
+        public LSL_Types.list llGetParcelDetails(vector pos, LSL_Types.list param)
        {
            return m_LSL_Functions.llGetParcelDetails(pos, param);
        }
@@ -2387,7 +2387,7 @@ namespace OpenSim.Region.ScriptEngine.Common
        public const int OBJECT_CREATOR = 8;
        // Can not be public const?
-        public LSL_Types.Vector3 ZERO_VECTOR = new LSL_Types.Vector3(0.0, 0.0, 0.0);
+        public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
-        public LSL_Types.Quaternion ZERO_ROTATION = new LSL_Types.Quaternion(0.0, 0, 0.0, 1.0);
+        public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0);
    }
 }
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 0521df2..76d8d11 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -29,12 +29,13 @@ using System;
 using System.IO;
 using log4net.Config;
 using Nini.Config;
+using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Tools.Export
+namespace OpenSimExport
 {
    public class OpenSimExport
    {
@@ -108,4 +109,4 @@ namespace OpenSim.Tools.Export
            return config;
        }
    }
-}
+}
+\ No newline at end of file