diff --git a/modules/autonavigation/CMakeLists.txt b/modules/autonavigation/CMakeLists.txt
index a324789083..477d7d9345 100644
--- a/modules/autonavigation/CMakeLists.txt
+++ b/modules/autonavigation/CMakeLists.txt
@@ -28,7 +28,6 @@ set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/atnodenavigator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/autonavigationmodule.h
   ${CMAKE_CURRENT_SOURCE_DIR}/autonavigationhandler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/avoidcollisioncurve.h
   ${CMAKE_CURRENT_SOURCE_DIR}/helperfunctions.h
   ${CMAKE_CURRENT_SOURCE_DIR}/instruction.h
   ${CMAKE_CURRENT_SOURCE_DIR}/pathspecification.h
@@ -37,7 +36,8 @@ set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/rotationinterpolator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/speedfunction.h
   ${CMAKE_CURRENT_SOURCE_DIR}/waypoint.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/zoomoutoverviewcurve.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/curves/avoidcollisioncurve.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/curves/zoomoutoverviewcurve.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
@@ -46,7 +46,6 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/autonavigationmodule.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/autonavigationmodule_lua.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/autonavigationhandler.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/avoidcollisioncurve.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/helperfunctions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/instruction.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/pathspecification.cpp
@@ -55,7 +54,8 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/rotationinterpolator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/speedfunction.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/waypoint.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/zoomoutoverviewcurve.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/curves/avoidcollisioncurve.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/curves/zoomoutoverviewcurve.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/autonavigation/avoidcollisioncurve.cpp b/modules/autonavigation/curves/avoidcollisioncurve.cpp
similarity index 99%
rename from modules/autonavigation/avoidcollisioncurve.cpp
rename to modules/autonavigation/curves/avoidcollisioncurve.cpp
index 4d29b50628..89db1422b0 100644
--- a/modules/autonavigation/avoidcollisioncurve.cpp
+++ b/modules/autonavigation/curves/avoidcollisioncurve.cpp
@@ -22,7 +22,7 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 
-#include <modules/autonavigation/avoidcollisioncurve.h>
+#include <modules/autonavigation/curves/avoidcollisioncurve.h>
 
 #include <modules/autonavigation/autonavigationmodule.h>
 #include <modules/autonavigation/helperfunctions.h>
diff --git a/modules/autonavigation/avoidcollisioncurve.h b/modules/autonavigation/curves/avoidcollisioncurve.h
similarity index 100%
rename from modules/autonavigation/avoidcollisioncurve.h
rename to modules/autonavigation/curves/avoidcollisioncurve.h
diff --git a/modules/autonavigation/zoomoutoverviewcurve.cpp b/modules/autonavigation/curves/zoomoutoverviewcurve.cpp
similarity index 98%
rename from modules/autonavigation/zoomoutoverviewcurve.cpp
rename to modules/autonavigation/curves/zoomoutoverviewcurve.cpp
index 46805d0bd2..5ec42880e1 100644
--- a/modules/autonavigation/zoomoutoverviewcurve.cpp
+++ b/modules/autonavigation/curves/zoomoutoverviewcurve.cpp
@@ -22,7 +22,7 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 
-#include <modules/autonavigation/zoomoutoverviewcurve.h>
+#include <modules/autonavigation/curves/zoomoutoverviewcurve.h>
 
 #include <modules/autonavigation/autonavigationmodule.h>
 #include <modules/autonavigation/helperfunctions.h>
diff --git a/modules/autonavigation/zoomoutoverviewcurve.h b/modules/autonavigation/curves/zoomoutoverviewcurve.h
similarity index 100%
rename from modules/autonavigation/zoomoutoverviewcurve.h
rename to modules/autonavigation/curves/zoomoutoverviewcurve.h
diff --git a/modules/autonavigation/pathsegment.cpp b/modules/autonavigation/pathsegment.cpp
index 5a9afef2cb..9144bb2f36 100644
--- a/modules/autonavigation/pathsegment.cpp
+++ b/modules/autonavigation/pathsegment.cpp
@@ -25,12 +25,12 @@
 #include <modules/autonavigation/pathsegment.h>
 
 #include <modules/autonavigation/autonavigationmodule.h>
-#include <modules/autonavigation/avoidcollisioncurve.h>
 #include <modules/autonavigation/helperfunctions.h>
 #include <modules/autonavigation/pathcurves.h>
 #include <modules/autonavigation/rotationinterpolator.h>
 #include <modules/autonavigation/speedfunction.h>
-#include <modules/autonavigation/zoomoutoverviewcurve.h>
+#include <modules/autonavigation/curves/avoidcollisioncurve.h>
+#include <modules/autonavigation/curves/zoomoutoverviewcurve.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/scene/scenegraphnode.h>