diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 50b99ae..1fc70d7 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -9,10 +9,8 @@
                 "-Wall",
                 "-g",
                 "main.c",
-                "court.c",
-                "gameServer.c",
-                "term.c",
-                "network/*.c",
+                "src/*.c",
+                "src/network/*.c",
                 "-o",
                 "netpong",
                 "-lncurses"
diff --git a/Makefile b/Makefile
index 87a9df7..2e32025 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 CFLAGS = -Wall -g
 
-NETPONG_SRC = main.c term.c court.c gameServer.c $(wildcard network/*.c)
+NETPONG_SRC = main.c $(wildcard src/*.c) $(wildcard src/network/*.c)
 
 LIBS = -lncurses
 
diff --git a/game.h b/include/game.h
similarity index 100%
rename from game.h
rename to include/game.h
diff --git a/network/networking.h b/include/network/networking.h
similarity index 100%
rename from network/networking.h
rename to include/network/networking.h
diff --git a/main.c b/main.c
index e6d1c24..f85a413 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "include/game.h"
 
 #include <unistd.h>
 #include <stdbool.h>
diff --git a/court.c b/src/court.c
similarity index 95%
rename from court.c
rename to src/court.c
index c0589a9..77cc469 100644
--- a/court.c
+++ b/src/court.c
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "../include/game.h"
 
 #include <curses.h>
 #include <signal.h>
diff --git a/gameServer.c b/src/gameServer.c
similarity index 99%
rename from gameServer.c
rename to src/gameServer.c
index 81c561a..6c3dfb1 100644
--- a/gameServer.c
+++ b/src/gameServer.c
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "../include/game.h"
 #include <curses.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/network/networking.c b/src/network/networking.c
similarity index 97%
rename from network/networking.c
rename to src/network/networking.c
index 94d9de9..bbe8840 100644
--- a/network/networking.c
+++ b/src/network/networking.c
@@ -1,4 +1,4 @@
-#include "networking.h"
+#include "../../include/network/networking.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/term.c b/src/term.c
similarity index 94%
rename from term.c
rename to src/term.c
index 7840838..ceba745 100644
--- a/term.c
+++ b/src/term.c
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "../include/game.h"
 
 #include <curses.h>
 #include <stdio.h>