diff --git a/OpenSim.sln b/OpenSim.sln
index ac2cefcd3b..746cd3ddc4 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communicatio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
@@ -38,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdeP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Simulation", "OpenSim\Region\Simulation\OpenSim.Region.Simulation.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}"
@@ -108,6 +108,10 @@ Global
 		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -132,10 +136,6 @@ Global
 		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 7f71949121..3e77f1ebf0 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,10 +91,10 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Logger.cs">
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index d5730a48ed..8e50e92329 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -144,15 +144,15 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
+      <Name>OpenSim.Region.Environment</Name>
+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj">
-      <Name>OpenSim.Region.Simulation</Name>
-      <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49104..f9f6b7d824 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="CommunicationsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 8cc5641831..1aa7019541 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGSUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGS1GridServices.cs">
+    <Compile Include="GridCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSInterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGSUserServices.cs">
+    <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 03805ae070..2eb5ac03e8 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -122,15 +122,15 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
-      <Name>OpenSim.Region.GridInterfaces.Local</Name>
-      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
+      <Name>OpenSim.Region.Environment</Name>
+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj">
-      <Name>OpenSim.Region.Simulation</Name>
-      <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
+      <Name>OpenSim.Region.GridInterfaces.Local</Name>
+      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
index 0597857e82..60305bd2d4 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
@@ -1,13 +1,12 @@
-<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>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region.Environment</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Region.Environment</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,31 +55,30 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll">
+    <Reference Include="Axiom.MathLib.dll" >
       <HintPath>..\..\..\bin\Axiom.MathLib.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>
-    <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="XMLRPC.dll">
+    <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -95,53 +88,53 @@
       <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="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\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>
     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
       <Name>OpenSim.Framework.GenericConfig.Xml</Name>
       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
       <Name>OpenSim.Region.Caches</Name>
       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
       <Name>OpenSim.Region.Physics.Manager</Name>
       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
       <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
       <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Caps.cs">
+    <Compile Include="RegionManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="EstateManager.cs">
@@ -150,58 +143,58 @@
     <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionManager.cs">
+    <Compile Include="Caps.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\Scene.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptContext.cs">
+    <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptEntity.cs">
+    <Compile Include="Scenes\SceneBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\IScriptHandler.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Scenes\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+    <Compile Include="Scenes\scripting\IScriptEntity.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
@@ -215,4 +208,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/prebuild.xml b/prebuild.xml
index efd114dbf1..2488587f08 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -584,7 +584,7 @@
 
 
 
-    <Project name="OpenSim.Region.Simulation" path="OpenSim/Region/Simulation" type="Library">
+    <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Simulation" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -641,7 +641,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
-	<Reference name="OpenSim.Region.Simulation"/>
+	<Reference name="OpenSim.Region.Environment"/>
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
 	<Reference name="OpenSim.Framework.Communications"/>
@@ -686,7 +686,7 @@
 <Reference name="OpenSim.Region.Communications.Local"/>      
       <Reference name="OpenSim.Region.Caches"/>
       <Reference name="OpenSim.Region.ClientStack"/>
-      <Reference name="OpenSim.Region.Simulation"/>
+      <Reference name="OpenSim.Region.Environment"/>
       
 
       <Files>