diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172cec..0ee62e9984 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsManager.cs">
+    <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="IGridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IInterRegionCommunications.cs">
+    <Compile Include="CommunicationsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IUserServices.cs">
+    <Compile Include="IInterRegionCommunications.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6065..8b0e0f6cb6 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="CommunicationsManager.cs" />
-                <include name="IGridServices.cs" />
-                <include name="IInterRegionCommunications.cs" />
                 <include name="IUserServices.cs" />
+                <include name="IGridServices.cs" />
+                <include name="CommunicationsManager.cs" />
+                <include name="IInterRegionCommunications.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index f3dcec59e7..c02a5066dc 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index eb40c0db4c..10e72a10d8 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="ConsoleCallbacksBase.cs" />
                 <include name="LogBase.cs" />
+                <include name="ConsoleCallbacksBase.cs" />
                 <include name="MainLog.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf756..f6e831117a 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5e2b..2c5e31ba9a 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="DB4oGridData.cs" />
-                <include name="DB4oManager.cs" />
                 <include name="DB4oUserData.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887249..09a32b54fa 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLLogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec5266c..3aeebbcec1 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="MySQLGridData.cs" />
                 <include name="MySQLInventoryData.cs" />
-                <include name="MySQLLogData.cs" />
-                <include name="MySQLManager.cs" />
                 <include name="MySQLUserData.cs" />
+                <include name="MySQLManager.cs" />
+                <include name="MySQLLogData.cs" />
+                <include name="MySQLGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f11f8..dab22eaab3 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6109..719fbc69f2 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="SQLiteGridData.cs" />
                 <include name="SQLiteManager.cs" />
+                <include name="SQLiteGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcdb84..47b9ba32fa 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,9 +78,15 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ReservationData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="GridData.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="SimProfileData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="ILogData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -90,12 +96,6 @@
     <Compile Include="InventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ReservationData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="UserData.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b032..881bb3ada6 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,12 +11,12 @@
             <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="ReservationData.cs" />
                 <include name="GridData.cs" />
+                <include name="SimProfileData.cs" />
                 <include name="ILogData.cs" />
                 <include name="IniConfig.cs" />
                 <include name="InventoryData.cs" />
-                <include name="ReservationData.cs" />
-                <include name="SimProfileData.cs" />
                 <include name="UserData.cs" />
                 <include name="UserProfileData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenSim/Framework/General/Logger.cs b/OpenSim/Framework/General/Logger.cs
deleted file mode 100644
index e7eaa03840..0000000000
--- a/OpenSim/Framework/General/Logger.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework
-{
-    public class Logger
-    {
-        public static Logger Instance = new Logger( false );
-     
-        public delegate void LoggerMethodDelegate();
-        private delegate bool LoggerDelegate( LoggerMethodDelegate whatToDo );
-
-        
-        private LoggerDelegate m_delegate;
-        
-        public Logger( bool log )
-        {
-            if( log )
-            {
-                m_delegate = CatchAndLog;
-            }
-            else
-            {
-                m_delegate = DontCatch;
-            }
-        }
-        
-        public bool Wrap( LoggerMethodDelegate whatToDo )
-        {
-            return m_delegate( whatToDo );
-        }
-
-
-        private bool CatchAndLog(LoggerMethodDelegate whatToDo)
-        {
-            try
-            {
-                whatToDo();
-                return true;
-            }
-            catch(Exception e)
-            {
-                System.Console.WriteLine( "Exception logged!!! Woah!!!!" );
-                return false;
-            }
-        }
-
-        private bool DontCatch(LoggerMethodDelegate whatToDo)
-        {
-            whatToDo();
-            return true;
-        }
-
-        public class LoggerExample
-        {
-            public void TryWrap()
-            {
-                // This will log and ignore
-                Logger log = new Logger(true);
-
-                log.Wrap(delegate()
-                             {
-                                 Int16.Parse("waa!");
-                             });
-
-                // This will throw;            
-                try
-                {
-
-                    log = new Logger(false);
-
-                    log.Wrap(delegate()
-                                 {
-                                     Int16.Parse("waa!");
-                                 });
-                }
-                catch
-                {
-                    System.Console.WriteLine("Example barfed!");
-                }
-            }
-        }
-    }              
-}
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 48db634cd2..c12d436cfa 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -88,10 +88,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgentInventory.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
+    <Compile Include="Remoting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="BlockingQueue.cs">
@@ -100,97 +103,91 @@
     <Compile Include="IRegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Logger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionCommsListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="SimProfile.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LoginService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\AuthenticateResponse.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IUserServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IWorld.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AgentWearable.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AssetBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\AssetStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\EstateSettings.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\Login.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\MapBlockData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\RegionHandle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\RegionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\AgentWearable.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\MapBlockData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\AssetStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\EstateSettings.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AgentCiruitData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\Login.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AssetLandmark.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index a18838bace..0d8077b63f 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -11,41 +11,40 @@
             <resources prefix="OpenSim.Framework" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="AgentInventory.cs" />
                 <include name="AuthenticateSessionBase.cs" />
+                <include name="Remoting.cs" />
+                <include name="RegionCommsListener.cs" />
                 <include name="BlockingQueue.cs" />
                 <include name="IRegionCommsListener.cs" />
-                <include name="Logger.cs" />
-                <include name="LoginService.cs" />
-                <include name="RegionCommsListener.cs" />
-                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
-                <include name="UserProfile.cs" />
                 <include name="Util.cs" />
+                <include name="UserProfile.cs" />
+                <include name="SimProfile.cs" />
+                <include name="LoginService.cs" />
+                <include name="AgentInventory.cs" />
                 <include name="Interfaces/AuthenticateResponse.cs" />
+                <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
                 <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IUserServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
                 <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IGridConfig.cs" />
                 <include name="Interfaces/Config/IUserConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
-                <include name="Types/AgentWearable.cs" />
-                <include name="Types/AssetBase.cs" />
-                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/AssetStorage.cs" />
-                <include name="Types/EstateSettings.cs" />
-                <include name="Types/Login.cs" />
-                <include name="Types/MapBlockData.cs" />
                 <include name="Types/NeighbourInfo.cs" />
                 <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/PrimData.cs" />
                 <include name="Types/RegionHandle.cs" />
                 <include name="Types/RegionInfo.cs" />
+                <include name="Types/ParcelData.cs" />
+                <include name="Types/AgentWearable.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/MapBlockData.cs" />
+                <include name="Types/AssetStorage.cs" />
+                <include name="Types/EstateSettings.cs" />
+                <include name="Types/AgentCiruitData.cs" />
+                <include name="Types/Login.cs" />
+                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/AssetBase.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 399f45634c..5262224c39 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -93,16 +93,16 @@
     <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServerBase.cs">
+    <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="CheckSumServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 7401b07d73..96b937cdef 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -12,10 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="BaseHttpServer.cs" />
-                <include name="CheckSumServer.cs" />
                 <include name="IRestHandler.cs" />
-                <include name="UDPServerBase.cs" />
                 <include name="XmlRpcMethod.cs" />
+                <include name="CheckSumServer.cs" />
+                <include name="UDPServerBase.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 02aa3f3686..60c4b2f1a3 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -108,10 +108,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LoginResponse.cs">
+    <Compile Include="UserManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserManagerBase.cs">
+    <Compile Include="LoginResponse.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
index 3ea339b375..ced9276ca0 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="LoginResponse.cs" />
                 <include name="UserManagerBase.cs" />
+                <include name="LoginResponse.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca32ea..945b7a598c 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 88724f6b69..0a1b533832 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="AssetHttpServer.cs" />
                 <include name="Main.cs" />
+                <include name="AssetHttpServer.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index bec85cca39..13619eb58d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,15 +170,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Application.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Application.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 6c7d7ac0ab..355092b6a8 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
                 <include name="VersionInfo.cs" />
+                <include name="Application.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 4667d525d0..1ed28d2630 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Caps.cs">
+    <Compile Include="LLSDCapsDetails.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LLSDArray.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDCapEvent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDCapsDetails.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LLSDEmpty.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDHelpers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapLayer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LLSDTest.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LLSDUploadReply.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="LLSDType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDUploadReply.cs">
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDCapEvent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayerResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayer.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index a091b5c043..dd853e7f1e 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
             <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Caps.cs" />
-                <include name="LLSDArray.cs" />
-                <include name="LLSDCapEvent.cs" />
                 <include name="LLSDCapsDetails.cs" />
+                <include name="LLSDArray.cs" />
                 <include name="LLSDEmpty.cs" />
-                <include name="LLSDHelpers.cs" />
-                <include name="LLSDMapLayer.cs" />
-                <include name="LLSDMapLayerResponse.cs" />
-                <include name="LLSDMapRequest.cs" />
                 <include name="LLSDTest.cs" />
-                <include name="LLSDType.cs" />
                 <include name="LLSDUploadReply.cs" />
+                <include name="LLSDType.cs" />
+                <include name="LLSDHelpers.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDMapRequest.cs" />
+                <include name="Caps.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapLayer.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0ef4..2e1d8e2642 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientStackNetworkHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UDPServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.API.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.ProcessPackets.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientViewBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8871..1c791d3e2b 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
             <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ClientStackNetworkHandler.cs" />
                 <include name="ClientView.AgentAssetUpload.cs" />
-                <include name="ClientView.API.cs" />
-                <include name="ClientView.cs" />
-                <include name="ClientView.PacketHandlers.cs" />
-                <include name="ClientView.ProcessPackets.cs" />
-                <include name="ClientViewBase.cs" />
+                <include name="ClientStackNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
-                <include name="RegionApplicationBase.cs" />
                 <include name="UDPServer.cs" />
+                <include name="ClientView.PacketHandlers.cs" />
+                <include name="ClientView.API.cs" />
+                <include name="ClientView.ProcessPackets.cs" />
+                <include name="RegionApplicationBase.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49104..f9f6b7d824 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="CommunicationsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 3cac9d3d50..bfefabffc0 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="LocalUserServices.cs" />
                 <include name="CommunicationsLocal.cs" />
                 <include name="LocalBackEndServices.cs" />
-                <include name="LocalUserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index d6abd13554..90a01b6e00 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,6 +116,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="OGS1UserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="CommunicationsOGS1.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -125,9 +128,6 @@
     <Compile Include="OGS1InterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGS1UserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 04d61b9a11..960a84a7ce 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="OGS1UserServices.cs" />
                 <include name="CommunicationsOGS1.cs" />
                 <include name="OGS1GridServices.cs" />
                 <include name="OGS1InterSimComms.cs" />
-                <include name="OGS1UserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 428f3812a7..6dabd05f37 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -144,55 +144,55 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="RegionManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
+    <Compile Include="Scenes\Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\IScenePresenceBody.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\ScriptManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\ScriptInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptManager.cs">
+    <Compile Include="Scenes\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 2fa5e7610a..eb26ea0a85 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,23 +11,23 @@
             <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="RegionManager.cs" />
                 <include name="EstateManager.cs" />
                 <include name="ParcelManager.cs" />
-                <include name="RegionManager.cs" />
                 <include name="Scenes/Entity.cs" />
-                <include name="Scenes/IScenePresenceBody.cs" />
-                <include name="Scenes/Primitive.cs" />
                 <include name="Scenes/Scene.cs" />
-                <include name="Scenes/Scene.PacketHandlers.cs" />
-                <include name="Scenes/SceneBase.cs" />
-                <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/SceneObject.cs" />
-                <include name="Scenes/ScenePresence.Animations.cs" />
                 <include name="Scenes/ScenePresence.Body.cs" />
+                <include name="Scenes/SceneEvents.cs" />
                 <include name="Scenes/ScenePresence.cs" />
-                <include name="Scenes/scripting/Script.cs" />
-                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/ScenePresence.Animations.cs" />
+                <include name="Scenes/Scene.PacketHandlers.cs" />
+                <include name="Scenes/SceneObject.cs" />
+                <include name="Scenes/Primitive.cs" />
+                <include name="Scenes/SceneBase.cs" />
+                <include name="Scenes/IScenePresenceBody.cs" />
                 <include name="Scenes/scripting/ScriptManager.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/scripting/Script.cs" />
                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
                 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
             </sources>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c6b8..716fd5761b 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -105,6 +102,9 @@
     <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index fc9f055b47..112ff1c309 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
                 <include name="MapStorage.cs" />
                 <include name="UUIDParcelQuery.cs" />
                 <include name="UUIDPrimQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index c8b859c41d..f332827196 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
     <Compile Include="Prebuild.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Kernel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -95,19 +92,25 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\FatalException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Interfaces\ITarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Interfaces\IDataNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
+    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ProjectNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -119,40 +122,28 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\MatchNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Nodes\OptionsNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ProcessNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Nodes\ReferenceNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Nodes\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Nodes\MatchNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Nodes\SolutionNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Nodes\ProcessNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Nodes\ReferenceNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\AutotoolsTarget.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\DebugTarget.cs">
@@ -161,10 +152,7 @@
     <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
+    <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelopTarget.cs">
@@ -176,13 +164,19 @@
     <Compile Include="Core\Targets\VS2003Target.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Targets\VS2005Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Parse\Preprocessor.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Utilities\Helper.cs">
@@ -191,6 +185,12 @@
     <Compile Include="Core\Utilities\Log.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 2851125232..52dd1a7778 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>
             <sources failonempty="true">
                 <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
                 <include name="Core/Kernel.cs" />
                 <include name="Core/UnknownLanguageException.cs" />
                 <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
-                <include name="Core/Attributes/OptionNodeAttribute.cs" />
-                <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/FatalException.cs" />
                 <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/Attributes/TargetAttribute.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
                 <include name="Core/Nodes/ConfigurationNode.cs" />
                 <include name="Core/Nodes/DataNode.cs" />
                 <include name="Core/Nodes/ExcludeNode.cs" />
+                <include name="Core/Nodes/OptionsNode.cs" />
+                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
+                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
                 <include name="Core/Nodes/FileNode.cs" />
                 <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
-                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.cs" />
-                <include name="Core/Nodes/SolutionNode.cs" />
-                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/DebugTarget.cs" />
                 <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/SharpDevelopTarget.cs" />
                 <include name="Core/Targets/VS2002Target.cs" />
                 <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
                 <include name="Core/Utilities/Helper.cs" />
                 <include name="Core/Utilities/Log.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">