diff --git a/src/ca-detail/ca-memory.cpp b/src/ca-storage-detail/ca-memory.cpp
similarity index 100%
rename from src/ca-detail/ca-memory.cpp
rename to src/ca-storage-detail/ca-memory.cpp
diff --git a/src/ca-detail/ca-memory.hpp b/src/ca-storage-detail/ca-memory.hpp
similarity index 100%
rename from src/ca-detail/ca-memory.hpp
rename to src/ca-storage-detail/ca-memory.hpp
diff --git a/src/ca-detail/ca-sqlite.cpp b/src/ca-storage-detail/ca-sqlite.cpp
similarity index 100%
rename from src/ca-detail/ca-sqlite.cpp
rename to src/ca-storage-detail/ca-sqlite.cpp
diff --git a/src/ca-detail/ca-sqlite.hpp b/src/ca-storage-detail/ca-sqlite.hpp
similarity index 100%
rename from src/ca-detail/ca-sqlite.hpp
rename to src/ca-storage-detail/ca-sqlite.hpp
diff --git a/src/challenge-module/challenge-credential.cpp b/src/challenge-modules/challenge-credential.cpp
similarity index 100%
rename from src/challenge-module/challenge-credential.cpp
rename to src/challenge-modules/challenge-credential.cpp
diff --git a/src/challenge-module/challenge-credential.hpp b/src/challenge-modules/challenge-credential.hpp
similarity index 100%
rename from src/challenge-module/challenge-credential.hpp
rename to src/challenge-modules/challenge-credential.hpp
diff --git a/src/challenge-module/challenge-email.cpp b/src/challenge-modules/challenge-email.cpp
similarity index 100%
rename from src/challenge-module/challenge-email.cpp
rename to src/challenge-modules/challenge-email.cpp
diff --git a/src/challenge-module/challenge-email.hpp b/src/challenge-modules/challenge-email.hpp
similarity index 100%
rename from src/challenge-module/challenge-email.hpp
rename to src/challenge-modules/challenge-email.hpp
diff --git a/src/challenge-module/challenge-pin.cpp b/src/challenge-modules/challenge-pin.cpp
similarity index 100%
rename from src/challenge-module/challenge-pin.cpp
rename to src/challenge-modules/challenge-pin.cpp
diff --git a/src/challenge-module/challenge-pin.hpp b/src/challenge-modules/challenge-pin.hpp
similarity index 100%
rename from src/challenge-module/challenge-pin.hpp
rename to src/challenge-modules/challenge-pin.hpp
diff --git a/tests/unit-tests/bench.t.cpp b/tests/unit-tests/bench.t.cpp
index 0a738d7..2721811 100644
--- a/tests/unit-tests/bench.t.cpp
+++ b/tests/unit-tests/bench.t.cpp
@@ -20,7 +20,7 @@
 
 #include "ca-module.hpp"
 #include "client-module.hpp"
-#include "challenge-module/challenge-pin.hpp"
+#include "challenge-modules/challenge-pin.hpp"
 #include "protocol-detail/info.hpp"
 #include "test-common.hpp"
 
diff --git a/tests/unit-tests/ca-memory.t.cpp b/tests/unit-tests/ca-memory.t.cpp
index 7db815a..242c4b3 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-detail/ca-memory.hpp"
-#include "ca-detail/ca-sqlite.hpp"
+#include "ca-storage-detail/ca-memory.hpp"
+#include "ca-storage-detail/ca-sqlite.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 2bee0c4..075d067 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -20,8 +20,8 @@
 
 #include "ca-module.hpp"
 #include "challenge-module.hpp"
-#include "challenge-module/challenge-email.hpp"
-#include "challenge-module/challenge-pin.hpp"
+#include "challenge-modules/challenge-email.hpp"
+#include "challenge-modules/challenge-pin.hpp"
 #include "client-module.hpp"
 #include "protocol-detail/info.hpp"
 #include "test-common.hpp"
diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index 754009a..2a0d013 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-detail/ca-sqlite.hpp"
+#include "ca-storage-detail/ca-sqlite.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tests/unit-tests/challenge-credential.t.cpp b/tests/unit-tests/challenge-credential.t.cpp
index cc5a8ac..46eccb2 100644
--- a/tests/unit-tests/challenge-credential.t.cpp
+++ b/tests/unit-tests/challenge-credential.t.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-module/challenge-credential.hpp"
+#include "challenge-modules/challenge-credential.hpp"
 #include "test-common.hpp"
 #include <ndn-cxx/security/signing-helpers.hpp>
 #include <ndn-cxx/util/io.hpp>
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index 9faf36d..5f647d1 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-module/challenge-email.hpp"
+#include "challenge-modules/challenge-email.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 7cb3041..90df736 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-module/challenge-pin.hpp"
+#include "challenge-modules/challenge-pin.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tools/ndncert-ca-status.cpp b/tools/ndncert-ca-status.cpp
index db93c69..5d09436 100644
--- a/tools/ndncert-ca-status.cpp
+++ b/tools/ndncert-ca-status.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "ca-detail/ca-sqlite.hpp"
+#include "ca-storage-detail/ca-sqlite.hpp"
 #include <iostream>
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>