diff --git a/.gitignore b/.gitignore
index 455212fd..79caed0d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -278,3 +278,7 @@ cathook.cbp
 .cproject
 .settings
 \.directory
+
+\.kdev4/cathook\.kdev4
+
+cathook\.kdev4
diff --git a/.gitmodules b/.gitmodules
old mode 100755
new mode 100644
index 18405cfe..69b2bfe8
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,9 +16,9 @@
 [submodule "external/co-library"]
 	path = external/co-library
 	url = https://github.com/nullworks/co-library.git
-[submodule "include/TF2_NavFile_Reader"]
-	path = include/TF2_NavFile_Reader
-	url = https://github.com/nullworks/TF2_NavFile_Reader.git
 [submodule "external/MicroPather"]
 	path = external/MicroPather
 	url = https://github.com/leethomason/MicroPather
+[submodule "external/TF2_NavFile_Reader"]
+	path = external/TF2_NavFile_Reader
+	url = https://github.com/nullworks/TF2_NavFile_Reader
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d20b371..ca19f3b8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,7 @@ target_include_directories(cathook SYSTEM PRIVATE
 
 target_include_directories(cathook PRIVATE "external/ucccccp")
 target_include_directories(cathook PRIVATE "external/MicroPather")
+target_include_directories(cathook PRIVATE "external/TF2_NavFile_Reader")
 
 if(EnableWarnings)
     target_compile_options(cathook PRIVATE -Wall -Wextra)
diff --git a/include/TF2_NavFile_Reader b/external/TF2_NavFile_Reader
similarity index 100%
rename from include/TF2_NavFile_Reader
rename to external/TF2_NavFile_Reader
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index f8f33bfe..1d2601d5 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -50,7 +50,6 @@ add_subdirectory(classinfo)
 add_subdirectory(copypasted)
 add_subdirectory(hacks)
 add_subdirectory(hooks)
-add_subdirectory(TF2_NavFile_Reader)
 add_subdirectory(reclasses)
 add_subdirectory(sdk)
 add_subdirectory(online)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c54107fb..97b8202a 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,7 @@ target_sources(cathook PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/velocity.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/votelogger.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.cpp"
-	"${CMAKE_CURRENT_LIST_DIR}/navparser.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/navparser.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/Options.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/PlayerTools.cpp")