diff --git a/pugixml/pugiconfig.hpp b/3rdparty/pugixml/pugiconfig.hpp
similarity index 100%
rename from pugixml/pugiconfig.hpp
rename to 3rdparty/pugixml/pugiconfig.hpp
diff --git a/pugixml/pugixml.cpp b/3rdparty/pugixml/pugixml.cpp
similarity index 100%
rename from pugixml/pugixml.cpp
rename to 3rdparty/pugixml/pugixml.cpp
diff --git a/pugixml/pugixml.hpp b/3rdparty/pugixml/pugixml.hpp
similarity index 100%
rename from pugixml/pugixml.hpp
rename to 3rdparty/pugixml/pugixml.hpp
diff --git a/makefile b/makefile
index 1381dd1..28f5bf5 100644
--- a/makefile
+++ b/makefile
@@ -15,8 +15,9 @@ CC = g++ -std=c++17
 # compiler options and optimization flags
 OPT = -O3 -Wall -Werror -Wunused-variable -Wsign-compare
 
-# include library path
-LIB = pugixml/
+# include 3rd party libraries paths
+LIBB := 3rdparty/
+LIB := $(foreach dir,$(shell ls $(LIBB)),-I $(LIBB)$(dir))
 
 # determine git version/commit tag
 GTAG := $(shell git tag | tail -n1)
@@ -52,11 +53,11 @@ main.o : src/main.cpp lib/$(SRC).hpp $(HPP)
 		sed -i '' 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
 		sed -i '' 's/HASHSTRING/$(GHSH)/g' $<.cpp; \
 	fi
-	$(CC) -c $(OPT) -I $(LIB) -I lib/ $<.cpp -o $@
+	$(CC) -c $(OPT) $(LIB) -I lib/ $<.cpp -o $@
 	@rm $<.cpp
 
 $(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp $(HPP)
-	$(CC) -c $(OPT) -I $(LIB) $< -o $@
+	$(CC) -c $(OPT) $(LIB) $< -o $@
 
 cpp-clean :
 	rm -f $(EXE) *.o src/main.cpp.cpp