diff --git a/BulletSharpPInvoke/BulletSharpPInvoke.csproj b/BulletSharp/BulletSharp.csproj similarity index 100% rename from BulletSharpPInvoke/BulletSharpPInvoke.csproj rename to BulletSharp/BulletSharp.csproj diff --git a/BulletSharpPInvoke/BulletSharp.dll.config b/BulletSharp/BulletSharp.dll.config similarity index 100% rename from BulletSharpPInvoke/BulletSharp.dll.config rename to BulletSharp/BulletSharp.dll.config diff --git a/BulletSharpPInvoke/BulletSharpPInvoke.sln b/BulletSharp/BulletSharp.sln similarity index 89% rename from BulletSharpPInvoke/BulletSharpPInvoke.sln rename to BulletSharp/BulletSharp.sln index 4342c0a4..d693d90f 100644 --- a/BulletSharpPInvoke/BulletSharpPInvoke.sln +++ b/BulletSharp/BulletSharp.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BulletSharpPInvoke", "BulletSharpPInvoke.csproj", "{76FDED5B-2C12-453E-B499-CB669E55AD5B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BulletSharp", "BulletSharp.csproj", "{76FDED5B-2C12-453E-B499-CB669E55AD5B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/BulletSharpPInvoke/Collision/ActivatingCollisionAlgorithm.cs b/BulletSharp/Collision/ActivatingCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ActivatingCollisionAlgorithm.cs rename to BulletSharp/Collision/ActivatingCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/AxisSweep3.cs b/BulletSharp/Collision/AxisSweep3.cs similarity index 100% rename from BulletSharpPInvoke/Collision/AxisSweep3.cs rename to BulletSharp/Collision/AxisSweep3.cs diff --git a/BulletSharpPInvoke/Collision/Box2DBox2DCollisionAlgorithm.cs b/BulletSharp/Collision/Box2DBox2DCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/Box2DBox2DCollisionAlgorithm.cs rename to BulletSharp/Collision/Box2DBox2DCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/Box2DShape.cs b/BulletSharp/Collision/Box2DShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/Box2DShape.cs rename to BulletSharp/Collision/Box2DShape.cs diff --git a/BulletSharpPInvoke/Collision/BoxBoxCollisionAlgorithm.cs b/BulletSharp/Collision/BoxBoxCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/BoxBoxCollisionAlgorithm.cs rename to BulletSharp/Collision/BoxBoxCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/BoxBoxDetector.cs b/BulletSharp/Collision/BoxBoxDetector.cs similarity index 100% rename from BulletSharpPInvoke/Collision/BoxBoxDetector.cs rename to BulletSharp/Collision/BoxBoxDetector.cs diff --git a/BulletSharpPInvoke/Collision/BoxShape.cs b/BulletSharp/Collision/BoxShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/BoxShape.cs rename to BulletSharp/Collision/BoxShape.cs diff --git a/BulletSharpPInvoke/Collision/BroadphaseInterface.cs b/BulletSharp/Collision/BroadphaseInterface.cs similarity index 100% rename from BulletSharpPInvoke/Collision/BroadphaseInterface.cs rename to BulletSharp/Collision/BroadphaseInterface.cs diff --git a/BulletSharpPInvoke/Collision/BroadphaseProxy.cs b/BulletSharp/Collision/BroadphaseProxy.cs similarity index 100% rename from BulletSharpPInvoke/Collision/BroadphaseProxy.cs rename to BulletSharp/Collision/BroadphaseProxy.cs diff --git a/BulletSharpPInvoke/Collision/BvhTriangleMeshShape.cs b/BulletSharp/Collision/BvhTriangleMeshShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/BvhTriangleMeshShape.cs rename to BulletSharp/Collision/BvhTriangleMeshShape.cs diff --git a/BulletSharpPInvoke/Collision/CapsuleShape.cs b/BulletSharp/Collision/CapsuleShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CapsuleShape.cs rename to BulletSharp/Collision/CapsuleShape.cs diff --git a/BulletSharpPInvoke/Collision/CollisionAlgorithm.cs b/BulletSharp/Collision/CollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionAlgorithm.cs rename to BulletSharp/Collision/CollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/CollisionConfiguration.cs b/BulletSharp/Collision/CollisionConfiguration.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionConfiguration.cs rename to BulletSharp/Collision/CollisionConfiguration.cs diff --git a/BulletSharpPInvoke/Collision/CollisionCreateFunc.cs b/BulletSharp/Collision/CollisionCreateFunc.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionCreateFunc.cs rename to BulletSharp/Collision/CollisionCreateFunc.cs diff --git a/BulletSharpPInvoke/Collision/CollisionDispatcher.cs b/BulletSharp/Collision/CollisionDispatcher.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionDispatcher.cs rename to BulletSharp/Collision/CollisionDispatcher.cs diff --git a/BulletSharpPInvoke/Collision/CollisionDispatcherMultiThreaded.cs b/BulletSharp/Collision/CollisionDispatcherMultiThreaded.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionDispatcherMultiThreaded.cs rename to BulletSharp/Collision/CollisionDispatcherMultiThreaded.cs diff --git a/BulletSharpPInvoke/Collision/CollisionObject.cs b/BulletSharp/Collision/CollisionObject.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionObject.cs rename to BulletSharp/Collision/CollisionObject.cs diff --git a/BulletSharpPInvoke/Collision/CollisionObjectWrapper.cs b/BulletSharp/Collision/CollisionObjectWrapper.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionObjectWrapper.cs rename to BulletSharp/Collision/CollisionObjectWrapper.cs diff --git a/BulletSharpPInvoke/Collision/CollisionShape.cs b/BulletSharp/Collision/CollisionShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionShape.cs rename to BulletSharp/Collision/CollisionShape.cs diff --git a/BulletSharpPInvoke/Collision/CollisionWorld.cs b/BulletSharp/Collision/CollisionWorld.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CollisionWorld.cs rename to BulletSharp/Collision/CollisionWorld.cs diff --git a/BulletSharpPInvoke/Collision/CompoundCollisionAlgorithm.cs b/BulletSharp/Collision/CompoundCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CompoundCollisionAlgorithm.cs rename to BulletSharp/Collision/CompoundCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/CompoundCompoundCollisionAlgorithm.cs b/BulletSharp/Collision/CompoundCompoundCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CompoundCompoundCollisionAlgorithm.cs rename to BulletSharp/Collision/CompoundCompoundCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/CompoundShape.cs b/BulletSharp/Collision/CompoundShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CompoundShape.cs rename to BulletSharp/Collision/CompoundShape.cs diff --git a/BulletSharpPInvoke/Collision/ConcaveShape.cs b/BulletSharp/Collision/ConcaveShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConcaveShape.cs rename to BulletSharp/Collision/ConcaveShape.cs diff --git a/BulletSharpPInvoke/Collision/ConeShape.cs b/BulletSharp/Collision/ConeShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConeShape.cs rename to BulletSharp/Collision/ConeShape.cs diff --git a/BulletSharpPInvoke/Collision/ContinuousConvexCollision.cs b/BulletSharp/Collision/ContinuousConvexCollision.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ContinuousConvexCollision.cs rename to BulletSharp/Collision/ContinuousConvexCollision.cs diff --git a/BulletSharpPInvoke/Collision/Convex2DConvex2DAlgorithm.cs b/BulletSharp/Collision/Convex2DConvex2DAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/Convex2DConvex2DAlgorithm.cs rename to BulletSharp/Collision/Convex2DConvex2DAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/Convex2DShape.cs b/BulletSharp/Collision/Convex2DShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/Convex2DShape.cs rename to BulletSharp/Collision/Convex2DShape.cs diff --git a/BulletSharpPInvoke/Collision/ConvexCast.cs b/BulletSharp/Collision/ConvexCast.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexCast.cs rename to BulletSharp/Collision/ConvexCast.cs diff --git a/BulletSharpPInvoke/Collision/ConvexConcaveCollisionAlgorithm.cs b/BulletSharp/Collision/ConvexConcaveCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexConcaveCollisionAlgorithm.cs rename to BulletSharp/Collision/ConvexConcaveCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/ConvexConvexAlgorithm.cs b/BulletSharp/Collision/ConvexConvexAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexConvexAlgorithm.cs rename to BulletSharp/Collision/ConvexConvexAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/ConvexHullShape.cs b/BulletSharp/Collision/ConvexHullShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexHullShape.cs rename to BulletSharp/Collision/ConvexHullShape.cs diff --git a/BulletSharpPInvoke/Collision/ConvexInternalShape.cs b/BulletSharp/Collision/ConvexInternalShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexInternalShape.cs rename to BulletSharp/Collision/ConvexInternalShape.cs diff --git a/BulletSharpPInvoke/Collision/ConvexPenetrationDepthSolver.cs b/BulletSharp/Collision/ConvexPenetrationDepthSolver.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexPenetrationDepthSolver.cs rename to BulletSharp/Collision/ConvexPenetrationDepthSolver.cs diff --git a/BulletSharpPInvoke/Collision/ConvexPlaneCollisionAlgorithm.cs b/BulletSharp/Collision/ConvexPlaneCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexPlaneCollisionAlgorithm.cs rename to BulletSharp/Collision/ConvexPlaneCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/ConvexPointCloudShape.cs b/BulletSharp/Collision/ConvexPointCloudShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexPointCloudShape.cs rename to BulletSharp/Collision/ConvexPointCloudShape.cs diff --git a/BulletSharpPInvoke/Collision/ConvexPolyhedron.cs b/BulletSharp/Collision/ConvexPolyhedron.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexPolyhedron.cs rename to BulletSharp/Collision/ConvexPolyhedron.cs diff --git a/BulletSharpPInvoke/Collision/ConvexShape.cs b/BulletSharp/Collision/ConvexShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexShape.cs rename to BulletSharp/Collision/ConvexShape.cs diff --git a/BulletSharpPInvoke/Collision/ConvexTriangleMeshShape.cs b/BulletSharp/Collision/ConvexTriangleMeshShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ConvexTriangleMeshShape.cs rename to BulletSharp/Collision/ConvexTriangleMeshShape.cs diff --git a/BulletSharpPInvoke/Collision/CylinderShape.cs b/BulletSharp/Collision/CylinderShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/CylinderShape.cs rename to BulletSharp/Collision/CylinderShape.cs diff --git a/BulletSharpPInvoke/Collision/Dbvt.cs b/BulletSharp/Collision/Dbvt.cs similarity index 100% rename from BulletSharpPInvoke/Collision/Dbvt.cs rename to BulletSharp/Collision/Dbvt.cs diff --git a/BulletSharpPInvoke/Collision/DbvtBroadphase.cs b/BulletSharp/Collision/DbvtBroadphase.cs similarity index 100% rename from BulletSharpPInvoke/Collision/DbvtBroadphase.cs rename to BulletSharp/Collision/DbvtBroadphase.cs diff --git a/BulletSharpPInvoke/Collision/DefaultCollisionConfiguration.cs b/BulletSharp/Collision/DefaultCollisionConfiguration.cs similarity index 100% rename from BulletSharpPInvoke/Collision/DefaultCollisionConfiguration.cs rename to BulletSharp/Collision/DefaultCollisionConfiguration.cs diff --git a/BulletSharpPInvoke/Collision/DiscreteCollisionDetectorInterface.cs b/BulletSharp/Collision/DiscreteCollisionDetectorInterface.cs similarity index 100% rename from BulletSharpPInvoke/Collision/DiscreteCollisionDetectorInterface.cs rename to BulletSharp/Collision/DiscreteCollisionDetectorInterface.cs diff --git a/BulletSharpPInvoke/Collision/Dispatcher.cs b/BulletSharp/Collision/Dispatcher.cs similarity index 100% rename from BulletSharpPInvoke/Collision/Dispatcher.cs rename to BulletSharp/Collision/Dispatcher.cs diff --git a/BulletSharpPInvoke/Collision/EmptyCollisionAlgorithm.cs b/BulletSharp/Collision/EmptyCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/EmptyCollisionAlgorithm.cs rename to BulletSharp/Collision/EmptyCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/EmptyShape.cs b/BulletSharp/Collision/EmptyShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/EmptyShape.cs rename to BulletSharp/Collision/EmptyShape.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/BoxCollision.cs b/BulletSharp/Collision/GImpact/BoxCollision.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/BoxCollision.cs rename to BulletSharp/Collision/GImpact/BoxCollision.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/CompoundFromGImpact.cs b/BulletSharp/Collision/GImpact/CompoundFromGImpact.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/CompoundFromGImpact.cs rename to BulletSharp/Collision/GImpact/CompoundFromGImpact.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/GImpactBvh.cs b/BulletSharp/Collision/GImpact/GImpactBvh.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/GImpactBvh.cs rename to BulletSharp/Collision/GImpact/GImpactBvh.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/GImpactCollisionAlgorithm.cs b/BulletSharp/Collision/GImpact/GImpactCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/GImpactCollisionAlgorithm.cs rename to BulletSharp/Collision/GImpact/GImpactCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/GImpactQuantizedBvh.cs b/BulletSharp/Collision/GImpact/GImpactQuantizedBvh.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/GImpactQuantizedBvh.cs rename to BulletSharp/Collision/GImpact/GImpactQuantizedBvh.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/GImpactShape.cs b/BulletSharp/Collision/GImpact/GImpactShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/GImpactShape.cs rename to BulletSharp/Collision/GImpact/GImpactShape.cs diff --git a/BulletSharpPInvoke/Collision/GImpact/TriangleShapeEx.cs b/BulletSharp/Collision/GImpact/TriangleShapeEx.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GImpact/TriangleShapeEx.cs rename to BulletSharp/Collision/GImpact/TriangleShapeEx.cs diff --git a/BulletSharpPInvoke/Collision/GhostObject.cs b/BulletSharp/Collision/GhostObject.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GhostObject.cs rename to BulletSharp/Collision/GhostObject.cs diff --git a/BulletSharpPInvoke/Collision/GjkConvexCast.cs b/BulletSharp/Collision/GjkConvexCast.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GjkConvexCast.cs rename to BulletSharp/Collision/GjkConvexCast.cs diff --git a/BulletSharpPInvoke/Collision/GjkEpaPenetrationDepthSolver.cs b/BulletSharp/Collision/GjkEpaPenetrationDepthSolver.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GjkEpaPenetrationDepthSolver.cs rename to BulletSharp/Collision/GjkEpaPenetrationDepthSolver.cs diff --git a/BulletSharpPInvoke/Collision/GjkPairDetector.cs b/BulletSharp/Collision/GjkPairDetector.cs similarity index 100% rename from BulletSharpPInvoke/Collision/GjkPairDetector.cs rename to BulletSharp/Collision/GjkPairDetector.cs diff --git a/BulletSharpPInvoke/Collision/HeightfieldTerrainShape.cs b/BulletSharp/Collision/HeightfieldTerrainShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/HeightfieldTerrainShape.cs rename to BulletSharp/Collision/HeightfieldTerrainShape.cs diff --git a/BulletSharpPInvoke/Collision/ManifoldPoint.cs b/BulletSharp/Collision/ManifoldPoint.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ManifoldPoint.cs rename to BulletSharp/Collision/ManifoldPoint.cs diff --git a/BulletSharpPInvoke/Collision/ManifoldResult.cs b/BulletSharp/Collision/ManifoldResult.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ManifoldResult.cs rename to BulletSharp/Collision/ManifoldResult.cs diff --git a/BulletSharpPInvoke/Collision/MinkowskiPenetrationDepthSolver.cs b/BulletSharp/Collision/MinkowskiPenetrationDepthSolver.cs similarity index 100% rename from BulletSharpPInvoke/Collision/MinkowskiPenetrationDepthSolver.cs rename to BulletSharp/Collision/MinkowskiPenetrationDepthSolver.cs diff --git a/BulletSharpPInvoke/Collision/MinkowskiSumShape.cs b/BulletSharp/Collision/MinkowskiSumShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/MinkowskiSumShape.cs rename to BulletSharp/Collision/MinkowskiSumShape.cs diff --git a/BulletSharpPInvoke/Collision/MultiSphereShape.cs b/BulletSharp/Collision/MultiSphereShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/MultiSphereShape.cs rename to BulletSharp/Collision/MultiSphereShape.cs diff --git a/BulletSharpPInvoke/Collision/MultimaterialTriangleMeshShape.cs b/BulletSharp/Collision/MultimaterialTriangleMeshShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/MultimaterialTriangleMeshShape.cs rename to BulletSharp/Collision/MultimaterialTriangleMeshShape.cs diff --git a/BulletSharpPInvoke/Collision/OptimizedBvh.cs b/BulletSharp/Collision/OptimizedBvh.cs similarity index 100% rename from BulletSharpPInvoke/Collision/OptimizedBvh.cs rename to BulletSharp/Collision/OptimizedBvh.cs diff --git a/BulletSharpPInvoke/Collision/OverlappingPairCache.cs b/BulletSharp/Collision/OverlappingPairCache.cs similarity index 100% rename from BulletSharpPInvoke/Collision/OverlappingPairCache.cs rename to BulletSharp/Collision/OverlappingPairCache.cs diff --git a/BulletSharpPInvoke/Collision/OverlappingPairCallback.cs b/BulletSharp/Collision/OverlappingPairCallback.cs similarity index 100% rename from BulletSharpPInvoke/Collision/OverlappingPairCallback.cs rename to BulletSharp/Collision/OverlappingPairCallback.cs diff --git a/BulletSharpPInvoke/Collision/PersistentManifold.cs b/BulletSharp/Collision/PersistentManifold.cs similarity index 100% rename from BulletSharpPInvoke/Collision/PersistentManifold.cs rename to BulletSharp/Collision/PersistentManifold.cs diff --git a/BulletSharpPInvoke/Collision/PointCollector.cs b/BulletSharp/Collision/PointCollector.cs similarity index 100% rename from BulletSharpPInvoke/Collision/PointCollector.cs rename to BulletSharp/Collision/PointCollector.cs diff --git a/BulletSharpPInvoke/Collision/PolyhedralConvexShape.cs b/BulletSharp/Collision/PolyhedralConvexShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/PolyhedralConvexShape.cs rename to BulletSharp/Collision/PolyhedralConvexShape.cs diff --git a/BulletSharpPInvoke/Collision/QuantizedBvh.cs b/BulletSharp/Collision/QuantizedBvh.cs similarity index 100% rename from BulletSharpPInvoke/Collision/QuantizedBvh.cs rename to BulletSharp/Collision/QuantizedBvh.cs diff --git a/BulletSharpPInvoke/Collision/RaycastCallback.cs b/BulletSharp/Collision/RaycastCallback.cs similarity index 100% rename from BulletSharpPInvoke/Collision/RaycastCallback.cs rename to BulletSharp/Collision/RaycastCallback.cs diff --git a/BulletSharpPInvoke/Collision/ScaledBvhTriangleMeshShape.cs b/BulletSharp/Collision/ScaledBvhTriangleMeshShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ScaledBvhTriangleMeshShape.cs rename to BulletSharp/Collision/ScaledBvhTriangleMeshShape.cs diff --git a/BulletSharpPInvoke/Collision/ShapeHull.cs b/BulletSharp/Collision/ShapeHull.cs similarity index 100% rename from BulletSharpPInvoke/Collision/ShapeHull.cs rename to BulletSharp/Collision/ShapeHull.cs diff --git a/BulletSharpPInvoke/Collision/SimulationIslandManager.cs b/BulletSharp/Collision/SimulationIslandManager.cs similarity index 100% rename from BulletSharpPInvoke/Collision/SimulationIslandManager.cs rename to BulletSharp/Collision/SimulationIslandManager.cs diff --git a/BulletSharpPInvoke/Collision/SphereBoxCollisionAlgorithm.cs b/BulletSharp/Collision/SphereBoxCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/SphereBoxCollisionAlgorithm.cs rename to BulletSharp/Collision/SphereBoxCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/SphereShape.cs b/BulletSharp/Collision/SphereShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/SphereShape.cs rename to BulletSharp/Collision/SphereShape.cs diff --git a/BulletSharpPInvoke/Collision/SphereSphereCollisionAlgorithm.cs b/BulletSharp/Collision/SphereSphereCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/SphereSphereCollisionAlgorithm.cs rename to BulletSharp/Collision/SphereSphereCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/SphereTriangleCollisionAlgorithm.cs b/BulletSharp/Collision/SphereTriangleCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/Collision/SphereTriangleCollisionAlgorithm.cs rename to BulletSharp/Collision/SphereTriangleCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/Collision/SphereTriangleDetector.cs b/BulletSharp/Collision/SphereTriangleDetector.cs similarity index 100% rename from BulletSharpPInvoke/Collision/SphereTriangleDetector.cs rename to BulletSharp/Collision/SphereTriangleDetector.cs diff --git a/BulletSharpPInvoke/Collision/StaticPlaneShape.cs b/BulletSharp/Collision/StaticPlaneShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/StaticPlaneShape.cs rename to BulletSharp/Collision/StaticPlaneShape.cs diff --git a/BulletSharpPInvoke/Collision/StridingMeshInterface.cs b/BulletSharp/Collision/StridingMeshInterface.cs similarity index 100% rename from BulletSharpPInvoke/Collision/StridingMeshInterface.cs rename to BulletSharp/Collision/StridingMeshInterface.cs diff --git a/BulletSharpPInvoke/Collision/TetrahedronShape.cs b/BulletSharp/Collision/TetrahedronShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TetrahedronShape.cs rename to BulletSharp/Collision/TetrahedronShape.cs diff --git a/BulletSharpPInvoke/Collision/TriangleBuffer.cs b/BulletSharp/Collision/TriangleBuffer.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleBuffer.cs rename to BulletSharp/Collision/TriangleBuffer.cs diff --git a/BulletSharpPInvoke/Collision/TriangleCallback.cs b/BulletSharp/Collision/TriangleCallback.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleCallback.cs rename to BulletSharp/Collision/TriangleCallback.cs diff --git a/BulletSharpPInvoke/Collision/TriangleIndexVertexArray.cs b/BulletSharp/Collision/TriangleIndexVertexArray.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleIndexVertexArray.cs rename to BulletSharp/Collision/TriangleIndexVertexArray.cs diff --git a/BulletSharpPInvoke/Collision/TriangleIndexVertexMaterialArray.cs b/BulletSharp/Collision/TriangleIndexVertexMaterialArray.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleIndexVertexMaterialArray.cs rename to BulletSharp/Collision/TriangleIndexVertexMaterialArray.cs diff --git a/BulletSharpPInvoke/Collision/TriangleInfoMap.cs b/BulletSharp/Collision/TriangleInfoMap.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleInfoMap.cs rename to BulletSharp/Collision/TriangleInfoMap.cs diff --git a/BulletSharpPInvoke/Collision/TriangleMesh.cs b/BulletSharp/Collision/TriangleMesh.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleMesh.cs rename to BulletSharp/Collision/TriangleMesh.cs diff --git a/BulletSharpPInvoke/Collision/TriangleMeshShape.cs b/BulletSharp/Collision/TriangleMeshShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleMeshShape.cs rename to BulletSharp/Collision/TriangleMeshShape.cs diff --git a/BulletSharpPInvoke/Collision/TriangleShape.cs b/BulletSharp/Collision/TriangleShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/TriangleShape.cs rename to BulletSharp/Collision/TriangleShape.cs diff --git a/BulletSharpPInvoke/Collision/UniformScalingShape.cs b/BulletSharp/Collision/UniformScalingShape.cs similarity index 100% rename from BulletSharpPInvoke/Collision/UniformScalingShape.cs rename to BulletSharp/Collision/UniformScalingShape.cs diff --git a/BulletSharpPInvoke/Collision/UnionFind.cs b/BulletSharp/Collision/UnionFind.cs similarity index 100% rename from BulletSharpPInvoke/Collision/UnionFind.cs rename to BulletSharp/Collision/UnionFind.cs diff --git a/BulletSharpPInvoke/Collision/VoronoiSimplexSolver.cs b/BulletSharp/Collision/VoronoiSimplexSolver.cs similarity index 100% rename from BulletSharpPInvoke/Collision/VoronoiSimplexSolver.cs rename to BulletSharp/Collision/VoronoiSimplexSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/ConeTwistConstraint.cs b/BulletSharp/Dynamics/ConeTwistConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/ConeTwistConstraint.cs rename to BulletSharp/Dynamics/ConeTwistConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/ConstraintSolver.cs b/BulletSharp/Dynamics/ConstraintSolver.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/ConstraintSolver.cs rename to BulletSharp/Dynamics/ConstraintSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/ContactConstraint.cs b/BulletSharp/Dynamics/ContactConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/ContactConstraint.cs rename to BulletSharp/Dynamics/ContactConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/ContactSolverInfo.cs b/BulletSharp/Dynamics/ContactSolverInfo.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/ContactSolverInfo.cs rename to BulletSharp/Dynamics/ContactSolverInfo.cs diff --git a/BulletSharpPInvoke/Dynamics/DantzigSolver.cs b/BulletSharp/Dynamics/DantzigSolver.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/DantzigSolver.cs rename to BulletSharp/Dynamics/DantzigSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/DiscreteDynamicsWorld.cs b/BulletSharp/Dynamics/DiscreteDynamicsWorld.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/DiscreteDynamicsWorld.cs rename to BulletSharp/Dynamics/DiscreteDynamicsWorld.cs diff --git a/BulletSharpPInvoke/Dynamics/DiscreteDynamicsWorldMultiThreaded.cs b/BulletSharp/Dynamics/DiscreteDynamicsWorldMultiThreaded.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/DiscreteDynamicsWorldMultiThreaded.cs rename to BulletSharp/Dynamics/DiscreteDynamicsWorldMultiThreaded.cs diff --git a/BulletSharpPInvoke/Dynamics/DynamicsWorld.cs b/BulletSharp/Dynamics/DynamicsWorld.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/DynamicsWorld.cs rename to BulletSharp/Dynamics/DynamicsWorld.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBody.cs b/BulletSharp/Dynamics/Featherstone/MultiBody.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBody.cs rename to BulletSharp/Dynamics/Featherstone/MultiBody.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyConstraint.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyConstraint.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyConstraintSolver.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyConstraintSolver.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyConstraintSolver.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyConstraintSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyDynamicsWorld.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyDynamicsWorld.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyDynamicsWorld.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyDynamicsWorld.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyFixedConstraint.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyFixedConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyFixedConstraint.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyFixedConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyJointLimitConstraint.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyJointLimitConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyJointLimitConstraint.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyJointLimitConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyJointMotor.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyJointMotor.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyJointMotor.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyJointMotor.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyLink.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyLink.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyLink.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyLink.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyLinkCollider.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyLinkCollider.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyLinkCollider.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyLinkCollider.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyPoint2Point.cs b/BulletSharp/Dynamics/Featherstone/MultiBodyPoint2Point.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodyPoint2Point.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodyPoint2Point.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodySliderConstraint.cs b/BulletSharp/Dynamics/Featherstone/MultiBodySliderConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodySliderConstraint.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodySliderConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Featherstone/MultiBodySolverConstraint.cs b/BulletSharp/Dynamics/Featherstone/MultiBodySolverConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Featherstone/MultiBodySolverConstraint.cs rename to BulletSharp/Dynamics/Featherstone/MultiBodySolverConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/FixedConstraint.cs b/BulletSharp/Dynamics/FixedConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/FixedConstraint.cs rename to BulletSharp/Dynamics/FixedConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/GearConstraint.cs b/BulletSharp/Dynamics/GearConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/GearConstraint.cs rename to BulletSharp/Dynamics/GearConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Generic6DofConstraint.cs b/BulletSharp/Dynamics/Generic6DofConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Generic6DofConstraint.cs rename to BulletSharp/Dynamics/Generic6DofConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Generic6DofSpring2Constraint.cs b/BulletSharp/Dynamics/Generic6DofSpring2Constraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Generic6DofSpring2Constraint.cs rename to BulletSharp/Dynamics/Generic6DofSpring2Constraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Generic6DofSpringConstraint.cs b/BulletSharp/Dynamics/Generic6DofSpringConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Generic6DofSpringConstraint.cs rename to BulletSharp/Dynamics/Generic6DofSpringConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/Hinge2Constraint.cs b/BulletSharp/Dynamics/Hinge2Constraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Hinge2Constraint.cs rename to BulletSharp/Dynamics/Hinge2Constraint.cs diff --git a/BulletSharpPInvoke/Dynamics/HingeConstraint.cs b/BulletSharp/Dynamics/HingeConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/HingeConstraint.cs rename to BulletSharp/Dynamics/HingeConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/IAction.cs b/BulletSharp/Dynamics/IAction.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/IAction.cs rename to BulletSharp/Dynamics/IAction.cs diff --git a/BulletSharpPInvoke/Dynamics/ICharacterController.cs b/BulletSharp/Dynamics/ICharacterController.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/ICharacterController.cs rename to BulletSharp/Dynamics/ICharacterController.cs diff --git a/BulletSharpPInvoke/Dynamics/KinematicCharacterController.cs b/BulletSharp/Dynamics/KinematicCharacterController.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/KinematicCharacterController.cs rename to BulletSharp/Dynamics/KinematicCharacterController.cs diff --git a/BulletSharpPInvoke/Dynamics/MlcpSolver.cs b/BulletSharp/Dynamics/MlcpSolver.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/MlcpSolver.cs rename to BulletSharp/Dynamics/MlcpSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/MlcpSolverInterface.cs b/BulletSharp/Dynamics/MlcpSolverInterface.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/MlcpSolverInterface.cs rename to BulletSharp/Dynamics/MlcpSolverInterface.cs diff --git a/BulletSharpPInvoke/Dynamics/NncgConstraintSolver.cs b/BulletSharp/Dynamics/NncgConstraintSolver.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/NncgConstraintSolver.cs rename to BulletSharp/Dynamics/NncgConstraintSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/Point2PointConstraint.cs b/BulletSharp/Dynamics/Point2PointConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/Point2PointConstraint.cs rename to BulletSharp/Dynamics/Point2PointConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/RaycastVehicle.cs b/BulletSharp/Dynamics/RaycastVehicle.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/RaycastVehicle.cs rename to BulletSharp/Dynamics/RaycastVehicle.cs diff --git a/BulletSharpPInvoke/Dynamics/RigidBody.cs b/BulletSharp/Dynamics/RigidBody.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/RigidBody.cs rename to BulletSharp/Dynamics/RigidBody.cs diff --git a/BulletSharpPInvoke/Dynamics/RigidBodyConstructionInfo.cs b/BulletSharp/Dynamics/RigidBodyConstructionInfo.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/RigidBodyConstructionInfo.cs rename to BulletSharp/Dynamics/RigidBodyConstructionInfo.cs diff --git a/BulletSharpPInvoke/Dynamics/SequentialImpulseConstraintSolver.cs b/BulletSharp/Dynamics/SequentialImpulseConstraintSolver.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/SequentialImpulseConstraintSolver.cs rename to BulletSharp/Dynamics/SequentialImpulseConstraintSolver.cs diff --git a/BulletSharpPInvoke/Dynamics/SliderConstraint.cs b/BulletSharp/Dynamics/SliderConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/SliderConstraint.cs rename to BulletSharp/Dynamics/SliderConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/TypedConstraint.cs b/BulletSharp/Dynamics/TypedConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/TypedConstraint.cs rename to BulletSharp/Dynamics/TypedConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/UniversalConstraint.cs b/BulletSharp/Dynamics/UniversalConstraint.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/UniversalConstraint.cs rename to BulletSharp/Dynamics/UniversalConstraint.cs diff --git a/BulletSharpPInvoke/Dynamics/VehicleRaycaster.cs b/BulletSharp/Dynamics/VehicleRaycaster.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/VehicleRaycaster.cs rename to BulletSharp/Dynamics/VehicleRaycaster.cs diff --git a/BulletSharpPInvoke/Dynamics/WheelInfo.cs b/BulletSharp/Dynamics/WheelInfo.cs similarity index 100% rename from BulletSharpPInvoke/Dynamics/WheelInfo.cs rename to BulletSharp/Dynamics/WheelInfo.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.csproj b/BulletSharp/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.csproj similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.csproj rename to BulletSharp/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.csproj diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.sln b/BulletSharp/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.sln similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.sln rename to BulletSharp/Extensions/BulletSharp.OpenTK/BulletSharp.OpenTK.sln diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/Box2dShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/Box2dShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/Box2dShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/Box2dShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BoxShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BoxShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BoxShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BoxShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BroadphaseInterfaceExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BroadphaseInterfaceExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BroadphaseInterfaceExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BroadphaseInterfaceExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BroadphaseProxyExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BroadphaseProxyExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BroadphaseProxyExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BroadphaseProxyExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BvhTriangleMeshShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BvhTriangleMeshShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/BvhTriangleMeshShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/BvhTriangleMeshShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CollisionObjectWrapperExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CollisionObjectWrapperExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CollisionObjectWrapperExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CollisionObjectWrapperExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CollisionShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CollisionShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CollisionShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CollisionShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CollisionWorldExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CollisionWorldExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CollisionWorldExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CollisionWorldExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CompoundShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CompoundShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CompoundShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CompoundShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConcaveShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConcaveShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConcaveShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConcaveShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexConcaveCollisionAlgorithmExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexConcaveCollisionAlgorithmExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexConcaveCollisionAlgorithmExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexConcaveCollisionAlgorithmExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexHullShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexHullShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexHullShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexHullShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexInternalShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexInternalShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexInternalShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexInternalShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPenetrationDepthSolverExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPenetrationDepthSolverExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPenetrationDepthSolverExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPenetrationDepthSolverExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPlaneCollisionAlgorithmExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPlaneCollisionAlgorithmExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPlaneCollisionAlgorithmExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPlaneCollisionAlgorithmExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPointCloudShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPointCloudShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPointCloudShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPointCloudShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPolyhedronExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPolyhedronExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexPolyhedronExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexPolyhedronExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexTriangleMeshShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexTriangleMeshShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ConvexTriangleMeshShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ConvexTriangleMeshShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CylinderShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CylinderShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/CylinderShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/CylinderShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/DbvtBroadphaseExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/DbvtBroadphaseExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/DbvtBroadphaseExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/DbvtBroadphaseExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/DiscreteCollisionDetectorInterfaceExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/DiscreteCollisionDetectorInterfaceExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/DiscreteCollisionDetectorInterfaceExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/DiscreteCollisionDetectorInterfaceExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/GhostObjectExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/GhostObjectExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/GhostObjectExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/GhostObjectExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/GjkPairDetectorExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/GjkPairDetectorExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/GjkPairDetectorExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/GjkPairDetectorExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ManifoldPointExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ManifoldPointExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ManifoldPointExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ManifoldPointExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/MinkowskiSumShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/MinkowskiSumShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/MinkowskiSumShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/MinkowskiSumShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/MultiSphereShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/MultiSphereShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/MultiSphereShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/MultiSphereShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/MultimaterialTriangleMeshShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/MultimaterialTriangleMeshShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/MultimaterialTriangleMeshShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/MultimaterialTriangleMeshShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/PersistentManifoldExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/PersistentManifoldExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/PersistentManifoldExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/PersistentManifoldExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/PointCollectorExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/PointCollectorExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/PointCollectorExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/PointCollectorExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/PolyhedralConvexShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/PolyhedralConvexShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/PolyhedralConvexShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/PolyhedralConvexShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ScaledBvhTriangleMeshShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ScaledBvhTriangleMeshShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ScaledBvhTriangleMeshShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ScaledBvhTriangleMeshShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ShapeHullExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ShapeHullExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/ShapeHullExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/ShapeHullExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/SoftBodyConcaveCollisionAlgorithmExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/SoftBodyConcaveCollisionAlgorithmExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/SoftBodyConcaveCollisionAlgorithmExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/SoftBodyConcaveCollisionAlgorithmExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/SphereBoxCollisionAlgorithmExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/SphereBoxCollisionAlgorithmExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/SphereBoxCollisionAlgorithmExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/SphereBoxCollisionAlgorithmExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/SphereTriangleDetectorExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/SphereTriangleDetectorExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/SphereTriangleDetectorExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/SphereTriangleDetectorExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/StaticPlaneShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/StaticPlaneShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/StaticPlaneShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/StaticPlaneShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/StridingMeshInterfaceExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/StridingMeshInterfaceExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/StridingMeshInterfaceExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/StridingMeshInterfaceExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TetrahedronShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TetrahedronShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TetrahedronShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TetrahedronShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TriangleMeshShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TriangleShapeExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TriangleShapeExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/TriangleShapeExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/TriangleShapeExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/VoronoiSimplexSolverExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Collision/VoronoiSimplexSolverExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Collision/VoronoiSimplexSolverExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Collision/VoronoiSimplexSolverExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/DefaultMotionStateExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/DefaultMotionStateExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/DefaultMotionStateExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/DefaultMotionStateExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/CharacterControllerInterfaceExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/CharacterControllerInterfaceExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/CharacterControllerInterfaceExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/CharacterControllerInterfaceExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/CollisionObjectExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/CollisionObjectExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/CollisionObjectExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/CollisionObjectExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/ConeTwistConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/ConeTwistConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/ConeTwistConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/ConeTwistConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/DynamicsWorldExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/DynamicsWorldExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/DynamicsWorldExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/DynamicsWorldExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/FixedConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/FixedConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/FixedConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/FixedConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/GearConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/GearConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/GearConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/GearConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofSpringConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofSpringConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofSpringConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Generic6DofSpringConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Hinge2ConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Hinge2ConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Hinge2ConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Hinge2ConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/HingeConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/HingeConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/HingeConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/HingeConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Point2PointConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Point2PointConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/Point2PointConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/Point2PointConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/RigidBodyExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/RigidBodyExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/RigidBodyExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/RigidBodyExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/SliderConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/SliderConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/SliderConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/SliderConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/TypedConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/TypedConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/TypedConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/TypedConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/UniversalConstraintExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/UniversalConstraintExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/UniversalConstraintExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/UniversalConstraintExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/VehicleRaycasterExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/VehicleRaycasterExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/VehicleRaycasterExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/VehicleRaycasterExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/WheelInfoExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/WheelInfoExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Dynamics/WheelInfoExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Dynamics/WheelInfoExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/IDebugDrawExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/IDebugDrawExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/IDebugDrawExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/IDebugDrawExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Math/MatrixExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Math/MatrixExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Math/MatrixExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Math/MatrixExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Math/QuaternionExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Math/QuaternionExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Math/QuaternionExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Math/QuaternionExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Math/Vector3Extensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Math/Vector3Extensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Math/Vector3Extensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Math/Vector3Extensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/MotionStateExtensions.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/MotionStateExtensions.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/MotionStateExtensions.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/MotionStateExtensions.cs diff --git a/BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Properties/AssemblyInfo.cs b/BulletSharp/Extensions/BulletSharp.OpenTK/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/Extensions/BulletSharp.OpenTK/Properties/AssemblyInfo.cs rename to BulletSharp/Extensions/BulletSharp.OpenTK/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/Extras/BulletFile.cs b/BulletSharp/Extras/BulletFile.cs similarity index 100% rename from BulletSharpPInvoke/Extras/BulletFile.cs rename to BulletSharp/Extras/BulletFile.cs diff --git a/BulletSharpPInvoke/Extras/BulletReader.cs b/BulletSharp/Extras/BulletReader.cs similarity index 100% rename from BulletSharpPInvoke/Extras/BulletReader.cs rename to BulletSharp/Extras/BulletReader.cs diff --git a/BulletSharpPInvoke/Extras/BulletWorldImporter.cs b/BulletSharp/Extras/BulletWorldImporter.cs similarity index 100% rename from BulletSharpPInvoke/Extras/BulletWorldImporter.cs rename to BulletSharp/Extras/BulletWorldImporter.cs diff --git a/BulletSharpPInvoke/Extras/BulletWriter.cs b/BulletSharp/Extras/BulletWriter.cs similarity index 100% rename from BulletSharpPInvoke/Extras/BulletWriter.cs rename to BulletSharp/Extras/BulletWriter.cs diff --git a/BulletSharpPInvoke/Extras/BulletXmlWorldImporter.cs b/BulletSharp/Extras/BulletXmlWorldImporter.cs similarity index 100% rename from BulletSharpPInvoke/Extras/BulletXmlWorldImporter.cs rename to BulletSharp/Extras/BulletXmlWorldImporter.cs diff --git a/BulletSharpPInvoke/Extras/Chunk.cs b/BulletSharp/Extras/Chunk.cs similarity index 100% rename from BulletSharpPInvoke/Extras/Chunk.cs rename to BulletSharp/Extras/Chunk.cs diff --git a/BulletSharpPInvoke/Extras/Dna.cs b/BulletSharp/Extras/Dna.cs similarity index 100% rename from BulletSharpPInvoke/Extras/Dna.cs rename to BulletSharp/Extras/Dna.cs diff --git a/BulletSharpPInvoke/Extras/Hacd.cs b/BulletSharp/Extras/Hacd.cs similarity index 100% rename from BulletSharpPInvoke/Extras/Hacd.cs rename to BulletSharp/Extras/Hacd.cs diff --git a/BulletSharpPInvoke/Extras/WorldImporter.cs b/BulletSharp/Extras/WorldImporter.cs similarity index 100% rename from BulletSharpPInvoke/Extras/WorldImporter.cs rename to BulletSharp/Extras/WorldImporter.cs diff --git a/BulletSharpPInvoke/Extras/bFile.cs b/BulletSharp/Extras/bFile.cs similarity index 100% rename from BulletSharpPInvoke/Extras/bFile.cs rename to BulletSharp/Extras/bFile.cs diff --git a/BulletSharpPInvoke/LinearMath/AlignedBroadphasePairArray.cs b/BulletSharp/LinearMath/AlignedBroadphasePairArray.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/AlignedBroadphasePairArray.cs rename to BulletSharp/LinearMath/AlignedBroadphasePairArray.cs diff --git a/BulletSharpPInvoke/LinearMath/AlignedCollisionObjectArray.cs b/BulletSharp/LinearMath/AlignedCollisionObjectArray.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/AlignedCollisionObjectArray.cs rename to BulletSharp/LinearMath/AlignedCollisionObjectArray.cs diff --git a/BulletSharpPInvoke/LinearMath/AlignedIndexedMeshArray.cs b/BulletSharp/LinearMath/AlignedIndexedMeshArray.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/AlignedIndexedMeshArray.cs rename to BulletSharp/LinearMath/AlignedIndexedMeshArray.cs diff --git a/BulletSharpPInvoke/LinearMath/AlignedManifoldArray.cs b/BulletSharp/LinearMath/AlignedManifoldArray.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/AlignedManifoldArray.cs rename to BulletSharp/LinearMath/AlignedManifoldArray.cs diff --git a/BulletSharpPInvoke/LinearMath/AlignedVector3Array.cs b/BulletSharp/LinearMath/AlignedVector3Array.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/AlignedVector3Array.cs rename to BulletSharp/LinearMath/AlignedVector3Array.cs diff --git a/BulletSharpPInvoke/LinearMath/Collections.cs b/BulletSharp/LinearMath/Collections.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/Collections.cs rename to BulletSharp/LinearMath/Collections.cs diff --git a/BulletSharpPInvoke/LinearMath/CpuFeatureUtility.cs b/BulletSharp/LinearMath/CpuFeatureUtility.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/CpuFeatureUtility.cs rename to BulletSharp/LinearMath/CpuFeatureUtility.cs diff --git a/BulletSharpPInvoke/LinearMath/DebugDraw.cs b/BulletSharp/LinearMath/DebugDraw.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/DebugDraw.cs rename to BulletSharp/LinearMath/DebugDraw.cs diff --git a/BulletSharpPInvoke/LinearMath/DefaultMotionState.cs b/BulletSharp/LinearMath/DefaultMotionState.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/DefaultMotionState.cs rename to BulletSharp/LinearMath/DefaultMotionState.cs diff --git a/BulletSharpPInvoke/LinearMath/GeometryUtil.cs b/BulletSharp/LinearMath/GeometryUtil.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/GeometryUtil.cs rename to BulletSharp/LinearMath/GeometryUtil.cs diff --git a/BulletSharpPInvoke/LinearMath/IDebugDraw.cs b/BulletSharp/LinearMath/IDebugDraw.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/IDebugDraw.cs rename to BulletSharp/LinearMath/IDebugDraw.cs diff --git a/BulletSharpPInvoke/LinearMath/MotionState.cs b/BulletSharp/LinearMath/MotionState.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/MotionState.cs rename to BulletSharp/LinearMath/MotionState.cs diff --git a/BulletSharpPInvoke/LinearMath/PolarDecomposition.cs b/BulletSharp/LinearMath/PolarDecomposition.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/PolarDecomposition.cs rename to BulletSharp/LinearMath/PolarDecomposition.cs diff --git a/BulletSharpPInvoke/LinearMath/PoolAllocator.cs b/BulletSharp/LinearMath/PoolAllocator.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/PoolAllocator.cs rename to BulletSharp/LinearMath/PoolAllocator.cs diff --git a/BulletSharpPInvoke/LinearMath/Serializer.cs b/BulletSharp/LinearMath/Serializer.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/Serializer.cs rename to BulletSharp/LinearMath/Serializer.cs diff --git a/BulletSharpPInvoke/LinearMath/Threads.cs b/BulletSharp/LinearMath/Threads.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/Threads.cs rename to BulletSharp/LinearMath/Threads.cs diff --git a/BulletSharpPInvoke/LinearMath/TransformUtil.cs b/BulletSharp/LinearMath/TransformUtil.cs similarity index 100% rename from BulletSharpPInvoke/LinearMath/TransformUtil.cs rename to BulletSharp/LinearMath/TransformUtil.cs diff --git a/BulletSharpPInvoke/Math/Matrix.cs b/BulletSharp/Math/Matrix.cs similarity index 100% rename from BulletSharpPInvoke/Math/Matrix.cs rename to BulletSharp/Math/Matrix.cs diff --git a/BulletSharpPInvoke/Math/Quaternion.cs b/BulletSharp/Math/Quaternion.cs similarity index 100% rename from BulletSharpPInvoke/Math/Quaternion.cs rename to BulletSharp/Math/Quaternion.cs diff --git a/BulletSharpPInvoke/Math/Vector3.cs b/BulletSharp/Math/Vector3.cs similarity index 100% rename from BulletSharpPInvoke/Math/Vector3.cs rename to BulletSharp/Math/Vector3.cs diff --git a/BulletSharpPInvoke/Math/Vector4.cs b/BulletSharp/Math/Vector4.cs similarity index 100% rename from BulletSharpPInvoke/Math/Vector4.cs rename to BulletSharp/Math/Vector4.cs diff --git a/BulletSharpPInvoke/MathUtil.cs b/BulletSharp/MathUtil.cs similarity index 100% rename from BulletSharpPInvoke/MathUtil.cs rename to BulletSharp/MathUtil.cs diff --git a/BulletSharpPInvoke/Native.cs b/BulletSharp/Native.cs similarity index 100% rename from BulletSharpPInvoke/Native.cs rename to BulletSharp/Native.cs diff --git a/BulletSharpPInvoke/Properties/AssemblyInfo.cs b/BulletSharp/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/Properties/AssemblyInfo.cs rename to BulletSharp/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedAnchorArray.cs b/BulletSharp/SoftBody/AlignedAnchorArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedAnchorArray.cs rename to BulletSharp/SoftBody/AlignedAnchorArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedClusterArray.cs b/BulletSharp/SoftBody/AlignedClusterArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedClusterArray.cs rename to BulletSharp/SoftBody/AlignedClusterArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedFaceArray.cs b/BulletSharp/SoftBody/AlignedFaceArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedFaceArray.cs rename to BulletSharp/SoftBody/AlignedFaceArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedJointArray.cs b/BulletSharp/SoftBody/AlignedJointArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedJointArray.cs rename to BulletSharp/SoftBody/AlignedJointArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedLinkArray.cs b/BulletSharp/SoftBody/AlignedLinkArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedLinkArray.cs rename to BulletSharp/SoftBody/AlignedLinkArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedMaterialArray.cs b/BulletSharp/SoftBody/AlignedMaterialArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedMaterialArray.cs rename to BulletSharp/SoftBody/AlignedMaterialArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedNodeArray.cs b/BulletSharp/SoftBody/AlignedNodeArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedNodeArray.cs rename to BulletSharp/SoftBody/AlignedNodeArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedNoteArray.cs b/BulletSharp/SoftBody/AlignedNoteArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedNoteArray.cs rename to BulletSharp/SoftBody/AlignedNoteArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedSoftBodyArray.cs b/BulletSharp/SoftBody/AlignedSoftBodyArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedSoftBodyArray.cs rename to BulletSharp/SoftBody/AlignedSoftBodyArray.cs diff --git a/BulletSharpPInvoke/SoftBody/AlignedTetraArray.cs b/BulletSharp/SoftBody/AlignedTetraArray.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/AlignedTetraArray.cs rename to BulletSharp/SoftBody/AlignedTetraArray.cs diff --git a/BulletSharpPInvoke/SoftBody/Collections.cs b/BulletSharp/SoftBody/Collections.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/Collections.cs rename to BulletSharp/SoftBody/Collections.cs diff --git a/BulletSharpPInvoke/SoftBody/DefaultSoftBodySolver.cs b/BulletSharp/SoftBody/DefaultSoftBodySolver.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/DefaultSoftBodySolver.cs rename to BulletSharp/SoftBody/DefaultSoftBodySolver.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftBody.cs b/BulletSharp/SoftBody/SoftBody.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftBody.cs rename to BulletSharp/SoftBody/SoftBody.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftBodyConcaveCollisionAlgorithm.cs b/BulletSharp/SoftBody/SoftBodyConcaveCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftBodyConcaveCollisionAlgorithm.cs rename to BulletSharp/SoftBody/SoftBodyConcaveCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftBodyHelpers.cs b/BulletSharp/SoftBody/SoftBodyHelpers.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftBodyHelpers.cs rename to BulletSharp/SoftBody/SoftBodyHelpers.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftBodyRigidBodyCollisionConfiguration.cs b/BulletSharp/SoftBody/SoftBodyRigidBodyCollisionConfiguration.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftBodyRigidBodyCollisionConfiguration.cs rename to BulletSharp/SoftBody/SoftBodyRigidBodyCollisionConfiguration.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftBodySolver.cs b/BulletSharp/SoftBody/SoftBodySolver.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftBodySolver.cs rename to BulletSharp/SoftBody/SoftBodySolver.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftRigidCollisionAlgorithm.cs b/BulletSharp/SoftBody/SoftRigidCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftRigidCollisionAlgorithm.cs rename to BulletSharp/SoftBody/SoftRigidCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftRigidDynamicsWorld.cs b/BulletSharp/SoftBody/SoftRigidDynamicsWorld.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftRigidDynamicsWorld.cs rename to BulletSharp/SoftBody/SoftRigidDynamicsWorld.cs diff --git a/BulletSharpPInvoke/SoftBody/SoftSoftCollisionAlgorithm.cs b/BulletSharp/SoftBody/SoftSoftCollisionAlgorithm.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SoftSoftCollisionAlgorithm.cs rename to BulletSharp/SoftBody/SoftSoftCollisionAlgorithm.cs diff --git a/BulletSharpPInvoke/SoftBody/SparseSdf.cs b/BulletSharp/SoftBody/SparseSdf.cs similarity index 100% rename from BulletSharpPInvoke/SoftBody/SparseSdf.cs rename to BulletSharp/SoftBody/SparseSdf.cs diff --git a/BulletSharpPInvoke/UnsafeNativeMethods.cs b/BulletSharp/UnsafeNativeMethods.cs similarity index 100% rename from BulletSharpPInvoke/UnsafeNativeMethods.cs rename to BulletSharp/UnsafeNativeMethods.cs diff --git a/BulletSharpPInvoke/Utilities.cs b/BulletSharp/Utilities.cs similarity index 100% rename from BulletSharpPInvoke/Utilities.cs rename to BulletSharp/Utilities.cs diff --git a/BulletSharpPInvoke/demos/BasicDemo/BasicDemo.cs b/BulletSharp/demos/BasicDemo/BasicDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/BasicDemo/BasicDemo.cs rename to BulletSharp/demos/BasicDemo/BasicDemo.cs diff --git a/BulletSharpPInvoke/demos/BasicDemo/BasicDemo.csproj b/BulletSharp/demos/BasicDemo/BasicDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/BasicDemo/BasicDemo.csproj rename to BulletSharp/demos/BasicDemo/BasicDemo.csproj diff --git a/BulletSharpPInvoke/demos/BenchmarkDemo/BenchmarkDemo.cs b/BulletSharp/demos/BenchmarkDemo/BenchmarkDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/BenchmarkDemo/BenchmarkDemo.cs rename to BulletSharp/demos/BenchmarkDemo/BenchmarkDemo.cs diff --git a/BulletSharpPInvoke/demos/BenchmarkDemo/BenchmarkDemo.csproj b/BulletSharp/demos/BenchmarkDemo/BenchmarkDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/BenchmarkDemo/BenchmarkDemo.csproj rename to BulletSharp/demos/BenchmarkDemo/BenchmarkDemo.csproj diff --git a/BulletSharpPInvoke/demos/Box2DDemo/Box2DDemo.cs b/BulletSharp/demos/Box2DDemo/Box2DDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/Box2DDemo/Box2DDemo.cs rename to BulletSharp/demos/Box2DDemo/Box2DDemo.cs diff --git a/BulletSharpPInvoke/demos/Box2DDemo/Box2DDemo.csproj b/BulletSharp/demos/Box2DDemo/Box2DDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/Box2DDemo/Box2DDemo.csproj rename to BulletSharp/demos/Box2DDemo/Box2DDemo.csproj diff --git a/BulletSharpPInvoke/demos/BspDemo/BspDemo.cs b/BulletSharp/demos/BspDemo/BspDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/BspDemo/BspDemo.cs rename to BulletSharp/demos/BspDemo/BspDemo.cs diff --git a/BulletSharpPInvoke/demos/BspDemo/BspDemo.csproj b/BulletSharp/demos/BspDemo/BspDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/BspDemo/BspDemo.csproj rename to BulletSharp/demos/BspDemo/BspDemo.csproj diff --git a/BulletSharpPInvoke/demos/BspDemo/data/BspDemo.bsp b/BulletSharp/demos/BspDemo/data/BspDemo.bsp similarity index 100% rename from BulletSharpPInvoke/demos/BspDemo/data/BspDemo.bsp rename to BulletSharp/demos/BspDemo/data/BspDemo.bsp diff --git a/BulletSharpPInvoke/demos/BulletXmlImportDemo/BulletXmlImportDemo.cs b/BulletSharp/demos/BulletXmlImportDemo/BulletXmlImportDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/BulletXmlImportDemo/BulletXmlImportDemo.cs rename to BulletSharp/demos/BulletXmlImportDemo/BulletXmlImportDemo.cs diff --git a/BulletSharpPInvoke/demos/BulletXmlImportDemo/BulletXmlImportDemo.csproj b/BulletSharp/demos/BulletXmlImportDemo/BulletXmlImportDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/BulletXmlImportDemo/BulletXmlImportDemo.csproj rename to BulletSharp/demos/BulletXmlImportDemo/BulletXmlImportDemo.csproj diff --git a/BulletSharpPInvoke/demos/BulletXmlImportDemo/data/bullet_basic.xml b/BulletSharp/demos/BulletXmlImportDemo/data/bullet_basic.xml similarity index 100% rename from BulletSharpPInvoke/demos/BulletXmlImportDemo/data/bullet_basic.xml rename to BulletSharp/demos/BulletXmlImportDemo/data/bullet_basic.xml diff --git a/BulletSharpPInvoke/demos/CcdPhysicsDemo/CcdPhysicsDemo.cs b/BulletSharp/demos/CcdPhysicsDemo/CcdPhysicsDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/CcdPhysicsDemo/CcdPhysicsDemo.cs rename to BulletSharp/demos/CcdPhysicsDemo/CcdPhysicsDemo.cs diff --git a/BulletSharpPInvoke/demos/CcdPhysicsDemo/CcdPhysicsDemo.csproj b/BulletSharp/demos/CcdPhysicsDemo/CcdPhysicsDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/CcdPhysicsDemo/CcdPhysicsDemo.csproj rename to BulletSharp/demos/CcdPhysicsDemo/CcdPhysicsDemo.csproj diff --git a/BulletSharpPInvoke/demos/CharacterDemo/CharacterDemo.cs b/BulletSharp/demos/CharacterDemo/CharacterDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/CharacterDemo/CharacterDemo.cs rename to BulletSharp/demos/CharacterDemo/CharacterDemo.cs diff --git a/BulletSharpPInvoke/demos/CharacterDemo/CharacterDemo.csproj b/BulletSharp/demos/CharacterDemo/CharacterDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/CharacterDemo/CharacterDemo.csproj rename to BulletSharp/demos/CharacterDemo/CharacterDemo.csproj diff --git a/BulletSharpPInvoke/demos/CharacterDemo/data/BspDemo.bsp b/BulletSharp/demos/CharacterDemo/data/BspDemo.bsp similarity index 100% rename from BulletSharpPInvoke/demos/CharacterDemo/data/BspDemo.bsp rename to BulletSharp/demos/CharacterDemo/data/BspDemo.bsp diff --git a/BulletSharpPInvoke/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cs b/BulletSharp/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cs rename to BulletSharp/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cs diff --git a/BulletSharpPInvoke/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.csproj b/BulletSharp/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.csproj rename to BulletSharp/demos/CollisionInterfaceDemo/CollisionInterfaceDemo.csproj diff --git a/BulletSharpPInvoke/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.cs b/BulletSharp/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.cs rename to BulletSharp/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.cs diff --git a/BulletSharpPInvoke/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.csproj b/BulletSharp/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.csproj rename to BulletSharp/demos/ConcaveConvexCastDemo/ConcaveConvexCastDemo.csproj diff --git a/BulletSharpPInvoke/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cs b/BulletSharp/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cs rename to BulletSharp/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cs diff --git a/BulletSharpPInvoke/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.csproj b/BulletSharp/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.csproj rename to BulletSharp/demos/ConcaveRaycastDemo/ConcaveRaycastDemo.csproj diff --git a/BulletSharpPInvoke/demos/ConstraintDemo/ConstraintDemo.cs b/BulletSharp/demos/ConstraintDemo/ConstraintDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/ConstraintDemo/ConstraintDemo.cs rename to BulletSharp/demos/ConstraintDemo/ConstraintDemo.cs diff --git a/BulletSharpPInvoke/demos/ConstraintDemo/ConstraintDemo.csproj b/BulletSharp/demos/ConstraintDemo/ConstraintDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/ConstraintDemo/ConstraintDemo.csproj rename to BulletSharp/demos/ConstraintDemo/ConstraintDemo.csproj diff --git a/BulletSharpPInvoke/demos/ConvexDecompositionDemo/ConvexDecomposition.cs b/BulletSharp/demos/ConvexDecompositionDemo/ConvexDecomposition.cs similarity index 100% rename from BulletSharpPInvoke/demos/ConvexDecompositionDemo/ConvexDecomposition.cs rename to BulletSharp/demos/ConvexDecompositionDemo/ConvexDecomposition.cs diff --git a/BulletSharpPInvoke/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cs b/BulletSharp/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cs rename to BulletSharp/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cs diff --git a/BulletSharpPInvoke/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.csproj b/BulletSharp/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.csproj rename to BulletSharp/demos/ConvexDecompositionDemo/ConvexDecompositionDemo.csproj diff --git a/BulletSharpPInvoke/demos/ConvexDecompositionDemo/WavefrontWriter.cs b/BulletSharp/demos/ConvexDecompositionDemo/WavefrontWriter.cs similarity index 100% rename from BulletSharpPInvoke/demos/ConvexDecompositionDemo/WavefrontWriter.cs rename to BulletSharp/demos/ConvexDecompositionDemo/WavefrontWriter.cs diff --git a/BulletSharpPInvoke/demos/ConvexDecompositionDemo/data/file.obj b/BulletSharp/demos/ConvexDecompositionDemo/data/file.obj similarity index 100% rename from BulletSharpPInvoke/demos/ConvexDecompositionDemo/data/file.obj rename to BulletSharp/demos/ConvexDecompositionDemo/data/file.obj diff --git a/BulletSharpPInvoke/demos/DemoFramework/Clock.cs b/BulletSharp/demos/DemoFramework/Clock.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Clock.cs rename to BulletSharp/demos/DemoFramework/Clock.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Controller/FreeLook.cs b/BulletSharp/demos/DemoFramework/Controller/FreeLook.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Controller/FreeLook.cs rename to BulletSharp/demos/DemoFramework/Controller/FreeLook.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Controller/Input.cs b/BulletSharp/demos/DemoFramework/Controller/Input.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Controller/Input.cs rename to BulletSharp/demos/DemoFramework/Controller/Input.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Controller/MouseController.cs b/BulletSharp/demos/DemoFramework/Controller/MouseController.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Controller/MouseController.cs rename to BulletSharp/demos/DemoFramework/Controller/MouseController.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Demo.cs b/BulletSharp/demos/DemoFramework/Demo.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Demo.cs rename to BulletSharp/demos/DemoFramework/Demo.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/DemoFramework.csproj b/BulletSharp/demos/DemoFramework/DemoFramework.csproj similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/DemoFramework.csproj rename to BulletSharp/demos/DemoFramework/DemoFramework.csproj diff --git a/BulletSharpPInvoke/demos/DemoFramework/DemoRunner.cs b/BulletSharp/demos/DemoFramework/DemoRunner.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/DemoRunner.cs rename to BulletSharp/demos/DemoFramework/DemoRunner.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/FileLoaders/BspConverter.cs b/BulletSharp/demos/DemoFramework/FileLoaders/BspConverter.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/FileLoaders/BspConverter.cs rename to BulletSharp/demos/DemoFramework/FileLoaders/BspConverter.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/FileLoaders/BspLoader.cs b/BulletSharp/demos/DemoFramework/FileLoaders/BspLoader.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/FileLoaders/BspLoader.cs rename to BulletSharp/demos/DemoFramework/FileLoaders/BspLoader.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/FileLoaders/UrdfLoader.cs b/BulletSharp/demos/DemoFramework/FileLoaders/UrdfLoader.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/FileLoaders/UrdfLoader.cs rename to BulletSharp/demos/DemoFramework/FileLoaders/UrdfLoader.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/FileLoaders/UrdfToBullet.cs b/BulletSharp/demos/DemoFramework/FileLoaders/UrdfToBullet.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/FileLoaders/UrdfToBullet.cs rename to BulletSharp/demos/DemoFramework/FileLoaders/UrdfToBullet.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/FileLoaders/WavefrontObj.cs b/BulletSharp/demos/DemoFramework/FileLoaders/WavefrontObj.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/FileLoaders/WavefrontObj.cs rename to BulletSharp/demos/DemoFramework/FileLoaders/WavefrontObj.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/BufferedDebugDraw.cs b/BulletSharp/demos/DemoFramework/Graphics/BufferedDebugDraw.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/BufferedDebugDraw.cs rename to BulletSharp/demos/DemoFramework/Graphics/BufferedDebugDraw.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/Graphics.cs b/BulletSharp/demos/DemoFramework/Graphics/Graphics.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/Graphics.cs rename to BulletSharp/demos/DemoFramework/Graphics/Graphics.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs b/BulletSharp/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs rename to BulletSharp/demos/DemoFramework/Graphics/GraphicsLibraryManager.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/LibrarySelection.Designer.cs b/BulletSharp/demos/DemoFramework/Graphics/LibrarySelection.Designer.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/LibrarySelection.Designer.cs rename to BulletSharp/demos/DemoFramework/Graphics/LibrarySelection.Designer.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/LibrarySelection.cs b/BulletSharp/demos/DemoFramework/Graphics/LibrarySelection.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/LibrarySelection.cs rename to BulletSharp/demos/DemoFramework/Graphics/LibrarySelection.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/LibrarySelection.resx b/BulletSharp/demos/DemoFramework/Graphics/LibrarySelection.resx similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/LibrarySelection.resx rename to BulletSharp/demos/DemoFramework/Graphics/LibrarySelection.resx diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/MeshFactory.cs b/BulletSharp/demos/DemoFramework/Graphics/MeshFactory.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/MeshFactory.cs rename to BulletSharp/demos/DemoFramework/Graphics/MeshFactory.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/GLForm.Designer.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/GLForm.Designer.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/GLForm.Designer.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/GLForm.Designer.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/GLForm.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/GLForm.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/GLForm.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/GLForm.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/GLForm.resx b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/GLForm.resx similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/GLForm.resx rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/GLForm.resx diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/InfoText.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/InfoText.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/InfoText.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/InfoText.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/MathHelper.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/MathHelper.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/MathHelper.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/MathHelper.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/MeshFactory.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/MeshFactory.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/MeshFactory.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/MeshFactory.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/OpenTK.csproj b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/OpenTK.csproj similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/OpenTK.csproj rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/OpenTK.csproj diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/OpenTKGraphics.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/OpenTKGraphics.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/OpenTKGraphics.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/OpenTKGraphics.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/PhysicsDebugDraw.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/PhysicsDebugDraw.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/PhysicsDebugDraw.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/PhysicsDebugDraw.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/Properties/AssemblyInfo.cs b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/Properties/AssemblyInfo.cs rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/app.config b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/app.config similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/app.config rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/app.config diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/fp.cg b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/fp.cg similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/fp.cg rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/fp.cg diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/packages.config b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/packages.config similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/packages.config rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/packages.config diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/vp.cg b/BulletSharp/demos/DemoFramework/Graphics/OpenTK/vp.cg similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/OpenTK/vp.cg rename to BulletSharp/demos/DemoFramework/Graphics/OpenTK/vp.cg diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/InfoText.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/InfoText.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/InfoText.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/InfoText.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/InstanceData.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/InstanceData.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/InstanceData.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/InstanceData.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/Light.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/Light.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/Light.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/Light.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/MathHelper.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/MathHelper.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/MathHelper.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/MathHelper.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/MeshFactory.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/MeshFactory.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/MeshFactory.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/MeshFactory.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/PhysicsDebugDraw.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/PhysicsDebugDraw.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/PhysicsDebugDraw.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/PhysicsDebugDraw.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/Properties/AssemblyInfo.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/Properties/AssemblyInfo.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/ShaderLoader.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/ShaderLoader.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/ShaderLoader.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/ShaderLoader.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/SharpDX11.csproj b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/SharpDX11.csproj similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/SharpDX11.csproj rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/SharpDX11.csproj diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/SharpDX11Graphics.cs b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/SharpDX11Graphics.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/SharpDX11Graphics.cs rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/SharpDX11Graphics.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/grender.fx b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/grender.fx similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/grender.fx rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/grender.fx diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/light.fx b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/light.fx similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/light.fx rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/light.fx diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/packages.config b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/packages.config similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/packages.config rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/packages.config diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/shader.fx b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/shader.fx similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/shader.fx rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/shader.fx diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_arm.dll b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_arm.dll similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_arm.dll rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_arm.dll diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x64.dll b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x64.dll similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x64.dll rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x64.dll diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x86.dll b/BulletSharp/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x86.dll similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x86.dll rename to BulletSharp/demos/DemoFramework/Graphics/SharpDX11/sharpdx_direct3d11_1_effects_x86.dll diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/DeviceContext9.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/DeviceContext9.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/DeviceContext9.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/DeviceContext9.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/DeviceSettings9.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/DeviceSettings9.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/DeviceSettings9.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/DeviceSettings9.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/InfoText.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/InfoText.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/InfoText.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/InfoText.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/MathHelper.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/MathHelper.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/MathHelper.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/MathHelper.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/MeshFactory.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/MeshFactory.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/MeshFactory.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/MeshFactory.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/PhysicsDebugDraw.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/PhysicsDebugDraw.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/PhysicsDebugDraw.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/PhysicsDebugDraw.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/Properties/AssemblyInfo.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/Properties/AssemblyInfo.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/SlimDX.csproj b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDX.csproj similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/SlimDX.csproj rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDX.csproj diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/SlimDXGraphics.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/checker_shader.fx b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/checker_shader.fx similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/checker_shader.fx rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/checker_shader.fx diff --git a/BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/packages.config b/BulletSharp/demos/DemoFramework/Graphics/SlimDX/packages.config similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Graphics/SlimDX/packages.config rename to BulletSharp/demos/DemoFramework/Graphics/SlimDX/packages.config diff --git a/BulletSharpPInvoke/demos/DemoFramework/IDemoConfiguration.cs b/BulletSharp/demos/DemoFramework/IDemoConfiguration.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/IDemoConfiguration.cs rename to BulletSharp/demos/DemoFramework/IDemoConfiguration.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/IUpdateReceiver.cs b/BulletSharp/demos/DemoFramework/IUpdateReceiver.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/IUpdateReceiver.cs rename to BulletSharp/demos/DemoFramework/IUpdateReceiver.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Meshes/Bunny.cs b/BulletSharp/demos/DemoFramework/Meshes/Bunny.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Meshes/Bunny.cs rename to BulletSharp/demos/DemoFramework/Meshes/Bunny.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Meshes/Taru.cs b/BulletSharp/demos/DemoFramework/Meshes/Taru.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Meshes/Taru.cs rename to BulletSharp/demos/DemoFramework/Meshes/Taru.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Meshes/Torus.cs b/BulletSharp/demos/DemoFramework/Meshes/Torus.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Meshes/Torus.cs rename to BulletSharp/demos/DemoFramework/Meshes/Torus.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Properties/AssemblyInfo.cs b/BulletSharp/demos/DemoFramework/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Properties/AssemblyInfo.cs rename to BulletSharp/demos/DemoFramework/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Simulation/BoxShooter.cs b/BulletSharp/demos/DemoFramework/Simulation/BoxShooter.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Simulation/BoxShooter.cs rename to BulletSharp/demos/DemoFramework/Simulation/BoxShooter.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Simulation/ISimulation.cs b/BulletSharp/demos/DemoFramework/Simulation/ISimulation.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Simulation/ISimulation.cs rename to BulletSharp/demos/DemoFramework/Simulation/ISimulation.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Simulation/PhysicsHelper.cs b/BulletSharp/demos/DemoFramework/Simulation/PhysicsHelper.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Simulation/PhysicsHelper.cs rename to BulletSharp/demos/DemoFramework/Simulation/PhysicsHelper.cs diff --git a/BulletSharpPInvoke/demos/DemoFramework/Simulation/SimulationExtensions.cs b/BulletSharp/demos/DemoFramework/Simulation/SimulationExtensions.cs similarity index 100% rename from BulletSharpPInvoke/demos/DemoFramework/Simulation/SimulationExtensions.cs rename to BulletSharp/demos/DemoFramework/Simulation/SimulationExtensions.cs diff --git a/BulletSharpPInvoke/demos/Demos.sln b/BulletSharp/demos/Demos.sln similarity index 100% rename from BulletSharpPInvoke/demos/Demos.sln rename to BulletSharp/demos/Demos.sln diff --git a/BulletSharpPInvoke/demos/DistanceDemo/DistanceDemo.cs b/BulletSharp/demos/DistanceDemo/DistanceDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/DistanceDemo/DistanceDemo.cs rename to BulletSharp/demos/DistanceDemo/DistanceDemo.cs diff --git a/BulletSharpPInvoke/demos/DistanceDemo/DistanceDemo.csproj b/BulletSharp/demos/DistanceDemo/DistanceDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/DistanceDemo/DistanceDemo.csproj rename to BulletSharp/demos/DistanceDemo/DistanceDemo.csproj diff --git a/BulletSharpPInvoke/demos/FeatherStoneDemo/FeatherStoneDemo.cs b/BulletSharp/demos/FeatherStoneDemo/FeatherStoneDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/FeatherStoneDemo/FeatherStoneDemo.cs rename to BulletSharp/demos/FeatherStoneDemo/FeatherStoneDemo.cs diff --git a/BulletSharpPInvoke/demos/FeatherStoneDemo/FeatherStoneDemo.csproj b/BulletSharp/demos/FeatherStoneDemo/FeatherStoneDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/FeatherStoneDemo/FeatherStoneDemo.csproj rename to BulletSharp/demos/FeatherStoneDemo/FeatherStoneDemo.csproj diff --git a/BulletSharpPInvoke/demos/GImpactTestDemo/GImpactTestDemo.cs b/BulletSharp/demos/GImpactTestDemo/GImpactTestDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/GImpactTestDemo/GImpactTestDemo.cs rename to BulletSharp/demos/GImpactTestDemo/GImpactTestDemo.cs diff --git a/BulletSharpPInvoke/demos/GImpactTestDemo/GImpactTestDemo.csproj b/BulletSharp/demos/GImpactTestDemo/GImpactTestDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/GImpactTestDemo/GImpactTestDemo.csproj rename to BulletSharp/demos/GImpactTestDemo/GImpactTestDemo.csproj diff --git a/BulletSharpPInvoke/demos/MotorDemo/MotorDemo.cs b/BulletSharp/demos/MotorDemo/MotorDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/MotorDemo/MotorDemo.cs rename to BulletSharp/demos/MotorDemo/MotorDemo.cs diff --git a/BulletSharpPInvoke/demos/MotorDemo/MotorDemo.csproj b/BulletSharp/demos/MotorDemo/MotorDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/MotorDemo/MotorDemo.csproj rename to BulletSharp/demos/MotorDemo/MotorDemo.csproj diff --git a/BulletSharpPInvoke/demos/MultiThreadedDemo/MultiThreadedDemo.cs b/BulletSharp/demos/MultiThreadedDemo/MultiThreadedDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/MultiThreadedDemo/MultiThreadedDemo.cs rename to BulletSharp/demos/MultiThreadedDemo/MultiThreadedDemo.cs diff --git a/BulletSharpPInvoke/demos/MultiThreadedDemo/MultiThreadedDemo.csproj b/BulletSharp/demos/MultiThreadedDemo/MultiThreadedDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/MultiThreadedDemo/MultiThreadedDemo.csproj rename to BulletSharp/demos/MultiThreadedDemo/MultiThreadedDemo.csproj diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/BasicDemo.cs b/BulletSharp/demos/OpenTK/BasicDemo/BasicDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/BasicDemo.cs rename to BulletSharp/demos/OpenTK/BasicDemo/BasicDemo.cs diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/BasicDemo.csproj b/BulletSharp/demos/OpenTK/BasicDemo/BasicDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/BasicDemo.csproj rename to BulletSharp/demos/OpenTK/BasicDemo/BasicDemo.csproj diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/BasicDemo.sln b/BulletSharp/demos/OpenTK/BasicDemo/BasicDemo.sln similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/BasicDemo.sln rename to BulletSharp/demos/OpenTK/BasicDemo/BasicDemo.sln diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/OpenTK.dll.config b/BulletSharp/demos/OpenTK/BasicDemo/OpenTK.dll.config similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/OpenTK.dll.config rename to BulletSharp/demos/OpenTK/BasicDemo/OpenTK.dll.config diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/Physics.cs b/BulletSharp/demos/OpenTK/BasicDemo/Physics.cs similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/Physics.cs rename to BulletSharp/demos/OpenTK/BasicDemo/Physics.cs diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/Program.cs b/BulletSharp/demos/OpenTK/BasicDemo/Program.cs similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/Program.cs rename to BulletSharp/demos/OpenTK/BasicDemo/Program.cs diff --git a/BulletSharpPInvoke/demos/OpenTK/BasicDemo/packages.config b/BulletSharp/demos/OpenTK/BasicDemo/packages.config similarity index 100% rename from BulletSharpPInvoke/demos/OpenTK/BasicDemo/packages.config rename to BulletSharp/demos/OpenTK/BasicDemo/packages.config diff --git a/BulletSharpPInvoke/demos/PendulumDemo/PendulumDemo.cs b/BulletSharp/demos/PendulumDemo/PendulumDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/PendulumDemo/PendulumDemo.cs rename to BulletSharp/demos/PendulumDemo/PendulumDemo.cs diff --git a/BulletSharpPInvoke/demos/PendulumDemo/PendulumDemo.csproj b/BulletSharp/demos/PendulumDemo/PendulumDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/PendulumDemo/PendulumDemo.csproj rename to BulletSharp/demos/PendulumDemo/PendulumDemo.csproj diff --git a/BulletSharpPInvoke/demos/RagdollDemo/Ragdoll.cs b/BulletSharp/demos/RagdollDemo/Ragdoll.cs similarity index 100% rename from BulletSharpPInvoke/demos/RagdollDemo/Ragdoll.cs rename to BulletSharp/demos/RagdollDemo/Ragdoll.cs diff --git a/BulletSharpPInvoke/demos/RagdollDemo/RagdollDemo.cs b/BulletSharp/demos/RagdollDemo/RagdollDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/RagdollDemo/RagdollDemo.cs rename to BulletSharp/demos/RagdollDemo/RagdollDemo.cs diff --git a/BulletSharpPInvoke/demos/RagdollDemo/RagdollDemo.csproj b/BulletSharp/demos/RagdollDemo/RagdollDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/RagdollDemo/RagdollDemo.csproj rename to BulletSharp/demos/RagdollDemo/RagdollDemo.csproj diff --git a/BulletSharpPInvoke/demos/RollingFrictionDemo/RollingFrictionDemo.cs b/BulletSharp/demos/RollingFrictionDemo/RollingFrictionDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/RollingFrictionDemo/RollingFrictionDemo.cs rename to BulletSharp/demos/RollingFrictionDemo/RollingFrictionDemo.cs diff --git a/BulletSharpPInvoke/demos/RollingFrictionDemo/RollingFrictionDemo.csproj b/BulletSharp/demos/RollingFrictionDemo/RollingFrictionDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/RollingFrictionDemo/RollingFrictionDemo.csproj rename to BulletSharp/demos/RollingFrictionDemo/RollingFrictionDemo.csproj diff --git a/BulletSharpPInvoke/demos/SerializeDemo/SerializeDemo.cs b/BulletSharp/demos/SerializeDemo/SerializeDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/SerializeDemo/SerializeDemo.cs rename to BulletSharp/demos/SerializeDemo/SerializeDemo.cs diff --git a/BulletSharpPInvoke/demos/SerializeDemo/SerializeDemo.csproj b/BulletSharp/demos/SerializeDemo/SerializeDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/SerializeDemo/SerializeDemo.csproj rename to BulletSharp/demos/SerializeDemo/SerializeDemo.csproj diff --git a/BulletSharpPInvoke/demos/SerializeDemo/testFile.bullet b/BulletSharp/demos/SerializeDemo/testFile.bullet similarity index 100% rename from BulletSharpPInvoke/demos/SerializeDemo/testFile.bullet rename to BulletSharp/demos/SerializeDemo/testFile.bullet diff --git a/BulletSharpPInvoke/demos/SoftDemo/Bunny.cs b/BulletSharp/demos/SoftDemo/Bunny.cs similarity index 100% rename from BulletSharpPInvoke/demos/SoftDemo/Bunny.cs rename to BulletSharp/demos/SoftDemo/Bunny.cs diff --git a/BulletSharpPInvoke/demos/SoftDemo/SoftDemo.cs b/BulletSharp/demos/SoftDemo/SoftDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/SoftDemo/SoftDemo.cs rename to BulletSharp/demos/SoftDemo/SoftDemo.cs diff --git a/BulletSharpPInvoke/demos/SoftDemo/SoftDemo.csproj b/BulletSharp/demos/SoftDemo/SoftDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/SoftDemo/SoftDemo.csproj rename to BulletSharp/demos/SoftDemo/SoftDemo.csproj diff --git a/BulletSharpPInvoke/demos/SoftDemo/data/cube.ele b/BulletSharp/demos/SoftDemo/data/cube.ele similarity index 100% rename from BulletSharpPInvoke/demos/SoftDemo/data/cube.ele rename to BulletSharp/demos/SoftDemo/data/cube.ele diff --git a/BulletSharpPInvoke/demos/SoftDemo/data/cube.node b/BulletSharp/demos/SoftDemo/data/cube.node similarity index 100% rename from BulletSharpPInvoke/demos/SoftDemo/data/cube.node rename to BulletSharp/demos/SoftDemo/data/cube.node diff --git a/BulletSharpPInvoke/demos/SoftDemo/data/cube.ply b/BulletSharp/demos/SoftDemo/data/cube.ply similarity index 100% rename from BulletSharpPInvoke/demos/SoftDemo/data/cube.ply rename to BulletSharp/demos/SoftDemo/data/cube.ply diff --git a/BulletSharpPInvoke/demos/UrdfDemo/UrdfDemo.cs b/BulletSharp/demos/UrdfDemo/UrdfDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/UrdfDemo/UrdfDemo.cs rename to BulletSharp/demos/UrdfDemo/UrdfDemo.cs diff --git a/BulletSharpPInvoke/demos/UrdfDemo/UrdfDemo.csproj b/BulletSharp/demos/UrdfDemo/UrdfDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/UrdfDemo/UrdfDemo.csproj rename to BulletSharp/demos/UrdfDemo/UrdfDemo.csproj diff --git a/BulletSharpPInvoke/demos/UrdfDemo/data/hinge.urdf b/BulletSharp/demos/UrdfDemo/data/hinge.urdf similarity index 100% rename from BulletSharpPInvoke/demos/UrdfDemo/data/hinge.urdf rename to BulletSharp/demos/UrdfDemo/data/hinge.urdf diff --git a/BulletSharpPInvoke/demos/VehicleDemo/CustomVehicle.cs b/BulletSharp/demos/VehicleDemo/CustomVehicle.cs similarity index 100% rename from BulletSharpPInvoke/demos/VehicleDemo/CustomVehicle.cs rename to BulletSharp/demos/VehicleDemo/CustomVehicle.cs diff --git a/BulletSharpPInvoke/demos/VehicleDemo/VehicleDemo.cs b/BulletSharp/demos/VehicleDemo/VehicleDemo.cs similarity index 100% rename from BulletSharpPInvoke/demos/VehicleDemo/VehicleDemo.cs rename to BulletSharp/demos/VehicleDemo/VehicleDemo.cs diff --git a/BulletSharpPInvoke/demos/VehicleDemo/VehicleDemo.csproj b/BulletSharp/demos/VehicleDemo/VehicleDemo.csproj similarity index 100% rename from BulletSharpPInvoke/demos/VehicleDemo/VehicleDemo.csproj rename to BulletSharp/demos/VehicleDemo/VehicleDemo.csproj diff --git a/BulletSharpPInvoke/demos/VehicleDemo/data/heightfield128x128.raw b/BulletSharp/demos/VehicleDemo/data/heightfield128x128.raw similarity index 100% rename from BulletSharpPInvoke/demos/VehicleDemo/data/heightfield128x128.raw rename to BulletSharp/demos/VehicleDemo/data/heightfield128x128.raw diff --git a/BulletSharpPInvoke/license.txt b/BulletSharp/license.txt similarity index 100% rename from BulletSharpPInvoke/license.txt rename to BulletSharp/license.txt diff --git a/BulletSharpPInvoke/test/AlignedCollisionObjectArrayTests.cs b/BulletSharp/test/AlignedCollisionObjectArrayTests.cs similarity index 100% rename from BulletSharpPInvoke/test/AlignedCollisionObjectArrayTests.cs rename to BulletSharp/test/AlignedCollisionObjectArrayTests.cs diff --git a/BulletSharpPInvoke/test/BulletSharpTest.csproj b/BulletSharp/test/BulletSharpTest.csproj similarity index 100% rename from BulletSharpPInvoke/test/BulletSharpTest.csproj rename to BulletSharp/test/BulletSharpTest.csproj diff --git a/BulletSharpPInvoke/test/BulletSharpTest.sln b/BulletSharp/test/BulletSharpTest.sln similarity index 100% rename from BulletSharpPInvoke/test/BulletSharpTest.sln rename to BulletSharp/test/BulletSharpTest.sln diff --git a/BulletSharpPInvoke/test/ContactSensorCallback.cs b/BulletSharp/test/ContactSensorCallback.cs similarity index 100% rename from BulletSharpPInvoke/test/ContactSensorCallback.cs rename to BulletSharp/test/ContactSensorCallback.cs diff --git a/BulletSharpPInvoke/test/DebugDrawTest.cs b/BulletSharp/test/DebugDrawTest.cs similarity index 100% rename from BulletSharpPInvoke/test/DebugDrawTest.cs rename to BulletSharp/test/DebugDrawTest.cs diff --git a/BulletSharpPInvoke/test/DebugDrawTest2.cs b/BulletSharp/test/DebugDrawTest2.cs similarity index 100% rename from BulletSharpPInvoke/test/DebugDrawTest2.cs rename to BulletSharp/test/DebugDrawTest2.cs diff --git a/BulletSharpPInvoke/test/GImpactTests.cs b/BulletSharp/test/GImpactTests.cs similarity index 100% rename from BulletSharpPInvoke/test/GImpactTests.cs rename to BulletSharp/test/GImpactTests.cs diff --git a/BulletSharpPInvoke/test/OverlapFilterCallbackTests.cs b/BulletSharp/test/OverlapFilterCallbackTests.cs similarity index 100% rename from BulletSharpPInvoke/test/OverlapFilterCallbackTests.cs rename to BulletSharp/test/OverlapFilterCallbackTests.cs diff --git a/BulletSharpPInvoke/test/Program.cs b/BulletSharp/test/Program.cs similarity index 100% rename from BulletSharpPInvoke/test/Program.cs rename to BulletSharp/test/Program.cs diff --git a/BulletSharpPInvoke/test/Properties/AssemblyInfo.cs b/BulletSharp/test/Properties/AssemblyInfo.cs similarity index 100% rename from BulletSharpPInvoke/test/Properties/AssemblyInfo.cs rename to BulletSharp/test/Properties/AssemblyInfo.cs diff --git a/BulletSharpPInvoke/test/SerializationTest.cs b/BulletSharp/test/SerializationTest.cs similarity index 100% rename from BulletSharpPInvoke/test/SerializationTest.cs rename to BulletSharp/test/SerializationTest.cs diff --git a/BulletSharpPInvoke/test/SoftBodyTests.cs b/BulletSharp/test/SoftBodyTests.cs similarity index 100% rename from BulletSharpPInvoke/test/SoftBodyTests.cs rename to BulletSharp/test/SoftBodyTests.cs diff --git a/BulletSharpPInvoke/test/app.config b/BulletSharp/test/app.config similarity index 100% rename from BulletSharpPInvoke/test/app.config rename to BulletSharp/test/app.config diff --git a/BulletSharpPInvoke/test/data/bsp.bullet b/BulletSharp/test/data/bsp.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/bsp.bullet rename to BulletSharp/test/data/bsp.bullet diff --git a/BulletSharpPInvoke/test/data/concaveCompound.bullet b/BulletSharp/test/data/concaveCompound.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/concaveCompound.bullet rename to BulletSharp/test/data/concaveCompound.bullet diff --git a/BulletSharpPInvoke/test/data/constraints.bullet b/BulletSharp/test/data/constraints.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/constraints.bullet rename to BulletSharp/test/data/constraints.bullet diff --git a/BulletSharpPInvoke/test/data/convex_decomposition.bullet b/BulletSharp/test/data/convex_decomposition.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/convex_decomposition.bullet rename to BulletSharp/test/data/convex_decomposition.bullet diff --git a/BulletSharpPInvoke/test/data/cylinders.bullet b/BulletSharp/test/data/cylinders.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/cylinders.bullet rename to BulletSharp/test/data/cylinders.bullet diff --git a/BulletSharpPInvoke/test/data/multibody.bullet b/BulletSharp/test/data/multibody.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/multibody.bullet rename to BulletSharp/test/data/multibody.bullet diff --git a/BulletSharpPInvoke/test/data/r2d2_multibody.bullet b/BulletSharp/test/data/r2d2_multibody.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/r2d2_multibody.bullet rename to BulletSharp/test/data/r2d2_multibody.bullet diff --git a/BulletSharpPInvoke/test/data/ragdoll_6dof.bullet b/BulletSharp/test/data/ragdoll_6dof.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/ragdoll_6dof.bullet rename to BulletSharp/test/data/ragdoll_6dof.bullet diff --git a/BulletSharpPInvoke/test/data/ragdoll_conetwist.bullet b/BulletSharp/test/data/ragdoll_conetwist.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/ragdoll_conetwist.bullet rename to BulletSharp/test/data/ragdoll_conetwist.bullet diff --git a/BulletSharpPInvoke/test/data/slope.bullet b/BulletSharp/test/data/slope.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/slope.bullet rename to BulletSharp/test/data/slope.bullet diff --git a/BulletSharpPInvoke/test/data/spider.bullet b/BulletSharp/test/data/spider.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/spider.bullet rename to BulletSharp/test/data/spider.bullet diff --git a/BulletSharpPInvoke/test/data/testFile.bullet b/BulletSharp/test/data/testFile.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/testFile.bullet rename to BulletSharp/test/data/testFile.bullet diff --git a/BulletSharpPInvoke/test/data/testFileFracture.bullet b/BulletSharp/test/data/testFileFracture.bullet similarity index 100% rename from BulletSharpPInvoke/test/data/testFileFracture.bullet rename to BulletSharp/test/data/testFileFracture.bullet diff --git a/BulletSharpPInvoke/test/packages.config b/BulletSharp/test/packages.config similarity index 100% rename from BulletSharpPInvoke/test/packages.config rename to BulletSharp/test/packages.config