resolved merge conflicts, now ConfigParser is even more intertwined with other parts

Makefile

@@ -3,7 +3,7 @@ NAME		 =	webserv
 CXX			 =	c++
 
 CXXFLAGS	 =	-Wall -Wextra #-Werror
-CXXFLAGS	+=	-I$(HEADERS_D)
+CXXFLAGS	+=	$(HEADERS_I)
 CXXFLAGS	+=	-std=c++98
 CXXFLAGS	+=	-g
 CXXFLAGS	+=	-MMD -MP #header dependencie
@@ -12,19 +12,20 @@ CXXFLAGS	+=	-MMD -MP #header dependencie
 #SHELL		 =	/bin/zsh
 VPATH		 =	$(SRCS_D)
 
-# HEADERS		 =	$(HEADERS_D:%=-I%)
-HEADERS_D = ./srcs
-HEADERS =	Webserv.hpp \
-			ConfigParser.hpp \
-			ServerConfig.hpp \
-			LocationConfig.hpp \
-			Client.hpp \
-			MethodType.hpp \
-			utils.hpp \
+HEADERS_I	 =	$(HEADERS_D:%=-I%)
+HEADERS_D	 =	srcs \
+				headers
+HEADERS		 =	Webserv.hpp \
+				ConfigParser.hpp \
+				ServerConfig.hpp \
+				LocationConfig.hpp \
+				Client.hpp \
+				MethodType.hpp \
+				utils.hpp \
 
-SRCS_D		 =	srcs srcs/webserv
+SRCS_D		 =	srcs \
+				srcs/webserv
 SRCS		 =	main.cpp \
-				ft_itoa.cpp \
 				base.cpp init.cpp close.cpp epoll_update.cpp signal.cpp \
 				accept.cpp request.cpp response.cpp \
 				run_loop.cpp \