diff --git a/src/common/headers.rs b/src/common/headers.rs
index b4f23fd..3589543 100644
--- a/src/common/headers.rs
+++ b/src/common/headers.rs
@@ -3,7 +3,7 @@
 
 use std::result::Result;
 
-use super::RequestError;
+use crate::RequestError;
 
 /// Wrapper over an HTTP Header type.
 #[derive(Debug, Eq, Hash, PartialEq)]
diff --git a/src/connection.rs b/src/connection.rs
index 0de4e34..2a5b03b 100644
--- a/src/connection.rs
+++ b/src/connection.rs
@@ -5,13 +5,12 @@ use std::collections::VecDeque;
 use std::io::{Read, Write};
 
 use crate::common::ascii::{CR, CRLF_LEN, LF};
-use crate::common::headers::Headers;
-use crate::common::{Body, RequestError};
+use crate::common::Body;
+pub use crate::common::{ConnectionError, RequestError};
+use crate::headers::Headers;
 use crate::request::{find, Request, RequestLine};
 use crate::response::{Response, StatusCode};
 
-pub use crate::common::ConnectionError;
-
 const BUFFER_SIZE: usize = 1024;
 
 /// Describes the state machine of an HTTP connection.
@@ -482,11 +481,12 @@ impl<T: Read + Write> HttpConnection<T> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use common::{Method, Version};
     use std::net::Shutdown;
     use std::os::unix::net::UnixStream;
 
+    use super::*;
+    use crate::common::{Method, Version};
+
     #[test]
     fn test_try_read_expect() {
         // Test request with `Expect` header.
diff --git a/src/lib.rs b/src/lib.rs
index 2aeda64..82b7fef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -118,11 +118,13 @@ mod request;
 mod response;
 mod router;
 mod server;
+use crate::common::ascii;
+use crate::common::headers;
 
-pub use self::common::headers::{Headers, MediaType};
-pub use self::common::{Body, Method, Version};
-pub use self::connection::{ConnectionError, HttpConnection};
-pub use self::request::{Request, RequestError};
-pub use self::response::{Response, StatusCode};
-pub use self::router::{EndpointHandler, HttpRoutes, RouteError};
-pub use self::server::{HttpServer, ServerError, ServerRequest, ServerResponse};
+pub use crate::connection::{ConnectionError, HttpConnection};
+pub use crate::request::{Request, RequestError};
+pub use crate::response::{Response, StatusCode};
+pub use crate::server::{HttpServer, ServerError, ServerRequest, ServerResponse};
+
+pub use crate::common::headers::{Headers, MediaType};
+pub use crate::common::{Body, Method, Version};
diff --git a/src/request.rs b/src/request.rs
index d342421..1dba506 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -4,10 +4,9 @@
 use std::str::from_utf8;
 
 use crate::common::ascii::{CR, CRLF_LEN, LF, SP};
-use crate::common::headers::Headers;
-use crate::common::{Body, Method, Version};
-
 pub use crate::common::RequestError;
+use crate::common::{Body, Method, Version};
+use crate::headers::Headers;
 
 // This type represents the RequestLine raw parts: method, uri and version.
 type RequestLineParts<'a> = (&'a [u8], &'a [u8], &'a [u8]);
diff --git a/src/response.rs b/src/response.rs
index a93ed39..cd22973 100644
--- a/src/response.rs
+++ b/src/response.rs
@@ -3,10 +3,10 @@
 
 use std::io::{Error as WriteError, Write};
 
-use ascii::{COLON, CR, LF, SP};
-use common::{Body, Version};
-use headers::{Header, MediaType};
-use Method;
+use crate::ascii::{COLON, CR, LF, SP};
+use crate::common::{Body, Version};
+use crate::headers::{Header, MediaType};
+use crate::Method;
 
 /// Wrapper over a response status code.
 ///
diff --git a/src/server.rs b/src/server.rs
index 29b9539..6003c10 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -8,13 +8,12 @@ use std::os::unix::io::RawFd;
 use std::os::unix::net::{UnixListener, UnixStream};
 use std::path::Path;
 
-use crate::common::ConnectionError;
 use crate::common::{Body, Version};
+pub use crate::common::{ConnectionError, RequestError, ServerError};
 use crate::connection::HttpConnection;
 use crate::request::Request;
 use crate::response::{Response, StatusCode};
-
-pub use crate::common::ServerError;
+use std::collections::HashMap;
 
 use utils::epoll;
 
@@ -559,7 +558,7 @@ mod tests {
     use std::io::{Read, Write};
     use std::os::unix::net::UnixStream;
 
-    use common::Body;
+    use crate::common::Body;
     use utils::tempfile::TempFile;
 
     fn get_temp_socket_file() -> TempFile {