diff --git a/Makefile b/Makefile
index d4eefac..6de71a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 NAME = cub3d
-CPP = gcc $(FLAGS)
+CPP = gcc
 LIBRARIES_DIR = Libft Minilibx
 LIBRARIES_A = Libft/libft.a Minilibx/libmlx.a
-CPP_1 = $(CPP) -Wall -Wextra -Werror -I Libft -I Minilibx $(FLAGS_1) -g
-CPP_2 = $(CPP) $(FLAGS_2)
 SHARED = -lX11 -lXext -lm
-C_FILES = $(wildcard **.c)
+CPP_1 = $(CPP) -Wall -Wextra -Werror -I Libft -I Minilibx -I include $(FLAGS) $(FLAGS_1)
+CPP_2 = $(CPP) $(FLAGS) $(FLAGS_2)
+C_FILES = $(wildcard src/*.c)
 O_FILES = $(patsubst %.c,%.o,$(C_FILES))
 
 ECHO = echoo(){ \
@@ -18,6 +18,12 @@ ECHO = echoo(){ \
 
 all : $(NAME)
 
+debug :
+	$(MAKE) all FLAGS_1="$(FLAGS_1) -g"
+
+debugre :
+	$(MAKE) re FLAGS_1="$(FLAGS_1) -g"
+
 $(LIBRARIES_DIR):
 	@$(ECHO)
 	@$(ECHO) "\e[30;47;1m  $(NAME): making library $@...  \e[0m"
@@ -32,8 +38,8 @@ fclean : clean
 	@$(ECHO)
 	@$(ECHO) "\e[30;47;1m  $(NAME): fclean...  \e[0m"
 	-rm -f $(NAME)
-	$(MAKE) -C Libft fclean
-	$(MAKE) -C Minilibx clean
+	-$(MAKE) -C Libft fclean
+	-$(MAKE) -C Minilibx clean
 	-rm $$(find Minilibx -name "Makefile.gen")
 
 re : fclean all
@@ -59,7 +65,7 @@ check_headers :
 		> __tmp_check_header.c echo "#include \"$$HEADER\""; \
 		>> __tmp_check_header.c echo "#include \"$$HEADER\""; \
 		>> __tmp_check_header.c echo "int main(void) {}"; \
-		$(CPP) -o __tmp_check_header.out __tmp_check_header.c; \
+		$(CPP_1) -o __tmp_check_header.out __tmp_check_header.c; \
 		if [ $$? -ne 0 ]; \
 		then \
 			ERROR=1; \
diff --git a/TODO b/dev/TODO
similarity index 100%
rename from TODO
rename to dev/TODO
diff --git a/algo.h b/include/algo.h
similarity index 91%
rename from algo.h
rename to include/algo.h
index 32839ac..8cc0bf9 100644
--- a/algo.h
+++ b/include/algo.h
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   algo.h                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: grobledo <grobledo@student.42.fr>          +#+  +:+       +#+        */
+/*   By: mc <mc@student.42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/30 15:45:59 by grobledo          #+#    #+#             */
-/*   Updated: 2024/10/24 14:27:27 by grobledo         ###   ########.fr       */
+/*   Updated: 2024/10/31 16:03:42 by mc               ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,9 +17,10 @@
 # include <math.h>
 # include <linux/types.h>
 # include <stdbool.h>
-# include "Minilibx/mlx.h"
-# include "Minilibx/mlx_int.h"
-# include "Libft/libft.h"
+# include <stdlib.h>
+# include <X11/X.h>
+# include "mlx.h"
+# include "libft.h"
 
 # include "stream.h"
 # include "read_all_text.h"
diff --git a/input.h b/include/input.h
similarity index 100%
rename from input.h
rename to include/input.h
diff --git a/map.h b/include/map.h
similarity index 96%
rename from map.h
rename to include/map.h
index 86c6a39..73802dd 100644
--- a/map.h
+++ b/include/map.h
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   map.h                                              :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: mcolonna <mcolonna@student.42perpignan.fr  +#+  +:+       +#+        */
+/*   By: mc <mc@student.42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/01 13:59:04 by mcolonna          #+#    #+#             */
-/*   Updated: 2024/10/16 17:59:12 by mcolonna         ###   ########.fr       */
+/*   Updated: 2024/10/31 15:57:58 by mc               ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/map_mapping.h b/include/map_mapping.h
similarity index 100%
rename from map_mapping.h
rename to include/map_mapping.h
diff --git a/map_utils.h b/include/map_utils.h
similarity index 100%
rename from map_utils.h
rename to include/map_utils.h
diff --git a/player.h b/include/player.h
similarity index 100%
rename from player.h
rename to include/player.h
diff --git a/read_all_text.h b/include/read_all_text.h
similarity index 100%
rename from read_all_text.h
rename to include/read_all_text.h
diff --git a/stream.h b/include/stream.h
similarity index 100%
rename from stream.h
rename to include/stream.h
diff --git a/utils.h b/include/utils.h
similarity index 100%
rename from utils.h
rename to include/utils.h
diff --git a/algo.c b/src/algo.c
similarity index 100%
rename from algo.c
rename to src/algo.c
diff --git a/color.c b/src/color.c
similarity index 100%
rename from color.c
rename to src/color.c
diff --git a/input.c b/src/input.c
similarity index 100%
rename from input.c
rename to src/input.c
diff --git a/map1.c b/src/map1.c
similarity index 100%
rename from map1.c
rename to src/map1.c
diff --git a/map2.c b/src/map2.c
similarity index 100%
rename from map2.c
rename to src/map2.c
diff --git a/map_mapping.c b/src/map_mapping.c
similarity index 100%
rename from map_mapping.c
rename to src/map_mapping.c
diff --git a/map_utils1.c b/src/map_utils1.c
similarity index 100%
rename from map_utils1.c
rename to src/map_utils1.c
diff --git a/map_utils2.c b/src/map_utils2.c
similarity index 100%
rename from map_utils2.c
rename to src/map_utils2.c
diff --git a/move.c b/src/move.c
similarity index 100%
rename from move.c
rename to src/move.c
diff --git a/player.c b/src/player.c
similarity index 100%
rename from player.c
rename to src/player.c
diff --git a/read_all_text.c b/src/read_all_text.c
similarity index 100%
rename from read_all_text.c
rename to src/read_all_text.c
diff --git a/render.c b/src/render.c
similarity index 100%
rename from render.c
rename to src/render.c
diff --git a/render2.c b/src/render2.c
similarity index 100%
rename from render2.c
rename to src/render2.c
diff --git a/stream.c b/src/stream.c
similarity index 100%
rename from stream.c
rename to src/stream.c
diff --git a/utils.c b/src/utils.c
similarity index 100%
rename from utils.c
rename to src/utils.c
diff --git a/utils2.c b/src/utils2.c
similarity index 100%
rename from utils2.c
rename to src/utils2.c