diff --git a/client/src/dispatcher.rs b/client/src/dispatcher.rs
index 3433347..eabaf9b 100644
--- a/client/src/dispatcher.rs
+++ b/client/src/dispatcher.rs
@@ -9,7 +9,7 @@ use crate::context::Context;
 use crate::control::Request as ControlRequest;
 use crate::handlers::*;
 use crate::message_handler::MessageHandler;
-use crate::room_event::{HandleRoomEvent, RoomEvent, RoomEventHandler};
+use crate::room::{HandleRoomEvent, RoomEvent, RoomEventHandler};
 
 /// The type of messages dispatched by a dispatcher.
 #[derive(Debug, Eq, PartialEq)]
@@ -167,7 +167,7 @@ mod tests {
   use crate::context::ContextBundle;
   use crate::control;
   use crate::dispatcher::Message;
-  use crate::room_event::testing::FakeRoomEventHandler;
+  use crate::room::testing::FakeRoomEventHandler;
 
   use super::*;
 
diff --git a/client/src/main.rs b/client/src/main.rs
index a9e933f..ebcba79 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -18,7 +18,6 @@ mod login;
 mod message_handler;
 mod peer;
 mod room;
-mod room_event;
 #[cfg(test)]
 mod testing;
 mod user;
diff --git a/client/src/room_event.rs b/client/src/room/event.rs
similarity index 100%
rename from client/src/room_event.rs
rename to client/src/room/event.rs
diff --git a/client/src/room.rs b/client/src/room/map.rs
similarity index 100%
rename from client/src/room.rs
rename to client/src/room/map.rs
diff --git a/client/src/room/mod.rs b/client/src/room/mod.rs
new file mode 100644
index 0000000..e8da223
--- /dev/null
+++ b/client/src/room/mod.rs
@@ -0,0 +1,6 @@
+mod event;
+mod map;
+mod state;
+
+pub use map::*;
+pub use event::*;
diff --git a/client/src/room/state.rs b/client/src/room/state.rs
new file mode 100644
index 0000000..e69de29