diff --git a/Cargo.toml b/Cargo.toml
index 60a81c83..8b0239a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,9 +17,9 @@ features = ["full"]
 version = "0.11.11"
 
 [dev-dependencies]
-futures = "0.1.13"
-serde = "1.0.4"
-serde_derive = "1.0.4"
+futures = "0.1.14"
+serde = "1.0.8"
+serde_derive = "1.0.8"
 serde_json = "1.0.2"
 
 [lib]
diff --git a/src/metadata.rs b/src/api/metadata.rs
similarity index 100%
rename from src/metadata.rs
rename to src/api/metadata.rs
diff --git a/src/api.rs b/src/api/mod.rs
similarity index 98%
rename from src/api.rs
rename to src/api/mod.rs
index 277818c7..64ee55ff 100644
--- a/src/api.rs
+++ b/src/api/mod.rs
@@ -1,9 +1,13 @@
 use quote::{ToTokens, Tokens};
 
-use metadata::Metadata;
+mod metadata;
+mod request;
+mod response;
+
 use parse::Entry;
-use request::Request;
-use response::Response;
+use self::metadata::Metadata;
+use self::request::Request;
+use self::response::Response;
 
 #[derive(Debug)]
 pub struct Api {
diff --git a/src/request.rs b/src/api/request.rs
similarity index 100%
rename from src/request.rs
rename to src/api/request.rs
diff --git a/src/response.rs b/src/api/response.rs
similarity index 100%
rename from src/response.rs
rename to src/api/response.rs
diff --git a/src/lib.rs b/src/lib.rs
index 80e3805f..f58ae1f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,10 +18,7 @@ use api::Api;
 use parse::parse_entries;
 
 mod api;
-mod metadata;
 mod parse;
-mod request;
-mod response;
 
 /// Generates a `ruma-api` endpoint.
 #[proc_macro]