diff --git a/src/api2.rs b/src/api2.rs
index 7993a608..7c8cddac 100644
--- a/src/api2.rs
+++ b/src/api2.rs
@@ -1,6 +1,6 @@
 //use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 use std::sync::Arc;
diff --git a/src/api2/access.rs b/src/api2/access.rs
index 851248d8..21d52a42 100644
--- a/src/api2/access.rs
+++ b/src/api2/access.rs
@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use crate::tools::ticket::*;
 use crate::auth_helpers::*;
diff --git a/src/api2/admin.rs b/src/api2/admin.rs
index a89d4373..a6eca7a7 100644
--- a/src/api2/admin.rs
+++ b/src/api2/admin.rs
@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index d706797e..1a50634e 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 //use crate::server::rest::*;
 use serde_json::{json, Value};
diff --git a/src/api2/admin/datastore/catar.rs b/src/api2/admin/datastore/catar.rs
index bf910ef0..94003bff 100644
--- a/src/api2/admin/datastore/catar.rs
+++ b/src/api2/admin/datastore/catar.rs
@@ -4,7 +4,7 @@ use crate::tools;
 use crate::tools::wrapped_reader_stream::*;
 use crate::backup::*;
 //use crate::server::rest::*;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 
 use chrono::{Utc, TimeZone};
diff --git a/src/api2/config.rs b/src/api2/config.rs
index 10d00ef0..b5d50e02 100644
--- a/src/api2/config.rs
+++ b/src/api2/config.rs
@@ -1,7 +1,7 @@
 //use failure::*;
 //use std::collections::HashMap;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 
diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index ba096400..e63a9f91 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -1,7 +1,7 @@
 use failure::*;
 //use std::collections::HashMap;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use crate::backup::*;
 use serde_json::{json, Value};
diff --git a/src/api2/node.rs b/src/api2/node.rs
index a002bf72..89ef8931 100644
--- a/src/api2/node.rs
+++ b/src/api2/node.rs
@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 
diff --git a/src/api2/node/dns.rs b/src/api2/node/dns.rs
index e6a630c8..7bccb0e5 100644
--- a/src/api2/node/dns.rs
+++ b/src/api2/node/dns.rs
@@ -3,7 +3,7 @@ use failure::*;
 
 use crate::tools;
 use crate::api2::*;
-//use crate::api_schema::schema::*;
+//use crate::api_schema::*;
 //use crate::api_schema::router::*;
 
 use lazy_static::lazy_static;
diff --git a/src/api2/node/network.rs b/src/api2/node/network.rs
index 799ad1df..334fde3e 100644
--- a/src/api2/node/network.rs
+++ b/src/api2/node/network.rs
@@ -1,7 +1,7 @@
 use failure::*;
 
 //use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs
index 2330ec0a..2c689621 100644
--- a/src/api2/node/services.rs
+++ b/src/api2/node/services.rs
@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
diff --git a/src/api2/node/syslog.rs b/src/api2/node/syslog.rs
index 3fc68824..204d6d38 100644
--- a/src/api2/node/syslog.rs
+++ b/src/api2/node/syslog.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
diff --git a/src/api2/node/time.rs b/src/api2/node/time.rs
index 048091f9..67407206 100644
--- a/src/api2/node/time.rs
+++ b/src/api2/node/time.rs
@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
diff --git a/src/api2/subscription.rs b/src/api2/subscription.rs
index 2421a892..5ebd6027 100644
--- a/src/api2/subscription.rs
+++ b/src/api2/subscription.rs
@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
diff --git a/src/api2/version.rs b/src/api2/version.rs
index 4079dcc2..381a8895 100644
--- a/src/api2/version.rs
+++ b/src/api2/version.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
diff --git a/src/api_schema.rs b/src/api_schema.rs
index 1b7b09bc..ebbe7c12 100644
--- a/src/api_schema.rs
+++ b/src/api_schema.rs
@@ -9,7 +9,9 @@
 //! definition by path.
 
 #[macro_use]
-pub mod schema;
+mod schema;
+pub use schema::*;
+
 pub mod registry;
 #[macro_use]
 pub mod router;
diff --git a/src/api_schema/registry.rs b/src/api_schema/registry.rs
index 4a4e9225..451d7c96 100644
--- a/src/api_schema/registry.rs
+++ b/src/api_schema/registry.rs
@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use failure::*;
 use std::collections::HashMap;
diff --git a/src/api_schema/router.rs b/src/api_schema/router.rs
index 2c22606c..e0fabc72 100644
--- a/src/api_schema/router.rs
+++ b/src/api_schema/router.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use serde_json::{Value};
 use std::collections::HashMap;
 use std::sync::Arc;
diff --git a/src/bin/catar.rs b/src/bin/catar.rs
index 53485076..abd41b4b 100644
--- a/src/bin/catar.rs
+++ b/src/bin/catar.rs
@@ -4,7 +4,7 @@ use failure::*;
 
 use proxmox_backup::tools;
 use proxmox_backup::cli::command::*;
-use proxmox_backup::api_schema::schema::*;
+use proxmox_backup::api_schema::*;
 use proxmox_backup::api_schema::router::*;
 
 use serde_json::{Value};
diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs
index 92dff600..2ea87264 100644
--- a/src/bin/proxmox-backup-client.rs
+++ b/src/bin/proxmox-backup-client.rs
@@ -5,7 +5,7 @@ use failure::*;
 
 use proxmox_backup::tools;
 use proxmox_backup::cli::command::*;
-use proxmox_backup::api_schema::schema::*;
+use proxmox_backup::api_schema::*;
 use proxmox_backup::api_schema::router::*;
 use proxmox_backup::client::*;
 //use proxmox_backup::backup::chunk_store::*;
diff --git a/src/cli/command.rs b/src/cli/command.rs
index 973f4eed..5fad6560 100644
--- a/src/cli/command.rs
+++ b/src/cli/command.rs
@@ -4,7 +4,7 @@ use std::collections::HashSet;
 
 use serde_json::Value;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 //use crate::api_schema::config::*;
 use super::environment::CliEnvironment;
diff --git a/src/client/backup_repo.rs b/src/client/backup_repo.rs
index caef0a66..45c146b1 100644
--- a/src/client/backup_repo.rs
+++ b/src/client/backup_repo.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use std::sync::Arc;
 use lazy_static::lazy_static;
diff --git a/src/config/datastore.rs b/src/config/datastore.rs
index 26dc9e4b..3365e3da 100644
--- a/src/config/datastore.rs
+++ b/src/config/datastore.rs
@@ -5,7 +5,7 @@ use std::io::Read;
 
 //use std::sync::Arc;
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use crate::section_config::*;
 
diff --git a/src/getopts.rs b/src/getopts.rs
index 6e742fe7..82b388c0 100644
--- a/src/getopts.rs
+++ b/src/getopts.rs
@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use failure::*;
 
diff --git a/src/section_config.rs b/src/section_config.rs
index a1031851..9f630c9f 100644
--- a/src/section_config.rs
+++ b/src/section_config.rs
@@ -7,7 +7,7 @@ use std::collections::VecDeque;
 use serde_json::{json, Value};
 
 use std::sync::Arc;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 pub struct SectionConfigPlugin {
     type_name: String,
diff --git a/src/server/rest.rs b/src/server/rest.rs
index ec64824a..9c236d82 100644
--- a/src/server/rest.rs
+++ b/src/server/rest.rs
@@ -1,5 +1,5 @@
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use crate::api_schema::config::*;
 use crate::auth_helpers::*;
diff --git a/src/storage/config.rs b/src/storage/config.rs
index 9c1be18e..ea8d4987 100644
--- a/src/storage/config.rs
+++ b/src/storage/config.rs
@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::section_config::*;
 
 use lazy_static::lazy_static;