diff --git a/src/bin/api-test-server.rs b/src/bin/api-test-server.rs
index 67e83c09..0c0b199b 100644
--- a/src/bin/api-test-server.rs
+++ b/src/bin/api-test-server.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use apitest::api::schema::*;
 use apitest::api::router::*;
 use apitest::api::config::*;
-use apitest::api::server::*;
+use apitest::server::rest::*;
 use apitest::getopts;
 
 //use failure::*;
diff --git a/src/lib.rs b/src/lib.rs
index 2a325225..98bf505a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,7 +19,11 @@ pub mod api {
     #[macro_use]
     pub mod router;
     pub mod config;
-    pub mod server;
+}
+
+pub mod server {
+
+    pub mod rest;
 
 }
 
diff --git a/src/api/server.rs b/src/server/rest.rs
similarity index 100%
rename from src/api/server.rs
rename to src/server/rest.rs