diff --git a/OpenSim/Grid/ScriptServer/Main.cs b/OpenSim/Grid/ScriptServer/Application.cs
similarity index 94%
rename from OpenSim/Grid/ScriptServer/Main.cs
rename to OpenSim/Grid/ScriptServer/Application.cs
index 9f16ea83fc..e7a6590f3a 100644
--- a/OpenSim/Grid/ScriptServer/Main.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -34,12 +34,12 @@ namespace OpenSim.Grid.ScriptServer
     class OpenScript_Main
     {
      
-        public static ScriptServer SE;
+        public static ScriptServerMain SE;
    
         static void Main(string[] args)
         {
             // Application is starting
-            SE = new ScriptServer();
+            SE = new ScriptServerMain();
         }
 
     }
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer.cs b/OpenSim/Grid/ScriptServer/ScriptServer.cs
deleted file mode 100644
index 2c26027e5e..0000000000
--- a/OpenSim/Grid/ScriptServer/ScriptServer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Grid.ScriptServer
-{
-    class ScriptServer
-    {
-        public RegionScriptDaemon RegionScriptDaemon;           // Listen for incoming from region
-        public RegionsManager RegionManager;                    // Handle regions
-        public ScriptEngineLoader ScriptEngineLoader;           // Loads scriptengines
-
-        public ScriptServer()
-        {
-            RegionScriptDaemon = new RegionScriptDaemon(this);
-            RegionManager = new RegionsManager(this);
-            //ScriptEngineLoader = new ScriptEngineLoader(this);
-        }
-
-        ~ScriptServer()
-        {
-        }
-
-
-
-    }
-}
diff --git a/OpenSim/Grid/ScriptServer/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
similarity index 100%
rename from OpenSim/Grid/ScriptServer/RegionConnectionManager.cs
rename to OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
diff --git a/OpenSim/Grid/ScriptServer/RegionScriptDaemon.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionScriptDaemon.cs
similarity index 94%
rename from OpenSim/Grid/ScriptServer/RegionScriptDaemon.cs
rename to OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionScriptDaemon.cs
index 435c09bfc6..03856939ce 100644
--- a/OpenSim/Grid/ScriptServer/RegionScriptDaemon.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionScriptDaemon.cs
@@ -37,8 +37,8 @@ namespace OpenSim.Grid.ScriptServer
     {
         private Thread listenThread;
 
-        public ScriptServer m_ScriptServer;
-        public RegionScriptDaemon(ScriptServer scriptServer)
+        public ScriptServerMain m_ScriptServer;
+        public RegionScriptDaemon(ScriptServerMain scriptServer)
         {
             m_ScriptServer = scriptServer;
         }
diff --git a/OpenSim/Grid/ScriptServer/RegionsManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionsManager.cs
similarity index 70%
rename from OpenSim/Grid/ScriptServer/RegionsManager.cs
rename to OpenSim/Grid/ScriptServer/ScriptServer/RegionsManager.cs
index 0e1fad1450..eeec92b724 100644
--- a/OpenSim/Grid/ScriptServer/RegionsManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionsManager.cs
@@ -9,8 +9,8 @@ namespace OpenSim.Grid.ScriptServer
     {
         private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
 
-                public ScriptServer m_ScriptServer;
-        public RegionsManager(ScriptServer scriptServer)
+                public ScriptServerMain m_ScriptServer;
+        public RegionsManager(ScriptServerMain scriptServer)
         {
             m_ScriptServer = scriptServer;
         }
diff --git a/OpenSim/Grid/ScriptServer/ScriptEngineInterface.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs
similarity index 100%
rename from OpenSim/Grid/ScriptServer/ScriptEngineInterface.cs
rename to OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs
diff --git a/OpenSim/Grid/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs
similarity index 100%
rename from OpenSim/Grid/ScriptServer/ScriptEngineLoader.cs
rename to OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
new file mode 100644
index 0000000000..4fce3d6058
--- /dev/null
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Grid.ScriptServer
+{
+    class ScriptServerMain : conscmd_callback
+    {
+        private readonly string m_logFilename = ("region-console.log");
+        public RegionScriptDaemon RegionScriptDaemon;           // Listen for incoming from region
+        public RegionsManager RegionManager;                    // Handle regions
+        public ScriptEngineLoader ScriptEngineLoader;           // Loads scriptengines
+        private LogBase m_log;
+
+        public ScriptServerMain()
+        {
+            m_log = CreateLog();
+
+            RegionScriptDaemon = new RegionScriptDaemon(this);
+            RegionManager = new RegionsManager(this);
+            ScriptEngineLoader = new ScriptEngineLoader(m_log);
+        }
+
+        ~ScriptServerMain()
+        {
+        }
+
+        protected LogBase CreateLog()
+        {
+            if (!Directory.Exists(Util.logDir()))
+            {
+                Directory.CreateDirectory(Util.logDir());
+            }
+
+            return new LogBase((Path.Combine(Util.logDir(), m_logFilename)), "Region", this, false);
+        }
+
+        public void RunCmd(string command, string[] cmdparams)
+        {
+        }
+        public void Show(string ShowWhat)
+        {
+        }
+
+    }
+}