diff --git a/sources/reactphysics3d/body/AABB.cpp b/sources/body/AABB.cpp
similarity index 100%
rename from sources/reactphysics3d/body/AABB.cpp
rename to sources/body/AABB.cpp
diff --git a/sources/reactphysics3d/body/AABB.h b/sources/body/AABB.h
similarity index 100%
rename from sources/reactphysics3d/body/AABB.h
rename to sources/body/AABB.h
diff --git a/sources/reactphysics3d/body/Body.cpp b/sources/body/Body.cpp
similarity index 100%
rename from sources/reactphysics3d/body/Body.cpp
rename to sources/body/Body.cpp
diff --git a/sources/reactphysics3d/body/Body.h b/sources/body/Body.h
similarity index 100%
rename from sources/reactphysics3d/body/Body.h
rename to sources/body/Body.h
diff --git a/sources/reactphysics3d/body/BoundingVolume.cpp b/sources/body/BoundingVolume.cpp
similarity index 100%
rename from sources/reactphysics3d/body/BoundingVolume.cpp
rename to sources/body/BoundingVolume.cpp
diff --git a/sources/reactphysics3d/body/BoundingVolume.h b/sources/body/BoundingVolume.h
similarity index 100%
rename from sources/reactphysics3d/body/BoundingVolume.h
rename to sources/body/BoundingVolume.h
diff --git a/sources/reactphysics3d/body/BroadBoundingVolume.cpp b/sources/body/BroadBoundingVolume.cpp
similarity index 100%
rename from sources/reactphysics3d/body/BroadBoundingVolume.cpp
rename to sources/body/BroadBoundingVolume.cpp
diff --git a/sources/reactphysics3d/body/BroadBoundingVolume.h b/sources/body/BroadBoundingVolume.h
similarity index 100%
rename from sources/reactphysics3d/body/BroadBoundingVolume.h
rename to sources/body/BroadBoundingVolume.h
diff --git a/sources/reactphysics3d/body/NarrowBoundingVolume.cpp b/sources/body/NarrowBoundingVolume.cpp
similarity index 100%
rename from sources/reactphysics3d/body/NarrowBoundingVolume.cpp
rename to sources/body/NarrowBoundingVolume.cpp
diff --git a/sources/reactphysics3d/body/NarrowBoundingVolume.h b/sources/body/NarrowBoundingVolume.h
similarity index 100%
rename from sources/reactphysics3d/body/NarrowBoundingVolume.h
rename to sources/body/NarrowBoundingVolume.h
diff --git a/sources/reactphysics3d/body/OBB.cpp b/sources/body/OBB.cpp
similarity index 100%
rename from sources/reactphysics3d/body/OBB.cpp
rename to sources/body/OBB.cpp
diff --git a/sources/reactphysics3d/body/OBB.h b/sources/body/OBB.h
similarity index 100%
rename from sources/reactphysics3d/body/OBB.h
rename to sources/body/OBB.h
diff --git a/sources/reactphysics3d/body/RigidBody.cpp b/sources/body/RigidBody.cpp
similarity index 100%
rename from sources/reactphysics3d/body/RigidBody.cpp
rename to sources/body/RigidBody.cpp
diff --git a/sources/reactphysics3d/body/RigidBody.h b/sources/body/RigidBody.h
similarity index 100%
rename from sources/reactphysics3d/body/RigidBody.h
rename to sources/body/RigidBody.h
diff --git a/sources/reactphysics3d/collision/BroadPhaseAlgorithm.cpp b/sources/collision/BroadPhaseAlgorithm.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/BroadPhaseAlgorithm.cpp
rename to sources/collision/BroadPhaseAlgorithm.cpp
diff --git a/sources/reactphysics3d/collision/BroadPhaseAlgorithm.h b/sources/collision/BroadPhaseAlgorithm.h
similarity index 100%
rename from sources/reactphysics3d/collision/BroadPhaseAlgorithm.h
rename to sources/collision/BroadPhaseAlgorithm.h
diff --git a/sources/reactphysics3d/collision/CollisionDetection.cpp b/sources/collision/CollisionDetection.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/CollisionDetection.cpp
rename to sources/collision/CollisionDetection.cpp
diff --git a/sources/reactphysics3d/collision/CollisionDetection.h b/sources/collision/CollisionDetection.h
similarity index 100%
rename from sources/reactphysics3d/collision/CollisionDetection.h
rename to sources/collision/CollisionDetection.h
diff --git a/sources/reactphysics3d/collision/ContactInfo.cpp b/sources/collision/ContactInfo.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/ContactInfo.cpp
rename to sources/collision/ContactInfo.cpp
diff --git a/sources/reactphysics3d/collision/ContactInfo.h b/sources/collision/ContactInfo.h
similarity index 100%
rename from sources/reactphysics3d/collision/ContactInfo.h
rename to sources/collision/ContactInfo.h
diff --git a/sources/reactphysics3d/collision/NarrowPhaseAlgorithm.cpp b/sources/collision/NarrowPhaseAlgorithm.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/NarrowPhaseAlgorithm.cpp
rename to sources/collision/NarrowPhaseAlgorithm.cpp
diff --git a/sources/reactphysics3d/collision/NarrowPhaseAlgorithm.h b/sources/collision/NarrowPhaseAlgorithm.h
similarity index 100%
rename from sources/reactphysics3d/collision/NarrowPhaseAlgorithm.h
rename to sources/collision/NarrowPhaseAlgorithm.h
diff --git a/sources/reactphysics3d/collision/NoBroadPhaseAlgorithm.cpp b/sources/collision/NoBroadPhaseAlgorithm.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/NoBroadPhaseAlgorithm.cpp
rename to sources/collision/NoBroadPhaseAlgorithm.cpp
diff --git a/sources/reactphysics3d/collision/NoBroadPhaseAlgorithm.h b/sources/collision/NoBroadPhaseAlgorithm.h
similarity index 100%
rename from sources/reactphysics3d/collision/NoBroadPhaseAlgorithm.h
rename to sources/collision/NoBroadPhaseAlgorithm.h
diff --git a/sources/reactphysics3d/collision/SAPAlgorithm.cpp b/sources/collision/SAPAlgorithm.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/SAPAlgorithm.cpp
rename to sources/collision/SAPAlgorithm.cpp
diff --git a/sources/reactphysics3d/collision/SAPAlgorithm.h b/sources/collision/SAPAlgorithm.h
similarity index 100%
rename from sources/reactphysics3d/collision/SAPAlgorithm.h
rename to sources/collision/SAPAlgorithm.h
diff --git a/sources/reactphysics3d/collision/SATAlgorithm.cpp b/sources/collision/SATAlgorithm.cpp
similarity index 100%
rename from sources/reactphysics3d/collision/SATAlgorithm.cpp
rename to sources/collision/SATAlgorithm.cpp
diff --git a/sources/reactphysics3d/collision/SATAlgorithm.h b/sources/collision/SATAlgorithm.h
similarity index 100%
rename from sources/reactphysics3d/collision/SATAlgorithm.h
rename to sources/collision/SATAlgorithm.h