diff --git a/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build b/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build
new file mode 100644
index 0000000000..6844aa759d
--- /dev/null
+++ b/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Caches" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Caches" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssetCache.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 3e3f6171db..4447819650 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.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>{196916AF-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Region</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,27 +55,26 @@
     <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="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>
@@ -91,49 +84,49 @@
       <Name>OpenSim.Terrain.BasicTerrain</Name>
       <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
       <Name>OpenSim.GenericConfig.Xml</Name>
       <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
       <Name>OpenSim.Physics.Manager</Name>
       <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
       <Name>OpenSim.Servers</Name>
       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
       <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="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
       <Name>OpenGrid.Framework.Communications</Name>
       <Project>{683344D5-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -155,6 +148,15 @@
     <Compile Include="World\WorldBase.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="World\Entities\Avatar.Animations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\Avatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World\Entities\Avatar.Update.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="World\Entities\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -164,15 +166,6 @@
     <Compile Include="World\Entities\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World\Entities\Avatar\Avatar.Animations.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\scripting\IScriptContext.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -192,9 +185,6 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="World\types\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PreBuildEvent>
@@ -202,4 +192,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index e87c029a3b..f0d1a3401f 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -17,20 +17,18 @@
                 <include name="World/World.PacketHandlers.cs" />
                 <include name="World/World.Scripting.cs" />
                 <include name="World/WorldBase.cs" />
+                <include name="World/Entities/Avatar.Animations.cs" />
+                <include name="World/Entities/Avatar.cs" />
+                <include name="World/Entities/Avatar.Update.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.Animations.cs" />
-                <include name="World/Entities/Avatar/Avatar.cs" />
-                <include name="World/Entities/Avatar/Avatar.Update.cs" />
                 <include name="World/scripting/IScriptContext.cs" />
                 <include name="World/scripting/IScriptEntity.cs" />
                 <include name="World/scripting/IScriptHandler.cs" />
                 <include name="World/scripting/Script.cs" />
                 <include name="World/scripting/ScriptFactory.cs" />
                 <include name="World/scripting/Scripts/FollowRandomAvatar.cs" />
-                <include name="World/types/Mesh.cs" />
-                <include name="World/types/Triangle.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar.Animations.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Animations.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entities/Avatar.Animations.cs
rename to OpenSim/OpenSim.Region/Scene/Entities/Avatar.Animations.cs
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Update.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entities/Avatar.Update.cs
rename to OpenSim/OpenSim.Region/Scene/Entities/Avatar.Update.cs
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entities/Avatar.cs
rename to OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
diff --git a/OpenSim/OpenSim.Region/World/Entities/Entity.cs b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entities/Entity.cs
rename to OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
diff --git a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entities/Primitive.cs
rename to OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
diff --git a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
rename to OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
diff --git a/OpenSim/OpenSim.Region/World/World.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/World.PacketHandlers.cs
rename to OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
diff --git a/OpenSim/OpenSim.Region/World/World.Scripting.cs b/OpenSim/OpenSim.Region/Scene/World.Scripting.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/World.Scripting.cs
rename to OpenSim/OpenSim.Region/Scene/World.Scripting.cs
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/Scene/World.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/World.cs
rename to OpenSim/OpenSim.Region/Scene/World.cs
diff --git a/OpenSim/OpenSim.Region/World/WorldBase.cs b/OpenSim/OpenSim.Region/Scene/WorldBase.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/WorldBase.cs
rename to OpenSim/OpenSim.Region/Scene/WorldBase.cs
diff --git a/OpenSim/OpenSim.Region/World/scripting/IScriptContext.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptContext.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/scripting/IScriptContext.cs
rename to OpenSim/OpenSim.Region/Scene/scripting/IScriptContext.cs
diff --git a/OpenSim/OpenSim.Region/World/scripting/IScriptEntity.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptEntity.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/scripting/IScriptEntity.cs
rename to OpenSim/OpenSim.Region/Scene/scripting/IScriptEntity.cs
diff --git a/OpenSim/OpenSim.Region/World/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/scripting/IScriptHandler.cs
rename to OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
diff --git a/OpenSim/OpenSim.Region/World/scripting/Script.cs b/OpenSim/OpenSim.Region/Scene/scripting/Script.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/scripting/Script.cs
rename to OpenSim/OpenSim.Region/Scene/scripting/Script.cs
diff --git a/OpenSim/OpenSim.Region/World/scripting/ScriptFactory.cs b/OpenSim/OpenSim.Region/Scene/scripting/ScriptFactory.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/scripting/ScriptFactory.cs
rename to OpenSim/OpenSim.Region/Scene/scripting/ScriptFactory.cs
diff --git a/OpenSim/OpenSim.Region/World/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.Region/Scene/scripting/Scripts/FollowRandomAvatar.cs
similarity index 100%
rename from OpenSim/OpenSim.Region/World/scripting/Scripts/FollowRandomAvatar.cs
rename to OpenSim/OpenSim.Region/Scene/scripting/Scripts/FollowRandomAvatar.cs