diff --git a/src/ca-storage/ca-memory.cpp b/src/ca-detail/ca-memory.cpp
similarity index 100%
rename from src/ca-storage/ca-memory.cpp
rename to src/ca-detail/ca-memory.cpp
diff --git a/src/ca-storage/ca-memory.hpp b/src/ca-detail/ca-memory.hpp
similarity index 100%
rename from src/ca-storage/ca-memory.hpp
rename to src/ca-detail/ca-memory.hpp
diff --git a/src/ca-storage/ca-sqlite.cpp b/src/ca-detail/ca-sqlite.cpp
similarity index 100%
rename from src/ca-storage/ca-sqlite.cpp
rename to src/ca-detail/ca-sqlite.cpp
diff --git a/src/ca-storage/ca-sqlite.hpp b/src/ca-detail/ca-sqlite.hpp
similarity index 100%
rename from src/ca-storage/ca-sqlite.hpp
rename to src/ca-detail/ca-sqlite.hpp
diff --git a/src/ca-storage/ca-storage.cpp b/src/ca-detail/ca-storage.cpp
similarity index 97%
rename from src/ca-storage/ca-storage.cpp
rename to src/ca-detail/ca-storage.cpp
index 657e41e..d0fac8f 100644
--- a/src/ca-storage/ca-storage.cpp
+++ b/src/ca-detail/ca-storage.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-storage/ca-storage.hpp"
+#include "ca-detail/ca-storage.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/ca-storage/ca-storage.hpp b/src/ca-detail/ca-storage.hpp
similarity index 100%
rename from src/ca-storage/ca-storage.hpp
rename to src/ca-detail/ca-storage.hpp
diff --git a/src/ca-module.hpp b/src/ca-module.hpp
index 652a7e4..3fb79cb 100644
--- a/src/ca-module.hpp
+++ b/src/ca-module.hpp
@@ -23,7 +23,7 @@
 
 #include "configuration.hpp"
 #include "protocol-detail/crypto-helper.hpp"
-#include "ca-storage/ca-storage.hpp"
+#include "ca-detail/ca-storage.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/tests/unit-tests/ca-memory.t.cpp b/tests/unit-tests/ca-memory.t.cpp
index 80ee5b0..04d37a4 100644
--- a/tests/unit-tests/ca-memory.t.cpp
+++ b/tests/unit-tests/ca-memory.t.cpp
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-storage/ca-memory.hpp"
-#include "ca-storage/ca-sqlite.hpp"
+#include "ca-detail/ca-memory.hpp"
+#include "ca-detail/ca-sqlite.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index 3699fb6..8e81a56 100644
--- a/tests/unit-tests/ca-sqlite.t.cpp
+++ b/tests/unit-tests/ca-sqlite.t.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-storage/ca-sqlite.hpp"
+#include "ca-detail/ca-sqlite.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tools/ndncert-ca-status.cpp b/tools/ndncert-ca-status.cpp
index bced16a..dfc78d7 100644
--- a/tools/ndncert-ca-status.cpp
+++ b/tools/ndncert-ca-status.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "ca-storage/ca-sqlite.hpp"
+#include "ca-detail/ca-sqlite.hpp"
 #include <iostream>
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>