diff --git a/Makefile b/Makefile
deleted file mode 100644
index 97ddd18..0000000
--- a/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-CC = gcc
-CFLAGS = -std=gnu11 -Wextra -pedantic -Wall -O0 -g3 -fsanitize=address
-LDFLAGS = -lncursesw -fsanitize=address
-OBJ_DIR = ./build
-OBJECTS = $(wildcard $(OBJ_DIR)/*.o)
-BUILD_COMMAND = $(CC) -c $^ -o $(OBJ_DIR)/$@ $(CFLAGS) $(LDFLAGS)
-
-.PHONY: clean
-
-build:
-	$(CC) $(OBJECTS) -o minigame-menu $(CFLAGS) $(LDFLAGS)
-
-clean:
-	rm -f *~ $(OBJECTS) main
-
-main.o: main.c
-	$(BUILD_COMMAND)
-
-minigame-menu.o: games/minigame-menu/minigame_menu.c
-	$(BUILD_COMMAND)
-
-manual.o: games/manual/manual.c
-	$(BUILD_COMMAND)
-
-maze-runner.o: games/maze-runner/maze_runner.c
-	$(BUILD_COMMAND)
-
-snake.o: games/snake/snake.c
-	$(BUILD_COMMAND)
-
-minesweeper.o: games/minesweeper/minesweeper.c
-	$(BUILD_COMMAND)
-
-engine.o: engine/grid_game_engine.c
-	$(BUILD_COMMAND)
-
-grid.o: engine/grid/grid.c
-	$(BUILD_COMMAND)
diff --git a/Makefile.yeet b/Makefile.yeet
new file mode 100644
index 0000000..8a48c07
--- /dev/null
+++ b/Makefile.yeet
@@ -0,0 +1,45 @@
+CC = gcc
+CFLAGS = -std=gnu11 -Wextra -pedantic -Wall -O0 -g3 -fsanitize=address
+LDFLAGS = -lncurses -fsanitize=address
+OBJ_DIR = build/
+
+OBJECTS = $(wildcard $(OBJ_DIR)/*.o)
+BUILD_COMMAND = $(CC) -c $^ -o $(OBJ_DIR)/$@ $(CFLAGS) $(LDFLAGS)
+
+SRC = src/
+GAMES_DIR = games/
+ENGINE_DIR = engine/
+
+
+
+.PHONY: clean
+
+build: $(OBJECTS)
+	$(CC) -o minigame-menu $(CFLAGS) $(LDFLAGS)
+
+clean:
+	rm -f *~ $(OBJECTS) main
+
+main.o: src/main.c
+	$(BUILD_COMMAND)
+
+minigame-menu.o: src/games
+	$(BUILD_COMMAND)
+
+manual.o: src/games
+	$(BUILD_COMMAND)
+
+maze-runner.o: src/games
+	$(BUILD_COMMAND)
+
+snake.o: src/games
+	$(BUILD_COMMAND)
+
+minesweeper.o: src/games
+	$(BUILD_COMMAND)
+
+engine.o: src/engine
+	$(BUILD_COMMAND)
+
+grid.o: src/engine
+	$(BUILD_COMMAND)
diff --git a/engine/grid_game_engine.c b/src/engine/engine/grid_game_engine.c
similarity index 100%
rename from engine/grid_game_engine.c
rename to src/engine/engine/grid_game_engine.c
diff --git a/engine/grid_game_engine.h b/src/engine/engine/grid_game_engine.h
similarity index 99%
rename from engine/grid_game_engine.h
rename to src/engine/engine/grid_game_engine.h
index f6dc5eb..df8654f 100644
--- a/engine/grid_game_engine.h
+++ b/src/engine/engine/grid_game_engine.h
@@ -8,7 +8,7 @@
 
 #ifndef MINIGAME_MENU_GRID_GAME_ENGINE_H
 #define MINIGAME_MENU_GRID_GAME_ENGINE_H
-#include "grid/grid.h"
+#include "../grid/grid.h"
 
 #define KEY_ESCAPE 27
 
diff --git a/engine/grid/grid.c b/src/engine/grid/grid.c
similarity index 100%
rename from engine/grid/grid.c
rename to src/engine/grid/grid.c
diff --git a/engine/grid/grid.h b/src/engine/grid/grid.h
similarity index 100%
rename from engine/grid/grid.h
rename to src/engine/grid/grid.h
diff --git a/games/manual/assets/manual.txt b/src/games/manual/assets/manual.txt
similarity index 100%
rename from games/manual/assets/manual.txt
rename to src/games/manual/assets/manual.txt
diff --git a/games/manual/manual.c b/src/games/manual/manual.c
similarity index 100%
rename from games/manual/manual.c
rename to src/games/manual/manual.c
diff --git a/games/manual/manual.h b/src/games/manual/manual.h
similarity index 100%
rename from games/manual/manual.h
rename to src/games/manual/manual.h
diff --git a/games/maze-runner/assets/maze.txt b/src/games/maze-runner/assets/maze.txt
similarity index 100%
rename from games/maze-runner/assets/maze.txt
rename to src/games/maze-runner/assets/maze.txt
diff --git a/games/maze-runner/maze_runner.c b/src/games/maze-runner/maze_runner.c
similarity index 100%
rename from games/maze-runner/maze_runner.c
rename to src/games/maze-runner/maze_runner.c
diff --git a/games/maze-runner/maze_runner.h b/src/games/maze-runner/maze_runner.h
similarity index 100%
rename from games/maze-runner/maze_runner.h
rename to src/games/maze-runner/maze_runner.h
diff --git a/games/minesweeper/minesweeper.c b/src/games/minesweeper/minesweeper.c
similarity index 100%
rename from games/minesweeper/minesweeper.c
rename to src/games/minesweeper/minesweeper.c
diff --git a/games/minesweeper/minesweeper.h b/src/games/minesweeper/minesweeper.h
similarity index 100%
rename from games/minesweeper/minesweeper.h
rename to src/games/minesweeper/minesweeper.h
diff --git a/games/minigame-menu/minigame_menu.c b/src/games/minigame-menu/minigame_menu.c
similarity index 100%
rename from games/minigame-menu/minigame_menu.c
rename to src/games/minigame-menu/minigame_menu.c
diff --git a/games/minigame-menu/minigame_menu.h b/src/games/minigame-menu/minigame_menu.h
similarity index 100%
rename from games/minigame-menu/minigame_menu.h
rename to src/games/minigame-menu/minigame_menu.h
diff --git a/games/snake/snake.c b/src/games/snake/snake.c
similarity index 99%
rename from games/snake/snake.c
rename to src/games/snake/snake.c
index 53fb169..89aefa8 100644
--- a/games/snake/snake.c
+++ b/src/games/snake/snake.c
@@ -12,7 +12,7 @@
 #include <pthread.h>
 #include <unistd.h>
 
-#include "../../engine/grid_game_engine.h"
+#include "../../engine/engine/grid_game_engine.h"
 
 #define CELL_EMPTY ' '
 #define CELL_FOOD '$'
diff --git a/games/snake/snake.h b/src/games/snake/snake.h
similarity index 100%
rename from games/snake/snake.h
rename to src/games/snake/snake.h
diff --git a/main.c b/src/main.c
similarity index 93%
rename from main.c
rename to src/main.c
index 77cddc1..e0a0e8c 100644
--- a/main.c
+++ b/src/main.c
@@ -15,7 +15,7 @@
  * A user manual can be found in the assets or by selected it in the menu using ENTER or 'f'.
  */
 
-#include "engine/grid_game_engine.h"
+#include "engine/engine/grid_game_engine.h"
 #include "games/minigame-menu/minigame_menu.h"
 
 /*