diff --git a/CMakeLists.txt b/CMakeLists.txt
index de19ed8..027c017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,13 @@ project(
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-add_subdirectory(src/ccunit)
-add_subdirectory(src/prep)
+add_subdirectory(src/cppunit)
+add_subdirectory(src/modules)
 
 add_executable(main src/main.cc)
-add_library(lib src/lib.cc src/lib.hh)
+add_library(lib src/lib.cc src/lib.hh src/validation.cc src/validation.hh)
 target_link_libraries(main PUBLIC lib)
-target_link_libraries(lib PUBLIC prepLib)
+target_link_libraries(lib PUBLIC modules)
 target_include_directories(main PUBLIC "${PROJECT_BINARY_DIR}"
                                        "${PROJECT_SOURCE_DIR}/prep")
 target_include_directories(lib PUBLIC "${PROJECT_BINARY_DIR}"
diff --git a/src/cppunit/CMakeLists.txt b/src/cppunit/CMakeLists.txt
index 9d4a5a9..eaebf71 100644
--- a/src/cppunit/CMakeLists.txt
+++ b/src/cppunit/CMakeLists.txt
@@ -1 +1 @@
-add_library(ccunit ccunit.cc ccunit.hh)
+add_library(cppunit cppunit.cc cppunit.hh)
diff --git a/src/lib.hh b/src/lib.hh
index fc3ec1f..46aa2bf 100644
--- a/src/lib.hh
+++ b/src/lib.hh
@@ -1 +1 @@
-#include "validation.hh"
+#include "./validation.hh"
diff --git a/src/main.cc b/src/main.cc
index 50b95bc..755ede2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-#include "lib.hh"
+#include "./lib.hh"
 
 #include <stdlib.h>
 
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
new file mode 100644
index 0000000..84ae806
--- /dev/null
+++ b/src/modules/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(
+  modules
+  action.cc
+  action.hh
+  event.cc
+  event.hh
+  player.cc
+  player.hh
+  role.cc
+  role.hh
+  room.cc
+  room.hh
+  time.cc
+  time.hh)
diff --git a/src/action.cc b/src/modules/action.cc
similarity index 90%
rename from src/action.cc
rename to src/modules/action.cc
index 5ad180c..b698933 100644
--- a/src/action.cc
+++ b/src/modules/action.cc
@@ -1,4 +1,4 @@
-#include "action.hh"
+#include "./action.hh"
 
 #include <string>
 
diff --git a/src/action.hh b/src/modules/action.hh
similarity index 100%
rename from src/action.hh
rename to src/modules/action.hh
diff --git a/src/event.cc b/src/modules/event.cc
similarity index 94%
rename from src/event.cc
rename to src/modules/event.cc
index 1c24b4d..d6e6950 100644
--- a/src/event.cc
+++ b/src/modules/event.cc
@@ -1,7 +1,7 @@
-#include "event.hh"
+#include "./event.hh"
 
-#include "action.hh"
-#include "time.hh"
+#include "./action.hh"
+#include "./time.hh"
 
 #include <initializer_list>
 #include <string>
diff --git a/src/event.hh b/src/modules/event.hh
similarity index 95%
rename from src/event.hh
rename to src/modules/event.hh
index 75199c8..5997743 100644
--- a/src/event.hh
+++ b/src/modules/event.hh
@@ -1,7 +1,7 @@
 #ifndef EVENT_HH
 #define EVENT_HH
 
-#include "action.hh"
+#include "./action.hh"
 
 #include <cstdint>
 #include <ctime>
@@ -16,7 +16,7 @@ namespace event {
         RoomStateChange,
         PlayerStateChange,
     };
-}
+}  // namespace event
 
 struct Event {
     std::string title;
diff --git a/src/player.cc b/src/modules/player.cc
similarity index 85%
rename from src/player.cc
rename to src/modules/player.cc
index 8e40a81..d67f05c 100644
--- a/src/player.cc
+++ b/src/modules/player.cc
@@ -1,6 +1,6 @@
-#include "player.hh"
+#include "./player.hh"
 
-#include "role.hh"
+#include "./role.hh"
 
 #include <string>
 
diff --git a/src/player.hh b/src/modules/player.hh
similarity index 90%
rename from src/player.hh
rename to src/modules/player.hh
index 588d17b..8f0b25c 100644
--- a/src/player.hh
+++ b/src/modules/player.hh
@@ -1,7 +1,7 @@
 #ifndef PLAYER_HH
 #define PLAYER_HH
 
-#include "role.hh"
+#include "./role.hh"
 
 #include <cstdint>
 #include <string>
@@ -13,7 +13,7 @@ namespace player {
         Dead,
         VotedOut,
     };
-}
+}  // namespace player
 
 struct Player {
     uint32_t id;
diff --git a/src/role.cc b/src/modules/role.cc
similarity index 90%
rename from src/role.cc
rename to src/modules/role.cc
index 9ed7d94..5b3e1a9 100644
--- a/src/role.cc
+++ b/src/modules/role.cc
@@ -1,4 +1,4 @@
-#include "role.hh"
+#include "./role.hh"
 
 #include <initializer_list>
 #include <vector>
diff --git a/src/role.hh b/src/modules/role.hh
similarity index 91%
rename from src/role.hh
rename to src/modules/role.hh
index a209895..e98e134 100644
--- a/src/role.hh
+++ b/src/modules/role.hh
@@ -1,15 +1,15 @@
 #ifndef ROLE_HH
 #define ROLE_HH
 
-#include "action.hh"
+#include "./action.hh"
 
 #include <initializer_list>
 #include <vector>
 
 struct Role {
     std::vector<Action> actions;
-    Role(std::initializer_list<Action> actions);
     Role(std::vector<Action> actions);
+    Role(std::initializer_list<Action> actions);
 };
 
 #endif  // !ROLE_HH
diff --git a/src/room.cc b/src/modules/room.cc
similarity index 93%
rename from src/room.cc
rename to src/modules/room.cc
index 64dd270..fd9dd39 100644
--- a/src/room.cc
+++ b/src/modules/room.cc
@@ -1,6 +1,6 @@
-#include "room.hh"
+#include "./room.hh"
 
-#include "time.hh"
+#include "./time.hh"
 
 #include <cstdint>
 #include <initializer_list>
diff --git a/src/room.hh b/src/modules/room.hh
similarity index 93%
rename from src/room.hh
rename to src/modules/room.hh
index e9ce478..ff0e98c 100644
--- a/src/room.hh
+++ b/src/modules/room.hh
@@ -1,7 +1,7 @@
 #ifndef ROOM_HH
 #define ROOM_HH
 
-#include "player.hh"
+#include "./player.hh"
 
 #include <cstdint>
 #include <ctime>
@@ -16,7 +16,7 @@ namespace room {
         Stopped,
         Ended,
     };
-}
+}  // namespace room
 
 struct Room {
     uint32_t id;
diff --git a/src/time.cc b/src/modules/time.cc
similarity index 100%
rename from src/time.cc
rename to src/modules/time.cc
diff --git a/src/time.hh b/src/modules/time.hh
similarity index 100%
rename from src/time.hh
rename to src/modules/time.hh
diff --git a/src/prep/CMakeLists.txt b/src/prep/CMakeLists.txt
deleted file mode 100644
index 599d6df..0000000
--- a/src/prep/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library(prepLib prep.cc prep.hh timeUtils.cc timeUtils.hh)
diff --git a/src/validation.cc b/src/validation.cc
index cc0f231..e7ae0b5 100644
--- a/src/validation.cc
+++ b/src/validation.cc
@@ -1,6 +1,6 @@
-#include "validation.hh"
+#include "./validation.hh"
 
-#include "room.hh"
+#include "modules/room.hh"
 
 #include <algorithm>
 
diff --git a/src/validation.hh b/src/validation.hh
index f07b3fe..32f94b3 100644
--- a/src/validation.hh
+++ b/src/validation.hh
@@ -1,9 +1,11 @@
 #ifndef VALIDATION_HH
 #define VALIDATION_HH
 
-#include "event.hh"
-#include "player.hh"
-#include "room.hh"
+#include "modules/event.hh"
+#include "modules/player.hh"
+#include "modules/room.hh"
+
+#include <vector>
 
 namespace validation {
     enum Status {
@@ -19,7 +21,7 @@ namespace validation {
         NoRelatedEvents,
         ActionValid,
     };
-}
+}  // namespace validation
 
 int validateAction(Player *actor, const Action *action, Room *room, std::vector<Event> *relatedEvents, Player *target);