diff --git a/src/client.rs b/src/client.rs
index e052552..7249daf 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -4,7 +4,8 @@ use std::sync::mpsc;
 use mio;
 
 use config;
-use control::{ControlRequest, ControlResponse};
+use control::request::ControlRequest;
+use control::response::ControlResponse;
 use proto::{Response, Request};
 use proto::server::*;
 
diff --git a/src/control.rs b/src/control/controller.rs
similarity index 92%
rename from src/control.rs
rename to src/control/controller.rs
index 93f1236..d1336cb 100644
--- a/src/control.rs
+++ b/src/control/controller.rs
@@ -11,6 +11,9 @@ use websocket::{Receiver, Sender};
 use client;
 use config;
 
+use super::request::*;
+use super::response::*;
+
 type WebSocketReceiver =
     websocket::receiver::Receiver<websocket::WebSocketStream>;
 
@@ -231,27 +234,3 @@ impl Controller {
     }
 }
 
-#[derive(Debug, RustcDecodable, RustcEncodable)]
-pub enum ControlRequest {
-    LoginStatusRequest(LoginStatusRequest),
-}
-
-#[derive(Debug, RustcDecodable, RustcEncodable)]
-pub enum ControlResponse {
-    LoginStatusResponse(LoginStatusResponse),
-}
-
-#[derive(Debug, RustcDecodable, RustcEncodable)]
-pub struct LoginStatusRequest;
-
-#[derive(Debug, RustcDecodable, RustcEncodable)]
-pub enum LoginStatusResponse {
-    LoginOk {
-        username: String,
-        motd: String,
-    },
-    LoginFail {
-        username: String,
-        reason: String,
-    }
-}
diff --git a/src/control/mod.rs b/src/control/mod.rs
new file mode 100644
index 0000000..4729e28
--- /dev/null
+++ b/src/control/mod.rs
@@ -0,0 +1,5 @@
+mod controller;
+pub mod request;
+pub mod response;
+
+pub use self::controller::Controller;
diff --git a/src/control/request.rs b/src/control/request.rs
new file mode 100644
index 0000000..ab6cc57
--- /dev/null
+++ b/src/control/request.rs
@@ -0,0 +1,7 @@
+#[derive(Debug, RustcDecodable, RustcEncodable)]
+pub enum ControlRequest {
+    LoginStatusRequest(LoginStatusRequest),
+}
+
+#[derive(Debug, RustcDecodable, RustcEncodable)]
+pub struct LoginStatusRequest;
diff --git a/src/control/response.rs b/src/control/response.rs
new file mode 100644
index 0000000..5aa5996
--- /dev/null
+++ b/src/control/response.rs
@@ -0,0 +1,16 @@
+#[derive(Debug, RustcDecodable, RustcEncodable)]
+pub enum ControlResponse {
+    LoginStatusResponse(LoginStatusResponse),
+}
+
+#[derive(Debug, RustcDecodable, RustcEncodable)]
+pub enum LoginStatusResponse {
+    LoginOk {
+        username: String,
+        motd: String,
+    },
+    LoginFail {
+        username: String,
+        reason: String,
+    }
+}