diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/KSFactory.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/KSFactory.java
index 2838b88..069459c 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/KSFactory.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/KSFactory.java
@@ -1,8 +1,8 @@
 package org.btcollider.cnc.keysrv;
 
 import java.util.concurrent.TimeUnit;
-import org.btcollider.cnc.keysrv.impl.keytree.KeyTreeServer;
-import org.btcollider.cnc.keysrv.impl.multistage.MultiStagedServer;
+import org.btcollider.cnc.keysrv.keytree.KeyTreeServer;
+import org.btcollider.cnc.keysrv.multistage.MultiStagedServer;
 
 public class KSFactory {
   private KSFactory() {}
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KTConcierge.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KTConcierge.java
similarity index 96%
rename from cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KTConcierge.java
rename to cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KTConcierge.java
index 12f9efb..b3071c8 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KTConcierge.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KTConcierge.java
@@ -1,4 +1,4 @@
-package org.btcollider.cnc.keysrv.impl.keytree;
+package org.btcollider.cnc.keysrv.keytree;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTree.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTree.java
similarity index 96%
rename from cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTree.java
rename to cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTree.java
index c076c88..9ce83e3 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTree.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTree.java
@@ -1,4 +1,4 @@
-package org.btcollider.cnc.keysrv.impl.keytree;
+package org.btcollider.cnc.keysrv.keytree;
 
 public class KeyTree {
   private boolean value;
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTreeServer.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java
similarity index 99%
rename from cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTreeServer.java
rename to cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java
index 2c09559..146b73c 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTreeServer.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/keytree/KeyTreeServer.java
@@ -1,4 +1,4 @@
-package org.btcollider.cnc.keysrv.impl.keytree;
+package org.btcollider.cnc.keysrv.keytree;
 
 import java.util.BitSet;
 import java.util.LinkedList;
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/KeyRangeBuffer.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/KeyRangeBuffer.java
similarity index 96%
rename from cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/KeyRangeBuffer.java
rename to cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/KeyRangeBuffer.java
index 05868d0..c7fccee 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/KeyRangeBuffer.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/KeyRangeBuffer.java
@@ -1,4 +1,4 @@
-package org.btcollider.cnc.keysrv.impl.multistage;
+package org.btcollider.cnc.keysrv.multistage;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java
similarity index 96%
rename from cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java
rename to cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java
index 1657c92..d34986e 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/multistage/MultiStagedServer.java
@@ -1,8 +1,8 @@
-package org.btcollider.cnc.keysrv.impl.multistage;
+package org.btcollider.cnc.keysrv.multistage;
 
 import org.btcollider.cnc.dto.KeyRange;
 import org.btcollider.cnc.keysrv.KeyServer;
-import org.btcollider.cnc.keysrv.impl.keytree.KeyTreeServer;
+import org.btcollider.cnc.keysrv.keytree.KeyTreeServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;