diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/BasicPhysics/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs
similarity index 100%
rename from OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
rename to OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs
similarity index 100%
rename from OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
rename to OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
similarity index 100%
rename from OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
rename to OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
similarity index 100%
rename from OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
rename to OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActors.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSActors.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraint.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraint.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraint6Dof.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraint6Dof.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraintCollection.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraintCollection.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintConeTwist.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraintConeTwist.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraintConeTwist.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraintConeTwist.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraintHinge.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraintHinge.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSlider.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraintSlider.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraintSlider.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraintSlider.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraintSpring.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSConstraintSpring.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSLinksetCompound.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/PhysicsModules/BulletS/BSLinksetConstraints.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSLinksetConstraints.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs b/OpenSim/Region/PhysicsModules/BulletS/BSMaterials.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSMaterials.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/PhysicsModules/BulletS/BSMotors.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSMotors.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSParam.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/PhysicsModules/BulletS/BulletSimData.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
rename to OpenSim/Region/PhysicsModules/BulletS/BulletSimData.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/PhysicsModules/BulletS/BulletSimTODO.txt
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
rename to OpenSim/Region/PhysicsModules/BulletS/BulletSimTODO.txt
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/BulletS/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/BulletS/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
rename to OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTests.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTests.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTests.cs
rename to OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTests.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/Tests/BulletSimTestsUtil.cs
rename to OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs
similarity index 100%
rename from OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
rename to OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/CTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/CTri.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Concavity.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/Concavity.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/ConvexBuilder.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/ConvexBuilder.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/ConvexDecomposition.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/ConvexDecomposition.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/ConvexResult.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/ConvexResult.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/HullClasses.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/HullClasses.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/HullTriangle.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/HullTriangle.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/HullUtils.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/HullUtils.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/LICENSE.txt b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/LICENSE.txt
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/LICENSE.txt
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/LICENSE.txt
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Plane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/Plane.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/PlaneTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/PlaneTri.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Quaternion.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/Quaternion.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/README.txt b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/README.txt
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/README.txt
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/README.txt
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/SplitPlane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/SplitPlane.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/VertexLookup.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/VertexLookup.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/float2.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/float2.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/float3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/float3.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/float3x3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/float3x3.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/float4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/float4.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/float4x4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/float4x4.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/int3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/int3.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/int4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
similarity index 100%
rename from OpenSim/Region/Physics/ConvexDecompositionDotNet/int4.cs
rename to OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
diff --git a/OpenSim/Region/Physics/Meshing/HelperTypes.cs b/OpenSim/Region/PhysicsModules/Meshing/HelperTypes.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/HelperTypes.cs
rename to OpenSim/Region/PhysicsModules/Meshing/HelperTypes.cs
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/PhysicsModules/Meshing/Mesh.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/Mesh.cs
rename to OpenSim/Region/PhysicsModules/Meshing/Mesh.cs
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/Meshmerizer.cs
rename to OpenSim/Region/PhysicsModules/Meshing/Meshmerizer.cs
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/PhysicsModules/Meshing/PrimMesher.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/PrimMesher.cs
rename to OpenSim/Region/PhysicsModules/Meshing/PrimMesher.cs
diff --git a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/Meshing/SculptMap.cs b/OpenSim/Region/PhysicsModules/Meshing/SculptMap.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/SculptMap.cs
rename to OpenSim/Region/PhysicsModules/Meshing/SculptMap.cs
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/PhysicsModules/Meshing/SculptMesh.cs
similarity index 100%
rename from OpenSim/Region/Physics/Meshing/SculptMesh.cs
rename to OpenSim/Region/PhysicsModules/Meshing/SculptMesh.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Ode/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/Ode/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
rename to OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.c_comments b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.c_comments
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/ODEDynamics.c_comments
rename to OpenSim/Region/PhysicsModules/Ode/ODEDynamics.c_comments
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
rename to OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
rename to OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
rename to OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
rename to OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
rename to OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/OdeScene.cs
rename to OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
rename to OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
diff --git a/OpenSim/Region/Physics/OdePlugin/drawstuff.cs b/OpenSim/Region/PhysicsModules/Ode/drawstuff.cs
similarity index 100%
rename from OpenSim/Region/Physics/OdePlugin/drawstuff.cs
rename to OpenSim/Region/PhysicsModules/Ode/drawstuff.cs
diff --git a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
similarity index 100%
rename from OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
rename to OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/PhysicsModules/POS/POSPlugin.cs
similarity index 100%
rename from OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
rename to OpenSim/Region/PhysicsModules/POS/POSPlugin.cs
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs
similarity index 100%
rename from OpenSim/Region/Physics/POSPlugin/POSPrim.cs
rename to OpenSim/Region/PhysicsModules/POS/POSPrim.cs
diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/PhysicsModules/POS/POSScene.cs
similarity index 100%
rename from OpenSim/Region/Physics/POSPlugin/POSScene.cs
rename to OpenSim/Region/PhysicsModules/POS/POSScene.cs
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/SharedBase/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/AssemblyInfo.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/AssemblyInfo.cs
diff --git a/OpenSim/Region/Physics/Manager/CollisionLocker.cs b/OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/CollisionLocker.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/IMesher.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs
diff --git a/OpenSim/Region/Physics/Manager/IPhysicsParameters.cs b/OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/IPhysicsParameters.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs
diff --git a/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/PhysicsActor.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
diff --git a/OpenSim/Region/Physics/Manager/PhysicsJoint.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/PhysicsJoint.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/PhysicsScene.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
diff --git a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/PhysicsSensor.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/PhysicsVector.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs
diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/VehicleConstants.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs
similarity index 100%
rename from OpenSim/Region/Physics/Manager/ZeroMesher.cs
rename to OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs
diff --git a/prebuild.xml b/prebuild.xml
index b5ebed1958..f1ab322929 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -410,7 +410,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -438,7 +438,7 @@
     </Project>
 
     <!-- Physics Plug-ins -->
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/Physics/BasicPhysics" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -455,13 +455,13 @@
       <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
       <Reference name="Nini" path="../../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.POS" path="OpenSim/Region/PhysicsModules/POS" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -478,13 +478,13 @@
       <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
       <Reference name="Nini" path="../../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.Ode" path="OpenSim/Region/PhysicsModules/Ode" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -503,7 +503,7 @@
       <Reference name="Nini" path="../../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="Ode.NET" path="../../../../bin/"/>
       <Reference name="log4net" path="../../../../bin/"/>
 
@@ -514,7 +514,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -536,7 +536,7 @@
       <Reference name="Nini" path="../../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="log4net" path="../../../../bin/"/>
 
       <Files>
@@ -653,7 +653,7 @@
       <Reference name="OpenSim.Framework.Serialization"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
 
       <!-- For scripting in funny languages by default -->
       <Reference name="XMLRPC" path="../../../bin/"/>
@@ -1507,7 +1507,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
@@ -1594,7 +1594,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="Mono.Addins" path="../../../../../bin/"/>
       <Reference name="Nini" path="../../../../../bin/"/>
@@ -1648,7 +1648,7 @@
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
       <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Server.Handlers"/>
       <Reference name="OpenSim.Services.Connectors"/>
@@ -1700,7 +1700,7 @@
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Server.Handlers"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="Nini" path="../../../bin/"/>
@@ -1749,7 +1749,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
       <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Server.Handlers"/>
       <Reference name="OpenSim.Services.Connectors"/>
@@ -1801,7 +1801,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -1826,7 +1826,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BulletS" path="OpenSim/Region/PhysicsModules/BulletS" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -1852,9 +1852,9 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../bin/Physics/"/>
-      <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
+      <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/Physics/"/>
+      <Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
 
@@ -1897,7 +1897,7 @@
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.ClientStack"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Base"/>
       <Reference name="OpenSim.Services.Interfaces"/>
@@ -2270,7 +2270,7 @@
       <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Services.Interfaces"/>
 	  <Reference name="OpenSim.Services.Connectors"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -2464,7 +2464,7 @@
       <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
       <Reference name="Mono.Addins" path="../../../bin/"/>
 
@@ -2729,7 +2729,7 @@
       <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Interfaces"/>
@@ -3056,7 +3056,7 @@
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
       <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
       <Reference name="OpenSim.Services.Interfaces"/>
@@ -3136,7 +3136,7 @@
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
       <Reference name="OpenSim.Services.AvatarService"/>
       <Reference name="OpenSim.Services.Interfaces"/>
@@ -3204,7 +3204,7 @@
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
       <Reference name="OpenSim.Services.Interfaces"/>
 
       <!-- Unit tests -->
@@ -3369,7 +3369,7 @@
            TODO: this is kind of lame, we basically build a duplicate
            assembly but with tests added in, just because we can't resolve cross-bin-dir-refs.
       -->
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.Ode.Tests" path="OpenSim/Region/PhysicsModules/Ode/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3388,8 +3388,8 @@
       <Reference name="Nini" path="../../../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.OdePlugin" path="../../../../../bin/Physics/"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
+      <Reference name="OpenSim.Region.PhysicsModule.Ode" path="../../../../../bin/Physics/"/>
       <Reference name="OpenSim.Tests.Common"/>
       <Reference name="Ode.NET" path="../../../../../bin/"/>
       <Reference name="nunit.framework" path="../../../../../bin/"/>
@@ -3400,7 +3400,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BulletS.Tests" path="OpenSim/Region/PhysicsModules/BulletS/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3424,9 +3424,9 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Tests.Common"/>
       <Reference name="OpenSim.Region.CoreModules"/>
-      <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../../bin/Physics/"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.BulletSPlugin" path="../../../../../bin/Physics/"/>
+      <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../../bin/Physics/"/>
+      <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
+      <Reference name="OpenSim.Region.PhysicsModule.BulletS" path="../../../../../bin/Physics/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="false"/>