diff --git a/btgui/MidiTest/RtMidi.cpp b/btgui/MidiTest/RtMidi.cpp
index 7d17aa2e5..0789d4d66 100644
--- a/btgui/MidiTest/RtMidi.cpp
+++ b/btgui/MidiTest/RtMidi.cpp
@@ -40,6 +40,7 @@
 
 #include "RtMidi.h"
 #include <sstream>
+#include <stdlib.h> //exit
 
 //*********************************************************************//
 //  RtMidi Definitions
diff --git a/btgui/MidiTest/RtMidi.h b/btgui/MidiTest/RtMidi.h
index 2c31aaadf..878c129d6 100644
--- a/btgui/MidiTest/RtMidi.h
+++ b/btgui/MidiTest/RtMidi.h
@@ -638,7 +638,7 @@ class MidiOutWinKS: public MidiOutApi
 #endif
 
 #if defined(__RTMIDI_DUMMY__)
-aa
+
 class MidiInDummy: public MidiInApi
 {
  public:
diff --git a/build3/premake4.lua b/build3/premake4.lua
index f086e8808..75e44f57c 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -89,10 +89,10 @@
 	
 	language "C++"
 	
-	include "../Test/gtest-1.7.0"
---	include "../Test/hello_gtest"
+	include "../test/gtest-1.7.0"
+--	include "../test/hello_gtest"
 	
-	include "../Test/TestBullet3OpenCL"
+	include "../test/TestBullet3OpenCL"
 	
 	
 	include "../Demos3/AllBullet2Demos"
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp
diff --git a/Test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp
similarity index 100%
rename from Test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp
rename to test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp
diff --git a/Test/OpenCL/BasicInitialize/testInitOpenCL.cpp b/test/OpenCL/BasicInitialize/testInitOpenCL.cpp
similarity index 100%
rename from Test/OpenCL/BasicInitialize/testInitOpenCL.cpp
rename to test/OpenCL/BasicInitialize/testInitOpenCL.cpp
diff --git a/Test/OpenGLTrueTypeFont/main.cpp b/test/OpenGLTrueTypeFont/main.cpp
similarity index 100%
rename from Test/OpenGLTrueTypeFont/main.cpp
rename to test/OpenGLTrueTypeFont/main.cpp
diff --git a/Test/TestBullet3OpenCL/main.cpp b/test/TestBullet3OpenCL/main.cpp
similarity index 100%
rename from Test/TestBullet3OpenCL/main.cpp
rename to test/TestBullet3OpenCL/main.cpp
diff --git a/Test/TestBullet3OpenCL/premake4.lua b/test/TestBullet3OpenCL/premake4.lua
similarity index 93%
rename from Test/TestBullet3OpenCL/premake4.lua
rename to test/TestBullet3OpenCL/premake4.lua
index 0b5a622f1..56147e2f0 100644
--- a/Test/TestBullet3OpenCL/premake4.lua
+++ b/test/TestBullet3OpenCL/premake4.lua
@@ -37,10 +37,11 @@ function createProject(vendor)
 	end
 
 	if os.is("Linux") then 
+		links {"pthread"}
 	end
 
 	if os.is("MacOSX") then
 	end
 end
 
-createProject("clew")
\ No newline at end of file
+createProject("clew")
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-death-test.h b/test/gtest-1.7.0/include/gtest/gtest-death-test.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-death-test.h
rename to test/gtest-1.7.0/include/gtest/gtest-death-test.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-message.h b/test/gtest-1.7.0/include/gtest/gtest-message.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-message.h
rename to test/gtest-1.7.0/include/gtest/gtest-message.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-param-test.h b/test/gtest-1.7.0/include/gtest/gtest-param-test.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-param-test.h
rename to test/gtest-1.7.0/include/gtest/gtest-param-test.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-param-test.h.pump b/test/gtest-1.7.0/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-param-test.h.pump
rename to test/gtest-1.7.0/include/gtest/gtest-param-test.h.pump
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-printers.h b/test/gtest-1.7.0/include/gtest/gtest-printers.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-printers.h
rename to test/gtest-1.7.0/include/gtest/gtest-printers.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-spi.h b/test/gtest-1.7.0/include/gtest/gtest-spi.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-spi.h
rename to test/gtest-1.7.0/include/gtest/gtest-spi.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-test-part.h b/test/gtest-1.7.0/include/gtest/gtest-test-part.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-test-part.h
rename to test/gtest-1.7.0/include/gtest/gtest-test-part.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest-typed-test.h b/test/gtest-1.7.0/include/gtest/gtest-typed-test.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest-typed-test.h
rename to test/gtest-1.7.0/include/gtest/gtest-typed-test.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest.h b/test/gtest-1.7.0/include/gtest/gtest.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest.h
rename to test/gtest-1.7.0/include/gtest/gtest.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest_pred_impl.h b/test/gtest-1.7.0/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest_pred_impl.h
rename to test/gtest-1.7.0/include/gtest/gtest_pred_impl.h
diff --git a/Test/gtest-1.7.0/include/gtest/gtest_prod.h b/test/gtest-1.7.0/include/gtest/gtest_prod.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/gtest_prod.h
rename to test/gtest-1.7.0/include/gtest/gtest_prod.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-death-test-internal.h b/test/gtest-1.7.0/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-death-test-internal.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-death-test-internal.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-filepath.h b/test/gtest-1.7.0/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-filepath.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-filepath.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-internal.h b/test/gtest-1.7.0/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-internal.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-internal.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-linked_ptr.h b/test/gtest-1.7.0/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-linked_ptr.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-linked_ptr.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h b/test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h.pump b/test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h.pump
rename to test/gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-param-util.h b/test/gtest-1.7.0/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-param-util.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-param-util.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-port.h b/test/gtest-1.7.0/include/gtest/internal/gtest-port.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-port.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-port.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-string.h b/test/gtest-1.7.0/include/gtest/internal/gtest-string.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-string.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-string.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h b/test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h.pump b/test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h.pump
rename to test/gtest-1.7.0/include/gtest/internal/gtest-tuple.h.pump
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h b/test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h
rename to test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h
diff --git a/Test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h.pump b/test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from Test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h.pump
rename to test/gtest-1.7.0/include/gtest/internal/gtest-type-util.h.pump
diff --git a/Test/gtest-1.7.0/premake4.lua b/test/gtest-1.7.0/premake4.lua
similarity index 100%
rename from Test/gtest-1.7.0/premake4.lua
rename to test/gtest-1.7.0/premake4.lua
diff --git a/Test/gtest-1.7.0/src/gtest-all.cc b/test/gtest-1.7.0/src/gtest-all.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-all.cc
rename to test/gtest-1.7.0/src/gtest-all.cc
diff --git a/Test/gtest-1.7.0/src/gtest-death-test.cc b/test/gtest-1.7.0/src/gtest-death-test.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-death-test.cc
rename to test/gtest-1.7.0/src/gtest-death-test.cc
diff --git a/Test/gtest-1.7.0/src/gtest-filepath.cc b/test/gtest-1.7.0/src/gtest-filepath.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-filepath.cc
rename to test/gtest-1.7.0/src/gtest-filepath.cc
diff --git a/Test/gtest-1.7.0/src/gtest-internal-inl.h b/test/gtest-1.7.0/src/gtest-internal-inl.h
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-internal-inl.h
rename to test/gtest-1.7.0/src/gtest-internal-inl.h
diff --git a/Test/gtest-1.7.0/src/gtest-port.cc b/test/gtest-1.7.0/src/gtest-port.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-port.cc
rename to test/gtest-1.7.0/src/gtest-port.cc
diff --git a/Test/gtest-1.7.0/src/gtest-printers.cc b/test/gtest-1.7.0/src/gtest-printers.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-printers.cc
rename to test/gtest-1.7.0/src/gtest-printers.cc
diff --git a/Test/gtest-1.7.0/src/gtest-test-part.cc b/test/gtest-1.7.0/src/gtest-test-part.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-test-part.cc
rename to test/gtest-1.7.0/src/gtest-test-part.cc
diff --git a/Test/gtest-1.7.0/src/gtest-typed-test.cc b/test/gtest-1.7.0/src/gtest-typed-test.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest-typed-test.cc
rename to test/gtest-1.7.0/src/gtest-typed-test.cc
diff --git a/Test/gtest-1.7.0/src/gtest.cc b/test/gtest-1.7.0/src/gtest.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest.cc
rename to test/gtest-1.7.0/src/gtest.cc
diff --git a/Test/gtest-1.7.0/src/gtest_main.cc b/test/gtest-1.7.0/src/gtest_main.cc
similarity index 100%
rename from Test/gtest-1.7.0/src/gtest_main.cc
rename to test/gtest-1.7.0/src/gtest_main.cc
diff --git a/Test/hello_gtest/main.cpp b/test/hello_gtest/main.cpp
similarity index 100%
rename from Test/hello_gtest/main.cpp
rename to test/hello_gtest/main.cpp
diff --git a/Test/hello_gtest/premake4.lua b/test/hello_gtest/premake4.lua
similarity index 100%
rename from Test/hello_gtest/premake4.lua
rename to test/hello_gtest/premake4.lua