diff --git a/zenoh/src/api.rs b/zenoh/src/api.rs
index 19ea8afaf2..1af7da37c5 100644
--- a/zenoh/src/api.rs
+++ b/zenoh/src/api.rs
@@ -12,6 +12,7 @@
 //   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
 //
 
+pub(crate) mod admin;
 pub(crate) mod builders;
 pub(crate) mod encoding;
 pub(crate) mod handlers;
diff --git a/zenoh/src/admin.rs b/zenoh/src/api/admin.rs
similarity index 100%
rename from zenoh/src/admin.rs
rename to zenoh/src/api/admin.rs
diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs
index 407a6256c3..83a57ce260 100644
--- a/zenoh/src/api/session.rs
+++ b/zenoh/src/api/session.rs
@@ -11,7 +11,7 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
 //
-use crate::admin;
+use crate::api::admin;
 use crate::api::encoding::Encoding;
 use crate::api::handlers::{Callback, DefaultHandler};
 use crate::api::info::SessionInfo;
diff --git a/zenoh/src/api/time.rs b/zenoh/src/api/time.rs
index eeeebdc6ba..cbdabe3a7e 100644
--- a/zenoh/src/api/time.rs
+++ b/zenoh/src/api/time.rs
@@ -13,7 +13,7 @@
 //
 use std::convert::TryFrom;
 
-use zenoh_protocol::core::{Timestamp, TimestampId, NTP64};
+use zenoh_protocol::core::{Timestamp, TimestampId};
 
 /// Generates a reception [`Timestamp`] with id=0x01.
 /// This operation should be called if a timestamp is required for an incoming [`zenoh::Sample`](crate::Sample)
diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
index 40c7a942bc..3a5c358ae2 100644
--- a/zenoh/src/lib.rs
+++ b/zenoh/src/lib.rs
@@ -227,9 +227,6 @@ pub mod time {
     pub use zenoh_protocol::core::{Timestamp, TimestampId, NTP64};
 }
 
-mod admin;
-#[macro_use]
-
 mod api;
 pub(crate) mod net;
 pub use net::runtime;