diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
index 7fb0f48c..acb72d8c 100644
--- a/src/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -247,464 +247,380 @@
     <ClCompile Include="platform\ps3\ps3input.cpp">
       <Filter>src\platform\ps3</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btAxisSweep3.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btBroadphaseProxy.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btDbvt.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\LinearMath\btAlignedAllocator.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btAxisSweep3.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btDispatcher.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btBox2dShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btBoxShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btBroadphaseProxy.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCapsuleShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btCollisionObject.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
+    </ClCompile>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCollisionShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btCollisionWorld.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btGhostObject.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btInternalEdgeUtility.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btManifoldResult.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSimulationIslandManager.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSphereBoxCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCompoundShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConcaveShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConeShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btUnionFind.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btContactConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btBox2dShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\btContactProcessing.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btBoxShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCapsuleShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvex2dShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCollisionShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btConvexCast.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCompoundShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConcaveShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConeShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\LinearMath\btConvexHull.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvex2dShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\LinearMath\btConvexHullComputer.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvexHullShape.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvexInternalShape.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
+    </ClCompile>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvexPointCloudShape.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvexPolyhedron.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvexShape.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\CollisionShapes\btCylinderShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btEmptyShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btMultiSphereShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btOptimizedBvh.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btShapeHull.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btSphereShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btDbvt.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btStaticPlaneShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btStridingMeshInterface.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTetrahedronShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btDefaultSoftBodySolver.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleBuffer.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleCallback.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btDispatcher.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btEmptyShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleMesh.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btGeneric6DofSpringConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btUniformScalingShape.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\btGenericPoolAllocator.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\btContactProcessing.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\LinearMath\btGeometryUtil.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\btGenericPoolAllocator.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btGhostObject.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\Gimpact\btGImpactBvh.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\Gimpact\btGImpactShape.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\btTriangleShapeEx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_box_set.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_contact.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_memory.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_tri_collision.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btConvexCast.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btPersistentManifold.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btPolyhedralContactClipping.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btRaycastCallback.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btHinge2Constraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btInternalEdgeUtility.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletDynamics\Character\btKinematicCharacterController.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btContactConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btManifoldResult.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btGeneric6DofSpringConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btHinge2Constraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btMultiSphereShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btOptimizedBvh.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btSliderConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btPersistentManifold.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btUniversalConstraint.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btPolyhedralContactClipping.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\Dynamics\btRigidBody.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\LinearMath\btQuickprof.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\Dynamics\Bullet-C-API.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btRaycastCallback.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
     <ClCompile Include="bullet\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
-      <Filter>src</Filter>
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletDynamics\Vehicle\btWheelInfo.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\Dynamics\btRigidBody.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\btGpu3DGridBroadphase.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\btParallelConstraintSolver.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\btThreadSupportInterface.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\LinearMath\btSerializer.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\GpuSoftBodySolvers\DX11\btSoftBodySolver_DX11.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btShapeHull.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\GpuSoftBodySolvers\DX11\btSoftBodySolver_DX11SIMDAware.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\btSoftBodySolverOutputCLtoGL.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\btSoftBodySolver_OpenCL.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSimulationIslandManager.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\btSoftBodySolver_OpenCLSIMDAware.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btSliderConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\MiniCL\MiniCLTaskWrap.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftBody.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\PosixThreadSupport.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftBodyConcaveCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SequentialThreadSupport.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftBodyHelpers.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuCollisionObjectWrapper.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuCollisionTaskProcess.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftRigidCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuContactManifoldCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftRigidDynamicsWorld.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuFakeDma.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletSoftBody\btSoftSoftCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuGatheringCollisionDispatcher.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuLibspe2Support.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSphereBoxCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btSphereShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuContactResult.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuGatheringCollisionTask.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btStaticPlaneShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuMinkowskiPenetrationDepthSolver.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btStridingMeshInterface.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuSampleTask\SpuSampleTask.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\SpuSampleTaskProcess.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTetrahedronShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletMultiThreaded\Win32ThreadSupport.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleBuffer.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btDefaultSoftBodySolver.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleCallback.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftBody.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftBodyConcaveCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftBodyHelpers.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleMesh.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftBodyRigidBodyCollisionConfiguration.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftRigidCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\btTriangleShapeEx.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftRigidDynamicsWorld.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\BulletSoftBody\btSoftSoftCollisionAlgorithm.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionShapes\btUniformScalingShape.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\LinearMath\btAlignedAllocator.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\CollisionDispatch\btUnionFind.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\LinearMath\btConvexHull.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\ConstraintSolver\btUniversalConstraint.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\LinearMath\btConvexHullComputer.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\LinearMath\btGeometryUtil.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\Vehicle\btWheelInfo.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\LinearMath\btQuickprof.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletDynamics\Dynamics\Bullet-C-API.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\LinearMath\btSerializer.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_box_set.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\MiniCL\MiniCL.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_contact.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\MiniCL\MiniCLTask\MiniCLTask.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_memory.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
-    <ClCompile Include="bullet\MiniCL\MiniCLTaskScheduler.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="bullet\BulletCollision\Gimpact\gim_tri_collision.cpp">
+      <Filter>bullet</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -921,15 +837,9 @@
     <ClInclude Include="bullet\Bullet-C-Api.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\boolInVec.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
     <ClInclude Include="bullet\BulletMultiThreaded\Win32ThreadSupport.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\vectormath\scalar\boolInVec.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
     <ClInclude Include="bullet\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\Box.h">
       <Filter>bullet</Filter>
     </ClInclude>
@@ -1527,24 +1437,6 @@
     <ClInclude Include="bullet\BulletDynamics\Vehicle\btWheelInfo.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\MiniCL\cl.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\MiniCL\cl_gl.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\MiniCL\cl_MiniCL_Defs.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\MiniCL\cl_platform.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\floatInVec.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\scalar\floatInVec.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
     <ClInclude Include="bullet\BulletCollision\Gimpact\gim_array.h">
       <Filter>bullet</Filter>
     </ClInclude>
@@ -1593,18 +1485,6 @@
     <ClInclude Include="bullet\BulletMultiThreaded\HeapManager.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\mat_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\scalar\mat_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\MiniCL\MiniCLTask\MiniCLTask.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\MiniCL\MiniCLTaskScheduler.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
     <ClInclude Include="bullet\BulletMultiThreaded\PlatformDefinitions.h">
       <Filter>bullet</Filter>
     </ClInclude>
@@ -1614,12 +1494,6 @@
     <ClInclude Include="bullet\BulletMultiThreaded\PpuAddressSpace.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\quat_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\scalar\quat_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
     <ClInclude Include="bullet\BulletMultiThreaded\SequentialThreadSupport.h">
       <Filter>bullet</Filter>
     </ClInclude>
@@ -1683,27 +1557,9 @@
     <ClInclude Include="bullet\BulletMultiThreaded\TrbStateVec.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\vec_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\scalar\vec_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\vecidx_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
     <ClInclude Include="bullet\BulletMultiThreaded\vectormath2bullet.h">
       <Filter>bullet</Filter>
     </ClInclude>
-    <ClInclude Include="bullet\vectormath\scalar\vectormath_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\sse\vectormath_aos.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
-    <ClInclude Include="bullet\vectormath\vmInclude.h">
-      <Filter>bullet</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <LolFxCompile Include="gpu\emptymaterial.lolfx">