diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index b3fd574387..fe3f9d9b30 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -80,7 +80,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RegionServerCommsOGS.cs">
+    <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionServerCommsLocal.cs">
@@ -89,19 +89,7 @@
     <Compile Include="RegionServerCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalBackEndServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserServer\UserCommsManagerOGS.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserServer\UserCommsManagerBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserServer\UserCommsManagerLocal.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="GridServer\GridCommsManagerOGS.cs">
+    <Compile Include="RegionServerCommsOGS.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="GridServer\GridCommsManagerBase.cs">
@@ -110,10 +98,7 @@
     <Compile Include="GridServer\GridCommsManagerLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterSimComms\InterSimsCommsOGS.cs">
+    <Compile Include="GridServer\GridCommsManagerOGS.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="InterSimComms\InterSimsCommsBase.cs">
@@ -122,6 +107,21 @@
     <Compile Include="InterSimComms\InterSimsCommsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="InterSimComms\InterSimsCommsOGS.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserServer\UserCommsManagerBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserServer\UserCommsManagerLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserServer\UserCommsManagerOGS.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index c46174c418..4036747080 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -11,20 +11,20 @@
             <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="RegionServerCommsOGS.cs" />
+                <include name="LocalBackEndServices.cs" />
                 <include name="RegionServerCommsLocal.cs" />
                 <include name="RegionServerCommsManager.cs" />
-                <include name="LocalBackEndServices.cs" />
-                <include name="UserServer/UserCommsManagerOGS.cs" />
-                <include name="UserServer/UserCommsManagerBase.cs" />
-                <include name="UserServer/UserCommsManagerLocal.cs" />
-                <include name="GridServer/GridCommsManagerOGS.cs" />
+                <include name="RegionServerCommsOGS.cs" />
                 <include name="GridServer/GridCommsManagerBase.cs" />
                 <include name="GridServer/GridCommsManagerLocal.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-                <include name="InterSimComms/InterSimsCommsOGS.cs" />
+                <include name="GridServer/GridCommsManagerOGS.cs" />
                 <include name="InterSimComms/InterSimsCommsBase.cs" />
                 <include name="InterSimComms/InterSimsCommsLocal.cs" />
+                <include name="InterSimComms/InterSimsCommsOGS.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+                <include name="UserServer/UserCommsManagerBase.cs" />
+                <include name="UserServer/UserCommsManagerLocal.cs" />
+                <include name="UserServer/UserCommsManagerOGS.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index a39385caec..f0292e6419 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.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>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Framework</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="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\bin\libsecondlife.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>
@@ -87,13 +80,13 @@
       <Name>XMLRPC</Name>
       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\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>
@@ -118,6 +111,9 @@
     <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="SimProfile.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -130,24 +126,9 @@
     <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.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\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>
@@ -157,22 +138,37 @@
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
+    <Compile Include="Interfaces\IUserServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
+    <Compile Include="Interfaces\IWorld.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
+    <Compile Include="Interfaces\LocalGridBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\RemoteGridBase.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\Remoting\IGridServerHost.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
+    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">
+    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">
@@ -181,24 +177,15 @@
     <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGenericConfig.cs">
+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types\EstateSettings.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Types\AgentCiruitData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -214,6 +201,9 @@
     <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>
@@ -223,6 +213,9 @@
     <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\ParcelData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -237,4 +230,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 248c3230f9..ac2ade4e8a 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -18,42 +18,41 @@
                 <include name="LoginService.cs" />
                 <include name="RegionCommsHostBase.cs" />
                 <include name="Remoting.cs" />
+                <include name="SimProfile.cs" />
                 <include name="UserProfile.cs" />
                 <include name="UserProfileManager.cs" />
                 <include name="UserProfileManagerBase.cs" />
                 <include name="Util.cs" />
-                <include name="SimProfile.cs" />
-                <include name="Interfaces/IUserManager.cs" />
-                <include name="Interfaces/LocalGridBase.cs" />
-                <include name="Interfaces/RemoteGridBase.cs" />
-                <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
                 <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/IGridServer.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/Scripting/IScriptEngine.cs" />
-                <include name="Interfaces/Scripting/IScriptAPI.cs" />
-                <include name="Interfaces/Remoting/IProxyServerHost.cs" />
-                <include name="Interfaces/Remoting/IProxyServerClient.cs" />
-                <include name="Interfaces/Remoting/IRegionGridClient.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
+                <include name="Interfaces/LocalGridBase.cs" />
+                <include name="Interfaces/RemoteGridBase.cs" />
+                <include name="Interfaces/Config/IGenericConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Config/IUserConfig.cs" />
                 <include name="Interfaces/Remoting/IGridServerHost.cs" />
+                <include name="Interfaces/Remoting/IProxyServerClient.cs" />
+                <include name="Interfaces/Remoting/IProxyServerHost.cs" />
+                <include name="Interfaces/Remoting/IRegionGridClient.cs" />
                 <include name="Interfaces/Remoting/IRegionSimHost.cs" />
                 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />
-                <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IUserConfig.cs" />
-                <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Scripting/IScriptAPI.cs" />
+                <include name="Interfaces/Scripting/IScriptEngine.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/EstateSettings.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/NeighbourInfo.cs" />
                 <include name="Types/NetworkServersInfo.cs" />
+                <include name="Types/ParcelData.cs" />
                 <include name="Types/PrimData.cs" />
                 <include name="Types/RegionInfo.cs" />
             </sources>
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 86f6aaab1e..61f8be0162 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="XmlRpcBoxcarRequest.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="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="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="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="XmlRpcRequestDeserializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="XmlRpcRequestSerializer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcDeserializer.cs">
+    <Compile Include="XmlRpcResponder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcResponse.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">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcSystemObject.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="XmlRpcXmlTokens.cs">
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 8d5efd19a9..2eabfcd0c4 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="XmlRpcBoxcarRequest.cs" />
-                <include name="XmlRpcRequest.cs" />
-                <include name="XmlRpcResponseSerializer.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="XmlRpcBoxcarRequest.cs" />
                 <include name="XmlRpcClientProxy.cs" />
-                <include name="XmlRpcRequestSerializer.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="XmlRpcServer.cs" />
+                <include name="XmlRpcSystemObject.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 3b783ca607..82d4f5fab5 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="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index db8662d7f8..8e0f53a0b1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="DB4oUserData.cs" />
-                <include name="DB4oManager.cs" />
                 <include name="DB4oGridData.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oUserData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
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 5fe0cf78b4..75ef149790 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="MySQLUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MySQLManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MySQLLogData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLGridData.cs">
+    <Compile Include="MySQLManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLUserData.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 84d3d56f4b..78f4afe523 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="MySQLInventoryData.cs" />
-                <include name="MySQLUserData.cs" />
-                <include name="MySQLManager.cs" />
-                <include name="MySQLLogData.cs" />
                 <include name="MySQLGridData.cs" />
+                <include name="MySQLInventoryData.cs" />
+                <include name="MySQLLogData.cs" />
+                <include name="MySQLManager.cs" />
+                <include name="MySQLUserData.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 fa17367954..463cf86c2c 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="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.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 8c0f8fe878..1be9b43403 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="SQLiteManager.cs" />
                 <include name="SQLiteGridData.cs" />
+                <include name="SQLiteManager.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 990cd16292..a57220494c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -81,9 +81,6 @@
     <Compile Include="GridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ILogData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -93,6 +90,9 @@
     <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 c993a8d4ba..e6e0313fc8 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.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 8c0f513c41..1bd07fb8c1 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -108,10 +108,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UserManager.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="UserManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 1183d65316..5275ef4108 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="UserManager.cs" />
                 <include name="Main.cs" />
+                <include name="UserManager.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim.sln b/OpenSim.sln
index 4b873496ef..ca590f49fc 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@@ -41,93 +41,144 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
 EndProject
 Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+    Debug|Any CPU = Debug|Any CPU
+    Release|Any CPU = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(ProjectDependencies) = postSolution
+    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+    ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({196916AF-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({97A82740-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 9a5e5dae2c..897f70fee7 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,34 +136,34 @@
     <Compile Include="Estate\EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World\AvatarAnimations.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="World\Avatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="World\Avatar.Update.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="World\Entity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="World\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="World\SceneObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="World\World.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="World\World.PacketHandlers.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\World.Scripting.cs">
+    <Compile Include="World\Entities\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\SceneObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\Avatar\Avatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\Avatar\Avatar.Update.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\Avatar\AvatarAnimations.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="World\scripting\IScriptContext.cs">
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index d6ddf0a58b..bcfaaa7188 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,16 +13,16 @@
             <sources failonempty="true">
                 <include name="ParcelManager.cs" />
                 <include name="Estate/EstateManager.cs" />
-                <include name="World/AvatarAnimations.cs" />
-                <include name="World/Avatar.cs" />
-                <include name="World/Avatar.Update.cs" />
-                <include name="World/Entity.cs" />
-                <include name="World/Primitive.cs" />
-                <include name="World/SceneObject.cs" />
                 <include name="World/World.cs" />
                 <include name="World/World.PacketHandlers.cs" />
-                <include name="World/WorldBase.cs" />
                 <include name="World/World.Scripting.cs" />
+                <include name="World/WorldBase.cs" />
+                <include name="World/Entities/Entity.cs" />
+                <include name="World/Entities/Primitive.cs" />
+                <include name="World/Entities/SceneObject.cs" />
+                <include name="World/Entities/Avatar/Avatar.cs" />
+                <include name="World/Entities/Avatar/Avatar.Update.cs" />
+                <include name="World/Entities/Avatar/AvatarAnimations.cs" />
                 <include name="World/scripting/IScriptContext.cs" />
                 <include name="World/scripting/IScriptEntity.cs" />
                 <include name="World/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.Region/World/Avatar.Update.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Avatar.Update.cs
rename to OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs
diff --git a/OpenSim/OpenSim.Region/World/Avatar.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Avatar.cs
rename to OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs
diff --git a/OpenSim/OpenSim.Region/World/AvatarAnimations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/AvatarAnimations.cs
rename to OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
diff --git a/OpenSim/OpenSim.Region/World/Entity.cs b/OpenSim/OpenSim.Region/World/Entities/Entity.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entity.cs
rename to OpenSim/OpenSim.Region/World/Entities/Entity.cs
diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Primitive.cs
rename to OpenSim/OpenSim.Region/World/Entities/Primitive.cs
diff --git a/OpenSim/OpenSim.Region/World/SceneObject.cs b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/SceneObject.cs
rename to OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 259d839099..a6605a8926 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -154,18 +154,18 @@
     <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserConfigUtility.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="RegionServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UserConfigUtility.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Assets\AssetCache.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 32c1699dcf..42792f0af0 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -21,10 +21,10 @@
                 <include name="NetworkServersInfo.cs" />
                 <include name="OpenSimNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
-                <include name="UserConfigUtility.cs" />
-                <include name="VersionInfo.cs" />
                 <include name="RegionServerBase.cs" />
                 <include name="UDPServer.cs" />
+                <include name="UserConfigUtility.cs" />
+                <include name="VersionInfo.cs" />
                 <include name="Assets/AssetCache.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 6bcf38a629..285c5be170 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -95,6 +95,9 @@
     <Compile Include="InterpreterLogic.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="InterpreterMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="InterpreterReturn.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -119,9 +122,6 @@
     <Compile Include="Thread.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InterpreterMethods.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index 2ff51ef57c..4eff97bb6e 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -16,6 +16,7 @@
                 <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" />
@@ -24,7 +25,6 @@
                 <include name="Stack.cs" />
                 <include name="StackFrame.cs" />
                 <include name="Thread.cs" />
-                <include name="InterpreterMethods.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
                 <include name="Types/ArrayReference.cs" />
                 <include name="Types/BaseType.cs" />
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 6f92e76c40..15ae5bf313 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -90,19 +90,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UUIDParcelQuery.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UUIDPrimQuery.cs">
+    <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Db4LocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AssemblyInfo.cs">
+    <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MapStorage.cs">
+    <Compile Include="UUIDParcelQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 7fb50c80af..c2fd2bdab4 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
             </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" />
-                <include name="AssemblyInfo.cs" />
-                <include name="MapStorage.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index df6b4f4426..55efffac57 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,6 +83,9 @@
     <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>
@@ -92,25 +95,19 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
     <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">
+    <Compile Include="Core\Interfaces\IDataNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\ITarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -122,28 +119,40 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\MatchNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <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\FileNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Parse\IfContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Parse\Preprocessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\DebugTarget.cs">
@@ -152,7 +161,10 @@
     <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\AutotoolsTarget.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelopTarget.cs">
@@ -164,33 +176,21 @@
     <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\Targets\NAntTarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <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">
-      <SubType>Code</SubType>
-    </Compile>
-    <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="Core\Utilities\Helper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\Log.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 f2c8cabd40..43f5516127 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/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/OptionNodeAttribute.cs" />
                 <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Interfaces/ITarget.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/AutotoolsTarget.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.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/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="Core/Utilities/Helper.cs" />
+                <include name="Core/Utilities/Log.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">