diff --git a/lib/msw/x86/BulletCollision-v120.lib b/lib/msw/x86/BulletCollision-v120.lib
new file mode 100644
index 0000000..453efa7
Binary files /dev/null and b/lib/msw/x86/BulletCollision-v120.lib differ
diff --git a/lib/msw/x86/BulletCollision-v120_d.lib b/lib/msw/x86/BulletCollision-v120_d.lib
new file mode 100644
index 0000000..c66392e
Binary files /dev/null and b/lib/msw/x86/BulletCollision-v120_d.lib differ
diff --git a/lib/msw/x86/BulletDynamics-v120.lib b/lib/msw/x86/BulletDynamics-v120.lib
new file mode 100644
index 0000000..1d9fcc6
Binary files /dev/null and b/lib/msw/x86/BulletDynamics-v120.lib differ
diff --git a/lib/msw/x86/BulletDynamics-v120_d.lib b/lib/msw/x86/BulletDynamics-v120_d.lib
new file mode 100644
index 0000000..ef2ef7e
Binary files /dev/null and b/lib/msw/x86/BulletDynamics-v120_d.lib differ
diff --git a/lib/msw/x86/BulletSoftBody-v120.lib b/lib/msw/x86/BulletSoftBody-v120.lib
new file mode 100644
index 0000000..cf03785
Binary files /dev/null and b/lib/msw/x86/BulletSoftBody-v120.lib differ
diff --git a/lib/msw/x86/BulletSoftBody-v120_d.lib b/lib/msw/x86/BulletSoftBody-v120_d.lib
new file mode 100644
index 0000000..78fc753
Binary files /dev/null and b/lib/msw/x86/BulletSoftBody-v120_d.lib differ
diff --git a/lib/msw/x86/LinearMath-v120.lib b/lib/msw/x86/LinearMath-v120.lib
new file mode 100644
index 0000000..12952db
Binary files /dev/null and b/lib/msw/x86/LinearMath-v120.lib differ
diff --git a/lib/msw/x86/LinearMath-v120_d.lib b/lib/msw/x86/LinearMath-v120_d.lib
new file mode 100644
index 0000000..bed48fc
Binary files /dev/null and b/lib/msw/x86/LinearMath-v120_d.lib differ
diff --git a/lib/msw/x86/bulletcollision-v120_d.pdb b/lib/msw/x86/bulletcollision-v120_d.pdb
new file mode 100644
index 0000000..978a5aa
Binary files /dev/null and b/lib/msw/x86/bulletcollision-v120_d.pdb differ
diff --git a/lib/msw/x86/bulletdynamics-v120_d.pdb b/lib/msw/x86/bulletdynamics-v120_d.pdb
new file mode 100644
index 0000000..132338e
Binary files /dev/null and b/lib/msw/x86/bulletdynamics-v120_d.pdb differ
diff --git a/lib/msw/x86/bulletsoftbody-v120_d.pdb b/lib/msw/x86/bulletsoftbody-v120_d.pdb
new file mode 100644
index 0000000..4ecff6b
Binary files /dev/null and b/lib/msw/x86/bulletsoftbody-v120_d.pdb differ
diff --git a/lib/msw/x86/linearmath-v120_d.pdb b/lib/msw/x86/linearmath-v120_d.pdb
new file mode 100644
index 0000000..3546d24
Binary files /dev/null and b/lib/msw/x86/linearmath-v120_d.pdb differ
diff --git a/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj b/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj
index 6aef8b6..9552f5e 100644
--- a/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj
+++ b/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -63,7 +64,7 @@
       <AdditionalIncludeDirectories>"..\..\..\..\..\\include";..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v110_d.lib;..\..\..\lib\msw\x86\BulletDynamics-v110_d.lib;..\..\..\lib\msw\x86\BulletSoftBody-v110_d.lib;..\..\..\lib\msw\x86\LinearMath-v110_d.lib</AdditionalDependencies>
+      <AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v120_d.lib;..\..\..\lib\msw\x86\BulletDynamics-v120_d.lib;..\..\..\lib\msw\x86\BulletSoftBody-v120_d.lib;..\..\..\lib\msw\x86\LinearMath-v120_d.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>"..\..\..\..\..\\lib\msw\$(PlatformTarget)"</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -90,7 +91,7 @@
       <AdditionalIncludeDirectories>"..\..\..\..\..\\include";..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cinder-$(PlatformToolset).lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v110.lib;..\..\..\lib\msw\x86\BulletDynamics-v110.lib;..\..\..\lib\msw\x86\BulletSoftBody-v110.lib;..\..\..\lib\msw\x86\LinearMath-v110.lib</AdditionalDependencies>
+      <AdditionalDependencies>cinder-$(PlatformToolset).lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v120.lib;..\..\..\lib\msw\x86\BulletDynamics-v120.lib;..\..\..\lib\msw\x86\BulletSoftBody-v120.lib;..\..\..\lib\msw\x86\LinearMath-v120.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>"..\..\..\..\..\\lib\msw\$(PlatformTarget)"</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
@@ -108,7 +109,6 @@
   <ItemGroup>
     <ClCompile Include="..\src\PhysicsPrimitivesApp.cpp" />
     <ClCompile Include="..\..\..\src\Cinder-Bullet3D\BulletContext.cpp" />
-    <ClCompile Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.cpp" />
     <ClCompile Include="..\..\..\src\Cinder-Bullet3D\Common.cpp" />
     <ClCompile Include="..\..\..\src\Cinder-Bullet3D\ConstraintBase.cpp" />
     <ClCompile Include="..\..\..\src\Cinder-Bullet3D\ConstraintConeTwist.cpp" />
@@ -330,7 +330,6 @@
     <ClInclude Include="..\..\..\src\BulletPhysics\vectormath\sse\vectormath_aos.h" />
     <ClInclude Include="..\..\..\src\BulletPhysics\vectormath\vmInclude.h" />
     <ClInclude Include="..\..\..\src\Cinder-Bullet3D\BulletContext.h" />
-    <ClInclude Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.h" />
     <ClInclude Include="..\..\..\src\Cinder-Bullet3D\Common.h" />
     <ClInclude Include="..\..\..\src\Cinder-Bullet3D\ConstraintBase.h" />
     <ClInclude Include="..\..\..\src\Cinder-Bullet3D\ConstraintConeTwist.h" />
@@ -478,4 +477,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj.filters b/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj.filters
index 18f0bc4..bcec9f2 100644
--- a/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj.filters
+++ b/samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj.filters
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -713,9 +714,6 @@
     <ClInclude Include="..\..\..\src\Cinder-Bullet3D\BulletContext.h">
       <Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.h">
-      <Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\Cinder-Bullet3D\Common.h">
       <Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
     </ClInclude>
@@ -1151,9 +1149,6 @@
     <ClCompile Include="..\..\..\src\Cinder-Bullet3D\BulletContext.cpp">
       <Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.cpp">
-      <Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\Cinder-Bullet3D\Common.cpp">
       <Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
     </ClCompile>
@@ -1198,4 +1193,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Cinder-Bullet3D/Common.cpp b/src/Cinder-Bullet3D/Common.cpp
index 38d4bfb..2d7867f 100644
--- a/src/Cinder-Bullet3D/Common.cpp
+++ b/src/Cinder-Bullet3D/Common.cpp
@@ -14,10 +14,10 @@
 #include "cinder/gl/VboMesh.h"
 #include "cinder/GeomIo.h"
 
-#include "btHeightfieldTerrainShape.h"
-#include "btConvexShape.h"
-#include "btCollisionShape.h"
-#include "btSoftBody.h"
+#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletSoftBody/btSoftBody.h"
 
 
 using namespace ci;
diff --git a/src/Cinder-Bullet3D/Common.h b/src/Cinder-Bullet3D/Common.h
index c64fd47..ce7b025 100644
--- a/src/Cinder-Bullet3D/Common.h
+++ b/src/Cinder-Bullet3D/Common.h
@@ -10,7 +10,10 @@
 
 #include "btBulletCollisionCommon.h"
 #include "btBulletDynamicsCommon.h"
-#include "btSoftRigidDynamicsWorld.h"
+#include "BulletSoftBody/btSoftRigidDynamicsWorld.h"
+#include <map>
+#include "cinder/Channel.h"
+#include "cinder/gl/VboMesh.h"
 
 #include "cinder/Log.h"
 
diff --git a/src/Cinder-Bullet3D/Conversions.hpp b/src/Cinder-Bullet3D/Conversions.hpp
index 2250f33..3cb9580 100644
--- a/src/Cinder-Bullet3D/Conversions.hpp
+++ b/src/Cinder-Bullet3D/Conversions.hpp
@@ -8,6 +8,11 @@
 
 #pragma once
 
+#include "cinder/Quaternion.h"
+#include "cinder/Vector.h"
+#include "cinder/Matrix.h"
+#include "cinder/TriMesh.h"
+
 namespace bullet {
 	
 // Beginning Conversion from type to type
diff --git a/src/Cinder-Bullet3D/RigidBody.cpp b/src/Cinder-Bullet3D/RigidBody.cpp
index 1804158..eaa3922 100644
--- a/src/Cinder-Bullet3D/RigidBody.cpp
+++ b/src/Cinder-Bullet3D/RigidBody.cpp
@@ -9,7 +9,7 @@
 #include "Cinder-Bullet3D/RigidBody.h"
 #include "Cinder-Bullet3D/Common.h"
 #include "Cinder-Bullet3D/BulletContext.h"
-#include "btCollisionObject.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 
 using namespace ci;