diff --git a/src/proto/handler.rs b/src/proto/handler.rs
index 99fcdef..b539cd5 100644
--- a/src/proto/handler.rs
+++ b/src/proto/handler.rs
@@ -6,9 +6,21 @@ use mio;
 
 use config;
 
-use super::{Intent, Stream, SendPacket, Request, Response};
+use super::{Intent, Stream, SendPacket};
 use super::server::*;
 
+/*====================*
+ * REQUEST - RESPONSE *
+ *====================*/
+
+pub enum Request {
+    ServerRequest(ServerRequest)
+}
+
+pub enum Response {
+    ServerResponse(ServerResponse)
+}
+
 /*===============*
  * TOKEN COUNTER *
  *===============*/
diff --git a/src/proto/mod.rs b/src/proto/mod.rs
index cd0d127..d05b0f2 100644
--- a/src/proto/mod.rs
+++ b/src/proto/mod.rs
@@ -7,11 +7,3 @@ mod stream;
 pub use self::handler::*;
 pub use self::packet::*;
 pub use self::stream::*;
-
-pub enum Request {
-    ServerRequest(server::ServerRequest),
-}
-
-pub enum Response {
-    ServerResponse(server::ServerResponse),
-}