diff --git a/ft_printf_include_libft/Makefile b/ft_printf_include_libft/Makefile
index 8a4ae84..e69de29 100644
--- a/ft_printf_include_libft/Makefile
+++ b/ft_printf_include_libft/Makefile
@@ -1,60 +0,0 @@
-LIBFT = ./libft/libft.a
-
-NAME = libftprintf.a
-
-srcs =
-subsrcs =
-
-SRCS =  ft_printf.c 			\
-	ft_parser.c					\
-	ft_parser_utils.c					\
-	ft_put_c.c 					\
-	ft_put_d.c					\
-	ft_put_d_utilc.c   		\
-	ft_put_p.c					\
-	ft_put_s.c \
-	ft_put_u.c					\
-	ft_put_x.c					\
-	ft_put_u.c	\
-	ft_put_u_utilc.c					\
-	ft_put_x.c\
-	ft_put_x_utilc.c					\
-	ft_put_p.c\
-	ft_put_p_utilc.c					\
-	putmaket_utils.c\
-	ft_put_d_undersize.c					\
-
-OBJDIR= ./obj/
-# addprefix (OBJDIR, OBJS)
-
-SURPL_O = *.o
-
-CC = gcc
-
-CFLAGS = -c -Wall -Wextra -Werror -I .
-
-OBJS = $(SRCS:.c=.o)
-
-VPATH =
-
-$(NAME): $(OBJS)
-	mkdir -p $(OBJDIR)
-	$(CC) $(CFLAGS) $(SRCS)
-
-lib:
-	make bonus -C ./libft
-	cp libft/libft.a $(NAME)
-
-all : lib $(NAME)
-	ar -rcs $(NAME) $(OBJS)
-
-clean :
-	$(MAKE) clean -C ./libft
-	rm -f $(SURPL_O)
-	rm -f $(OBJS)
-
-fclean : clean
-	$(MAKE) fclean -C ./libft
-	rm -f $(NAME)
-
-re : fclean all
diff --git a/ft_printf_include_libft/ft_printf.h.gch b/ft_printf_include_libft/ft_printf.h.gch
deleted file mode 100644
index c587b14..0000000
Binary files a/ft_printf_include_libft/ft_printf.h.gch and /dev/null differ
diff --git a/ft_printf_include_libft/libft/Makefile b/ft_printf_include_libft/libft/Makefile
index 4fa9369..b5a2fb2 100644
--- a/ft_printf_include_libft/libft/Makefile
+++ b/ft_printf_include_libft/libft/Makefile
@@ -1,49 +1,47 @@
-# **************************************************************************** #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    Makefile                                           :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2020/10/28 11:52:03 by mdenys            #+#    #+#              #
-#    Updated: 2021/01/10 22:56:29 by mdenys           ###   ########.fr        #
-#                                                                              #
-# **************************************************************************** #
+.PHONY:			all clean fclean re
 
-SRCS			=	ft_isalnum.c ft_isprint.c ft_memcmp.c  ft_putchar_fd.c ft_split.c \
+SRCS			=		ft_isalnum.c ft_isprint.c ft_memcmp.c  ft_putchar_fd.c ft_split.c \
 					ft_strlcat.c ft_strncmp.c ft_substr.c ft_atoi.c ft_isalpha.c \
 					ft_itoa.c ft_memcpy.c  ft_putendl_fd.c ft_strchr.c  ft_strlcpy.c \
 					ft_strnstr.c ft_tolower.c ft_bzero.c   ft_isascii.c ft_memccpy.c \
 					ft_memmove.c ft_putnbr_fd.c  ft_strdup.c  ft_strlen.c  ft_strrchr.c \
 					ft_toupper.c ft_calloc.c  ft_isdigit.c ft_memchr.c  ft_memset.c  \
-					ft_putstr_fd.c  ft_strjoin.c ft_strmapi.c ft_strtrim.c ft_putchar.c
-OBJS			= $(SRCS:.c=.o)
-
-BONUS			=	ft_lstadd_back.c ft_lstadd_front.c ft_lstclear.c \
+					ft_putstr_fd.c  ft_strjoin.c ft_strmapi.c ft_strtrim.c ft_putchar.c\
+					ft_lstadd_back.c ft_lstadd_front.c ft_lstclear.c \
 					ft_lstdelone.c ft_lstiter.c ft_lstlast.c \
 					ft_lstmap.c ft_lstnew.c ft_lstsize.c
-BONUS_OBJS		= $(BONUS:.c=.o)
+
+SRC_DIR = ./src/
+OBJ_DIR = ./obj/
+
+OBJS			= $(SRCS:%.c=%.o)
+
+OBJS_FILES = $(addprefix $(OBJ_DIR), $(OBJS))
+
+HEADER = libft.h
+
+vpath %.h includes
+vpath %.o $(OBJ_DIR)
+vpath %.c $(SRC_DIR)
 
 CC				= gcc
 RM				= rm -f
-CFLAGS			= -Wall -Wextra -Werror -I.
+CFLAGS			= -Wall -Wextra -Werror -I ./includes/
 
 NAME			= libft.a
 
-all:			$(NAME)
+all:	$(NAME)
 
-$(NAME):		$(OBJS) libft.h
+$(NAME):		$(OBJS_FILES)
 				ar rcs $@ $?
 
 clean:
-				$(RM) $(OBJS) $(BONUS_OBJS)
+				$(RM) $(OBJS_FILES)
+
+$(OBJ_DIR)%.o: %.c $(HEADER)
+	$(CC) $(CFLAGS) -c $< -o $@
 
 fclean:			clean
 				$(RM) $(NAME)
 
 re:				fclean $(NAME)
-
-bonus:			$(OBJS) $(BONUS_OBJS) libft.h
-				ar rcs $(NAME) $(OBJS) $(BONUS_OBJS)
-
-.PHONY:			all clean fclean re bonus
diff --git a/ft_printf_include_libft/libft/libft.h b/ft_printf_include_libft/libft/includes/libft.h
similarity index 100%
rename from ft_printf_include_libft/libft/libft.h
rename to ft_printf_include_libft/libft/includes/libft.h
diff --git a/ft_printf_include_libft/libft/ft_atoi.c b/ft_printf_include_libft/libft/src/ft_atoi.c
similarity index 94%
rename from ft_printf_include_libft/libft/ft_atoi.c
rename to ft_printf_include_libft/libft/src/ft_atoi.c
index 79f6a02..f7b0f59 100644
--- a/ft_printf_include_libft/libft/ft_atoi.c
+++ b/ft_printf_include_libft/libft/src/ft_atoi.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 13:36:13 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 17:22:30 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:03 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 static int		ch(char ch)
 {
diff --git a/ft_printf_include_libft/libft/ft_bzero.c b/ft_printf_include_libft/libft/src/ft_bzero.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_bzero.c
rename to ft_printf_include_libft/libft/src/ft_bzero.c
index 7e2c4eb..b065593 100644
--- a/ft_printf_include_libft/libft/ft_bzero.c
+++ b/ft_printf_include_libft/libft/src/ft_bzero.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 12:19:35 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/29 18:24:02 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_bzero(void *s, size_t num)
 {
diff --git a/ft_printf_include_libft/libft/ft_calloc.c b/ft_printf_include_libft/libft/src/ft_calloc.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_calloc.c
rename to ft_printf_include_libft/libft/src/ft_calloc.c
index 3422564..9950a49 100644
--- a/ft_printf_include_libft/libft/ft_calloc.c
+++ b/ft_printf_include_libft/libft/src/ft_calloc.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/01 19:59:31 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/01 20:41:24 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	*ft_calloc(size_t num, size_t size)
 {
diff --git a/ft_printf_include_libft/libft/ft_isalnum.c b/ft_printf_include_libft/libft/src/ft_isalnum.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_isalnum.c
rename to ft_printf_include_libft/libft/src/ft_isalnum.c
index 46ab34b..845975d 100644
--- a/ft_printf_include_libft/libft/ft_isalnum.c
+++ b/ft_printf_include_libft/libft/src/ft_isalnum.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 16:43:05 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/29 19:50:43 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_isalnum(int c)
 {
diff --git a/ft_printf_include_libft/libft/ft_isalpha.c b/ft_printf_include_libft/libft/src/ft_isalpha.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_isalpha.c
rename to ft_printf_include_libft/libft/src/ft_isalpha.c
index cb4c04f..0a94d91 100644
--- a/ft_printf_include_libft/libft/ft_isalpha.c
+++ b/ft_printf_include_libft/libft/src/ft_isalpha.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 14:03:52 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/30 11:46:57 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_isalpha(int c)
 {
diff --git a/ft_printf_include_libft/libft/ft_isascii.c b/ft_printf_include_libft/libft/src/ft_isascii.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_isascii.c
rename to ft_printf_include_libft/libft/src/ft_isascii.c
index a715209..552f102 100644
--- a/ft_printf_include_libft/libft/ft_isascii.c
+++ b/ft_printf_include_libft/libft/src/ft_isascii.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 18:53:32 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/30 11:54:20 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_isascii(int c)
 {
diff --git a/ft_printf_include_libft/libft/ft_isdigit.c b/ft_printf_include_libft/libft/src/ft_isdigit.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_isdigit.c
rename to ft_printf_include_libft/libft/src/ft_isdigit.c
index 1a45ce4..ec50170 100644
--- a/ft_printf_include_libft/libft/ft_isdigit.c
+++ b/ft_printf_include_libft/libft/src/ft_isdigit.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 14:29:08 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/30 11:52:05 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_isdigit(int ch)
 {
diff --git a/ft_printf_include_libft/libft/ft_isprint.c b/ft_printf_include_libft/libft/src/ft_isprint.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_isprint.c
rename to ft_printf_include_libft/libft/src/ft_isprint.c
index b9d4c4f..5fd78bb 100644
--- a/ft_printf_include_libft/libft/ft_isprint.c
+++ b/ft_printf_include_libft/libft/src/ft_isprint.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 18:53:32 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/30 11:53:10 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_isprint(int c)
 {
diff --git a/ft_printf_include_libft/libft/ft_itoa.c b/ft_printf_include_libft/libft/src/ft_itoa.c
similarity index 93%
rename from ft_printf_include_libft/libft/ft_itoa.c
rename to ft_printf_include_libft/libft/src/ft_itoa.c
index a0b0119..8ed4f09 100644
--- a/ft_printf_include_libft/libft/ft_itoa.c
+++ b/ft_printf_include_libft/libft/src/ft_itoa.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/03 20:26:38 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 13:20:27 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 static int			nbleng(unsigned int n)
 {
diff --git a/ft_printf_include_libft/libft/ft_lstadd_back.c b/ft_printf_include_libft/libft/src/ft_lstadd_back.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_lstadd_back.c
rename to ft_printf_include_libft/libft/src/ft_lstadd_back.c
index aa24128..30c0e78 100644
--- a/ft_printf_include_libft/libft/ft_lstadd_back.c
+++ b/ft_printf_include_libft/libft/src/ft_lstadd_back.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 18:15:55 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 18:36:49 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_lstadd_back(t_list **lst, t_list *new)
 {
diff --git a/ft_printf_include_libft/libft/ft_lstadd_front.c b/ft_printf_include_libft/libft/src/ft_lstadd_front.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_lstadd_front.c
rename to ft_printf_include_libft/libft/src/ft_lstadd_front.c
index 7a137be..9e3ee35 100644
--- a/ft_printf_include_libft/libft/ft_lstadd_front.c
+++ b/ft_printf_include_libft/libft/src/ft_lstadd_front.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 17:29:57 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 17:54:55 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_lstadd_front(t_list **lst, t_list *new)
 {
diff --git a/ft_printf_include_libft/libft/ft_lstclear.c b/ft_printf_include_libft/libft/src/ft_lstclear.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_lstclear.c
rename to ft_printf_include_libft/libft/src/ft_lstclear.c
index ad0ee8e..0309b36 100644
--- a/ft_printf_include_libft/libft/ft_lstclear.c
+++ b/ft_printf_include_libft/libft/src/ft_lstclear.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 20:53:46 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 21:34:51 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_lstclear(t_list **lst, void (*del)(void*))
 {
diff --git a/ft_printf_include_libft/libft/ft_lstdelone.c b/ft_printf_include_libft/libft/src/ft_lstdelone.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_lstdelone.c
rename to ft_printf_include_libft/libft/src/ft_lstdelone.c
index 09e382c..93f42e8 100644
--- a/ft_printf_include_libft/libft/ft_lstdelone.c
+++ b/ft_printf_include_libft/libft/src/ft_lstdelone.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 18:37:58 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 20:49:50 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_lstdelone(t_list *lst, void (*del)(void *))
 {
diff --git a/ft_printf_include_libft/libft/ft_lstiter.c b/ft_printf_include_libft/libft/src/ft_lstiter.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_lstiter.c
rename to ft_printf_include_libft/libft/src/ft_lstiter.c
index 7be5633..f56e821 100644
--- a/ft_printf_include_libft/libft/ft_lstiter.c
+++ b/ft_printf_include_libft/libft/src/ft_lstiter.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 21:10:38 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 21:24:22 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_lstiter(t_list *lst, void (*f)(void *))
 {
diff --git a/ft_printf_include_libft/libft/ft_lstlast.c b/ft_printf_include_libft/libft/src/ft_lstlast.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_lstlast.c
rename to ft_printf_include_libft/libft/src/ft_lstlast.c
index c8ee653..db3e262 100644
--- a/ft_printf_include_libft/libft/ft_lstlast.c
+++ b/ft_printf_include_libft/libft/src/ft_lstlast.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 18:07:26 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 18:14:43 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 t_list	*ft_lstlast(t_list *lst)
 {
diff --git a/ft_printf_include_libft/libft/ft_lstmap.c b/ft_printf_include_libft/libft/src/ft_lstmap.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_lstmap.c
rename to ft_printf_include_libft/libft/src/ft_lstmap.c
index 63c8ef1..e28b575 100644
--- a/ft_printf_include_libft/libft/ft_lstmap.c
+++ b/ft_printf_include_libft/libft/src/ft_lstmap.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 21:25:01 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 16:46:12 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 t_list		*ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *))
 {
diff --git a/ft_printf_include_libft/libft/ft_lstnew.c b/ft_printf_include_libft/libft/src/ft_lstnew.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_lstnew.c
rename to ft_printf_include_libft/libft/src/ft_lstnew.c
index 863e495..b9a69dc 100644
--- a/ft_printf_include_libft/libft/ft_lstnew.c
+++ b/ft_printf_include_libft/libft/src/ft_lstnew.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 17:06:10 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 17:29:10 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 t_list	*ft_lstnew(void *content)
 {
diff --git a/ft_printf_include_libft/libft/ft_lstsize.c b/ft_printf_include_libft/libft/src/ft_lstsize.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_lstsize.c
rename to ft_printf_include_libft/libft/src/ft_lstsize.c
index f3dd04e..6f57c0f 100644
--- a/ft_printf_include_libft/libft/ft_lstsize.c
+++ b/ft_printf_include_libft/libft/src/ft_lstsize.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 17:57:03 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 18:06:42 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_lstsize(t_list *lst)
 {
diff --git a/ft_printf_include_libft/libft/ft_memccpy.c b/ft_printf_include_libft/libft/src/ft_memccpy.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_memccpy.c
rename to ft_printf_include_libft/libft/src/ft_memccpy.c
index 806e6fc..4e1736b 100644
--- a/ft_printf_include_libft/libft/ft_memccpy.c
+++ b/ft_printf_include_libft/libft/src/ft_memccpy.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/30 15:35:27 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 17:38:29 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	*ft_memccpy(void *dst, const void *src, int ch, size_t n)
 {
diff --git a/ft_printf_include_libft/libft/ft_memchr.c b/ft_printf_include_libft/libft/src/ft_memchr.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_memchr.c
rename to ft_printf_include_libft/libft/src/ft_memchr.c
index 6ba3f3a..5a59823 100644
--- a/ft_printf_include_libft/libft/ft_memchr.c
+++ b/ft_printf_include_libft/libft/src/ft_memchr.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/30 19:55:27 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 17:40:00 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	*ft_memchr(const void *arr, int c, size_t n)
 {
diff --git a/ft_printf_include_libft/libft/ft_memcmp.c b/ft_printf_include_libft/libft/src/ft_memcmp.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_memcmp.c
rename to ft_printf_include_libft/libft/src/ft_memcmp.c
index 56047fc..3c3dc17 100644
--- a/ft_printf_include_libft/libft/ft_memcmp.c
+++ b/ft_printf_include_libft/libft/src/ft_memcmp.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/31 12:46:41 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 17:41:43 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_memcmp(const void *buf1, const void *buf2, size_t n)
 {
diff --git a/ft_printf_include_libft/libft/ft_memcpy.c b/ft_printf_include_libft/libft/src/ft_memcpy.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_memcpy.c
rename to ft_printf_include_libft/libft/src/ft_memcpy.c
index 7e77e76..30f336d 100644
--- a/ft_printf_include_libft/libft/ft_memcpy.c
+++ b/ft_printf_include_libft/libft/src/ft_memcpy.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/30 14:43:54 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/31 13:33:48 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	*ft_memcpy(void *destination, const void *source, size_t n)
 {
diff --git a/ft_printf_include_libft/libft/ft_memmove.c b/ft_printf_include_libft/libft/src/ft_memmove.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_memmove.c
rename to ft_printf_include_libft/libft/src/ft_memmove.c
index 3d72e4f..c92c818 100644
--- a/ft_printf_include_libft/libft/ft_memmove.c
+++ b/ft_printf_include_libft/libft/src/ft_memmove.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/30 17:04:51 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 18:41:12 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	*ft_memmove(void *dst, const void *source, size_t n)
 {
diff --git a/ft_printf_include_libft/libft/ft_memset.c b/ft_printf_include_libft/libft/src/ft_memset.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_memset.c
rename to ft_printf_include_libft/libft/src/ft_memset.c
index eec8e84..6e676f6 100644
--- a/ft_printf_include_libft/libft/ft_memset.c
+++ b/ft_printf_include_libft/libft/src/ft_memset.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 10:24:40 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/29 17:01:59 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	*ft_memset(void *dest, int val, size_t num)
 {
diff --git a/ft_printf_include_libft/libft/ft_putchar.c b/ft_printf_include_libft/libft/src/ft_putchar.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_putchar.c
rename to ft_printf_include_libft/libft/src/ft_putchar.c
index 7d338b7..c0792c3 100644
--- a/ft_printf_include_libft/libft/ft_putchar.c
+++ b/ft_printf_include_libft/libft/src/ft_putchar.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/12/04 22:44:21 by mdenys            #+#    #+#             */
-/*   Updated: 2020/12/04 22:49:12 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_putchar(char c)
 {
diff --git a/ft_printf_include_libft/libft/ft_putchar_fd.c b/ft_printf_include_libft/libft/src/ft_putchar_fd.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_putchar_fd.c
rename to ft_printf_include_libft/libft/src/ft_putchar_fd.c
index 8f3a068..cfa180b 100644
--- a/ft_printf_include_libft/libft/ft_putchar_fd.c
+++ b/ft_printf_include_libft/libft/src/ft_putchar_fd.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 13:02:20 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 15:47:39 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_putchar_fd(char c, int fd)
 {
diff --git a/ft_printf_include_libft/libft/ft_putendl_fd.c b/ft_printf_include_libft/libft/src/ft_putendl_fd.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_putendl_fd.c
rename to ft_printf_include_libft/libft/src/ft_putendl_fd.c
index 5940d29..167908f 100644
--- a/ft_printf_include_libft/libft/ft_putendl_fd.c
+++ b/ft_printf_include_libft/libft/src/ft_putendl_fd.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 14:53:54 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 14:57:01 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_putendl_fd(char *s, int fd)
 {
diff --git a/ft_printf_include_libft/libft/ft_putnbr_fd.c b/ft_printf_include_libft/libft/src/ft_putnbr_fd.c
similarity index 93%
rename from ft_printf_include_libft/libft/ft_putnbr_fd.c
rename to ft_printf_include_libft/libft/src/ft_putnbr_fd.c
index 605733a..f29c403 100644
--- a/ft_printf_include_libft/libft/ft_putnbr_fd.c
+++ b/ft_printf_include_libft/libft/src/ft_putnbr_fd.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 15:04:13 by mdenys            #+#    #+#             */
-/*   Updated: 2020/12/16 05:49:18 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_putnbr_fd(long int n, int fd)
 {
diff --git a/ft_printf_include_libft/libft/ft_putstr_fd.c b/ft_printf_include_libft/libft/src/ft_putstr_fd.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_putstr_fd.c
rename to ft_printf_include_libft/libft/src/ft_putstr_fd.c
index 6e026e7..607769c 100644
--- a/ft_printf_include_libft/libft/ft_putstr_fd.c
+++ b/ft_printf_include_libft/libft/src/ft_putstr_fd.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 13:45:44 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 13:48:29 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 void	ft_putstr_fd(char *s, int fd)
 {
diff --git a/ft_printf_include_libft/libft/ft_split.c b/ft_printf_include_libft/libft/src/ft_split.c
similarity index 95%
rename from ft_printf_include_libft/libft/ft_split.c
rename to ft_printf_include_libft/libft/src/ft_split.c
index 200ede3..a2e8bba 100644
--- a/ft_printf_include_libft/libft/ft_split.c
+++ b/ft_printf_include_libft/libft/src/ft_split.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/03 13:48:14 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/03 20:34:46 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 #include <stdlib.h>
 
 static int	ft_isspace(char c, char b)
diff --git a/ft_printf_include_libft/libft/ft_strchr.c b/ft_printf_include_libft/libft/src/ft_strchr.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strchr.c
rename to ft_printf_include_libft/libft/src/ft_strchr.c
index 801acfc..19c641a 100644
--- a/ft_printf_include_libft/libft/ft_strchr.c
+++ b/ft_printf_include_libft/libft/src/ft_strchr.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/01 13:44:25 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 18:00:06 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strchr(const char *str, int ch)
 {
diff --git a/ft_printf_include_libft/libft/ft_strdup.c b/ft_printf_include_libft/libft/src/ft_strdup.c
similarity index 91%
rename from ft_printf_include_libft/libft/ft_strdup.c
rename to ft_printf_include_libft/libft/src/ft_strdup.c
index 79396e9..4f949d9 100644
--- a/ft_printf_include_libft/libft/ft_strdup.c
+++ b/ft_printf_include_libft/libft/src/ft_strdup.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/01 20:43:44 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/01 21:11:41 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strdup(const char *str)
 {
diff --git a/ft_printf_include_libft/libft/ft_strjoin.c b/ft_printf_include_libft/libft/src/ft_strjoin.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strjoin.c
rename to ft_printf_include_libft/libft/src/ft_strjoin.c
index c6be36c..0810b3e 100644
--- a/ft_printf_include_libft/libft/ft_strjoin.c
+++ b/ft_printf_include_libft/libft/src/ft_strjoin.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/02 17:18:40 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/02 17:56:57 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strjoin(char const *s1, char const *s2)
 {
diff --git a/ft_printf_include_libft/libft/ft_strlcat.c b/ft_printf_include_libft/libft/src/ft_strlcat.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strlcat.c
rename to ft_printf_include_libft/libft/src/ft_strlcat.c
index 4b7dcdc..8153a5e 100644
--- a/ft_printf_include_libft/libft/ft_strlcat.c
+++ b/ft_printf_include_libft/libft/src/ft_strlcat.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/31 17:10:24 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 16:58:02 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 size_t	ft_strlcat(char *dst, const char *src, size_t size)
 {
diff --git a/ft_printf_include_libft/libft/ft_strlcpy.c b/ft_printf_include_libft/libft/src/ft_strlcpy.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strlcpy.c
rename to ft_printf_include_libft/libft/src/ft_strlcpy.c
index 6e07543..dea14d0 100644
--- a/ft_printf_include_libft/libft/ft_strlcpy.c
+++ b/ft_printf_include_libft/libft/src/ft_strlcpy.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/28 19:26:31 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 16:57:58 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 size_t	ft_strlcpy(char *dst, const char *src, size_t size)
 {
diff --git a/ft_printf_include_libft/libft/ft_strlen.c b/ft_printf_include_libft/libft/src/ft_strlen.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_strlen.c
rename to ft_printf_include_libft/libft/src/ft_strlen.c
index b9058f9..1acb572 100644
--- a/ft_printf_include_libft/libft/ft_strlen.c
+++ b/ft_printf_include_libft/libft/src/ft_strlen.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/28 19:10:44 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/23 18:40:34 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int		ft_strlen(char *str)
 {
diff --git a/ft_printf_include_libft/libft/ft_strmapi.c b/ft_printf_include_libft/libft/src/ft_strmapi.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strmapi.c
rename to ft_printf_include_libft/libft/src/ft_strmapi.c
index 46365f0..a2f1976 100644
--- a/ft_printf_include_libft/libft/ft_strmapi.c
+++ b/ft_printf_include_libft/libft/src/ft_strmapi.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/04 12:41:12 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 13:01:25 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strmapi(char const *s, char (*f)(unsigned int, char))
 {
diff --git a/ft_printf_include_libft/libft/ft_strncmp.c b/ft_printf_include_libft/libft/src/ft_strncmp.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strncmp.c
rename to ft_printf_include_libft/libft/src/ft_strncmp.c
index 6d93b98..173e7b3 100644
--- a/ft_printf_include_libft/libft/ft_strncmp.c
+++ b/ft_printf_include_libft/libft/src/ft_strncmp.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/29 12:22:15 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 17:52:29 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int	ft_strncmp(const char *s1, const char *s2, size_t a)
 {
diff --git a/ft_printf_include_libft/libft/ft_strnstr.c b/ft_printf_include_libft/libft/src/ft_strnstr.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strnstr.c
rename to ft_printf_include_libft/libft/src/ft_strnstr.c
index 65b5fc0..b4a8cad 100644
--- a/ft_printf_include_libft/libft/ft_strnstr.c
+++ b/ft_printf_include_libft/libft/src/ft_strnstr.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/01 18:43:20 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/04 18:41:20 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strnstr(const char *hst, const char *ndl, size_t size)
 {
diff --git a/ft_printf_include_libft/libft/ft_strrchr.c b/ft_printf_include_libft/libft/src/ft_strrchr.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strrchr.c
rename to ft_printf_include_libft/libft/src/ft_strrchr.c
index 470aa00..80eb326 100644
--- a/ft_printf_include_libft/libft/ft_strrchr.c
+++ b/ft_printf_include_libft/libft/src/ft_strrchr.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/01 16:14:36 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/05 17:56:32 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strrchr(const char *str, int ch)
 {
diff --git a/ft_printf_include_libft/libft/ft_strtrim.c b/ft_printf_include_libft/libft/src/ft_strtrim.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_strtrim.c
rename to ft_printf_include_libft/libft/src/ft_strtrim.c
index 639486f..b72a639 100644
--- a/ft_printf_include_libft/libft/ft_strtrim.c
+++ b/ft_printf_include_libft/libft/src/ft_strtrim.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/02 17:58:31 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/03 11:18:41 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_strtrim(char const *s1, char const *set)
 {
diff --git a/ft_printf_include_libft/libft/ft_substr.c b/ft_printf_include_libft/libft/src/ft_substr.c
similarity index 92%
rename from ft_printf_include_libft/libft/ft_substr.c
rename to ft_printf_include_libft/libft/src/ft_substr.c
index 7539d6a..52cdff1 100644
--- a/ft_printf_include_libft/libft/ft_substr.c
+++ b/ft_printf_include_libft/libft/src/ft_substr.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/02 12:21:46 by mdenys            #+#    #+#             */
-/*   Updated: 2020/11/02 16:58:52 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 char	*ft_substr(char const *s, unsigned int start, size_t len)
 {
diff --git a/ft_printf_include_libft/libft/ft_tolower.c b/ft_printf_include_libft/libft/src/ft_tolower.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_tolower.c
rename to ft_printf_include_libft/libft/src/ft_tolower.c
index 0086955..6966a91 100644
--- a/ft_printf_include_libft/libft/ft_tolower.c
+++ b/ft_printf_include_libft/libft/src/ft_tolower.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/28 14:40:51 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/29 20:01:38 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int	ft_tolower(int a)
 {
diff --git a/ft_printf_include_libft/libft/ft_toupper.c b/ft_printf_include_libft/libft/src/ft_toupper.c
similarity index 90%
rename from ft_printf_include_libft/libft/ft_toupper.c
rename to ft_printf_include_libft/libft/src/ft_toupper.c
index 87e5bfd..203ed52 100644
--- a/ft_printf_include_libft/libft/ft_toupper.c
+++ b/ft_printf_include_libft/libft/src/ft_toupper.c
@@ -6,11 +6,11 @@
 /*   By: mdenys <mdenys@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/10/28 15:04:43 by mdenys            #+#    #+#             */
-/*   Updated: 2020/10/29 20:02:26 by mdenys           ###   ########.fr       */
+/*   Updated: 2021/01/11 11:13:02 by mdenys           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft.h"
+#include "../includes/libft.h"
 
 int	ft_toupper(int a)
 {
diff --git a/ft_printf_include_libft/libft/work.makefile b/ft_printf_include_libft/libft/work.makefile
new file mode 100644
index 0000000..1d631f6
--- /dev/null
+++ b/ft_printf_include_libft/libft/work.makefile
@@ -0,0 +1,42 @@
+SRCS			=		ft_isalnum.c ft_isprint.c ft_memcmp.c  ft_putchar_fd.c ft_split.c \
+					ft_strlcat.c ft_strncmp.c ft_substr.c ft_atoi.c ft_isalpha.c \
+					ft_itoa.c ft_memcpy.c  ft_putendl_fd.c ft_strchr.c  ft_strlcpy.c \
+					ft_strnstr.c ft_tolower.c ft_bzero.c   ft_isascii.c ft_memccpy.c \
+					ft_memmove.c ft_putnbr_fd.c  ft_strdup.c  ft_strlen.c  ft_strrchr.c \
+					ft_toupper.c ft_calloc.c  ft_isdigit.c ft_memchr.c  ft_memset.c  \
+					ft_putstr_fd.c  ft_strjoin.c ft_strmapi.c ft_strtrim.c ft_putchar.c\
+					ft_lstadd_back.c ft_lstadd_front.c ft_lstclear.c \
+					ft_lstdelone.c ft_lstiter.c ft_lstlast.c \
+					ft_lstmap.c ft_lstnew.c ft_lstsize.c
+
+
+
+SRC = ./src/
+OBJDIR = ./obj/
+
+SRCFILES = $(addprefix $(SRC), $(SRCS))
+
+OBJS			= $(SRCFILES:.c=.o)
+
+OBJS_WITH_DIR =  $(addprefix $(OBJ_DIR), $(OBJS))
+
+CC				= gcc
+RM				= rm -f
+CFLAGS			= -Wall -Wextra -Werror -I.
+
+NAME			= libft.a
+
+all:			$(NAME)
+
+$(NAME):		$(OBJS)
+				ar rcs $@ $?
+
+clean:
+				$(RM) $(OBJS)
+
+fclean:			clean
+				$(RM) $(NAME)
+
+re:				fclean $(NAME)
+
+.PHONY:			all clean fclean re bonus
diff --git a/ft_printf_include_libft/ft_printf.c b/ft_printf_include_libft/srcs/ft_printf.c
similarity index 100%
rename from ft_printf_include_libft/ft_printf.c
rename to ft_printf_include_libft/srcs/ft_printf.c
diff --git a/ft_printf_include_libft/parser/ft_parser.c b/ft_printf_include_libft/srcs/parser/ft_parser.c
similarity index 100%
rename from ft_printf_include_libft/parser/ft_parser.c
rename to ft_printf_include_libft/srcs/parser/ft_parser.c
diff --git a/ft_printf_include_libft/parser/ft_parser.o b/ft_printf_include_libft/srcs/parser/ft_parser.o
similarity index 100%
rename from ft_printf_include_libft/parser/ft_parser.o
rename to ft_printf_include_libft/srcs/parser/ft_parser.o
diff --git a/ft_printf_include_libft/parser/ft_parser_utils.c b/ft_printf_include_libft/srcs/parser/ft_parser_utils.c
similarity index 100%
rename from ft_printf_include_libft/parser/ft_parser_utils.c
rename to ft_printf_include_libft/srcs/parser/ft_parser_utils.c
diff --git a/ft_printf_include_libft/parser/ft_parser_utils.o b/ft_printf_include_libft/srcs/parser/ft_parser_utils.o
similarity index 100%
rename from ft_printf_include_libft/parser/ft_parser_utils.o
rename to ft_printf_include_libft/srcs/parser/ft_parser_utils.o
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_c.c b/ft_printf_include_libft/srcs/putchar_maker/ft_put_c.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_c.c
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_c.c
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_c.o b/ft_printf_include_libft/srcs/putchar_maker/ft_put_c.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_c.o
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_c.o
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_p.c b/ft_printf_include_libft/srcs/putchar_maker/ft_put_p.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_p.c
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_p.c
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_p.o b/ft_printf_include_libft/srcs/putchar_maker/ft_put_p.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_p.o
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_p.o
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_s.c b/ft_printf_include_libft/srcs/putchar_maker/ft_put_s.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_s.c
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_s.c
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_s.o b/ft_printf_include_libft/srcs/putchar_maker/ft_put_s.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_s.o
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_s.o
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_u.c b/ft_printf_include_libft/srcs/putchar_maker/ft_put_u.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_u.c
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_u.c
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_u.o b/ft_printf_include_libft/srcs/putchar_maker/ft_put_u.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_u.o
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_u.o
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_x.c b/ft_printf_include_libft/srcs/putchar_maker/ft_put_x.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_x.c
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_x.c
diff --git a/ft_printf_include_libft/putchar_maker/ft_put_x.o b/ft_printf_include_libft/srcs/putchar_maker/ft_put_x.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/ft_put_x.o
rename to ft_printf_include_libft/srcs/putchar_maker/ft_put_x.o
diff --git a/ft_printf_include_libft/putchar_maker/put_d/ft_put_d.c b/ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_d/ft_put_d.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d.c
diff --git a/ft_printf_include_libft/putchar_maker/put_d/ft_put_d.o b/ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_d/ft_put_d.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d.o
diff --git a/ft_printf_include_libft/putchar_maker/put_d/ft_put_d_undersize.c b/ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_undersize.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_d/ft_put_d_undersize.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_undersize.c
diff --git a/ft_printf_include_libft/putchar_maker/put_d/ft_put_d_undersize.o b/ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_undersize.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_d/ft_put_d_undersize.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_undersize.o
diff --git a/ft_printf_include_libft/putchar_maker/put_d/ft_put_d_utilc.c b/ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_utilc.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_d/ft_put_d_utilc.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_utilc.c
diff --git a/ft_printf_include_libft/putchar_maker/put_d/ft_put_d_utilc.o b/ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_utilc.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_d/ft_put_d_utilc.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_d/ft_put_d_utilc.o
diff --git a/ft_printf_include_libft/putchar_maker/put_p/ft_put_p.c b/ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_p/ft_put_p.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p.c
diff --git a/ft_printf_include_libft/putchar_maker/put_p/ft_put_p.o b/ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_p/ft_put_p.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p.o
diff --git a/ft_printf_include_libft/putchar_maker/put_p/ft_put_p_utilc.c b/ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p_utilc.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_p/ft_put_p_utilc.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p_utilc.c
diff --git a/ft_printf_include_libft/putchar_maker/put_p/ft_put_p_utilc.o b/ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p_utilc.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_p/ft_put_p_utilc.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_p/ft_put_p_utilc.o
diff --git a/ft_printf_include_libft/putchar_maker/put_u/ft_put_u.c b/ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_u/ft_put_u.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u.c
diff --git a/ft_printf_include_libft/putchar_maker/put_u/ft_put_u.o b/ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_u/ft_put_u.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u.o
diff --git a/ft_printf_include_libft/putchar_maker/put_u/ft_put_u_utilc.c b/ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u_utilc.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_u/ft_put_u_utilc.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u_utilc.c
diff --git a/ft_printf_include_libft/putchar_maker/put_u/ft_put_u_utilc.o b/ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u_utilc.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_u/ft_put_u_utilc.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_u/ft_put_u_utilc.o
diff --git a/ft_printf_include_libft/putchar_maker/put_x/ft_put_x.c b/ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_x/ft_put_x.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x.c
diff --git a/ft_printf_include_libft/putchar_maker/put_x/ft_put_x.o b/ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_x/ft_put_x.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x.o
diff --git a/ft_printf_include_libft/putchar_maker/put_x/ft_put_x_utilc.c b/ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x_utilc.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_x/ft_put_x_utilc.c
rename to ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x_utilc.c
diff --git a/ft_printf_include_libft/putchar_maker/put_x/ft_put_x_utilc.o b/ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x_utilc.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/put_x/ft_put_x_utilc.o
rename to ft_printf_include_libft/srcs/putchar_maker/put_x/ft_put_x_utilc.o
diff --git a/ft_printf_include_libft/putchar_maker/putmaket_utils.c b/ft_printf_include_libft/srcs/putchar_maker/putmaket_utils.c
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/putmaket_utils.c
rename to ft_printf_include_libft/srcs/putchar_maker/putmaket_utils.c
diff --git a/ft_printf_include_libft/putchar_maker/putmaket_utils.o b/ft_printf_include_libft/srcs/putchar_maker/putmaket_utils.o
similarity index 100%
rename from ft_printf_include_libft/putchar_maker/putmaket_utils.o
rename to ft_printf_include_libft/srcs/putchar_maker/putmaket_utils.o