diff --git a/src/builder.rs b/src/client/builder.rs
similarity index 100%
rename from src/builder.rs
rename to src/client/builder.rs
diff --git a/src/client.rs b/src/client/mod.rs
similarity index 97%
rename from src/client.rs
rename to src/client/mod.rs
index c4e44ce..869fc5d 100644
--- a/src/client.rs
+++ b/src/client/mod.rs
@@ -1,4 +1,7 @@
-use crate::{builder::ClientBuilder, error::*, response::Response, status::*};
+pub mod builder;
+
+use crate::{error::*, response::Response, status::*};
+use builder::ClientBuilder;
 
 use std::net::ToSocketAddrs;
 use std::sync::Arc;
diff --git a/src/lib.rs b/src/lib.rs
index d079639..e6f456e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,3 @@
-pub mod builder;
 pub mod certs;
 pub mod client;
 pub mod error;