diff --git a/src/collision/GJK/GJKAlgorithm.h b/src/collision/GJK/GJKAlgorithm.h
index b79aa149..9e9888e6 100644
--- a/src/collision/GJK/GJKAlgorithm.h
+++ b/src/collision/GJK/GJKAlgorithm.h
@@ -29,7 +29,7 @@
 #include "../NarrowPhaseAlgorithm.h"
 #include "../ContactInfo.h"
 #include "../../shapes/Shape.h"
-#include "../EPA/EPAAlgorithm.h"
+#include "../narrowphase/EPA/EPAAlgorithm.h"
 
 
 // ReactPhysics3D namespace
diff --git a/src/collision/EPA/EPAAlgorithm.cpp b/src/collision/narrowphase/EPA/EPAAlgorithm.cpp
similarity index 99%
rename from src/collision/EPA/EPAAlgorithm.cpp
rename to src/collision/narrowphase/EPA/EPAAlgorithm.cpp
index 9f0de3af..d0282592 100644
--- a/src/collision/EPA/EPAAlgorithm.cpp
+++ b/src/collision/narrowphase/EPA/EPAAlgorithm.cpp
@@ -24,7 +24,7 @@
 
 // Libraries
 #include "EPAAlgorithm.h"
-#include "../GJK/GJKAlgorithm.h"
+#include "../../GJK/GJKAlgorithm.h"
 #include "TrianglesStore.h"
 
 // We want to use the ReactPhysics3D namespace
diff --git a/src/collision/EPA/EPAAlgorithm.h b/src/collision/narrowphase/EPA/EPAAlgorithm.h
similarity index 97%
rename from src/collision/EPA/EPAAlgorithm.h
rename to src/collision/narrowphase/EPA/EPAAlgorithm.h
index d8ed53a4..68a0381a 100644
--- a/src/collision/EPA/EPAAlgorithm.h
+++ b/src/collision/narrowphase/EPA/EPAAlgorithm.h
@@ -26,10 +26,10 @@
 #define EPA_ALGORITHM_H
 
 // Libraries
-#include "../GJK/Simplex.h"
-#include "../../shapes/Shape.h"
-#include "../ContactInfo.h"
-#include "../../mathematics/mathematics.h"
+#include "../../GJK/Simplex.h"
+#include "../../../shapes/Shape.h"
+#include "../../ContactInfo.h"
+#include "../../../mathematics/mathematics.h"
 #include "TriangleEPA.h"
 #include <algorithm>
 
diff --git a/src/collision/EPA/EdgeEPA.cpp b/src/collision/narrowphase/EPA/EdgeEPA.cpp
similarity index 100%
rename from src/collision/EPA/EdgeEPA.cpp
rename to src/collision/narrowphase/EPA/EdgeEPA.cpp
diff --git a/src/collision/EPA/EdgeEPA.h b/src/collision/narrowphase/EPA/EdgeEPA.h
similarity index 98%
rename from src/collision/EPA/EdgeEPA.h
rename to src/collision/narrowphase/EPA/EdgeEPA.h
index 0d5dc7d0..58e87cca 100644
--- a/src/collision/EPA/EdgeEPA.h
+++ b/src/collision/narrowphase/EPA/EdgeEPA.h
@@ -27,7 +27,7 @@
 
 
 // Libraries
-#include "../../mathematics/mathematics.h"
+#include "../../../mathematics/mathematics.h"
 
 // ReactPhysics3D namespace
 namespace reactphysics3d {
diff --git a/src/collision/EPA/TriangleEPA.cpp b/src/collision/narrowphase/EPA/TriangleEPA.cpp
similarity index 100%
rename from src/collision/EPA/TriangleEPA.cpp
rename to src/collision/narrowphase/EPA/TriangleEPA.cpp
diff --git a/src/collision/EPA/TriangleEPA.h b/src/collision/narrowphase/EPA/TriangleEPA.h
similarity index 98%
rename from src/collision/EPA/TriangleEPA.h
rename to src/collision/narrowphase/EPA/TriangleEPA.h
index e8250064..9552911c 100644
--- a/src/collision/EPA/TriangleEPA.h
+++ b/src/collision/narrowphase/EPA/TriangleEPA.h
@@ -26,8 +26,8 @@
 #define TRIANGLE_EPA_H
 
 // Libraries
-#include "../../mathematics/mathematics.h"
-#include "../../constants.h"
+#include "../../../mathematics/mathematics.h"
+#include "../../../constants.h"
 #include "EdgeEPA.h"
 #include <cassert>
 
diff --git a/src/collision/EPA/TrianglesStore.cpp b/src/collision/narrowphase/EPA/TrianglesStore.cpp
similarity index 100%
rename from src/collision/EPA/TrianglesStore.cpp
rename to src/collision/narrowphase/EPA/TrianglesStore.cpp
diff --git a/src/collision/EPA/TrianglesStore.h b/src/collision/narrowphase/EPA/TrianglesStore.h
similarity index 100%
rename from src/collision/EPA/TrianglesStore.h
rename to src/collision/narrowphase/EPA/TrianglesStore.h