diff --git a/src/server.rs b/src/client.rs
similarity index 97%
rename from src/server.rs
rename to src/client.rs
index 0301d03..c226f8a 100644
--- a/src/server.rs
+++ b/src/client.rs
@@ -15,7 +15,7 @@ enum State {
 }
 
 #[derive(Debug)]
-pub struct ServerConnection {
+pub struct Client {
     state: State,
 
     token_counter: usize,
@@ -25,10 +25,10 @@ pub struct ServerConnection {
     server_interest: EventSet,
 }
 
-impl ServerConnection {
+impl Client {
     pub fn new(server_stream: PacketStream<TcpStream>) -> Self {
         let token_counter = 0;
-        ServerConnection {
+        Client {
             state: State::NotLoggedIn,
             token_counter: token_counter,
             server_token: Token(token_counter),
@@ -151,7 +151,7 @@ impl ServerConnection {
     }
 }
 
-impl Handler for ServerConnection {
+impl Handler for Client {
     type Timeout = ();
     type Message = ();
 
diff --git a/src/main.rs b/src/main.rs
index 58c4585..081a06c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
-mod server;
-mod proto;
+mod client;
 mod config;
+mod proto;
 
 extern crate byteorder;
 extern crate crypto;
@@ -15,7 +15,7 @@ use mio::EventLoop;
 use mio::tcp::TcpStream;
 
 use proto::PacketStream;
-use server::ServerConnection;
+use client::Client;
 
 fn connect(hostname: &str, port: u16) -> io::Result<TcpStream> {
     for sock_addr in try!((hostname, port).to_socket_addrs()) {
@@ -38,7 +38,7 @@ fn main() {
     let mut event_loop = EventLoop::new().unwrap();
 
     let packet_stream = PacketStream::new(stream);
-    let mut server_conn = ServerConnection::new(packet_stream);
+    let mut server_conn = Client::new(packet_stream);
     server_conn.register_all(&mut event_loop).unwrap();
 
     event_loop.run(&mut server_conn).unwrap();