diff --git a/src/body/Body.cpp b/src/body/Body.cpp
index a1d8e57e..db642792 100644
--- a/src/body/Body.cpp
+++ b/src/body/Body.cpp
@@ -25,7 +25,7 @@
 
  // Libraries
 #include "Body.h"
-#include "../shapes/Collider.h"
+#include "../colliders/Collider.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/body/Body.h b/src/body/Body.h
index e4c6bb4e..cd295ffc 100644
--- a/src/body/Body.h
+++ b/src/body/Body.h
@@ -30,8 +30,8 @@
 #include <stdexcept>
 #include <cassert>
 #include "../mathematics/Transform.h"
-#include "../shapes/AABB.h"
-#include "../shapes/Collider.h"
+#include "../colliders/AABB.h"
+#include "../colliders/Collider.h"
 #include "../configuration.h"
 
 // Namespace reactphysics3d
diff --git a/src/body/RigidBody.cpp b/src/body/RigidBody.cpp
index 88fb35cf..ec6906eb 100644
--- a/src/body/RigidBody.cpp
+++ b/src/body/RigidBody.cpp
@@ -25,7 +25,7 @@
 
 // Libraries
 #include "RigidBody.h"
-#include "../shapes/Collider.h"
+#include "../colliders/Collider.h"
 
 // We want to use the ReactPhysics3D namespace
 using namespace reactphysics3d;
diff --git a/src/body/RigidBody.h b/src/body/RigidBody.h
index 7c978de5..80eed40b 100644
--- a/src/body/RigidBody.h
+++ b/src/body/RigidBody.h
@@ -29,7 +29,7 @@
 // Libraries
 #include <cassert>
 #include "Body.h"
-#include "../shapes/Collider.h"
+#include "../colliders/Collider.h"
 #include "../mathematics/mathematics.h"
 
 // Namespace reactphysics3d
diff --git a/src/shapes/AABB.cpp b/src/colliders/AABB.cpp
similarity index 100%
rename from src/shapes/AABB.cpp
rename to src/colliders/AABB.cpp
diff --git a/src/shapes/AABB.h b/src/colliders/AABB.h
similarity index 100%
rename from src/shapes/AABB.h
rename to src/colliders/AABB.h
diff --git a/src/shapes/BoxCollider.cpp b/src/colliders/BoxCollider.cpp
similarity index 100%
rename from src/shapes/BoxCollider.cpp
rename to src/colliders/BoxCollider.cpp
diff --git a/src/shapes/BoxCollider.h b/src/colliders/BoxCollider.h
similarity index 100%
rename from src/shapes/BoxCollider.h
rename to src/colliders/BoxCollider.h
diff --git a/src/shapes/Collider.cpp b/src/colliders/Collider.cpp
similarity index 100%
rename from src/shapes/Collider.cpp
rename to src/colliders/Collider.cpp
diff --git a/src/shapes/Collider.h b/src/colliders/Collider.h
similarity index 100%
rename from src/shapes/Collider.h
rename to src/colliders/Collider.h
diff --git a/src/shapes/ConeCollider..cpp b/src/colliders/ConeCollider..cpp
similarity index 100%
rename from src/shapes/ConeCollider..cpp
rename to src/colliders/ConeCollider..cpp
diff --git a/src/shapes/ConeCollider.h b/src/colliders/ConeCollider.h
similarity index 100%
rename from src/shapes/ConeCollider.h
rename to src/colliders/ConeCollider.h
diff --git a/src/shapes/CylinderCollider.cpp b/src/colliders/CylinderCollider.cpp
similarity index 100%
rename from src/shapes/CylinderCollider.cpp
rename to src/colliders/CylinderCollider.cpp
diff --git a/src/shapes/CylinderCollider.h b/src/colliders/CylinderCollider.h
similarity index 100%
rename from src/shapes/CylinderCollider.h
rename to src/colliders/CylinderCollider.h
diff --git a/src/shapes/SphereCollider.cpp b/src/colliders/SphereCollider.cpp
similarity index 100%
rename from src/shapes/SphereCollider.cpp
rename to src/colliders/SphereCollider.cpp
diff --git a/src/shapes/SphereCollider.h b/src/colliders/SphereCollider.h
similarity index 100%
rename from src/shapes/SphereCollider.h
rename to src/colliders/SphereCollider.h
diff --git a/src/collision/CollisionDetection.cpp b/src/collision/CollisionDetection.cpp
index f1222fba..1d94331d 100644
--- a/src/collision/CollisionDetection.cpp
+++ b/src/collision/CollisionDetection.cpp
@@ -28,7 +28,7 @@
 #include "broadphase/SweepAndPruneAlgorithm.h"
 #include "narrowphase/GJK/GJKAlgorithm.h"
 #include "../body/Body.h"
-#include "../shapes/BoxCollider.h"
+#include "../colliders/BoxCollider.h"
 #include "../body/RigidBody.h"
 #include "../configuration.h"
 #include <cassert>
diff --git a/src/collision/ContactInfo.h b/src/collision/ContactInfo.h
index 51e2aecf..b93c2979 100644
--- a/src/collision/ContactInfo.h
+++ b/src/collision/ContactInfo.h
@@ -27,7 +27,7 @@
 #define	CONTACT_INFO_H
 
 // Libraries
-#include "../shapes/BoxCollider.h"
+#include "../colliders/BoxCollider.h"
 #include "../mathematics/mathematics.h"
 
 // ReactPhysics3D namespace
diff --git a/src/collision/broadphase/SweepAndPruneAlgorithm.h b/src/collision/broadphase/SweepAndPruneAlgorithm.h
index ce4554ac..45078025 100644
--- a/src/collision/broadphase/SweepAndPruneAlgorithm.h
+++ b/src/collision/broadphase/SweepAndPruneAlgorithm.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include "BroadPhaseAlgorithm.h"
-#include "../../shapes/AABB.h"
+#include "../../colliders/AABB.h"
 
 
 // Namespace ReactPhysics3D
diff --git a/src/collision/narrowphase/EPA/EPAAlgorithm.h b/src/collision/narrowphase/EPA/EPAAlgorithm.h
index 90bb07f0..8adf0bbd 100644
--- a/src/collision/narrowphase/EPA/EPAAlgorithm.h
+++ b/src/collision/narrowphase/EPA/EPAAlgorithm.h
@@ -28,7 +28,7 @@
 
 // Libraries
 #include "../GJK/Simplex.h"
-#include "../../../shapes/Collider.h"
+#include "../../../colliders/Collider.h"
 #include "../../ContactInfo.h"
 #include "../../../mathematics/mathematics.h"
 #include "TriangleEPA.h"
diff --git a/src/collision/narrowphase/GJK/GJKAlgorithm.h b/src/collision/narrowphase/GJK/GJKAlgorithm.h
index 098cb173..6a1f770e 100644
--- a/src/collision/narrowphase/GJK/GJKAlgorithm.h
+++ b/src/collision/narrowphase/GJK/GJKAlgorithm.h
@@ -29,7 +29,7 @@
 // Libraries
 #include "../NarrowPhaseAlgorithm.h"
 #include "../../ContactInfo.h"
-#include "../../../shapes/Collider.h"
+#include "../../../colliders/Collider.h"
 #include "../EPA/EPAAlgorithm.h"
 
 
diff --git a/src/decimal.h b/src/decimal.h
new file mode 100755
index 00000000..e2963de8
--- /dev/null
+++ b/src/decimal.h
@@ -0,0 +1,41 @@
+/********************************************************************************
+* ReactPhysics3D physics library, http://code.google.com/p/reactphysics3d/      *
+* Copyright (c) 2010-2012 Daniel Chappuis                                       *
+*********************************************************************************
+*                                                                               *
+* This software is provided 'as-is', without any express or implied warranty.   *
+* In no event will the authors be held liable for any damages arising from the  *
+* use of this software.                                                         *
+*                                                                               *
+* Permission is granted to anyone to use this software for any purpose,         *
+* including commercial applications, and to alter it and redistribute it        *
+* freely, subject to the following restrictions:                                *
+*                                                                               *
+* 1. The origin of this software must not be misrepresented; you must not claim *
+*    that you wrote the original software. If you use this software in a        *
+*    product, an acknowledgment in the product documentation would be           *
+*    appreciated but is not required.                                           *
+*                                                                               *
+* 2. Altered source versions must be plainly marked as such, and must not be    *
+*    misrepresented as being the original software.                             *
+*                                                                               *
+* 3. This notice may not be removed or altered from any source distribution.    *
+*                                                                               *
+********************************************************************************/
+
+#ifndef DECIMAL_H
+#define	DECIMAL_H
+
+// ReactPhysiscs3D namespace
+namespace reactphysics3d {
+
+#if defined(DOUBLE_PRECISION_ENABLED)   // If we are compiling for double precision
+    typedef double decimal;
+#else                           // If we are compiling for single precision
+    typedef float decimal;
+#endif
+
+}
+
+#endif
+
diff --git a/src/reactphysics3d.h b/src/reactphysics3d.h
index 38733190..ca8973e7 100644
--- a/src/reactphysics3d.h
+++ b/src/reactphysics3d.h
@@ -40,12 +40,12 @@
 #include "body/RigidBody.h"
 #include "engine/PhysicsWorld.h"
 #include "engine/PhysicsEngine.h"
-#include "shapes/Collider.h"
-#include "shapes/BoxCollider.h"
-#include "shapes/SphereCollider.h"
-#include "shapes/ConeCollider.h"
-#include "shapes/CylinderCollider.h"
-#include "shapes/AABB.h"
+#include "colliders/Collider.h"
+#include "colliders/BoxCollider.h"
+#include "colliders/SphereCollider.h"
+#include "colliders/ConeCollider.h"
+#include "colliders/CylinderCollider.h"
+#include "colliders/AABB.h"
 
 // Alias to the ReactPhysics3D namespace
 namespace rp3d = reactphysics3d;