diff --git a/rust/agent/src/agent.rs b/rust/agent/src/agent.rs
index 9cc9b1d5bd158efa86a76591d2064b02435970e9..d8040a7c69137ba43734fe1a7a878c8f34e2fcef 100644
--- a/rust/agent/src/agent.rs
+++ b/rust/agent/src/agent.rs
@@ -8,14 +8,15 @@
 use crate::cli::CliArgs;
 use crate::collectors::{Collectors, Runnable};
 use crate::config::{ConfigResolver, Reader, Resolver};
+use crate::config::{ZkConfig, ZkConfigCollector};
 use crate::error::AgentError;
-use crate::zk::{ZkConfig, ZkConfigCollector};
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::sync::Arc;
 use tokio::{runtime::Runtime, task::JoinHandle};
 
 pub struct RunningCollector {
+    #[allow(dead_code)]
     collector: Arc<Collectors>,
     handle: JoinHandle<()>,
 }
diff --git a/rust/agent/src/collectors/base.rs b/rust/agent/src/collectors/base.rs
index 6486e9466024d5e39e147b9a4d8ac947b39eb6e3..7372166708baaed309416d14f88c661a0fe28fee 100644
--- a/rust/agent/src/collectors/base.rs
+++ b/rust/agent/src/collectors/base.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
 use rand::Rng;
diff --git a/rust/agent/src/collectors/cpu/collector.rs b/rust/agent/src/collectors/cpu/collector.rs
index 85126b4c0f47ee46982e4ff95c706ea41f3e1c06..642e43e9d2c688e32b4e8ebea2b0c74b9c1d6baa 100644
--- a/rust/agent/src/collectors/cpu/collector.rs
+++ b/rust/agent/src/collectors/cpu/collector.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/dns/collector.rs b/rust/agent/src/collectors/dns/collector.rs
index 092a7a2bebcf561da55528406340a8cda9c6cd47..e54a22ac44fe33e0a6ceb7d73f473d39ecf03133 100644
--- a/rust/agent/src/collectors/dns/collector.rs
+++ b/rust/agent/src/collectors/dns/collector.rs
@@ -6,9 +6,9 @@
 // ---------------------------------------------------------------------
 
 use crate::collectors::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
 use crate::timing::Timing;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/fs/collector.rs b/rust/agent/src/collectors/fs/collector.rs
index f827982a3989ea01523ec0da7c8545fe3ddd6939..1ec6bff7f846e95dfff6fa84ffec6fd9e7dcf264 100644
--- a/rust/agent/src/collectors/fs/collector.rs
+++ b/rust/agent/src/collectors/fs/collector.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/memory/collector.rs b/rust/agent/src/collectors/memory/collector.rs
index f9d3869694c2efb782284bd5c8044981758d4036..d9f233b897fd78cd74063be246b0598aeacb14b8 100644
--- a/rust/agent/src/collectors/memory/collector.rs
+++ b/rust/agent/src/collectors/memory/collector.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/network/collector.rs b/rust/agent/src/collectors/network/collector.rs
index c81f709a9c99d0c55774ab03bd4d44f0bec52bd8..0678cb60d08b795fe774495922a5817b09fa6cd4 100644
--- a/rust/agent/src/collectors/network/collector.rs
+++ b/rust/agent/src/collectors/network/collector.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/registry.rs b/rust/agent/src/collectors/registry.rs
index 3d18ed6508d303a3e9623de8ccf5aec8c575caee..5fb35aa4498746743fb7636db60a1ecd24e4e236 100644
--- a/rust/agent/src/collectors/registry.rs
+++ b/rust/agent/src/collectors/registry.rs
@@ -14,8 +14,8 @@ use super::twamp_reflector::{TwampReflectorCollector, TwampReflectorConfig};
 use super::twamp_sender::{TwampSenderCollector, TwampSenderConfig};
 use super::uptime::{UptimeCollector, UptimeConfig};
 use super::Runnable;
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use enum_dispatch::enum_dispatch;
 use serde::Deserialize;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/test/collector.rs b/rust/agent/src/collectors/test/collector.rs
index 6566c900273da91ddde439377c08ad81fd6aaefa..43d58e541dc222fd82d8ce3dfa6a387faec84e3a 100644
--- a/rust/agent/src/collectors/test/collector.rs
+++ b/rust/agent/src/collectors/test/collector.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/collectors/twamp_reflector/collector.rs b/rust/agent/src/collectors/twamp_reflector/collector.rs
index ccd394ab696c5a3230b6520b5d55d952fab707bf..34c60ebdac9cc7af020dec65d233f13ebbe391de 100644
--- a/rust/agent/src/collectors/twamp_reflector/collector.rs
+++ b/rust/agent/src/collectors/twamp_reflector/collector.rs
@@ -5,6 +5,7 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{CollectorConfig, Id, Runnable};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
 use crate::proto::connection::Connection;
 use crate::proto::twamp::{
@@ -12,7 +13,6 @@ use crate::proto::twamp::{
     StartSessions, StopSessions, TestRequest, TestResponse, DEFAULT_COUNT, MODE_UNAUTHENTICATED,
 };
 use crate::proto::udp::UdpConnection;
-use crate::zk::ZkConfigCollector;
 use agent_derive::Id;
 use async_trait::async_trait;
 use bytes::Bytes;
diff --git a/rust/agent/src/collectors/twamp_sender/collector.rs b/rust/agent/src/collectors/twamp_sender/collector.rs
index 0e629e1932241130b4f8cb4246ffd5f4fd35025a..99bcc0c3f414b83f32f69be4ea66cfb413530732 100644
--- a/rust/agent/src/collectors/twamp_sender/collector.rs
+++ b/rust/agent/src/collectors/twamp_sender/collector.rs
@@ -6,6 +6,7 @@
 // ---------------------------------------------------------------------
 
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
 use crate::proto::connection::Connection;
 use crate::proto::frame::{FrameReader, FrameWriter};
@@ -17,7 +18,6 @@ use crate::proto::twamp::{
     MODE_UNAUTHENTICATED,
 };
 use crate::timing::Timing;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use bytes::{Bytes, BytesMut};
diff --git a/rust/agent/src/collectors/uptime/collector.rs b/rust/agent/src/collectors/uptime/collector.rs
index 038a8d446f41a720db9de47ebec0dbfe7d7bf9fa..8509d42006ccf26c1ba21c3b8e8fe6a83a12b8d2 100644
--- a/rust/agent/src/collectors/uptime/collector.rs
+++ b/rust/agent/src/collectors/uptime/collector.rs
@@ -5,8 +5,8 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 use super::super::{Collectable, CollectorConfig, Id, Repeatable, Status};
+use crate::config::ZkConfigCollector;
 use crate::error::AgentError;
-use crate::zk::ZkConfigCollector;
 use agent_derive::{Id, Repeatable};
 use async_trait::async_trait;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/zk.rs b/rust/agent/src/config/config.rs
similarity index 100%
rename from rust/agent/src/zk.rs
rename to rust/agent/src/config/config.rs
diff --git a/rust/agent/src/config/mod.rs b/rust/agent/src/config/mod.rs
index 12177af38def421f86a0aedf314e9116c7bc77ae..a14ff9f75289043593987d91bb62076616a04703 100644
--- a/rust/agent/src/config/mod.rs
+++ b/rust/agent/src/config/mod.rs
@@ -5,10 +5,12 @@
 // See LICENSE for details
 // ---------------------------------------------------------------------
 
+pub mod config;
 pub mod parser;
 pub mod reader;
 pub mod resolver;
 
+pub use config::{ZkConfig, ZkConfigCollector};
 pub use parser::{ConfigParser, Parser};
 pub use reader::{ConfigReader, Reader};
 pub use resolver::{ConfigResolver, Resolver};
diff --git a/rust/agent/src/config/parser/base.rs b/rust/agent/src/config/parser/base.rs
index 7da211b1787d483918aa730f375a5a6c6f5cafee..b5d7df0f4d072af8e5e06042b6fc398f173adfe5 100644
--- a/rust/agent/src/config/parser/base.rs
+++ b/rust/agent/src/config/parser/base.rs
@@ -7,8 +7,8 @@
 
 use super::JsonParser;
 use super::YamlParser;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 
 pub enum ConfigParser {
     Json(JsonParser),
diff --git a/rust/agent/src/config/parser/json/base.rs b/rust/agent/src/config/parser/json/base.rs
index cab4ed2cbb9184e3d8ca019670a2eb4ef0510dce..2d935a31960752fd8810e685f5ccbdb46b3c4c4f 100644
--- a/rust/agent/src/config/parser/json/base.rs
+++ b/rust/agent/src/config/parser/json/base.rs
@@ -6,8 +6,8 @@
 // ---------------------------------------------------------------------
 
 use super::super::Parser;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 
 pub struct JsonParser;
 
diff --git a/rust/agent/src/config/parser/yaml/base.rs b/rust/agent/src/config/parser/yaml/base.rs
index dd979b552a0f3b5d3d0d717acb9219fcd64a6010..72ed73a66de0fce975e36a93035f65678246ccb3 100644
--- a/rust/agent/src/config/parser/yaml/base.rs
+++ b/rust/agent/src/config/parser/yaml/base.rs
@@ -6,8 +6,8 @@
 // ---------------------------------------------------------------------
 
 use super::super::Parser;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 
 pub struct YamlParser;
 
diff --git a/rust/agent/src/config/reader/base.rs b/rust/agent/src/config/reader/base.rs
index 0d1674e20b0ebe5c50f4d0ecfa8633e74667b51a..d092c1e6084830c731e1af4f8c3fbec5235e7ce8 100644
--- a/rust/agent/src/config/reader/base.rs
+++ b/rust/agent/src/config/reader/base.rs
@@ -6,8 +6,8 @@
 // ---------------------------------------------------------------------
 
 use super::FileReader;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
 
diff --git a/rust/agent/src/config/reader/file/base.rs b/rust/agent/src/config/reader/file/base.rs
index 52897511baf3a6456ffba3a96d349f71df572549..59210a3fe6ef6568de715d2a92958197b7176603 100644
--- a/rust/agent/src/config/reader/file/base.rs
+++ b/rust/agent/src/config/reader/file/base.rs
@@ -7,8 +7,8 @@
 
 use super::super::Reader;
 use crate::config::ConfigParser;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 use async_trait::async_trait;
 use std::fs;
 use std::path::Path;
diff --git a/rust/agent/src/config/resolver/base.rs b/rust/agent/src/config/resolver/base.rs
index 2ee343a3625a6a5d54dde52715e1dabad182eece..ff3ba59856c4d34e420afa00e2437ce50978491b 100644
--- a/rust/agent/src/config/resolver/base.rs
+++ b/rust/agent/src/config/resolver/base.rs
@@ -8,8 +8,8 @@
 use super::{StaticResolver, ZkResolver};
 use crate::cli::CliArgs;
 use crate::config::ConfigReader;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 use async_trait::async_trait;
 use enum_dispatch::enum_dispatch;
 use std::convert::TryFrom;
diff --git a/rust/agent/src/config/resolver/zk/base.rs b/rust/agent/src/config/resolver/zk/base.rs
index 64450edb2342a2ddf15f81ff1f2f8f666de3bd0c..9cbaab707b419bb7a91c6bab1ce21fbc19b7b406 100644
--- a/rust/agent/src/config/resolver/zk/base.rs
+++ b/rust/agent/src/config/resolver/zk/base.rs
@@ -8,8 +8,8 @@
 use super::super::Resolver;
 use crate::cli::CliArgs;
 use crate::config::reader::ConfigReader;
+use crate::config::ZkConfig;
 use crate::error::AgentError;
-use crate::zk::ZkConfig;
 use async_trait::async_trait;
 use std::convert::TryFrom;
 use std::fs;
diff --git a/rust/agent/src/lib.rs b/rust/agent/src/lib.rs
index 84fe60f682d6001c0e62a28d10829f448ad3777a..28a3ad73b881f5fa9e9c92fc6dfedadede9fb714 100644
--- a/rust/agent/src/lib.rs
+++ b/rust/agent/src/lib.rs
@@ -12,4 +12,3 @@ pub mod config;
 pub mod error;
 pub mod proto;
 pub mod timing;
-pub mod zk;