diff --git a/Makefile b/Makefile
index 07f8dde..6a7065a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 CC = g++
 ASAN_FLAGS = -fsanitize=address -fno-omit-frame-pointer -Wno-format-security
-CFLAGS := -g -std=c++20 -Wall -I./include
+CFLAGS := -g -std=c++20 -Wall -I./include -I./server -I./client
 LDFLAGS   += -fsanitize=address -lpthread -lssl -lcrypto
+VPATH = server/:client/
 
 TARGET = client server
 BUILD_DIR = build
diff --git a/client.cpp b/client/client.cpp
similarity index 100%
rename from client.cpp
rename to client/client.cpp
diff --git a/mail.cpp b/server/mail.cpp
similarity index 100%
rename from mail.cpp
rename to server/mail.cpp
diff --git a/mail.h b/server/mail.h
similarity index 100%
rename from mail.h
rename to server/mail.h
diff --git a/server.cpp b/server/server.cpp
similarity index 100%
rename from server.cpp
rename to server/server.cpp
diff --git a/user.cpp b/server/user.cpp
similarity index 100%
rename from user.cpp
rename to server/user.cpp
diff --git a/user.h b/server/user.h
similarity index 100%
rename from user.h
rename to server/user.h
diff --git a/user_handler.cpp b/server/user_handler.cpp
similarity index 100%
rename from user_handler.cpp
rename to server/user_handler.cpp
diff --git a/user_handler.h b/server/user_handler.h
similarity index 100%
rename from user_handler.h
rename to server/user_handler.h