diff --git a/Demos/AllBulletDemos/Jamfile b/Demos/AllBulletDemos/Jamfile
new file mode 100644
index 000000000..3019367f7
--- /dev/null
+++ b/Demos/AllBulletDemos/Jamfile
@@ -0,0 +1,11 @@
+SubDir TOP Demos AllBulletDemos ;
+
+FrameWorkDemo AllBulletDemos : 
+[ Wildcard *.h *.cpp  ] 
+	../CcdPhysicsDemo/CcdPhysicsDemo.cpp
+        ../BasicDemo/BasicDemo.cpp
+        ../BspDemo/BspDemo.cpp
+        ../BspDemo/BspConverter.cpp
+        ../BspDemo/BspLoader.cpp
+
+;
diff --git a/Examples/TestBed/FrameWork/Main.cpp b/Demos/AllBulletDemos/Main.cpp
similarity index 100%
rename from Examples/TestBed/FrameWork/Main.cpp
rename to Demos/AllBulletDemos/Main.cpp
diff --git a/Examples/TestBed/FrameWork/Render.cpp b/Demos/AllBulletDemos/Render.cpp
similarity index 100%
rename from Examples/TestBed/FrameWork/Render.cpp
rename to Demos/AllBulletDemos/Render.cpp
diff --git a/Examples/TestBed/FrameWork/Render.h b/Demos/AllBulletDemos/Render.h
similarity index 100%
rename from Examples/TestBed/FrameWork/Render.h
rename to Demos/AllBulletDemos/Render.h
diff --git a/Examples/TestBed/FrameWork/Test.cpp b/Demos/AllBulletDemos/Test.cpp
similarity index 100%
rename from Examples/TestBed/FrameWork/Test.cpp
rename to Demos/AllBulletDemos/Test.cpp
diff --git a/Examples/TestBed/FrameWork/Test.h b/Demos/AllBulletDemos/Test.h
similarity index 100%
rename from Examples/TestBed/FrameWork/Test.h
rename to Demos/AllBulletDemos/Test.h
diff --git a/Examples/TestBed/Tests/TestEntries.cpp b/Demos/AllBulletDemos/TestEntries.cpp
similarity index 85%
rename from Examples/TestBed/Tests/TestEntries.cpp
rename to Demos/AllBulletDemos/TestEntries.cpp
index 6e06c78e7..bfd0e5219 100644
--- a/Examples/TestBed/Tests/TestEntries.cpp
+++ b/Demos/AllBulletDemos/TestEntries.cpp
@@ -1,8 +1,8 @@
 
 
-#include "../FrameWork/Test.h"
+#include "Test.h"
 
-#include "../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.h"
+#include "../CcdPhysicsDemo/CcdPhysicsDemo.h"
 
 class CcdPhysicsTest : public Test
 {
@@ -27,7 +27,7 @@ public:
 	}
 };
 
-#include "../../../Demos/BspDemo/BspDemo.h"
+#include "../BspDemo/BspDemo.h"
 
 class BspDemoTest : public Test
 {
diff --git a/Examples/Jamfile b/Examples/Jamfile
deleted file mode 100644
index 93cbb6fcb..000000000
--- a/Examples/Jamfile
+++ /dev/null
@@ -1,3 +0,0 @@
-SubDir TOP Examples ;
-
-SubInclude TOP Examples TestBed ;
diff --git a/Examples/TestBed/FrameWork/Jamfile b/Examples/TestBed/FrameWork/Jamfile
deleted file mode 100644
index edc3c8732..000000000
--- a/Examples/TestBed/FrameWork/Jamfile
+++ /dev/null
@@ -1,11 +0,0 @@
-SubDir TOP Examples TestBed FrameWork ;
-
-FrameWorkDemo AllBulletDemos : 
-[ Wildcard *.h *.cpp  ] 
-	../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
-        ../../../Demos/BasicDemo/BasicDemo.cpp
-        ../../../Demos/BspDemo/BspDemo.cpp
-        ../../../Demos/BspDemo/BspConverter.cpp
-        ../../../Demos/BspDemo/BspLoader.cpp
-
-;
diff --git a/Examples/TestBed/FrameWork/TestEntries.cpp b/Examples/TestBed/FrameWork/TestEntries.cpp
deleted file mode 100644
index 6e06c78e7..000000000
--- a/Examples/TestBed/FrameWork/TestEntries.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-#include "../FrameWork/Test.h"
-
-#include "../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.h"
-
-class CcdPhysicsTest : public Test
-{
-	CcdPhysicsDemo*	m_demo;
-	CcdPhysicsTest()
-	{
-		m_demo = new CcdPhysicsDemo();
-		m_demo->initPhysics();
-	}
-	virtual ~CcdPhysicsTest()
-	{
-		delete m_demo;
-	}
-public:
-	void Step(const Settings* settings)
-	{
-		m_demo->clientMoveAndDisplay();
-	}
-	static Test* Create()
-	{
-		return new CcdPhysicsTest;
-	}
-};
-
-#include "../../../Demos/BspDemo/BspDemo.h"
-
-class BspDemoTest : public Test
-{
-	BspDemo*	m_demo;
-
-	BspDemoTest()
-	{
-		m_demo = new BspDemo();
-		m_demo->initPhysics("BspDemo.bsp");
-	}
-	virtual ~BspDemoTest()
-	{
-		delete m_demo;
-	}
-public:
-	void Step(const Settings* settings)
-	{
-		m_demo->clientMoveAndDisplay();
-	}
-	static Test* Create()
-	{
-		return new BspDemoTest;
-	}
-};
-
-
-TestEntry g_testEntries[] =
-{
-		{"CcdPhysics Test", CcdPhysicsTest::Create},
-		{"BspDemo Test", BspDemoTest::Create},
-		{0, 0}
-};
-
diff --git a/Examples/TestBed/Jamfile b/Examples/TestBed/Jamfile
deleted file mode 100644
index 31d6a3df5..000000000
--- a/Examples/TestBed/Jamfile
+++ /dev/null
@@ -1,24 +0,0 @@
-SubDir TOP Examples TestBed ;
-
-if $(GLUT.AVAILABLE) = "yes"
-{
-  # All demo apps have a lot in common, so use this rule to simply things
-  rule FrameWorkDemo
-  {
-    Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   bulletopenglsupport bulletdynamics bulletcollision bulletmath glui ;
-    CFlags $(<) : 
-	  [ FIncludes $(TOP)/Extras ] 
-	 [ FIncludes $(TOP)/Demos/OpenGL ]
-    ;
-    MsvcIncDirs $(<) : 
-	"../../Extras" 
-	"../../src" 
-	"../../Demos/OpenGL"
-;
-
-  }
-}
-
-
-SubInclude TOP Examples TestBed FrameWork ;
diff --git a/Examples/TestBed/Tests/Jamfile b/Examples/TestBed/Tests/Jamfile
deleted file mode 100644
index 2484c6ba8..000000000
--- a/Examples/TestBed/Tests/Jamfile
+++ /dev/null
@@ -1,25 +0,0 @@
-SubDir TOP Examples TestBed Tests ;
-
-if $(GLUT.AVAILABLE) = "yes"
-{
-
-
-  Description Tests : "Bullet Tests" ;
-  Library Tests : 
-	../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp 
-	../../../Demos/BasicDemo/BasicDemo.cpp 
-	../../../Demos/BspDemo/BspDemo.cpp
-	../../../Demos/BspDemo/BspConverter.cpp
-	../../../Demos/BspDemo/BspLoader.cpp
-	[ Wildcard *.h *.cpp ]
- : noinstall 
-;
-
-CFlags Tests :
- [ FIncludes $(TOP)/Demos/OpenGL ]
-;
-
-LibDepends Tests : bulletdynamics   ;
-
-  ExternalLibs Tests : GLUT ;
-}