diff --git a/.gitignore b/.gitignore
index eaadb6e..b8a14e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ Thumbs.db
 *.lnk
 *.zip
 philo
+!philo/
diff --git a/Makefile b/philo/Makefile
similarity index 100%
rename from Makefile
rename to philo/Makefile
diff --git a/headers/philo.h b/philo/headers/philo.h
similarity index 100%
rename from headers/philo.h
rename to philo/headers/philo.h
diff --git a/headers/philo_macro.h b/philo/headers/philo_macro.h
similarity index 100%
rename from headers/philo_macro.h
rename to philo/headers/philo_macro.h
diff --git a/headers/philo_proto.h b/philo/headers/philo_proto.h
similarity index 100%
rename from headers/philo_proto.h
rename to philo/headers/philo_proto.h
diff --git a/headers/philo_struct.h b/philo/headers/philo_struct.h
similarity index 100%
rename from headers/philo_struct.h
rename to philo/headers/philo_struct.h
diff --git a/srcs/exec.c b/philo/srcs/exec.c
similarity index 100%
rename from srcs/exec.c
rename to philo/srcs/exec.c
diff --git a/srcs/generic.c b/philo/srcs/generic.c
similarity index 100%
rename from srcs/generic.c
rename to philo/srcs/generic.c
diff --git a/srcs/init.c b/philo/srcs/init.c
similarity index 96%
rename from srcs/init.c
rename to philo/srcs/init.c
index 37bfba1..0baf729 100644
--- a/srcs/init.c
+++ b/philo/srcs/init.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <hulamy@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/01/26 15:30:34 by hulamy            #+#    #+#             */
-/*   Updated: 2022/01/26 18:15:42 by hulamy           ###   ########.fr       */
+/*   Updated: 2022/01/27 15:01:30 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -50,7 +50,8 @@ static t_philo	*init_chain_philo(t_params *params, t_global *global)
 		philo = tmp;
 		i++;
 	}
-	philo->next = start;
+	if (philo)
+		philo->next = start;
 	return (philo);
 }
 
diff --git a/srcs/launch.c b/philo/srcs/launch.c
similarity index 100%
rename from srcs/launch.c
rename to philo/srcs/launch.c
diff --git a/srcs/main.c b/philo/srcs/main.c
similarity index 100%
rename from srcs/main.c
rename to philo/srcs/main.c
diff --git a/srcs/utils.c b/philo/srcs/utils.c
similarity index 100%
rename from srcs/utils.c
rename to philo/srcs/utils.c