19 files changed, 71 insertions, 71 deletions
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 177c49d..177c49d 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 341ffbb..dcb8f3b 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenSim.Physics.Manager;
-namespace OpenSim.Physics.BasicPhysicsPlugin
+namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 {
        /// <summary>
        /// Will be the PhysX plugin but for now will be a very basic physics engine
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
index f88eb32..7dad533 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4F874463-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{15B4FEF3-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.BasicPhysicsPlugin</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.BasicPhysicsPlugin</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.BasicPhysicsPlugin</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.BasicPhysicsPlugin</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -68,9 +68,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
index 00ca3f9..6cf26ca 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build">
+<project name="OpenSim.Region.Physics.BasicPhysicsPlugin" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </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.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -19,14 +19,14 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 132f64a..132f64a 100644
--- a/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
index 347a649..f340400 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8BE16150-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{F4FF31EB-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.Manager</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.Manager</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.Manager</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.Manager</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,13 +72,13 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+    <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>
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
index fc3e1e6..4b7ce81 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.Manager" default="build">
+<project name="OpenSim.Region.Physics.Manager" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </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.Physics.Manager" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.Manager" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -22,16 +22,16 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
-        <copy todir="${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"/>
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 6366fb8..6366fb8 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index efccb36..efccb36 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 0901c2f..0901c2f 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
index 888dbb5..888dbb5 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
index b49c8da..b49c8da 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 5233042..8aca851 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Physics.Manager;
 using Ode.NET;
-namespace OpenSim.Physics.OdePlugin
+namespace OpenSim.Region.Physics.OdePlugin
 {
    /// <summary>
    /// ODE plugin 
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
index 08f54aa..490c681 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{63A05FE9-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{90620634-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.OdePlugin</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.OdePlugin</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.OdePlugin</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.OdePlugin</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Ode.NET.dll" >
-      <HintPath>..\..\..\bin\Ode.NET.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Ode.NET.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,9 +72,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
index c93c0c2..07b9386 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.OdePlugin" default="build">
+<project name="OpenSim.Region.Physics.OdePlugin" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </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.Physics.OdePlugin" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.OdePlugin" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -19,15 +19,15 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/Ode.NET.dll" />
+                <include name="../../../../bin/Ode.NET.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
index b49c8da..b49c8da 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
index aa89cc1..77da908 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{988F0AC4-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{A6D191D8-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName>
+    <AssemblyName>OpenSim.Region.Physics.PhysXPlugin</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace>
+    <RootNamespace>OpenSim.Region.Physics.PhysXPlugin</RootNamespace>
    <StartupObject></StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -32,7 +32,7 @@
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
    <RegisterForComInterop>False</RegisterForComInterop>
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="PhysX_Wrapper_Dotnet.dll" >
-      <HintPath>..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
+      <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -72,9 +72,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Physics.Manager</Name>
+      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
index be7a847..c1a9608 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="OpenSim.Physics.PhysXPlugin" default="build">
+<project name="OpenSim.Region.Physics.PhysXPlugin" default="build">
    <target name="build">
        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
            </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.Physics.PhysXPlugin" dynamicprefix="true" >
+            <resources prefix="OpenSim.Region.Physics.PhysXPlugin" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
@@ -19,15 +19,15 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Axiom.MathLib.dll" />
-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
-                <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" />
+                <include name="../../../../bin/PhysX_Wrapper_Dotnet.dll" />
                <include name="System.dll" />
            </references>
        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
                <include name="*.dll"/>
                <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 200b232..8bf794b 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Physics.Manager;
 using PhysXWrapper;
-namespace OpenSim.Physics.PhysXPlugin
+namespace OpenSim.Region.Physics.PhysXPlugin
 {
        /// <summary>
        /// Will be the PhysX plugin but for now will be a very basic physics engine