diff --git a/src/reactphysics3d/collision/BroadPhaseAlgorithm.cpp b/src/collision/BroadPhaseAlgorithm.cpp
similarity index 100%
rename from src/reactphysics3d/collision/BroadPhaseAlgorithm.cpp
rename to src/collision/BroadPhaseAlgorithm.cpp
diff --git a/src/reactphysics3d/collision/BroadPhaseAlgorithm.h b/src/collision/BroadPhaseAlgorithm.h
similarity index 100%
rename from src/reactphysics3d/collision/BroadPhaseAlgorithm.h
rename to src/collision/BroadPhaseAlgorithm.h
diff --git a/src/reactphysics3d/collision/CollisionDetection.cpp b/src/collision/CollisionDetection.cpp
similarity index 100%
rename from src/reactphysics3d/collision/CollisionDetection.cpp
rename to src/collision/CollisionDetection.cpp
diff --git a/src/reactphysics3d/collision/CollisionDetection.h b/src/collision/CollisionDetection.h
similarity index 100%
rename from src/reactphysics3d/collision/CollisionDetection.h
rename to src/collision/CollisionDetection.h
diff --git a/src/reactphysics3d/collision/ContactInfo.cpp b/src/collision/ContactInfo.cpp
similarity index 100%
rename from src/reactphysics3d/collision/ContactInfo.cpp
rename to src/collision/ContactInfo.cpp
diff --git a/src/reactphysics3d/collision/ContactInfo.h b/src/collision/ContactInfo.h
similarity index 100%
rename from src/reactphysics3d/collision/ContactInfo.h
rename to src/collision/ContactInfo.h
diff --git a/src/reactphysics3d/collision/NarrowPhaseAlgorithm.cpp b/src/collision/NarrowPhaseAlgorithm.cpp
similarity index 100%
rename from src/reactphysics3d/collision/NarrowPhaseAlgorithm.cpp
rename to src/collision/NarrowPhaseAlgorithm.cpp
diff --git a/src/reactphysics3d/collision/NarrowPhaseAlgorithm.h b/src/collision/NarrowPhaseAlgorithm.h
similarity index 100%
rename from src/reactphysics3d/collision/NarrowPhaseAlgorithm.h
rename to src/collision/NarrowPhaseAlgorithm.h
diff --git a/src/reactphysics3d/collision/NoBroadPhaseAlgorithm.cpp b/src/collision/NoBroadPhaseAlgorithm.cpp
similarity index 100%
rename from src/reactphysics3d/collision/NoBroadPhaseAlgorithm.cpp
rename to src/collision/NoBroadPhaseAlgorithm.cpp
diff --git a/src/reactphysics3d/collision/NoBroadPhaseAlgorithm.h b/src/collision/NoBroadPhaseAlgorithm.h
similarity index 100%
rename from src/reactphysics3d/collision/NoBroadPhaseAlgorithm.h
rename to src/collision/NoBroadPhaseAlgorithm.h
diff --git a/src/reactphysics3d/collision/SAPAlgorithm.cpp b/src/collision/SAPAlgorithm.cpp
similarity index 100%
rename from src/reactphysics3d/collision/SAPAlgorithm.cpp
rename to src/collision/SAPAlgorithm.cpp
diff --git a/src/reactphysics3d/collision/SAPAlgorithm.h b/src/collision/SAPAlgorithm.h
similarity index 100%
rename from src/reactphysics3d/collision/SAPAlgorithm.h
rename to src/collision/SAPAlgorithm.h
diff --git a/src/reactphysics3d/collision/SATAlgorithm.cpp b/src/collision/SATAlgorithm.cpp
similarity index 100%
rename from src/reactphysics3d/collision/SATAlgorithm.cpp
rename to src/collision/SATAlgorithm.cpp
diff --git a/src/reactphysics3d/collision/SATAlgorithm.h b/src/collision/SATAlgorithm.h
similarity index 100%
rename from src/reactphysics3d/collision/SATAlgorithm.h
rename to src/collision/SATAlgorithm.h
diff --git a/src/reactphysics3d/constraint/Constraint.cpp b/src/constraint/Constraint.cpp
similarity index 100%
rename from src/reactphysics3d/constraint/Constraint.cpp
rename to src/constraint/Constraint.cpp
diff --git a/src/reactphysics3d/constraint/Constraint.h b/src/constraint/Constraint.h
similarity index 100%
rename from src/reactphysics3d/constraint/Constraint.h
rename to src/constraint/Constraint.h
diff --git a/src/reactphysics3d/constraint/Contact.cpp b/src/constraint/Contact.cpp
similarity index 100%
rename from src/reactphysics3d/constraint/Contact.cpp
rename to src/constraint/Contact.cpp
diff --git a/src/reactphysics3d/constraint/Contact.h b/src/constraint/Contact.h
similarity index 100%
rename from src/reactphysics3d/constraint/Contact.h
rename to src/constraint/Contact.h
diff --git a/src/reactphysics3d/engine/ConstraintSolver.cpp b/src/engine/ConstraintSolver.cpp
similarity index 100%
rename from src/reactphysics3d/engine/ConstraintSolver.cpp
rename to src/engine/ConstraintSolver.cpp
diff --git a/src/reactphysics3d/engine/ConstraintSolver.h b/src/engine/ConstraintSolver.h
similarity index 100%
rename from src/reactphysics3d/engine/ConstraintSolver.h
rename to src/engine/ConstraintSolver.h
diff --git a/src/reactphysics3d/engine/ContactCache.cpp b/src/engine/ContactCache.cpp
similarity index 100%
rename from src/reactphysics3d/engine/ContactCache.cpp
rename to src/engine/ContactCache.cpp
diff --git a/src/reactphysics3d/engine/ContactCache.h b/src/engine/ContactCache.h
similarity index 100%
rename from src/reactphysics3d/engine/ContactCache.h
rename to src/engine/ContactCache.h
diff --git a/src/reactphysics3d/engine/ContactCachingInfo.cpp b/src/engine/ContactCachingInfo.cpp
similarity index 100%
rename from src/reactphysics3d/engine/ContactCachingInfo.cpp
rename to src/engine/ContactCachingInfo.cpp
diff --git a/src/reactphysics3d/engine/ContactCachingInfo.h b/src/engine/ContactCachingInfo.h
similarity index 100%
rename from src/reactphysics3d/engine/ContactCachingInfo.h
rename to src/engine/ContactCachingInfo.h
diff --git a/src/reactphysics3d/engine/PhysicsEngine.cpp b/src/engine/PhysicsEngine.cpp
similarity index 100%
rename from src/reactphysics3d/engine/PhysicsEngine.cpp
rename to src/engine/PhysicsEngine.cpp
diff --git a/src/reactphysics3d/engine/PhysicsEngine.h b/src/engine/PhysicsEngine.h
similarity index 100%
rename from src/reactphysics3d/engine/PhysicsEngine.h
rename to src/engine/PhysicsEngine.h
diff --git a/src/reactphysics3d/engine/PhysicsWorld.cpp b/src/engine/PhysicsWorld.cpp
similarity index 100%
rename from src/reactphysics3d/engine/PhysicsWorld.cpp
rename to src/engine/PhysicsWorld.cpp
diff --git a/src/reactphysics3d/engine/PhysicsWorld.h b/src/engine/PhysicsWorld.h
similarity index 100%
rename from src/reactphysics3d/engine/PhysicsWorld.h
rename to src/engine/PhysicsWorld.h
diff --git a/src/reactphysics3d/engine/Timer.cpp b/src/engine/Timer.cpp
similarity index 100%
rename from src/reactphysics3d/engine/Timer.cpp
rename to src/engine/Timer.cpp
diff --git a/src/reactphysics3d/engine/Timer.h b/src/engine/Timer.h
similarity index 100%
rename from src/reactphysics3d/engine/Timer.h
rename to src/engine/Timer.h
diff --git a/src/reactphysics3d/mathematics/Matrix.cpp b/src/mathematics/Matrix.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/Matrix.cpp
rename to src/mathematics/Matrix.cpp
diff --git a/src/reactphysics3d/mathematics/Matrix.h b/src/mathematics/Matrix.h
similarity index 100%
rename from src/reactphysics3d/mathematics/Matrix.h
rename to src/mathematics/Matrix.h
diff --git a/src/reactphysics3d/mathematics/Matrix3x3.cpp b/src/mathematics/Matrix3x3.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/Matrix3x3.cpp
rename to src/mathematics/Matrix3x3.cpp
diff --git a/src/reactphysics3d/mathematics/Matrix3x3.h b/src/mathematics/Matrix3x3.h
similarity index 100%
rename from src/reactphysics3d/mathematics/Matrix3x3.h
rename to src/mathematics/Matrix3x3.h
diff --git a/src/reactphysics3d/mathematics/Quaternion.cpp b/src/mathematics/Quaternion.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/Quaternion.cpp
rename to src/mathematics/Quaternion.cpp
diff --git a/src/reactphysics3d/mathematics/Quaternion.h b/src/mathematics/Quaternion.h
similarity index 100%
rename from src/reactphysics3d/mathematics/Quaternion.h
rename to src/mathematics/Quaternion.h
diff --git a/src/reactphysics3d/mathematics/Vector.cpp b/src/mathematics/Vector.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/Vector.cpp
rename to src/mathematics/Vector.cpp
diff --git a/src/reactphysics3d/mathematics/Vector.h b/src/mathematics/Vector.h
similarity index 100%
rename from src/reactphysics3d/mathematics/Vector.h
rename to src/mathematics/Vector.h
diff --git a/src/reactphysics3d/mathematics/Vector3D.cpp b/src/mathematics/Vector3D.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/Vector3D.cpp
rename to src/mathematics/Vector3D.cpp
diff --git a/src/reactphysics3d/mathematics/Vector3D.h b/src/mathematics/Vector3D.h
similarity index 100%
rename from src/reactphysics3d/mathematics/Vector3D.h
rename to src/mathematics/Vector3D.h
diff --git a/src/reactphysics3d/mathematics/constants.h b/src/mathematics/constants.h
similarity index 100%
rename from src/reactphysics3d/mathematics/constants.h
rename to src/mathematics/constants.h
diff --git a/src/reactphysics3d/mathematics/exceptions.cpp b/src/mathematics/exceptions.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/exceptions.cpp
rename to src/mathematics/exceptions.cpp
diff --git a/src/reactphysics3d/mathematics/exceptions.h b/src/mathematics/exceptions.h
similarity index 100%
rename from src/reactphysics3d/mathematics/exceptions.h
rename to src/mathematics/exceptions.h
diff --git a/src/reactphysics3d/mathematics/lcp/LCPProjectedGaussSeidel.cpp b/src/mathematics/lcp/LCPProjectedGaussSeidel.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/lcp/LCPProjectedGaussSeidel.cpp
rename to src/mathematics/lcp/LCPProjectedGaussSeidel.cpp
diff --git a/src/reactphysics3d/mathematics/lcp/LCPProjectedGaussSeidel.h b/src/mathematics/lcp/LCPProjectedGaussSeidel.h
similarity index 100%
rename from src/reactphysics3d/mathematics/lcp/LCPProjectedGaussSeidel.h
rename to src/mathematics/lcp/LCPProjectedGaussSeidel.h
diff --git a/src/reactphysics3d/mathematics/lcp/LCPSolver.cpp b/src/mathematics/lcp/LCPSolver.cpp
similarity index 100%
rename from src/reactphysics3d/mathematics/lcp/LCPSolver.cpp
rename to src/mathematics/lcp/LCPSolver.cpp
diff --git a/src/reactphysics3d/mathematics/lcp/LCPSolver.h b/src/mathematics/lcp/LCPSolver.h
similarity index 100%
rename from src/reactphysics3d/mathematics/lcp/LCPSolver.h
rename to src/mathematics/lcp/LCPSolver.h
diff --git a/src/reactphysics3d/mathematics/mathematics.h b/src/mathematics/mathematics.h
similarity index 100%
rename from src/reactphysics3d/mathematics/mathematics.h
rename to src/mathematics/mathematics.h
diff --git a/src/reactphysics3d/mathematics/mathematics_functions.h b/src/mathematics/mathematics_functions.h
similarity index 100%
rename from src/reactphysics3d/mathematics/mathematics_functions.h
rename to src/mathematics/mathematics_functions.h