diff --git a/msvc/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp
index e84d1f73a..02586da9f 100644
--- a/msvc/6/libbulletdynamics.dsp
+++ b/msvc/6/libbulletdynamics.dsp
@@ -132,10 +132,18 @@ SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp
 # End Source File
 # Begin Source File
@@ -188,6 +196,14 @@ SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\Dynamics\btDynamicsWorld.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\Dynamics\btMassProps.h
 # End Source File
 # Begin Source File
@@ -196,6 +212,10 @@ SOURCE=..\..\src\BulletDynamics\Dynamics\btRigidBody.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h
 # End Source File
 # Begin Source File
diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp
index 34e244ea0..a7f10a4be 100644
--- a/msvc/6/libbulletmath.dsp
+++ b/msvc/6/libbulletmath.dsp
@@ -104,7 +104,7 @@ SOURCE="$(InputPath)"
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenQuickprof.cpp
+SOURCE=..\..\src\LinearMath\btQuickprof.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -112,63 +112,63 @@ SOURCE=..\..\src\LinearMath\GenQuickprof.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenAabbUtil2.h
+SOURCE=..\..\src\LinearMath\btAabbUtil2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenIDebugDraw.h
+SOURCE=..\..\src\LinearMath\btIDebugDraw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenList.h
+SOURCE=..\..\src\LinearMath\btList.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenMinMax.h
+SOURCE=..\..\src\LinearMath\btMatrix3x3.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenQuickprof.h
+SOURCE=..\..\src\LinearMath\btMinMax.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\GenRandom.h
+SOURCE=..\..\src\LinearMath\btPoint3.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdMatrix3x3.h
+SOURCE=..\..\src\LinearMath\btQuadWord.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdMinMax.h
+SOURCE=..\..\src\LinearMath\btQuaternion.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdPoint3.h
+SOURCE=..\..\src\LinearMath\btQuickprof.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdQuadWord.h
+SOURCE=..\..\src\LinearMath\btRandom.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdQuaternion.h
+SOURCE=..\..\src\LinearMath\btScalar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdScalar.h
+SOURCE=..\..\src\LinearMath\btSimdMinMax.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdTransform.h
+SOURCE=..\..\src\LinearMath\btTransform.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdTransformUtil.h
+SOURCE=..\..\src\LinearMath\btTransformUtil.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\SimdVector3.h
+SOURCE=..\..\src\LinearMath\btVector3.h
 # End Source File
 # End Group
 # End Target
diff --git a/msvc/7/libbulletdynamics.vcproj b/msvc/7/libbulletdynamics.vcproj
index cbefad948..345f8ed62 100644
--- a/msvc/7/libbulletdynamics.vcproj
+++ b/msvc/7/libbulletdynamics.vcproj
@@ -182,9 +182,15 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
 			</File>
@@ -225,12 +231,21 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDynamicsWorld.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btMassProps.h">
 			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h">
 			</File>
diff --git a/msvc/7/libbulletmath.vcproj b/msvc/7/libbulletmath.vcproj
index a50e14838..1ecbaca80 100644
--- a/msvc/7/libbulletmath.vcproj
+++ b/msvc/7/libbulletmath.vcproj
@@ -162,56 +162,56 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\src\LinearMath\GenQuickprof.cpp">
+				RelativePath="..\..\src\LinearMath\btQuickprof.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\src\LinearMath\GenAabbUtil2.h">
+				RelativePath="..\..\src\LinearMath\btAabbUtil2.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenIDebugDraw.h">
+				RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenList.h">
+				RelativePath="..\..\src\LinearMath\btList.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenMinMax.h">
+				RelativePath="..\..\src\LinearMath\btMatrix3x3.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenQuickprof.h">
+				RelativePath="..\..\src\LinearMath\btMinMax.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenRandom.h">
+				RelativePath="..\..\src\LinearMath\btPoint3.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdMatrix3x3.h">
+				RelativePath="..\..\src\LinearMath\btQuadWord.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdMinMax.h">
+				RelativePath="..\..\src\LinearMath\btQuaternion.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdPoint3.h">
+				RelativePath="..\..\src\LinearMath\btQuickprof.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdQuadWord.h">
+				RelativePath="..\..\src\LinearMath\btRandom.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdQuaternion.h">
+				RelativePath="..\..\src\LinearMath\btScalar.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdScalar.h">
+				RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdTransform.h">
+				RelativePath="..\..\src\LinearMath\btTransform.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdTransformUtil.h">
+				RelativePath="..\..\src\LinearMath\btTransformUtil.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdVector3.h">
+				RelativePath="..\..\src\LinearMath\btVector3.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/msvc/71/libbulletdynamics.vcproj b/msvc/71/libbulletdynamics.vcproj
index e959d2f3c..df9061690 100644
--- a/msvc/71/libbulletdynamics.vcproj
+++ b/msvc/71/libbulletdynamics.vcproj
@@ -182,9 +182,15 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
 			</File>
@@ -225,12 +231,21 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDynamicsWorld.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btMassProps.h">
 			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h">
 			</File>
diff --git a/msvc/71/libbulletmath.vcproj b/msvc/71/libbulletmath.vcproj
index f27dfb0f8..5e8b2f227 100644
--- a/msvc/71/libbulletmath.vcproj
+++ b/msvc/71/libbulletmath.vcproj
@@ -162,56 +162,56 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\src\LinearMath\GenQuickprof.cpp">
+				RelativePath="..\..\src\LinearMath\btQuickprof.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\src\LinearMath\GenAabbUtil2.h">
+				RelativePath="..\..\src\LinearMath\btAabbUtil2.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenIDebugDraw.h">
+				RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenList.h">
+				RelativePath="..\..\src\LinearMath\btList.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenMinMax.h">
+				RelativePath="..\..\src\LinearMath\btMatrix3x3.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenQuickprof.h">
+				RelativePath="..\..\src\LinearMath\btMinMax.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenRandom.h">
+				RelativePath="..\..\src\LinearMath\btPoint3.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdMatrix3x3.h">
+				RelativePath="..\..\src\LinearMath\btQuadWord.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdMinMax.h">
+				RelativePath="..\..\src\LinearMath\btQuaternion.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdPoint3.h">
+				RelativePath="..\..\src\LinearMath\btQuickprof.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdQuadWord.h">
+				RelativePath="..\..\src\LinearMath\btRandom.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdQuaternion.h">
+				RelativePath="..\..\src\LinearMath\btScalar.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdScalar.h">
+				RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdTransform.h">
+				RelativePath="..\..\src\LinearMath\btTransform.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdTransformUtil.h">
+				RelativePath="..\..\src\LinearMath\btTransformUtil.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdVector3.h">
+				RelativePath="..\..\src\LinearMath\btVector3.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/msvc/8/libbulletdynamics.vcproj b/msvc/8/libbulletdynamics.vcproj
index f5c0f31c8..7f7d3fe6e 100644
--- a/msvc/8/libbulletdynamics.vcproj
+++ b/msvc/8/libbulletdynamics.vcproj
@@ -182,9 +182,15 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp">
 			</File>
@@ -225,12 +231,21 @@
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btDynamicsWorld.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btMassProps.h">
 			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Dynamics\btRigidBody.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.h">
 			</File>
diff --git a/msvc/8/libbulletmath.vcproj b/msvc/8/libbulletmath.vcproj
index 90b862b73..5ab57e27b 100644
--- a/msvc/8/libbulletmath.vcproj
+++ b/msvc/8/libbulletmath.vcproj
@@ -162,56 +162,56 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\src\LinearMath\GenQuickprof.cpp">
+				RelativePath="..\..\src\LinearMath\btQuickprof.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\src\LinearMath\GenAabbUtil2.h">
+				RelativePath="..\..\src\LinearMath\btAabbUtil2.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenIDebugDraw.h">
+				RelativePath="..\..\src\LinearMath\btIDebugDraw.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenList.h">
+				RelativePath="..\..\src\LinearMath\btList.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenMinMax.h">
+				RelativePath="..\..\src\LinearMath\btMatrix3x3.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenQuickprof.h">
+				RelativePath="..\..\src\LinearMath\btMinMax.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\GenRandom.h">
+				RelativePath="..\..\src\LinearMath\btPoint3.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdMatrix3x3.h">
+				RelativePath="..\..\src\LinearMath\btQuadWord.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdMinMax.h">
+				RelativePath="..\..\src\LinearMath\btQuaternion.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdPoint3.h">
+				RelativePath="..\..\src\LinearMath\btQuickprof.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdQuadWord.h">
+				RelativePath="..\..\src\LinearMath\btRandom.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdQuaternion.h">
+				RelativePath="..\..\src\LinearMath\btScalar.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdScalar.h">
+				RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdTransform.h">
+				RelativePath="..\..\src\LinearMath\btTransform.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdTransformUtil.h">
+				RelativePath="..\..\src\LinearMath\btTransformUtil.h">
 			</File>
 			<File
-				RelativePath="..\..\src\LinearMath\SimdVector3.h">
+				RelativePath="..\..\src\LinearMath\btVector3.h">
 			</File>
 		</Filter>
 	</Files>