diff --git a/Makefile b/Makefile
index 30ce404..7ca47cb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SRCDIR = src
 BUILDDIR = build
 TARGET = main
 
-SOURCES = $(wildcard $(SRCDIR)/*.c)
+SOURCES = $(wildcard $(SRCDIR)/**/*.c $(SRCDIR)/*.c)
 OBJECTS = $(patsubst $(SRCDIR)/%.c, $(BUILDDIR)/%.o, $(SOURCES))
 
 ifeq ($(OS),Windows_NT)
@@ -23,7 +23,7 @@ $(EXECUTABLE): $(OBJECTS)
 	$(CC) $(CFLAGS) -o $@ $^
 
 $(BUILDDIR)/%.o: $(SRCDIR)/%.c
-	$(MKDIR) $(BUILDDIR)
+	@$(MKDIR) -p $(@D)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
diff --git a/src/engine.h b/src/engine.h
index f68b454..b2c3875 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -1,8 +1,8 @@
 #ifndef __ENGINE_HEADER
 #define __ENGINE_HEADER
 
-#include "board.h"
-#include "common.h"
-#include "fen.h"
+#include "engine/board.h"
+#include "engine/common.h"
+#include "engine/fen.h"
 
 #endif // !__ENGINE_HEADER
diff --git a/src/board.c b/src/engine/board.c
similarity index 100%
rename from src/board.c
rename to src/engine/board.c
diff --git a/src/board.h b/src/engine/board.h
similarity index 100%
rename from src/board.h
rename to src/engine/board.h
diff --git a/src/common.c b/src/engine/common.c
similarity index 100%
rename from src/common.c
rename to src/engine/common.c
diff --git a/src/common.h b/src/engine/common.h
similarity index 100%
rename from src/common.h
rename to src/engine/common.h
diff --git a/src/fen.c b/src/engine/fen.c
similarity index 100%
rename from src/fen.c
rename to src/engine/fen.c
diff --git a/src/fen.h b/src/engine/fen.h
similarity index 100%
rename from src/fen.h
rename to src/engine/fen.h