diff --git a/Makefile b/Makefile
index be6ed7a..d8eef65 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ HDR=\
 	src/CNShardServer.hpp\
 	src/CNShared.hpp\
 	src/CNStructs.hpp\
-	src/INIReader.hpp\
+	src/contrib/INIReader.hpp\
+	src/contrib/JSON.hpp\
 	src/NanoManager.hpp\
 	src/ItemManager.hpp\
 	src/NPCManager.hpp\
diff --git a/src/NPCManager.cpp b/src/NPCManager.cpp
index 8ac6a0d..42206dd 100644
--- a/src/NPCManager.cpp
+++ b/src/NPCManager.cpp
@@ -6,7 +6,7 @@
 #include <list>
 #include <fstream>
 
-#include "JSON.hpp"
+#include "contrib/JSON.hpp"
 
 std::map<int32_t, BaseNPC> NPCManager::NPCs;
 
diff --git a/src/INIReader.hpp b/src/contrib/INIReader.hpp
similarity index 100%
rename from src/INIReader.hpp
rename to src/contrib/INIReader.hpp
diff --git a/src/JSON.hpp b/src/contrib/JSON.hpp
similarity index 100%
rename from src/JSON.hpp
rename to src/contrib/JSON.hpp
diff --git a/src/settings.cpp b/src/settings.cpp
index a4fcb47..59dff6d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include "settings.hpp"
-#include "INIReader.hpp"
+#include "contrib/INIReader.hpp"
 
 // defaults :)
 int settings::LOGINPORT = 8001;