diff --git a/src/prep/prep.cc b/src/prep/prep.cc
index 40252fe..ec5d4a3 100644
--- a/src/prep/prep.cc
+++ b/src/prep/prep.cc
@@ -5,24 +5,6 @@
 #include <cstdint>
 #include <initializer_list>
 
-Room::Room(
-  uint32_t id, std::string title, uint32_t utcTimestampCreatedAt, RoomStatus status, std::vector<Player> players):
-    id(id),
-    title(title),
-    status(status),
-    players(players) {
-    this->utcTimestampCreatedAt = createUTCTimestamp(utcTimestampCreatedAt);
-}
-
-Room::Room(uint32_t id,
-           std::string title,
-           uint32_t utcTimestampCreatedAt,
-           RoomStatus status,
-           std::initializer_list<Player> players):
-    Room(id, title, utcTimestampCreatedAt, status, std::vector<Player>(players)) {
-    this->utcTimestampCreatedAt = createUTCTimestamp(utcTimestampCreatedAt);
-}
-
 Event::Event(std::string title,
              uint32_t utcTimestampCreatedAt,
              uint32_t numberNight,
diff --git a/src/prep/prep.hh b/src/prep/prep.hh
index 91e738b..b199396 100644
--- a/src/prep/prep.hh
+++ b/src/prep/prep.hh
@@ -14,32 +14,8 @@ enum EventType {
     PLAYER_STATE_CHANGE,
 };
 
-enum RoomStatus {
-    AWAITING_START,
-    IN_PROGRESS,
-    STOPPED,
-    ENDED,
-};
-
-struct Room;
 struct Event;
 
-struct Room {
-    uint32_t id;
-    std::string title;
-    std::tm *utcTimestampCreatedAt;
-    RoomStatus status;
-    std::vector<Player> players;
-
-    Room(
-      uint32_t id, std::string title, uint32_t utcTimestampCreatedAt, RoomStatus status, std::vector<Player> players);
-    Room(uint32_t id,
-         std::string title,
-         uint32_t utcTimestampCreatedAt,
-         RoomStatus status,
-         std::initializer_list<Player> players);
-};
-
 struct Event {
     std::string title;
     std::tm *utcTimestampCreatedAt;
diff --git a/src/room.cc b/src/room.cc
new file mode 100644
index 0000000..a3dec91
--- /dev/null
+++ b/src/room.cc
@@ -0,0 +1,23 @@
+#include "room.hh"
+
+#include <cstdint>
+#include <initializer_list>
+#include <string>
+#include <vector>
+
+Room::Room(uint32_t id, std::string title, uint32_t created_at, RoomStatus status, std::vector<Player> players):
+    id(id),
+    title(title),
+    created_at(createUTCTimestamp(created_at)),
+    status(status),
+    players(players) {
+}
+
+Room::Room(
+  uint32_t id, std::string title, uint32_t created_at, RoomStatus status, std::initializer_list<Player> players):
+    id(id),
+    title(title),
+    created_at(createUTCTimestamp(created_at)),
+    status(status),
+    players(players) {
+}
diff --git a/src/room.hh b/src/room.hh
new file mode 100644
index 0000000..39cb12d
--- /dev/null
+++ b/src/room.hh
@@ -0,0 +1,30 @@
+#ifndef ROOM_HH
+#define ROOM_HH
+
+#include "player.hh"
+
+#include <cstdint>
+#include <ctime>
+#include <initializer_list>
+#include <string>
+#include <vector>
+
+enum RoomStatus {
+    AwaitingStart,
+    InProgress,
+    Stopped,
+    Ended,
+};
+
+struct Room {
+    uint32_t id;
+    std::string title;
+    std::tm *created_at;
+    RoomStatus status;
+    std::vector<Player> players;
+
+    Room(uint32_t id, std::string title, uint32_t created_at, RoomStatus status, std::vector<Player> players);
+    Room(uint32_t id, std::string title, uint32_t created_at, RoomStatus status, std::initializer_list<Player> players);
+};
+
+#endif  // !ROOM_HH