Move various paths out of the bin directory.

27 files changed, 82 insertions, 49 deletions

diff --git a/.nant/local.include b/.nant/local.include
index be79d1c..07421c8 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -5,9 +5,9 @@
 <!-- This target produces a source distribution of OpenSimulator -->
 <!-- TODO: A few parameters still need to be tweaked after running this - need to do this automatically with sed or similar -->
 <target name="distsrc">
-  <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/>
-  <copy file="bin/config-include/StandaloneCommon.ini.example" tofile="bin/config-include/StandaloneCommon.ini"/>
-  <copy file="bin/config-include/FlotsamCache.ini.example" tofile="bin/config-include/FlotsamCache.ini"/>
+  <copy file="config/OpenSim.ini.example" tofile="config/OpenSim.ini"/>
+  <copy file="config/config-include/StandaloneCommon.ini.example" tofile="config/config-include/StandaloneCommon.ini"/>
+  <copy file="config/config-include/FlotsamCache.ini.example" tofile="config/config-include/FlotsamCache.ini"/>
   <!-- delete files generated by runprebuild.sh which had to be run in order to generate the build file for this target-->
   <delete>
     <fileset basedir="OpenSim">
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 966d0b8..51d1030 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Data.SQLite
 
             if (dbconnect == string.Empty)
             {
-                dbconnect = "URI=file:Asset.db,version=3";
+                dbconnect = "URI=file:" + Util.dbDir() + "Asset.db,version=3";
             }
             m_conn = new SqliteConnection(dbconnect);
             m_conn.Open();
@@ -360,7 +360,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         override public void Initialise()
         {
-            Initialise("URI=file:Asset.db,version=3");
+            Initialise("URI=file:" + Util.dbDir() + "Asset.db,version=3");
         }
 
         /// <summary>
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index 79691e4..580e7aa 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
                 if (String.IsNullOrEmpty(m_connStr))
                 {
                     m_file = Path.GetTempFileName() + ".db";
-                    m_connStr = "URI=file:" + m_file + ",version=3";
+                    m_connStr = "URI=file:" + Util.dbDir() + "/" + m_file + ",version=3";
                 }
             }
 
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 7b55467..2ddec8b 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -16,9 +16,9 @@
 ; file for the DB.  If you want the resulting DB to persist (e.g. for performance testing,
 ; when filling up the tables can take a long time), explicitly specify a conn string like this: 
 
-; SqliteConnection="URI=file:<path_to_your_file>,version=3"
+; SqliteConnection="URI=file:../../db/<path_to_your_file>,version=3"
 
 [TestConnections]
 MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
 SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
-SqliteConnection="URI=file:opensim-nunit.db,version=3"
\ No newline at end of file
+SqliteConnection="URI=file:../../db/opensim-nunit.db,version=3"
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index e1492b8..f84d21c 100755
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -96,9 +96,9 @@ namespace OpenSim.Framework.Console
                 return;
             }
 
-            string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt");
+            string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", Path.Combine(Util.logsDir(), "OpenSimConsoleHistory.txt"));
             int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
-            m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile));
+            m_historyPath = Path.GetFullPath(m_historyFile);
             m_historytimestamps = startupConfig.GetBoolean("ConsoleHistoryTimeStamp", false);
             m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1} {2} timestamps",
                 m_historySize, m_historyPath, m_historytimestamps?"with":"without");
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e0e35db..cc449af 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1304,8 +1304,19 @@ namespace OpenSim.Framework
             return Path.Combine(configDir(), "inventory");
         }
 
+        public static string dbDir()
+        {
+            return Path.Combine("..", Path.Combine("..", "db"));
+        }
+
+        public static string cacheDir()
+        {
+            return Path.Combine("..", Path.Combine("..", "caches"));
+        }
+
         public static string configDir()
         {
+//            return Path.Combine("..", Path.Combine("..", "config"));
             return ".";
         }
 
@@ -1314,6 +1325,16 @@ namespace OpenSim.Framework
             return ".";
         }
 
+        public static string logsDir()
+        {
+            return Path.Combine("..", "logs");
+        }
+
+        public static string webDir()
+        {
+            return Path.Combine("..", Path.Combine("..", "web"));
+        }
+
         public static string logFile()
         {
             foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
@@ -1324,7 +1345,7 @@ namespace OpenSim.Framework
                 }
             }
 
-            return "./OpenSim.log";
+            return Path.Combine(logsDir(), "OpenSim.log");
         }
 
         public static string statsLogFile()
@@ -1337,7 +1358,7 @@ namespace OpenSim.Framework
                 }
             }
 
-            return "./OpenSimStats.log";
+            return Path.Combine(logsDir(), "OpenSimStats.log");
         }
 
         public static string logDir()
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 66e46cb..02a9941 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -153,15 +153,14 @@ namespace OpenSim
             }
 
             // Override distro settings with contents of inidirectory
-            string iniDirName = startupConfig.GetString("inidirectory", "config");
-            string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
+            string iniDirPath = startupConfig.GetString("inidirectory", Util.configDir());
 
             if (Directory.Exists(iniDirPath))
             {
                 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
                 List<string> overrideSources = new List<string>();
 
-                string[] fileEntries = Directory.GetFiles(iniDirName);
+                string[] fileEntries = Directory.GetFiles(iniDirPath);
                 foreach (string filePath in fileEntries)
                 {
                     if (Path.GetExtension(filePath).ToLower() == ".ini")
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index bbf7be7..238fbab 100755
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Asset
         private bool m_cleanupRunning;
 
         private const string m_ModuleName = "FlotsamAssetCache";
-        private const string m_DefaultCacheDirectory = "./assetcache";
+        private const string m_DefaultCacheDirectory = "assetcache";
         private string m_CacheDirectory = m_DefaultCacheDirectory;
 
         private readonly List<char> m_InvalidChars = new List<char>();
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 4c922ba..ce5e167 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -83,6 +83,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private bool m_texturePrims = true;     // true if should texture the rendered prims
         private float m_texturePrimSize = 48f;  // size of prim before we consider texturing it
         private bool m_renderMeshes = false;    // true if to render meshes rather than just bounding boxes
+        private String m_cacheDirectory = "";
         private float m_renderMinHeight = -100f;
         private float m_renderMaxHeight = 4096f;
 
@@ -119,6 +120,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 Util.GetConfigVarFromSections<float>(m_config, "TexturePrimSize", configSections, m_texturePrimSize);
             m_renderMeshes =
                 Util.GetConfigVarFromSections<bool>(m_config, "RenderMeshes", configSections, m_renderMeshes);
+            m_cacheDirectory
+                = Util.GetConfigVarFromSections<string>(m_config, "CacheDirectory", configSections, System.IO.Path.Combine(Util.cacheDir(), "MapImageCache"));
+
+            if (!Directory.Exists(m_cacheDirectory))
+                Directory.CreateDirectory(m_cacheDirectory);
 
             m_renderMaxHeight = Util.GetConfigVarFromSections<float>(m_config, "RenderMaxHeight", configSections, m_renderMaxHeight);
             m_renderMinHeight = Util.GetConfigVarFromSections<float>(m_config, "RenderMinHeight", configSections, m_renderMinHeight);
@@ -210,7 +216,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             Bitmap tile = GenImage();
             // image may be reloaded elsewhere, so no compression format
-            string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";
+            string filename = System.IO.Path.Combine(m_cacheDirectory,"MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png");
             tile.Save(filename, ImageFormat.Png);
             m_primMesher = null;
             return tile;
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index c15b194..f76b057 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.UserStatistics
 
             //IConfig startupConfig = config.Configs["Startup"];
 
-            dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
+            dbConn = new SqliteConnection("URI=file:" + Util.dbDir()  + "/LocalUserStatistics.db,version=3");
             dbConn.Open();
             CreateTables(dbConn);
 
@@ -1200,4 +1200,4 @@ VALUES
             m_scriptLinesPerSecond = stats.ExtraStatsBlock[0].StatValue;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
index de39d0e..93c2986 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
 
                     IConfig mesh_config = source.Configs["Mesh"];
 
-                    decodedSculptMapPath = config.GetString("DecodedSculptMapPath", "j2kDecodeCache");
+                    decodedSculptMapPath = config.GetString("DecodedSculptMapPath", System.IO.Path.Combine(Util.cacheDir(), "j2kDecodeCache"));
                     cacheSculptMaps = config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
                     if (mesh_config != null)
                     {
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index ac32f75..66c376c 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
 
         public bool doMeshFileCache = true;
         public bool doCacheExpire = true;
-        public string cachePath = "MeshCache";
+        public string cachePath = System.IO.Path.Combine(Util.cacheDir(), "MeshCache");
         public TimeSpan CacheExpire;
 
 //        const string baseDir = "rawFiles";
diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
index e35f79f..6c42e2e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             string dirName = myDomain.FriendlyName;
             string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath;
 
-            string[] pathList = new string[] {"", "bin", ScriptEnginesPath,
+            string[] pathList = new string[] {"", "caches", ScriptEnginesPath,
                                               Path.Combine(ScriptEnginesPath, dirName)};
 
             string assemblyName = args.Name;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 9e47530..b225aad 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_WaitForEventCompletionOnScriptStop
                 = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop);
 
-            m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines");
+            m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", Path.Combine(Util.cacheDir(), "ScriptEngines"));
 
             m_Prio = ThreadPriority.BelowNormal;
             switch (priority)
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 3bede45..8c16f61 100755
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Base
             string fileName = "";
             if (Assembly.GetEntryAssembly() != null)
                 fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
-            string iniFile = fileName + ".ini";
+            string iniFile = Path.Combine(Util.configDir(), fileName + ".ini");
             string logConfig = null;
 
             IConfig startupConfig = argvConfig.Configs["Startup"];
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
index 4e55433..0c74564 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
@@ -67,12 +67,7 @@ namespace OpenSim.Server.Handlers.BakedTextures
                 throw new Exception("No BakedTextureService configuration");
             }
 
-            m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty);
-            if (m_FSBase == String.Empty)
-            {
-                m_log.ErrorFormat("[BAKES]: BaseDirectory not specified");
-                throw new Exception("Configuration error");
-            }
+            m_FSBase = assetConfig.GetString("BaseDirectory", Util.cacheDir() + "/bakes");
 
             m_log.Info("[BAKES]: XBakes service enabled");
         }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 9c66e3d..4f5fe59 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -95,7 +95,8 @@ namespace OpenSim.Services.GridService
 
 //                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
 
-            m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
+//// TODO OpenSim is crazy, this is called from Robust and OpenSim, Robust needs the ../caches bit, OpenSim somehow adds a path already.  I can't tell why.  So strip the path.
+            m_MapTileDirectory = Path.Combine(Util.cacheDir(), Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles")));
 
             m_ThisGatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 30d3e41..9c5e0bb 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Services.MapImageService
         private const int HALF_WIDTH = 128;
         private const int JPEG_QUALITY = 80;
 
-        private static string m_TilesStoragePath = "maptiles";
+        private static string m_TilesStoragePath = Path.Combine(Util.cacheDir(), "/maptiles");
 
         private static object m_Sync = new object();
         private static bool m_Initialized = false;
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs
index 1e0797e..41c2185 100644
--- a/OpenSim/Tests/Robust/Server/DemonServer.cs
+++ b/OpenSim/Tests/Robust/Server/DemonServer.cs
@@ -48,8 +48,8 @@ namespace Robust.Tests
         [SetUp]
         public void StartDemon()
         {
-            if (File.Exists("Robust.Tests.log"))
-                File.Delete("Robust.Tests.log");
+            if (File.Exists("../../logs/Robust.Tests.log"))
+                File.Delete("../../logs/Robust.Tests.log");
 
             Console.WriteLine("**** Starting demon Robust server ****");
             m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));
diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 3a50408..6542517 100644
--- a/bin/OpenSim.ConsoleClient.exe.config
+++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -18,7 +18,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.ConsoleClient.log" />
+      <file value="../../logs/OpenSim.ConsoleClient.log" />
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 5be6989..690f808 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -24,7 +24,8 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/OpenSim.log" />
+      <threshold value="DEBUG" />
+      <file value="../../logs/OpenSim.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
@@ -44,7 +45,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimStats.log"/>
+      <file value="../../logs/OpenSimStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 04a4f7d..6129640 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -988,7 +988,7 @@
     ;; co-op will be more stable but this option is currently experimental.
     ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
     ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
-    ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ;; or by deleting the script DLL* files in ../../caches/ScriptEngines/<region-id>/
     ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
     ;; Current valid values are "abort" and "co-op"
     ; ScriptStopStrategy = co-op
@@ -1049,7 +1049,7 @@
 
     ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines
     ;; Path to script engine assemblies
-    ;; Default is ./bin/ScriptEngines
+    ;; Default is ../../caches/ScriptEngines
     ; ScriptEnginesPath = "ScriptEngines"
 
 [OSSL]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5d99110..2e680df 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,6 +1,12 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
+
+[Includes]
+    ; Define your server specific constants in this file.
+    Include-Common = ../../config/config.ini
+
+
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
@@ -13,11 +19,11 @@
     ConsoleHistoryFileEnabled = true
 
     ; Log file location. This can be set to a simple file path
-    ; LogFile = OpenSim.log
+    LogFile = "${Paths|LogPath}/OpenSim.log"
 
     ; The history file can be just a filename (relative to OpenSim's bin/ directory
     ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/)
-    ConsoleHistoryFile = "OpenSimConsoleHistory.txt"
+    ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory.txt"
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
@@ -98,7 +104,7 @@
 
     ; Determines where the region XML files are stored if you are loading these from the filesystem.
     ; Defaults to bin/Regions in your OpenSimulator installation directory
-    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
+    regionload_regionsdir="Regions"
 
     ; Determines the page from which regions xml is retrieved if you are loading these from the web
     ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
@@ -459,6 +465,9 @@
     ; Show NPCs as green world map dots
     ;ShowNPCs = true
 
+    ; where to store cached map tiles.
+    CacheDirectory = "${Paths|CachePath}/MapImageCache"
+
 [Permissions]
     ; ##
     ; ## PERMISSIONS
@@ -1699,7 +1708,7 @@
     default_snapshot_period = 1200
 
     ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
-    snapshot_cache_directory = "DataSnapshot"
+    snapshot_cache_directory = "${Paths|CachePath}/DataSnapshot"
 
     ; Uncomment if you want to index your data with this and/or other search providers. One entry per
     ; data service
@@ -1927,7 +1936,7 @@
     ; DisableUndergroundMovement = true
 
     ;; Path to script assemblies
-    ; ScriptEnginesPath = "ScriptEngines"
+    ; ScriptEnginesPath = "${Paths|CachePath}/ScriptEngines"
 
 
 [Concierge]
diff --git a/bin/Robust.Tests.dll.config b/bin/Robust.Tests.dll.config
index a4c43e7..cc0bead 100644
--- a/bin/Robust.Tests.dll.config
+++ b/bin/Robust.Tests.dll.config
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="Robust.Tests.log" />
+      <file value="../../logs/Robust.Tests.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 3ad5f31..62ffcc6 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -22,7 +22,8 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/Robust.log" />
+      <threshold value="DEBUG" />
+      <file value="../../logs/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
@@ -41,7 +42,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="RobustStats.log"/>
+      <file value="../../logs/RobustStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 46b4ded..3550ed9 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -6,7 +6,7 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql
     ; Uncomment these lines if you want to use mysql storage
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a4be88e9..906ab84 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,7 +6,7 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ;Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql
     ; Uncomment these lines if you want to use mysql storage