diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index ecb51c8..1d3b21f
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,48 @@
-# **************************************************************************** #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    Makefile                                           :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2023/07/28 00:35:01 by tomoron           #+#    #+#              #
-#    Updated: 2024/02/16 21:24:47 by tomoron          ###   ########.fr        #
-#                                                                              #
-# **************************************************************************** #
-
 CC = cc
+SRCS_RAW =	main.c\
+			lst_cmd.c\
+			lst_env.c\
+			exec.c\
+			exit.c\
+			echo.c\
+			pwd.c\
+			parsing.c\
+			debug.c\
+			env_to_char_tab.c\
+			parsing_var.c\
+			minishellrc.c
 
-SRCS =	main.c\
-		lst_cmd.c\
-		lst_env.c\
-		exec.c\
-		exit.c\
-		echo.c\
-		pwd.c\
-		parsing.c\
-		debug.c\
-		env_to_char_tab.c\
-		parsing_var.c\
-		minishellrc.c
-
-OBJS = $(SRCS:.c=.o)
-
-OBJS_DIR = objs
-
+OBJS_DIR = objs/
+SRCS_DIR = srcs/
+SRCS = $(addprefix $(SRCS_DIR), $(SRCS_RAW))
+OBJS = $(addprefix $(OBJS_DIR), $(SRCS_RAW:.c=.o))
 FLAGS = -Wall -Wextra -Werror -g
-
 LIBFT = libft/libft.a
-
 NAME = minishell
 
-all: $(NAME) 
+all: $(NAME)
 
 $(NAME) : $(LIBFT) $(OBJS)
-	mkdir $(OBJS_DIR)
 	$(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME)
 
 $(LIBFT):
 	make --no-print-directory -j -C ./libft
 
-.c.o:
+$(OBJS_DIR):
+	mkdir -p $(OBJS_DIR)
+
+$(OBJS_DIR)%.o : $(SRCS_DIR)%.c | $(OBJS_DIR)
 	$(CC) $(FLAGS) -c $< -o $@
 
 clean:
-	rm -f $(OBJS)
-	make --no-print-directory -C ./libft fclean
+	rm -rf $(OBJS_DIR)
+	make --no-print-directory -C ./libft clean
 
 fclean: clean
 	rm -f $(NAME)
+	make --no-print-directory -C ./libft fclean
 
 re: fclean all
 
 .PHONY: all clean fclean re
+
diff --git a/debug.c b/srcs/debug.c
similarity index 100%
rename from debug.c
rename to srcs/debug.c
diff --git a/echo.c b/srcs/echo.c
similarity index 100%
rename from echo.c
rename to srcs/echo.c
diff --git a/env_to_char_tab.c b/srcs/env_to_char_tab.c
similarity index 100%
rename from env_to_char_tab.c
rename to srcs/env_to_char_tab.c
diff --git a/exec.c b/srcs/exec.c
similarity index 96%
rename from exec.c
rename to srcs/exec.c
index 8139d27..6cf0886 100755
--- a/exec.c
+++ b/srcs/exec.c
@@ -6,13 +6,11 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/07 14:12:49 by tomoron           #+#    #+#             */
-/*   Updated: 2024/02/16 17:26:04 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/02/16 21:52:02 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "libft/libft.h"
 #include "minishell.h"
-#include <readline/readline.h>
 
 int	exec_builtin(t_cmd *parsed_cmd, t_env *env)
 {
diff --git a/exit.c b/srcs/exit.c
similarity index 100%
rename from exit.c
rename to srcs/exit.c
diff --git a/lst_cmd.c b/srcs/lst_cmd.c
similarity index 100%
rename from lst_cmd.c
rename to srcs/lst_cmd.c
diff --git a/lst_env.c b/srcs/lst_env.c
similarity index 100%
rename from lst_env.c
rename to srcs/lst_env.c
diff --git a/main.c b/srcs/main.c
similarity index 92%
rename from main.c
rename to srcs/main.c
index d80ef59..781a330 100755
--- a/main.c
+++ b/srcs/main.c
@@ -6,11 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/02 21:59:20 by tomoron           #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2024/02/16 16:37:13 by tomoron          ###   ########.fr       */
-=======
-/*   Updated: 2024/02/16 18:21:27 by marde-vr         ###   ########.fr       */
->>>>>>> ad1de58fb2aacb8a3b1b7ef5d74fc6d87f4550b2
+/*   Updated: 2024/02/16 21:29:05 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/minishell.h b/srcs/minishell.h
similarity index 95%
rename from minishell.h
rename to srcs/minishell.h
index 49c8b15..a08460f 100755
--- a/minishell.h
+++ b/srcs/minishell.h
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/04 17:31:38 by tomoron           #+#    #+#             */
-/*   Updated: 2024/02/16 21:25:14 by tomoron          ###   ########.fr       */
+/*   Updated: 2024/02/16 21:51:37 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,7 @@
 # include <limits.h>
 # include <stdio.h>//debug	
 # include <sys/wait.h>
-# include "libft/libft.h"
+# include "../libft/libft.h"
 # include "fcntl.h"
 
 typedef enum e_token_type
diff --git a/minishellrc.c b/srcs/minishellrc.c
similarity index 100%
rename from minishellrc.c
rename to srcs/minishellrc.c
diff --git a/parsing.c b/srcs/parsing.c
similarity index 100%
rename from parsing.c
rename to srcs/parsing.c
diff --git a/parsing_var.c b/srcs/parsing_var.c
similarity index 100%
rename from parsing_var.c
rename to srcs/parsing_var.c
diff --git a/pwd.c b/srcs/pwd.c
similarity index 100%
rename from pwd.c
rename to srcs/pwd.c