diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..6b13f20e
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,9 @@
+BasedOnStyle: Microsoft
+IndentWidth: 4
+ColumnLimit: 80
+UseTab: Always
+SortIncludes: CaseInsensitive
+IndentPPDirectives: AfterHash
+PPIndentWidth: 1
+AllowShortIfStatementsOnASingleLine: false
+AlignConsecutiveDeclarations: true
diff --git a/.clangd b/.clangd
new file mode 100644
index 00000000..294e143f
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,12 @@
+CompileFlags: # Tweak the parse settings
+  Add:
+    - "-I/usr/include/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/vendor/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/mecstd/include/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/mecstd/vendor/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/mecstd/output/include/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/mecstd/generic_sources/header/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/includes/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/output/include/"
+    - "-I/home/maiboyer/Documents/ring-2/shcat/generic_sources/header/"
+
diff --git a/Makefile b/Makefile
index 05650dda..fdce2405 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: rparodi <rparodi@student.42.fr>            +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/12 11:05:05 by rparodi           #+#    #+#              #
-#    Updated: 2024/04/28 19:53:00 by maiboyer         ###   ########.fr        #
+#    Updated: 2024/04/29 13:46:41 by maiboyer         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -21,7 +21,7 @@ GOLD = \033[38;5;220m
 END = \033[0m
 
 # Rules
-
+SRC_DIR = ./sources
 NAME = minishell
 
 # All (make all)
@@ -87,5 +87,8 @@ fclean: clean
 re: header 
 	@$(MAKE) --no-print-directory fclean
 	@$(MAKE) --no-print-directory all
+
+generate_filelist:
+	@/usr/bin/env zsh -c "tree -iFf --noreport $(SRC_DIR) | rg '^$(SRC_DIR)/(.*\.c)\$$' --replace '\$$1' | sort -u" > ./src.list
 #	phony
 .PHONY: all bonus clean fclean re
diff --git a/Minishell.mk b/Minishell.mk
index 57f0b968..975f82c3 100644
--- a/Minishell.mk
+++ b/Minishell.mk
@@ -6,7 +6,7 @@
 #    By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/04/28 17:28:30 by maiboyer          #+#    #+#              #
-#    Updated: 2024/04/29 13:33:59 by maiboyer         ###   ########.fr        #
+#    Updated: 2024/04/29 13:46:19 by maiboyer         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -27,13 +27,8 @@ LIB =	./libft/ft_bzero.c \
 		./libft/ft_strjoin.c \
 		./libft/ft_strlen.c
 
-SRC =	./sources/ft_cmd.c \
-		./sources/ft_echo.c \
-		./sources/ft_exit.c \
-		./sources/ft_pwd.c \
-		./sources/main.c \
-		./sources/node/node.c
-
+SRC_DIR = ./sources
+SRC =	$(addprefix $(SRC_DIR)/,$(shell cat ./src.list))
 # Name
 NAME = minishell
 LIBDIRNAME = libft
diff --git a/src.list b/src.list
new file mode 100644
index 00000000..0530ac76
--- /dev/null
+++ b/src.list
@@ -0,0 +1,7 @@
+ft_cmd.c
+ft_echo.c
+ft_exit.c
+ft_pwd.c
+main.c
+node/create_node.c
+node/node.c