diff --git a/Makefile b/Makefile
index 89bc3be..32934b3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,7 @@
 
 NAME	=	libft.a
 CC		=	gcc
-VPATH	=	srcs/ \
-			srcs/part1/ \
-			srcs/part2/ \
-			srcs/bonus/ \
-			srcs/add/
+VPATH	=	srcs/
 
 IDIR	=	.
 _DEP	=	libft.h
@@ -133,7 +129,7 @@ fclean: clean
 
 re: fclean all
 
-.PHONY: bonus clean fclean re all
+.PHONY: clean fclean re all
 
 
 
diff --git a/srcs/add/ft_any.c b/srcs/ft_any.c
similarity index 100%
rename from srcs/add/ft_any.c
rename to srcs/ft_any.c
diff --git a/srcs/add/ft_arraymap.c b/srcs/ft_arraymap.c
similarity index 100%
rename from srcs/add/ft_arraymap.c
rename to srcs/ft_arraymap.c
diff --git a/srcs/part1/ft_atoi.c b/srcs/ft_atoi.c
similarity index 100%
rename from srcs/part1/ft_atoi.c
rename to srcs/ft_atoi.c
diff --git a/srcs/add/ft_atoibase.c b/srcs/ft_atoibase.c
similarity index 100%
rename from srcs/add/ft_atoibase.c
rename to srcs/ft_atoibase.c
diff --git a/srcs/part1/ft_bzero.c b/srcs/ft_bzero.c
similarity index 100%
rename from srcs/part1/ft_bzero.c
rename to srcs/ft_bzero.c
diff --git a/srcs/part1/ft_calloc.c b/srcs/ft_calloc.c
similarity index 100%
rename from srcs/part1/ft_calloc.c
rename to srcs/ft_calloc.c
diff --git a/srcs/add/ft_convertbase.c b/srcs/ft_convertbase.c
similarity index 100%
rename from srcs/add/ft_convertbase.c
rename to srcs/ft_convertbase.c
diff --git a/srcs/add/ft_foreach.c b/srcs/ft_foreach.c
similarity index 100%
rename from srcs/add/ft_foreach.c
rename to srcs/ft_foreach.c
diff --git a/srcs/part1/ft_isalnum.c b/srcs/ft_isalnum.c
similarity index 100%
rename from srcs/part1/ft_isalnum.c
rename to srcs/ft_isalnum.c
diff --git a/srcs/part1/ft_isalpha.c b/srcs/ft_isalpha.c
similarity index 100%
rename from srcs/part1/ft_isalpha.c
rename to srcs/ft_isalpha.c
diff --git a/srcs/part1/ft_isascii.c b/srcs/ft_isascii.c
similarity index 100%
rename from srcs/part1/ft_isascii.c
rename to srcs/ft_isascii.c
diff --git a/srcs/part1/ft_isdigit.c b/srcs/ft_isdigit.c
similarity index 100%
rename from srcs/part1/ft_isdigit.c
rename to srcs/ft_isdigit.c
diff --git a/srcs/part1/ft_isprint.c b/srcs/ft_isprint.c
similarity index 100%
rename from srcs/part1/ft_isprint.c
rename to srcs/ft_isprint.c
diff --git a/srcs/add/ft_issort.c b/srcs/ft_issort.c
similarity index 100%
rename from srcs/add/ft_issort.c
rename to srcs/ft_issort.c
diff --git a/srcs/part2/ft_itoa.c b/srcs/ft_itoa.c
similarity index 100%
rename from srcs/part2/ft_itoa.c
rename to srcs/ft_itoa.c
diff --git a/srcs/bonus/ft_lstadd_back.c b/srcs/ft_lstadd_back.c
similarity index 100%
rename from srcs/bonus/ft_lstadd_back.c
rename to srcs/ft_lstadd_back.c
diff --git a/srcs/bonus/ft_lstadd_front.c b/srcs/ft_lstadd_front.c
similarity index 100%
rename from srcs/bonus/ft_lstadd_front.c
rename to srcs/ft_lstadd_front.c
diff --git a/srcs/bonus/ft_lstclear.c b/srcs/ft_lstclear.c
similarity index 100%
rename from srcs/bonus/ft_lstclear.c
rename to srcs/ft_lstclear.c
diff --git a/srcs/bonus/ft_lstdelone.c b/srcs/ft_lstdelone.c
similarity index 100%
rename from srcs/bonus/ft_lstdelone.c
rename to srcs/ft_lstdelone.c
diff --git a/srcs/bonus/ft_lstiter.c b/srcs/ft_lstiter.c
similarity index 100%
rename from srcs/bonus/ft_lstiter.c
rename to srcs/ft_lstiter.c
diff --git a/srcs/bonus/ft_lstlast.c b/srcs/ft_lstlast.c
similarity index 100%
rename from srcs/bonus/ft_lstlast.c
rename to srcs/ft_lstlast.c
diff --git a/srcs/bonus/ft_lstmap.c b/srcs/ft_lstmap.c
similarity index 100%
rename from srcs/bonus/ft_lstmap.c
rename to srcs/ft_lstmap.c
diff --git a/srcs/bonus/ft_lstnew.c b/srcs/ft_lstnew.c
similarity index 100%
rename from srcs/bonus/ft_lstnew.c
rename to srcs/ft_lstnew.c
diff --git a/srcs/bonus/ft_lstsize.c b/srcs/ft_lstsize.c
similarity index 100%
rename from srcs/bonus/ft_lstsize.c
rename to srcs/ft_lstsize.c
diff --git a/srcs/add/ft_memalloc.c b/srcs/ft_memalloc.c
similarity index 100%
rename from srcs/add/ft_memalloc.c
rename to srcs/ft_memalloc.c
diff --git a/srcs/part1/ft_memccpy.c b/srcs/ft_memccpy.c
similarity index 100%
rename from srcs/part1/ft_memccpy.c
rename to srcs/ft_memccpy.c
diff --git a/srcs/part1/ft_memchr.c b/srcs/ft_memchr.c
similarity index 100%
rename from srcs/part1/ft_memchr.c
rename to srcs/ft_memchr.c
diff --git a/srcs/part1/ft_memcmp.c b/srcs/ft_memcmp.c
similarity index 100%
rename from srcs/part1/ft_memcmp.c
rename to srcs/ft_memcmp.c
diff --git a/srcs/part1/ft_memcpy.c b/srcs/ft_memcpy.c
similarity index 100%
rename from srcs/part1/ft_memcpy.c
rename to srcs/ft_memcpy.c
diff --git a/srcs/add/ft_memdel.c b/srcs/ft_memdel.c
similarity index 100%
rename from srcs/add/ft_memdel.c
rename to srcs/ft_memdel.c
diff --git a/srcs/part1/ft_memmove.c b/srcs/ft_memmove.c
similarity index 100%
rename from srcs/part1/ft_memmove.c
rename to srcs/ft_memmove.c
diff --git a/srcs/part1/ft_memset.c b/srcs/ft_memset.c
similarity index 100%
rename from srcs/part1/ft_memset.c
rename to srcs/ft_memset.c
diff --git a/srcs/add/ft_putchar.c b/srcs/ft_putchar.c
similarity index 100%
rename from srcs/add/ft_putchar.c
rename to srcs/ft_putchar.c
diff --git a/srcs/part2/ft_putchar_fd.c b/srcs/ft_putchar_fd.c
similarity index 100%
rename from srcs/part2/ft_putchar_fd.c
rename to srcs/ft_putchar_fd.c
diff --git a/srcs/add/ft_putendl.c b/srcs/ft_putendl.c
similarity index 100%
rename from srcs/add/ft_putendl.c
rename to srcs/ft_putendl.c
diff --git a/srcs/part2/ft_putendl_fd.c b/srcs/ft_putendl_fd.c
similarity index 100%
rename from srcs/part2/ft_putendl_fd.c
rename to srcs/ft_putendl_fd.c
diff --git a/srcs/add/ft_putnbr.c b/srcs/ft_putnbr.c
similarity index 100%
rename from srcs/add/ft_putnbr.c
rename to srcs/ft_putnbr.c
diff --git a/srcs/part2/ft_putnbr_fd.c b/srcs/ft_putnbr_fd.c
similarity index 100%
rename from srcs/part2/ft_putnbr_fd.c
rename to srcs/ft_putnbr_fd.c
diff --git a/srcs/add/ft_putnbrbase.c b/srcs/ft_putnbrbase.c
similarity index 100%
rename from srcs/add/ft_putnbrbase.c
rename to srcs/ft_putnbrbase.c
diff --git a/srcs/add/ft_putnbrendl.c b/srcs/ft_putnbrendl.c
similarity index 100%
rename from srcs/add/ft_putnbrendl.c
rename to srcs/ft_putnbrendl.c
diff --git a/srcs/add/ft_putnbrendl_fd.c b/srcs/ft_putnbrendl_fd.c
similarity index 100%
rename from srcs/add/ft_putnbrendl_fd.c
rename to srcs/ft_putnbrendl_fd.c
diff --git a/srcs/add/ft_putstr.c b/srcs/ft_putstr.c
similarity index 100%
rename from srcs/add/ft_putstr.c
rename to srcs/ft_putstr.c
diff --git a/srcs/part2/ft_putstr_fd.c b/srcs/ft_putstr_fd.c
similarity index 100%
rename from srcs/part2/ft_putstr_fd.c
rename to srcs/ft_putstr_fd.c
diff --git a/srcs/part2/ft_split.c b/srcs/ft_split.c
similarity index 100%
rename from srcs/part2/ft_split.c
rename to srcs/ft_split.c
diff --git a/srcs/add/ft_strcat.c b/srcs/ft_strcat.c
similarity index 100%
rename from srcs/add/ft_strcat.c
rename to srcs/ft_strcat.c
diff --git a/srcs/part1/ft_strchr.c b/srcs/ft_strchr.c
similarity index 100%
rename from srcs/part1/ft_strchr.c
rename to srcs/ft_strchr.c
diff --git a/srcs/add/ft_strclr.c b/srcs/ft_strclr.c
similarity index 100%
rename from srcs/add/ft_strclr.c
rename to srcs/ft_strclr.c
diff --git a/srcs/add/ft_strcmp.c b/srcs/ft_strcmp.c
similarity index 100%
rename from srcs/add/ft_strcmp.c
rename to srcs/ft_strcmp.c
diff --git a/srcs/add/ft_strcpy.c b/srcs/ft_strcpy.c
similarity index 100%
rename from srcs/add/ft_strcpy.c
rename to srcs/ft_strcpy.c
diff --git a/srcs/add/ft_strdel.c b/srcs/ft_strdel.c
similarity index 100%
rename from srcs/add/ft_strdel.c
rename to srcs/ft_strdel.c
diff --git a/srcs/part1/ft_strdup.c b/srcs/ft_strdup.c
similarity index 100%
rename from srcs/part1/ft_strdup.c
rename to srcs/ft_strdup.c
diff --git a/srcs/add/ft_strequ.c b/srcs/ft_strequ.c
similarity index 100%
rename from srcs/add/ft_strequ.c
rename to srcs/ft_strequ.c
diff --git a/srcs/add/ft_striter.c b/srcs/ft_striter.c
similarity index 100%
rename from srcs/add/ft_striter.c
rename to srcs/ft_striter.c
diff --git a/srcs/add/ft_striteri.c b/srcs/ft_striteri.c
similarity index 100%
rename from srcs/add/ft_striteri.c
rename to srcs/ft_striteri.c
diff --git a/srcs/part2/ft_strjoin.c b/srcs/ft_strjoin.c
similarity index 100%
rename from srcs/part2/ft_strjoin.c
rename to srcs/ft_strjoin.c
diff --git a/srcs/add/ft_strjoinfree.c b/srcs/ft_strjoinfree.c
similarity index 100%
rename from srcs/add/ft_strjoinfree.c
rename to srcs/ft_strjoinfree.c
diff --git a/srcs/part1/ft_strlcat.c b/srcs/ft_strlcat.c
similarity index 100%
rename from srcs/part1/ft_strlcat.c
rename to srcs/ft_strlcat.c
diff --git a/srcs/part1/ft_strlcpy.c b/srcs/ft_strlcpy.c
similarity index 100%
rename from srcs/part1/ft_strlcpy.c
rename to srcs/ft_strlcpy.c
diff --git a/srcs/part1/ft_strlen.c b/srcs/ft_strlen.c
similarity index 100%
rename from srcs/part1/ft_strlen.c
rename to srcs/ft_strlen.c
diff --git a/srcs/add/ft_strmap.c b/srcs/ft_strmap.c
similarity index 100%
rename from srcs/add/ft_strmap.c
rename to srcs/ft_strmap.c
diff --git a/srcs/part2/ft_strmapi.c b/srcs/ft_strmapi.c
similarity index 100%
rename from srcs/part2/ft_strmapi.c
rename to srcs/ft_strmapi.c
diff --git a/srcs/add/ft_strmultisplit.c b/srcs/ft_strmultisplit.c
similarity index 100%
rename from srcs/add/ft_strmultisplit.c
rename to srcs/ft_strmultisplit.c
diff --git a/srcs/add/ft_strncat.c b/srcs/ft_strncat.c
similarity index 100%
rename from srcs/add/ft_strncat.c
rename to srcs/ft_strncat.c
diff --git a/srcs/part1/ft_strncmp.c b/srcs/ft_strncmp.c
similarity index 100%
rename from srcs/part1/ft_strncmp.c
rename to srcs/ft_strncmp.c
diff --git a/srcs/add/ft_strncpy.c b/srcs/ft_strncpy.c
similarity index 100%
rename from srcs/add/ft_strncpy.c
rename to srcs/ft_strncpy.c
diff --git a/srcs/add/ft_strnequ.c b/srcs/ft_strnequ.c
similarity index 100%
rename from srcs/add/ft_strnequ.c
rename to srcs/ft_strnequ.c
diff --git a/srcs/add/ft_strnew.c b/srcs/ft_strnew.c
similarity index 100%
rename from srcs/add/ft_strnew.c
rename to srcs/ft_strnew.c
diff --git a/srcs/part1/ft_strnstr.c b/srcs/ft_strnstr.c
similarity index 100%
rename from srcs/part1/ft_strnstr.c
rename to srcs/ft_strnstr.c
diff --git a/srcs/part1/ft_strrchr.c b/srcs/ft_strrchr.c
similarity index 100%
rename from srcs/part1/ft_strrchr.c
rename to srcs/ft_strrchr.c
diff --git a/srcs/add/ft_strstr.c b/srcs/ft_strstr.c
similarity index 100%
rename from srcs/add/ft_strstr.c
rename to srcs/ft_strstr.c
diff --git a/srcs/part2/ft_strtrim.c b/srcs/ft_strtrim.c
similarity index 100%
rename from srcs/part2/ft_strtrim.c
rename to srcs/ft_strtrim.c
diff --git a/srcs/part2/ft_substr.c b/srcs/ft_substr.c
similarity index 100%
rename from srcs/part2/ft_substr.c
rename to srcs/ft_substr.c
diff --git a/srcs/part1/ft_tolower.c b/srcs/ft_tolower.c
similarity index 100%
rename from srcs/part1/ft_tolower.c
rename to srcs/ft_tolower.c
diff --git a/srcs/part1/ft_toupper.c b/srcs/ft_toupper.c
similarity index 100%
rename from srcs/part1/ft_toupper.c
rename to srcs/ft_toupper.c
diff --git a/srcs/part2/main.c b/srcs/main_itoa_split_join_mapi_trim_sub.c
similarity index 95%
rename from srcs/part2/main.c
rename to srcs/main_itoa_split_join_mapi_trim_sub.c
index 8f48030..3eec65b 100644
--- a/srcs/part2/main.c
+++ b/srcs/main_itoa_split_join_mapi_trim_sub.c
@@ -66,6 +66,8 @@ int main()
 {
 	char	touppercase(unsigned int, char);
 
+	printf("ITOA :\n");
+
 	print_ft_itoa(1338);
 	print_ft_itoa(0);
 	print_ft_itoa(-1);
@@ -76,7 +78,7 @@ int main()
 	print_ft_itoa(-2147483648);
 	print_ft_itoa('t');
 
-	printf("\n");
+	printf("\nSPLIT :\n");
 
 	print_ft_split(" dfs zfe f ez f fez  ", ' ');
 	print_ft_split(NULL, 0);
@@ -90,7 +92,7 @@ int main()
 	print_ft_split("zd\nazd\nds", '\n');
 	print_ft_split("          ", ' ');
 
-	printf("\n");
+	printf("\nJOIN :\n");
 
 	print_ft_strjoin("alpha", "bravo");
 	print_ft_strjoin("", "");
@@ -102,7 +104,7 @@ int main()
 	print_ft_strjoin("sdffez", NULL);
 	print_ft_strjoin("           ", "          ");
 
-	printf("\n");
+	printf("\nMAPI :\n");
 
 	print_ft_strmapi("truc", touppercase);
 	print_ft_strmapi("truc", NULL);
@@ -114,7 +116,7 @@ int main()
 	print_ft_strmapi("\0", touppercase);
 	print_ft_strmapi("f f f f", touppercase);
 
-	printf("\n");
+	printf("\nSUB :\n");
 
 	print_ft_substr("zeff", 3, 4);
 	print_ft_substr(NULL, 1, 1);
@@ -128,7 +130,7 @@ int main()
 	print_ft_substr("gzrgzgb zeez", 1123238713, 2873981730);
 	print_ft_substr("gzrgzgb zeez", 1, 2873981730);
 
-	printf("\n");
+	printf("\nTRIM :\n");
 
 	print_ft_strtrim("   stmr trim ", "m ");
 	print_ft_strtrim("                 ", " ");
@@ -141,7 +143,7 @@ int main()
 	print_ft_strtrim("     e f zfzelelijz   ", " ");
 	print_ft_strtrim("cccccccccccccccccccc", "c");
 
-	printf("\n");
+	printf("\nPUTNBR :\n");
 
 	print_ft_putnbr_fd(52, 1);
 	print_ft_putnbr_fd(2147483647, 1);