diff --git a/preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java b/preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java
index 60037d6a..2e34b6fa 100644
--- a/preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java
+++ b/preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java
@@ -10,6 +10,7 @@
 import bio.guoda.preston.process.StatementsListener;
 import bio.guoda.preston.store.BlobStore;
 import bio.guoda.preston.store.BlobStoreAppendOnly;
+import bio.guoda.preston.store.KeyToPathFactoryDepth;
 import bio.guoda.preston.store.ValidatingKeyValueStreamContentAddressedFactory;
 import org.apache.commons.rdf.api.IRI;
 import picocli.CommandLine;
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactory.java b/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactory.java
deleted file mode 100644
index a9937125..00000000
--- a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactory.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyToPath;
-
-public interface KeyToPathFactory {
-    KeyToPath getKeyToPath();
-}
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactory.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactory.java
new file mode 100644
index 00000000..17002d97
--- /dev/null
+++ b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactory.java
@@ -0,0 +1,5 @@
+package bio.guoda.preston.store;
+
+public interface KeyToPathFactory {
+    KeyToPath getKeyToPath();
+}
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactoryDepth.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactoryDepth.java
similarity index 84%
rename from preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactoryDepth.java
rename to preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactoryDepth.java
index abc90f6e..819f8fbc 100644
--- a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyToPathFactoryDepth.java
+++ b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyToPathFactoryDepth.java
@@ -1,8 +1,4 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyTo1LevelPath;
-import bio.guoda.preston.store.KeyTo3LevelPath;
-import bio.guoda.preston.store.KeyToPath;
+package bio.guoda.preston.store;
 
 import java.net.URI;
 
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyValueStoreFactory.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreFactory.java
similarity index 50%
rename from preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyValueStoreFactory.java
rename to preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreFactory.java
index e2c77ca5..40d90be9 100644
--- a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyValueStoreFactory.java
+++ b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreFactory.java
@@ -1,7 +1,4 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyValueStore;
-import bio.guoda.preston.store.ValidatingKeyValueStreamFactory;
+package bio.guoda.preston.store;
 
 public interface KeyValueStoreFactory {
     KeyValueStore getKeyValueStore(ValidatingKeyValueStreamFactory validatingKeyValueStreamFactory);
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyValueStoreFactoryFallBack.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreFactoryFallBack.java
similarity index 71%
rename from preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyValueStoreFactoryFallBack.java
rename to preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreFactoryFallBack.java
index 1fcc0206..c027d536 100644
--- a/preston-cmd/src/main/java/bio/guoda/preston/cmd/KeyValueStoreFactoryFallBack.java
+++ b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreFactoryFallBack.java
@@ -1,12 +1,4 @@
-package bio.guoda.preston.cmd;
-
-import bio.guoda.preston.store.KeyTo5LevelPath;
-import bio.guoda.preston.store.KeyToPath;
-import bio.guoda.preston.store.KeyValueStore;
-import bio.guoda.preston.store.KeyValueStoreLocalFileSystem;
-import bio.guoda.preston.store.KeyValueStoreReadOnly;
-import bio.guoda.preston.store.KeyValueStoreWithFallback;
-import bio.guoda.preston.store.ValidatingKeyValueStreamFactory;
+package bio.guoda.preston.store;
 
 import java.io.File;
 
diff --git a/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreUtil.java b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreUtil.java
index ce3c8abb..c3b467b3 100644
--- a/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreUtil.java
+++ b/preston-cmd/src/main/java/bio/guoda/preston/store/KeyValueStoreUtil.java
@@ -3,9 +3,6 @@
 import bio.guoda.preston.DerefProgressListener;
 import bio.guoda.preston.HashType;
 import bio.guoda.preston.ResourcesHTTP;
-import bio.guoda.preston.cmd.KeyToPathFactory;
-import bio.guoda.preston.cmd.KeyToPathFactoryDepth;
-import bio.guoda.preston.cmd.KeyValueStoreFactoryFallBack;
 import bio.guoda.preston.stream.ContentStreamUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;