diff --git a/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp b/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
index dfccf0bd9..5643ae388 100644
--- a/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
+++ b/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
@@ -23,17 +23,17 @@ subject to the following restrictions:
 //#define BATCH_RAYCASTER
 
 #ifdef BATCH_RAYCASTER
-#include "../../Extras/BulletMultiThreaded/SpuBatchRaycaster.h"
+#include "BulletMultiThreaded/SpuBatchRaycaster.h"
 static SpuBatchRaycaster* gBatchRaycaster = NULL;
 #endif
 
 #ifdef USE_LIBSPE2
-#include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h"
+#include "BulletMultiThreaded/SpuLibspe2Support.h"
 #elif defined (WIN32)
-#include "../../Extras/BulletMultiThreaded/Win32ThreadSupport.h"
+#include "BulletMultiThreaded/Win32ThreadSupport.h"
 #else
 //other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
-#include "../../Extras/BulletMultiThreaded/SequentialThreadSupport.h"
+#include "BulletMultiThreaded/SequentialThreadSupport.h"
 #endif //USE_LIBSPE2
 
 static btVector3*	gVertices=0;
diff --git a/Demos/EPAPenDepthDemo/Jamfile b/Demos/EPAPenDepthDemo/Jamfile
index 9337cde8d..bd058241d 100644
--- a/Demos/EPAPenDepthDemo/Jamfile
+++ b/Demos/EPAPenDepthDemo/Jamfile
@@ -6,7 +6,7 @@ SubDir TOP Demos EPAPenDepthDemo ;
 
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :    GIMPACT  bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
+    LinkWith $(<) :    bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Demos/OpenGL ]
           [ FIncludes $(TOP)/Extras/GIMPACT/include ]
@@ -14,8 +14,7 @@ SubDir TOP Demos EPAPenDepthDemo ;
     ;
 
     MsvcIncDirs $(<) :
-        "../../Demos/OpenGL"
-        "../../Extras/GIMPACT/include" ;
+        "../../Demos/OpenGL" ;
   }
 
 ExtraDemo4 EPAPenDepthDemo : [ Wildcard *.h *.cpp  ] ;
diff --git a/Demos/GimpactTestDemo/GimpactTestDemo.h b/Demos/GimpactTestDemo/GimpactTestDemo.h
index 269cb6bd1..42ff51bd4 100644
--- a/Demos/GimpactTestDemo/GimpactTestDemo.h
+++ b/Demos/GimpactTestDemo/GimpactTestDemo.h
@@ -27,16 +27,16 @@ class btDefaultCollisionConfiguration;
 
 #ifdef BULLET_GIMPACT
 
-#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 	#ifdef BULLET_GIMPACT_CONVEX_DECOMPOSITION
-	#include "btGImpactConvexDecompositionShape.h"
+	#include "../Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h"
 	#endif
 
 
 #else
 
-#include "btConcaveConcaveCollisionAlgorithm.h"
-#include "btGIMPACTMeshShape.h"
+#include "BulletCollision/Gimpact/btConcaveConcaveCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGIMPACTMeshShape.h"
 
 #endif
 
diff --git a/Demos/GimpactTestDemo/Jamfile b/Demos/GimpactTestDemo/Jamfile
index 7b614be6d..b55b23882 100644
--- a/Demos/GimpactTestDemo/Jamfile
+++ b/Demos/GimpactTestDemo/Jamfile
@@ -6,16 +6,14 @@ SubDir TOP Demos GimpactTestDemo ;
 
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   GIMPACTUtils GIMPACT  bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
+    LinkWith $(<) :   GIMPACTUtils  bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Demos/OpenGL ]
-       	  [ FIncludes $(TOP)/Extras/GIMPACT/include ]
  	  [ FIncludes $(TOP)/Extras/GIMPACTUtils ]
     ;
 
     MsvcIncDirs $(<) :
         "../../Demos/OpenGL"
-      	"../../Extras/GIMPACT/include"
 	"../../Extras/GIMPACTUtils"	
  	;
   }
diff --git a/Demos/Jamfile b/Demos/Jamfile
index e72d95d06..7020ac0fa 100644
--- a/Demos/Jamfile
+++ b/Demos/Jamfile
@@ -50,13 +50,12 @@ if $(GLUT.AVAILABLE) = "yes"
   rule FrameWorkDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  GIMPACTUtils  GIMPACT  bulletopenglsupport bulletsoftbody  convexdecomposition   bulletdynamics bulletcollision bulletmath glui ;
+    LinkWith $(<) :  GIMPACTUtils   bulletopenglsupport bulletsoftbody  convexdecomposition   bulletdynamics bulletcollision bulletmath glui ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Extras ]
          [ FIncludes $(TOP)/Demos/OpenGL ]
 	[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
 	[ FIncludes $(TOP)/Extras/ConvexHull ]
-	  [ FIncludes $(TOP)/Extras/GIMPACT/include ]
           [ FIncludes $(TOP)/Extras/GIMPACTUtils ]
     ;
     MsvcIncDirs $(<) :
@@ -65,7 +64,6 @@ if $(GLUT.AVAILABLE) = "yes"
 	"../../Extras/ConvexHull"
         "../../Demos/OpenGL"
 	"../../Extras/ConvexDecomposition"
-	"../../Extras/GIMPACT/include"
         "../../Extras/GIMPACTUtils"
 ;
 
diff --git a/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp
index d4179c50f..8dcfe48db 100644
--- a/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp
+++ b/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp
@@ -20,8 +20,8 @@ subject to the following restrictions:
 #include "LinearMath/btIDebugDraw.h"
 #include "LinearMath/btQuickprof.h"
 #include "LinearMath/btDefaultMotionState.h"
-#include "GIMPACT/Bullet/btGImpactShape.h"
-#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactShape.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 
 
 
diff --git a/Demos/MovingConcaveDemo/Jamfile b/Demos/MovingConcaveDemo/Jamfile
index 5757da7a7..05d0e58a9 100644
--- a/Demos/MovingConcaveDemo/Jamfile
+++ b/Demos/MovingConcaveDemo/Jamfile
@@ -6,16 +6,14 @@ SubDir TOP Demos MovingConcaveDemo ;
 
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   GIMPACT  bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
+    LinkWith $(<) :    bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Demos/OpenGL ]
-       	  [ FIncludes $(TOP)/Extras/GIMPACT/include ]
  	  		
     ;
 
     MsvcIncDirs $(<) :
-        "../../Demos/OpenGL"
-      	"../../Extras/GIMPACT/include" 	;
+        "../../Demos/OpenGL" ;
   }
 
 ExtraDemo1 MovingConcaveDemo : [ Wildcard *.h *.cpp  ] ;
diff --git a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
index 1ed317be6..0c540ba15 100644
--- a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
+++ b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
@@ -21,29 +21,29 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
 
 #ifdef USE_PARALLEL_DISPATCHER
-#include "../../Extras/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
-#include "../../Extras/BulletMultiThreaded/PlatformDefinitions.h"
+#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
+#include "BulletMultiThreaded/PlatformDefinitions.h"
 
 #ifdef USE_LIBSPE2
-#include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h"
+#include "BulletMultiThreaded/SpuLibspe2Support.h"
 #elif defined (WIN32)
-#include "../../Extras/BulletMultiThreaded/Win32ThreadSupport.h"
-#include "../../Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
+#include "BulletMultiThreaded/Win32ThreadSupport.h"
+#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
 
 #elif defined (USE_PTHREADS)
 
-#include "../../Extras/BulletMultiThreaded/PosixThreadSupport.h"
-#include "../../Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
+#include "BulletMultiThreaded/PosixThreadSupport.h"
+#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
 
 #else
 //other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
-#include "../../Extras/BulletMultiThreaded/SequentialThreadSupport.h"
-#include "../../Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
+#include "BulletMultiThreaded/SequentialThreadSupport.h"
+#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
 #endif //USE_LIBSPE2
 
 #ifdef USE_PARALLEL_SOLVER
-#include "../../Extras/BulletMultiThreaded/SpuParallelSolver.h"
-#include "../../Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h"
+#include "BulletMultiThreaded/SpuParallelSolver.h"
+#include "BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h"
 #endif //USE_PARALLEL_SOLVER
 
 #endif//USE_PARALLEL_DISPATCHER
diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt
index b10813436..cac9bb394 100644
--- a/Extras/CMakeLists.txt
+++ b/Extras/CMakeLists.txt
@@ -1,5 +1 @@
-if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	SUBDIRS( glui ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
-else (CMAKE_SIZEOF_VOID_P MATCHES "8")
-	SUBDIRS( glui ConvexDecomposition BulletMultiThreaded BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
-endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+SUBDIRS( glui ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils )
diff --git a/Extras/GIMPACTUtils/Jamfile b/Extras/GIMPACTUtils/Jamfile
index b7df9995a..af50674d9 100644
--- a/Extras/GIMPACTUtils/Jamfile
+++ b/Extras/GIMPACTUtils/Jamfile
@@ -1,10 +1,8 @@
 SubDir TOP Extras GIMPACTUtils ;
 
-#IncludeDir Extras/GIMPACT/include ;
 
 Library GIMPACTUtils : [ Wildcard .  : */.h *.cpp ] : noinstall ;
-CFlags GIMPACTUtils : [ FIncludes $(TOP)/Extras/GIMPACT/include ] [ FIncludes $(TOP)/Extras/GIMPACTUtils ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] ;
-LibDepends GIMPACTUtils : GIMPACT ;
+CFlags GIMPACTUtils : [ FIncludes $(TOP)/Extras/GIMPACTUtils ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] ;
 LibDepends GIMPACTUtils : convexdecomposition ;
 
    MsvcIncDirs GIMPACTUtils : 
diff --git a/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h b/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h
index bc56c0952..4710861f3 100644
--- a/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h
+++ b/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h
@@ -25,7 +25,7 @@ subject to the following restrictions:
 #define GIMPACT_CONVEX_DECOMPOSITION_SHAPE_H
 
 
-#include "GIMPACT/Bullet/btGImpactShape.h" // box tree class
+#include "BulletCollision/Gimpact/btGImpactShape.h" // box tree class
 
 
 
diff --git a/Extras/Jamfile b/Extras/Jamfile
index dd87d70fa..2060ae88d 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -5,10 +5,8 @@ SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras glui ;
 SubInclude TOP Extras LibXML ;
 SubInclude TOP Extras BulletColladaConverter ;
-SubInclude TOP Extras BulletMultiThreaded ;
 #SubInclude TOP Extras EPA ;
 #SubInclude TOP Extras ExtraSolid35 ;
-SubInclude TOP Extras GIMPACT ;
 SubInclude TOP Extras GIMPACTUtils ;
 #GPUphysics needs 'make', not jam compatible build yet:
 #SubInclude TOP Extras GPUphysics ;
diff --git a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
index 9ecd7a9d5..7a79ac257 100644
--- a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
+++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
@@ -15,6 +15,16 @@ subject to the following restrictions:
 
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
 
+btPolyhedralConvexShape::btPolyhedralConvexShape() :btConvexInternalShape(),
+m_localAabbMin(1,1,1),
+m_localAabbMax(-1,-1,-1),
+m_isLocalAabbValid(false),
+m_optionalHull(0)
+{
+
+}
+
+
 btVector3	btPolyhedralConvexShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0)const
 {
 	int i;
diff --git a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
index 3d52c0d33..6a823e73b 100644
--- a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
+++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
@@ -31,17 +31,9 @@ protected:
 	btVector3	m_localAabbMax;
 	bool		m_isLocalAabbValid;
 
-	btPolyhedralConvexShape() :btConvexInternalShape(),
-m_localAabbMin(1,1,1),
-m_localAabbMax(-1,-1,-1),
-m_isLocalAabbValid(false),
-m_optionalHull(0)
-{
-
-}
 public:
 
-	
+	btPolyhedralConvexShape();
 
 	//brute force implementations
 
diff --git a/src/BulletCollision/Jamfile b/src/BulletCollision/Jamfile
index bd968fdfb..9c79feafe 100644
--- a/src/BulletCollision/Jamfile
+++ b/src/BulletCollision/Jamfile
@@ -3,6 +3,7 @@ SubDir TOP src BulletCollision ;
 
 Description bulletcollision : "Bullet Collision Detection" ;
 Library bulletcollision :
+  [ Wildcard Gimpact : *.h *.cpp ]
   [ Wildcard BroadphaseCollision : *.h *.cpp ] 
   [ Wildcard CollisionDispatch : *.h *.cpp ] 
   [ Wildcard CollisionShapes : *.h *.cpp ] 
diff --git a/src/BulletMultiThreaded/CMakeLists.txt b/src/BulletMultiThreaded/CMakeLists.txt
index 88eb9c8db..267d2ee06 100644
--- a/src/BulletMultiThreaded/CMakeLists.txt
+++ b/src/BulletMultiThreaded/CMakeLists.txt
@@ -1,5 +1,4 @@
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletMultiThreaded/
 ${BULLET_PHYSICS_SOURCE_DIR}/src
 )
 
diff --git a/src/BulletMultiThreaded/Jamfile b/src/BulletMultiThreaded/Jamfile
index 970cb4925..76a918277 100644
--- a/src/BulletMultiThreaded/Jamfile
+++ b/src/BulletMultiThreaded/Jamfile
@@ -1,12 +1,12 @@
-SubDir TOP Extras BulletMultiThreaded ;
+SubDir TOP src BulletMultiThreaded ;
 
-#IncludeDir Extras/BulletMultiThreaded ;
+#IncludeDir src/BulletMultiThreaded ;
 
 Library bulletmultithreaded : [ Wildcard . : */.h *.cpp ] [ Wildcard SpuNarrowPhaseCollisionTask : *.h *.cpp  ] [ Wildcard SpuSolverTask : *.h *.cpp  ] : noinstall ;
-CFlags bulletmultithreaded : [ FIncludes $(TOP)/Extras/BulletMultiThreaded ] ;
+CFlags bulletmultithreaded : [ FIncludes $(TOP)/src/BulletMultiThreaded ] ;
 LibDepends bulletmultithreaded :  ;
 
    MsvcIncDirs bulletmultithreaded : 
-	"../../Extras/BulletMultiThreaded"  ;
+	"../../src/BulletMultiThreaded"  ;
 
 InstallHeader [ Wildcard *.h ] : bulletmultithreaded ;
diff --git a/src/BulletMultiThreaded/PosixThreadSupport.h b/src/BulletMultiThreaded/PosixThreadSupport.h
index 1c4855dbd..24ed1ec7c 100644
--- a/src/BulletMultiThreaded/PosixThreadSupport.h
+++ b/src/BulletMultiThreaded/PosixThreadSupport.h
@@ -111,6 +111,10 @@ public:
 ///tell the task scheduler we are done with the SPU tasks
 	virtual	void stopSPU();
 
+	virtual void setNumTasks(int numTasks)
+	{
+	}
+
 };
 
 #endif // POSIX_THREAD_SUPPORT_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1470d6d48..87a4c0391 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1 +1,7 @@
-SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath )
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+SUBDIRS( BulletSoftBody BulletCollision BulletDynamics Linea
+rMath )
+else (CMAKE_SIZEOF_VOID_P MATCHES "8")
+SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics Linea
+rMath )
+endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
diff --git a/src/Jamfile b/src/Jamfile
index c80617ae5..5689366b2 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,8 +1,7 @@
 SubDir TOP src ;
-
+SubInclude TOP src BulletMultiThreaded ;
 SubInclude TOP src BulletSoftBody ;
 SubInclude TOP src BulletCollision ;
 SubInclude TOP src BulletDynamics ;
 SubInclude TOP src LinearMath ;
-
 Recurse InstallHeader : .h  ;