diff --git a/client/src/client.rs b/client/src/client.rs
index 419e929..0d365c4 100644
--- a/client/src/client.rs
+++ b/client/src/client.rs
@@ -9,7 +9,7 @@ use solstice_proto::server;
 
 use crate::config::Config;
 use crate::control;
-use crate::login::LoginStatus;
+use crate::server::LoginStatus;
 use crate::room;
 use crate::user;
 
diff --git a/client/src/main.rs b/client/src/main.rs
index 2a3c74f..4f01e99 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -15,10 +15,10 @@ mod control;
 mod dispatcher;
 mod event;
 mod handlers;
-mod login;
 mod message_handler;
 mod peer;
 mod room;
+mod server;
 #[cfg(test)]
 mod testing;
 mod user;
diff --git a/client/src/login.rs b/client/src/server/login.rs
similarity index 100%
rename from client/src/login.rs
rename to client/src/server/login.rs
diff --git a/client/src/server/mod.rs b/client/src/server/mod.rs
new file mode 100644
index 0000000..7dc3c78
--- /dev/null
+++ b/client/src/server/mod.rs
@@ -0,0 +1,3 @@
+mod login;
+
+pub use login::LoginStatus;