diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 89802d52e5..8e33dd9fca 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -87,105 +87,105 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BlockingQueue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="HeightMapGenHills.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="UserProfileManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfile.cs">
+    <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserProfileManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserProfileManagerBase.cs">
+    <Compile Include="HeightMapGenHills.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IAssetServer.cs">
+    <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
+    <Compile Include="SimProfileBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IConfig.cs">
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IGridServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\ILocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IScriptAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IScriptEngine.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IUserConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\LocalGridBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\RemoteGridBase.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IUserConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IConfig.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\IClientAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IScriptEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IGridConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IGridServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IScriptAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\ILocalStorage.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\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\Login.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\OSVector3.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\AssetStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\OSVector3.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>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 4f58ae1055..8da7748436 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -12,39 +12,39 @@
             </resources>
             <sources failonempty="true">
                 <include name="AgentInventory.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="HeightMapGenHills.cs" />
-                <include name="LoginService.cs" />
-                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
-                <include name="SimProfileBase.cs" />
-                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
                 <include name="Util.cs" />
-                <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IClientAPI.cs" />
-                <include name="Interfaces/IConfig.cs" />
+                <include name="Remoting.cs" />
+                <include name="UserProfileManagerBase.cs" />
+                <include name="LoginService.cs" />
+                <include name="UserProfileManager.cs" />
+                <include name="HeightMapGenHills.cs" />
+                <include name="BlockingQueue.cs" />
+                <include name="UserProfile.cs" />
+                <include name="SimProfileBase.cs" />
+                <include name="SimProfile.cs" />
                 <include name="Interfaces/IGenericConfig.cs" />
-                <include name="Interfaces/IGridConfig.cs" />
-                <include name="Interfaces/IGridServer.cs" />
-                <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IScriptAPI.cs" />
-                <include name="Interfaces/IScriptEngine.cs" />
-                <include name="Interfaces/IUserConfig.cs" />
-                <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/LocalGridBase.cs" />
                 <include name="Interfaces/RemoteGridBase.cs" />
+                <include name="Interfaces/IUserConfig.cs" />
+                <include name="Interfaces/IConfig.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/IAssetServer.cs" />
+                <include name="Interfaces/IClientAPI.cs" />
+                <include name="Interfaces/IScriptEngine.cs" />
+                <include name="Interfaces/IGridConfig.cs" />
+                <include name="Interfaces/IGridServer.cs" />
+                <include name="Interfaces/IScriptAPI.cs" />
+                <include name="Interfaces/ILocalStorage.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
-                <include name="Types/AssetBase.cs" />
-                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/AssetStorage.cs" />
-                <include name="Types/Login.cs" />
                 <include name="Types/NeighbourInfo.cs" />
-                <include name="Types/OSVector3.cs" />
                 <include name="Types/ParcelData.cs" />
                 <include name="Types/PrimData.cs" />
+                <include name="Types/AssetStorage.cs" />
+                <include name="Types/OSVector3.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/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index e89a62c41b..6768ce45ae 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,33 +92,33 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="LoginServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="BaseServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LocalUserProfileManager.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="XmlRpcMethod.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="LoginResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LoginServer.cs">
+    <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index 41c1350bea..a2af584834 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,15 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="LoginServer.cs" />
                 <include name="BaseHttpServer.cs" />
                 <include name="BaseServer.cs" />
-                <include name="CheckSumServer.cs" />
                 <include name="IRestHandler.cs" />
                 <include name="LocalUserProfileManager.cs" />
-                <include name="LoginResponse.cs" />
-                <include name="LoginServer.cs" />
-                <include name="UDPServerBase.cs" />
                 <include name="XmlRpcMethod.cs" />
+                <include name="LoginResponse.cs" />
+                <include name="CheckSumServer.cs" />
+                <include name="UDPServerBase.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 61f8be0162..86f6aaab1e 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,60 +70,60 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Logger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimpleHttpRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="XmlRpcBoxcarRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcClientProxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcDeserializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcErrorCodes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcExposedAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="XmlRpcRequest.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="XmlRpcResponseSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Logger.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="XmlRpcRequestDeserializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcRequestSerializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcResponder.cs">
+    <Compile Include="XmlRpcExposedAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="XmlRpcResponse.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="XmlRpcException.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="XmlRpcResponseDeserializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcResponseSerializer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="XmlRpcSerializer.cs">
+    <Compile Include="XmlRpcResponder.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="XmlRpcServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="XmlRpcErrorCodes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="XmlRpcSystemObject.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="SimpleHttpRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcClientProxy.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcRequestSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcDeserializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="XmlRpcXmlTokens.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 2eabfcd0c4..8d5efd19a9 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
             <resources prefix="XMLRPC" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Logger.cs" />
-                <include name="SimpleHttpRequest.cs" />
                 <include name="XmlRpcBoxcarRequest.cs" />
-                <include name="XmlRpcClientProxy.cs" />
-                <include name="XmlRpcDeserializer.cs" />
-                <include name="XmlRpcErrorCodes.cs" />
-                <include name="XmlRpcException.cs" />
-                <include name="XmlRpcExposedAttribute.cs" />
                 <include name="XmlRpcRequest.cs" />
-                <include name="XmlRpcRequestDeserializer.cs" />
-                <include name="XmlRpcRequestSerializer.cs" />
-                <include name="XmlRpcResponder.cs" />
-                <include name="XmlRpcResponse.cs" />
-                <include name="XmlRpcResponseDeserializer.cs" />
                 <include name="XmlRpcResponseSerializer.cs" />
-                <include name="XmlRpcSerializer.cs" />
+                <include name="Logger.cs" />
+                <include name="XmlRpcRequestDeserializer.cs" />
+                <include name="XmlRpcExposedAttribute.cs" />
+                <include name="XmlRpcResponse.cs" />
+                <include name="XmlRpcException.cs" />
+                <include name="XmlRpcResponseDeserializer.cs" />
+                <include name="XmlRpcResponder.cs" />
                 <include name="XmlRpcServer.cs" />
+                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcSerializer.cs" />
                 <include name="XmlRpcSystemObject.cs" />
+                <include name="SimpleHttpRequest.cs" />
+                <include name="XmlRpcClientProxy.cs" />
+                <include name="XmlRpcRequestSerializer.cs" />
+                <include name="XmlRpcDeserializer.cs" />
                 <include name="XmlRpcXmlTokens.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 82d4f5fab5..3b783ca607 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.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/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index 75ef149790..5fe0cf78b4 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.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/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index 78f4afe523..84d3d56f4b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenGrid.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/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index 463cf86c2c..fa17367954 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.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/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index 1be9b43403..8c0f8fe878 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGrid.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/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index a57220494c..990cd16292 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -81,6 +81,9 @@
     <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,9 +93,6 @@
     <Compile Include="InventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="UserData.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index e6e0313fc8..c993a8d4ba 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
@@ -12,10 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="GridData.cs" />
+                <include name="SimProfileData.cs" />
                 <include name="ILogData.cs" />
                 <include name="IniConfig.cs" />
                 <include name="InventoryData.cs" />
-                <include name="SimProfileData.cs" />
                 <include name="UserData.cs" />
                 <include name="UserProfileData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index 257f6e1c9f..031e405924 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
@@ -102,10 +102,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/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index e889a4d392..0da1d3450b 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGridServices.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/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
index 0836b8d948..6aec357c19 100644
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
+++ b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
@@ -108,13 +108,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="InventoryManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="InventoryManager.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
index 080233f85a..c23a862adc 100644
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
+++ b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
@@ -11,9 +11,8 @@
             <resources prefix="OpenGridServices.InventoryServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="InventoryManager.cs" />
                 <include name="Main.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="InventoryManager.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 256d3e1bae..9161a4e026 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgentAssetUpload.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionsBase.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="AuthenticateSessionsLocal.cs">
@@ -136,28 +136,16 @@
     <Compile Include="AuthenticateSessionsRemote.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClientView.Grid.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="OpenSimNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Grid.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="RegionInfoBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimNetworkHandler.cs">
+    <Compile Include="ClientView.Grid.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PacketServer.cs">
@@ -166,55 +154,55 @@
     <Compile Include="RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionInfoBase.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionServerBase.cs">
+    <Compile Include="AuthenticateSessionsBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Assets\AssetCache.cs">
+    <Compile Include="AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Assets\InventoryCache.cs">
+    <Compile Include="ClientViewBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionServerBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="CAPS\AdminWebFront.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="types\Mesh.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="types\Triangle.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="world\Avatar.Client.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="world\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="world\Avatar.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="world\World.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="world\Avatar.Update.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\AvatarAnimations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Entity.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="world\ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="world\Primitive2.cs">
+    <Compile Include="world\WorldBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\SceneObject.cs">
@@ -223,33 +211,45 @@
     <Compile Include="world\World.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\World.PacketHandlers.cs">
+    <Compile Include="world\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\World.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\WorldBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="world\scripting\IScriptContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="world\scripting\IScriptEntity.cs">
+    <Compile Include="world\Primitive2.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="world\scripting\IScriptHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="world\scripting\Script.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="world\scripting\ScriptFactory.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="world\scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="world\scripting\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="world\scripting\IScriptEntity.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Assets\InventoryCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Assets\AssetCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="types\Mesh.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="types\Triangle.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 25bbf075ca..bbd63f1c59 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,48 +11,48 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="AgentAssetUpload.cs" />
-                <include name="AuthenticateSessionsBase.cs" />
+                <include name="OpenSimMain.cs" />
+                <include name="UDPServer.cs" />
                 <include name="AuthenticateSessionsLocal.cs" />
                 <include name="AuthenticateSessionsRemote.cs" />
-                <include name="ClientView.cs" />
-                <include name="ClientView.Grid.cs" />
-                <include name="ClientView.PacketHandlers.cs" />
-                <include name="ClientView.ProcessPackets.cs" />
-                <include name="ClientViewBase.cs" />
-                <include name="Grid.cs" />
-                <include name="OpenSimMain.cs" />
                 <include name="OpenSimNetworkHandler.cs" />
+                <include name="Grid.cs" />
+                <include name="RegionInfoBase.cs" />
+                <include name="ClientView.Grid.cs" />
                 <include name="PacketServer.cs" />
                 <include name="RegionInfo.cs" />
-                <include name="RegionInfoBase.cs" />
-                <include name="RegionServerBase.cs" />
-                <include name="UDPServer.cs" />
+                <include name="ClientView.PacketHandlers.cs" />
+                <include name="AuthenticateSessionsBase.cs" />
+                <include name="ClientView.ProcessPackets.cs" />
                 <include name="VersionInfo.cs" />
-                <include name="Assets/AssetCache.cs" />
-                <include name="Assets/InventoryCache.cs" />
+                <include name="AgentAssetUpload.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="RegionServerBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="CAPS/AdminWebFront.cs" />
-                <include name="types/Mesh.cs" />
-                <include name="types/Triangle.cs" />
                 <include name="world/Avatar.Client.cs" />
+                <include name="world/Entity.cs" />
                 <include name="world/Avatar.cs" />
+                <include name="world/World.PacketHandlers.cs" />
                 <include name="world/Avatar.Update.cs" />
                 <include name="world/AvatarAnimations.cs" />
-                <include name="world/Entity.cs" />
                 <include name="world/ParcelManager.cs" />
-                <include name="world/Primitive.cs" />
-                <include name="world/Primitive2.cs" />
+                <include name="world/WorldBase.cs" />
                 <include name="world/SceneObject.cs" />
                 <include name="world/World.cs" />
-                <include name="world/World.PacketHandlers.cs" />
+                <include name="world/Primitive.cs" />
                 <include name="world/World.Scripting.cs" />
-                <include name="world/WorldBase.cs" />
-                <include name="world/scripting/IScriptContext.cs" />
-                <include name="world/scripting/IScriptEntity.cs" />
+                <include name="world/Primitive2.cs" />
                 <include name="world/scripting/IScriptHandler.cs" />
-                <include name="world/scripting/Script.cs" />
                 <include name="world/scripting/ScriptFactory.cs" />
+                <include name="world/scripting/IScriptContext.cs" />
+                <include name="world/scripting/Script.cs" />
+                <include name="world/scripting/IScriptEntity.cs" />
                 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
+                <include name="Assets/InventoryCache.cs" />
+                <include name="Assets/AssetCache.cs" />
+                <include name="types/Mesh.cs" />
+                <include name="types/Triangle.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index bd1a332963..6ffcf9ed5d 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -76,64 +76,64 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClassInstance.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClassRecord.cs">
+    <Compile Include="MainMemory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Heap.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interpreter.cs">
+    <Compile Include="StackFrame.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="InterpreterLogic.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="OpenSimJVM.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="InterpreterMethods.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ClassInstance.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="InterpreterReturn.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainMemory.cs">
+    <Compile Include="Interpreter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MethodMemory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Object.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSimJVM.cs">
+    <Compile Include="ClassRecord.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Stack.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="StackFrame.cs">
+    <Compile Include="Object.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Thread.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="MethodMemory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ArrayReference.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\BaseType.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\ArrayReference.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\ObjectReference.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+    <Compile Include="Types\PrimitiveTypes\Char.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimitiveTypes\Char.cs">
+    <Compile Include="Types\PrimitiveTypes\Byte.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\PrimitiveTypes\Float.cs">
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index c5255db462..ac4d564317 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ClassInstance.cs" />
-                <include name="ClassRecord.cs" />
-                <include name="Heap.cs" />
-                <include name="Interpreter.cs" />
-                <include name="InterpreterLogic.cs" />
-                <include name="InterpreterMethods.cs" />
-                <include name="InterpreterReturn.cs" />
                 <include name="MainMemory.cs" />
-                <include name="MethodMemory.cs" />
-                <include name="Object.cs" />
-                <include name="OpenSimJVM.cs" />
-                <include name="Stack.cs" />
+                <include name="Heap.cs" />
                 <include name="StackFrame.cs" />
+                <include name="InterpreterLogic.cs" />
+                <include name="OpenSimJVM.cs" />
+                <include name="InterpreterMethods.cs" />
+                <include name="ClassInstance.cs" />
+                <include name="InterpreterReturn.cs" />
+                <include name="Interpreter.cs" />
+                <include name="ClassRecord.cs" />
+                <include name="Stack.cs" />
+                <include name="Object.cs" />
                 <include name="Thread.cs" />
+                <include name="MethodMemory.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/ArrayReference.cs" />
                 <include name="Types/BaseType.cs" />
+                <include name="Types/ArrayReference.cs" />
                 <include name="Types/ObjectReference.cs" />
-                <include name="Types/PrimitiveTypes/Byte.cs" />
                 <include name="Types/PrimitiveTypes/Char.cs" />
+                <include name="Types/PrimitiveTypes/Byte.cs" />
                 <include name="Types/PrimitiveTypes/Float.cs" />
                 <include name="Types/PrimitiveTypes/Int.cs" />
             </sources>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 231ba1d913..7bb5d6ed5b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
     <ProjectGuid>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
       <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -87,29 +80,31 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UUIDParcelQuery.cs" />
-    <Compile Include="UUIDPrimQuery.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UUIDPrimQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Db4LocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UUIDParcelQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
@@ -118,4 +113,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index da2db1490c..e18478ab8a 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,9 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
                 <include name="MapStorage.cs" />
-                <include name="UUIDQuery.cs" />
+                <include name="UUIDPrimQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
+                <include name="UUIDParcelQuery.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
index 069c5c6bd2..a3f6ec06f4 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim/OpenSim.csproj
@@ -130,10 +130,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Application.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
index 4f8ca8a6ba..670b77ca58 100644
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim/OpenSim.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
+                <include name="Application.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 55efffac57..df6b4f4426 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 43f5516127..f2c8cabd40 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()}">