diff --git a/code/src/waiting-state/chopstick.cpp b/code/src/chopstick.cpp
similarity index 100%
rename from code/src/waiting-state/chopstick.cpp
rename to code/src/chopstick.cpp
diff --git a/code/src/waiting-state/chopstick.h b/code/src/chopstick.h
similarity index 100%
rename from code/src/waiting-state/chopstick.h
rename to code/src/chopstick.h
diff --git a/code/src/waiting-state/diningTable.cpp b/code/src/diningTable.cpp
similarity index 100%
rename from code/src/waiting-state/diningTable.cpp
rename to code/src/diningTable.cpp
diff --git a/code/src/waiting-state/diningTable.h b/code/src/diningTable.h
similarity index 100%
rename from code/src/waiting-state/diningTable.h
rename to code/src/diningTable.h
diff --git a/code/src/main.cpp b/code/src/main.cpp
index 771ffbf..fb3b6fa 100644
--- a/code/src/main.cpp
+++ b/code/src/main.cpp
@@ -1,4 +1,4 @@
-#include "waiting-state/diningTable.h"
+#include "diningTable.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/code/src/waiting-state/philosopher.cpp b/code/src/philosopher.cpp
similarity index 100%
rename from code/src/waiting-state/philosopher.cpp
rename to code/src/philosopher.cpp
diff --git a/code/src/waiting-state/philosopher.h b/code/src/philosopher.h
similarity index 100%
rename from code/src/waiting-state/philosopher.h
rename to code/src/philosopher.h
diff --git a/code/kill-ipcs.sh b/code/unittest/kill-ipcs.sh
similarity index 100%
rename from code/kill-ipcs.sh
rename to code/unittest/kill-ipcs.sh
diff --git a/code/unittest/test-waiting-state.cpp b/code/unittest/test-waiting-state.cpp
index 7262770..dc21817 100644
--- a/code/unittest/test-waiting-state.cpp
+++ b/code/unittest/test-waiting-state.cpp
@@ -8,9 +8,9 @@
 #include <sys/sem.h>
 #include <sys/shm.h>
 
-#include "waiting-state/philosopher.h"
-#include "waiting-state/chopstick.h"
-#include "waiting-state/diningTable.h"
+#include "philosopher.h"
+#include "chopstick.h"
+#include "diningTable.h"
 #include "constants.h"
 
 using namespace WaitingPhilosopher;