diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt
index ed325b97c..1c7525048 100644
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -1,2 +1,2 @@
-SUBDIRS( OpenGL CcdPhysicsDemo BspDemo ColladaDemo VehicleDemo ForkLiftDemo UserCollisionAlgorithm )
+SUBDIRS( OpenGL CcdPhysicsDemo BspDemo ColladaDemo UserCollisionAlgorithm )
 
diff --git a/Demos/CcdPhysicsDemo/CMakeLists.txt b/Demos/CcdPhysicsDemo/CMakeLists.txt
index 1aec56ab1..3d38de35b 100644
--- a/Demos/CcdPhysicsDemo/CMakeLists.txt
+++ b/Demos/CcdPhysicsDemo/CMakeLists.txt
@@ -48,11 +48,11 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )
 
 LINK_LIBRARIES(
-LibOpenGLSupport LibCcdPhysicsInterface LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
+LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
 )
 
 ADD_EXECUTABLE(CcdPhysicsDemo
diff --git a/Demos/Jamfile b/Demos/Jamfile
index 45ba348a5..431fca0fa 100644
--- a/Demos/Jamfile
+++ b/Demos/Jamfile
@@ -8,28 +8,23 @@ if $(GLUT.AVAILABLE) = "yes"
   rule BulletDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  bulletcollision bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ;
+    LinkWith $(<) :  bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
     CFlags $(<) : 
 	  [ FIncludes $(TOP)/Demos/OpenGL ] 
-	  [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] 
-	  [ FIncludes $(TOP)/Extras/PhysicsInterface/Common ] 
     ;
     MsvcIncDirs $(<) : 
 	"../../Demos/OpenGL" 
-	"../../Extras/PhysicsInterface/CcdPhysics" 
-	"../../Extras/PhysicsInterface/Common" ;
+	"../../src" ;
   }
 
   #some demos need extra functionality, Collada / ConvexDecomposition etc.
   rule ExtraDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   collada-dom libxml convexdecomposition bulletcollision bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ;
+    LinkWith $(<) :   collada-dom libxml convexdecomposition bulletdynamics bulletcollision  bulletopenglsupport  bulletmath ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Demos/OpenGL ]
-          [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
-          [ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
-	  			[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
+       	  			[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
  	  			[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
  	  			[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
 	  			[ FIncludes $(TOP)/Extras/LibXML ]
@@ -40,9 +35,7 @@ if $(GLUT.AVAILABLE) = "yes"
     ;
     MsvcIncDirs $(<) :
         "../../Demos/OpenGL"
-        "../../Extras/PhysicsInterface/CcdPhysics"
-        "../../Extras/PhysicsInterface/Common" 
-	"../../Extras/ConvexDecomposition" 
+      	"../../Extras/ConvexDecomposition" 
 	"../../Extras/COLLADA_DOM/include"
  	"../../Extras/COLLADA_DOM/include/1.4"
 	"../../Extras/LibXML"
@@ -62,24 +55,22 @@ else
  rule BulletBasicDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  bulletcollision bulletphysicsinterfacecommon bulletccdphysics bulletmath ;
+    LinkWith $(<) :  bulletcollision  bulletmath ;
     CFlags $(<) :
-          [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
-          [ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
-    ;
+          [ FIncludes $(TOP)/src ]
+           ;
     MsvcIncDirs $(<) :
-        "../../Extras/PhysicsInterface/CcdPhysics"
-        "../../Extras/PhysicsInterface/Common" ;
+        "../../src" ;
   }
 
 SubInclude TOP Demos CcdPhysicsDemo ;
 SubInclude TOP Demos UserCollisionAlgorithm ;
-SubInclude TOP Demos ForkLiftDemo ;
+#SubInclude TOP Demos ForkLiftDemo ;
 SubInclude TOP Demos BspDemo ;
 SubInclude TOP Demos ConvexDecompositionDemo ;
 SubInclude TOP Demos ColladaDemo ;
 SubInclude TOP Demos BspDemo ;
-SubInclude TOP Demos VehicleDemo ;
+#SubInclude TOP Demos VehicleDemo ;
 SubInclude TOP Demos CollisionDemo ;
 SubInclude TOP Demos CollisionInterfaceDemo ;
 SubInclude TOP Demos ConcaveDemo ;
diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt
index 89fb9b9c5..be3bf071c 100644
--- a/Extras/CMakeLists.txt
+++ b/Extras/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS( PhysicsInterface LibXML COLLADA_DOM )
+SUBDIRS( LibXML COLLADA_DOM )
diff --git a/Extras/Jamfile b/Extras/Jamfile
index 06ef45425..69cbdd2f2 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -1,6 +1,5 @@
 SubDir TOP Extras ;
 
-SubInclude TOP Extras PhysicsInterface ;
 SubInclude TOP Extras ConvexDecomposition ;
 SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras LibXML ;