diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 83a5936..50d851e 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include "crypto-support/enc-tlv.hpp"
 #include "protocol-detail/challenge.hpp"
 #include "protocol-detail/error.hpp"
diff --git a/src/ca-module.hpp b/src/ca-module.hpp
index fe4ccf9..b1bb3a3 100644
--- a/src/ca-module.hpp
+++ b/src/ca-module.hpp
@@ -23,7 +23,7 @@
 
 #include "configuration.hpp"
 #include "crypto-support/crypto-helper.hpp"
-#include "ca-storage.hpp"
+#include "ca-storage/ca-storage.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/ca-storage-detail/ca-memory.cpp b/src/ca-storage/ca-memory.cpp
similarity index 100%
rename from src/ca-storage-detail/ca-memory.cpp
rename to src/ca-storage/ca-memory.cpp
diff --git a/src/ca-storage-detail/ca-memory.hpp b/src/ca-storage/ca-memory.hpp
similarity index 98%
rename from src/ca-storage-detail/ca-memory.hpp
rename to src/ca-storage/ca-memory.hpp
index 754090e..842121b 100644
--- a/src/ca-storage-detail/ca-memory.hpp
+++ b/src/ca-storage/ca-memory.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CA_DETAIL_CA_MEMORY_HPP
 #define NDNCERT_CA_DETAIL_CA_MEMORY_HPP
 
-#include "../ca-storage.hpp"
+#include "ca-storage.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/ca-storage-detail/ca-sqlite.cpp b/src/ca-storage/ca-sqlite.cpp
similarity index 100%
rename from src/ca-storage-detail/ca-sqlite.cpp
rename to src/ca-storage/ca-sqlite.cpp
diff --git a/src/ca-storage-detail/ca-sqlite.hpp b/src/ca-storage/ca-sqlite.hpp
similarity index 96%
rename from src/ca-storage-detail/ca-sqlite.hpp
rename to src/ca-storage/ca-sqlite.hpp
index b3988c0..5d12188 100644
--- a/src/ca-storage-detail/ca-sqlite.hpp
+++ b/src/ca-storage/ca-sqlite.hpp
@@ -21,8 +21,7 @@
 #ifndef NDNCERT_CA_DETAIL_CA_SQLITE_HPP
 #define NDNCERT_CA_DETAIL_CA_SQLITE_HPP
 
-#include "../ca-module.hpp"
-#include "../ca-state.hpp"
+#include "ca-storage.hpp"
 
 struct sqlite3;
 
diff --git a/src/ca-storage.cpp b/src/ca-storage/ca-storage.cpp
similarity index 97%
rename from src/ca-storage.cpp
rename to src/ca-storage/ca-storage.cpp
index 683e9a3..dfcced2 100644
--- a/src/ca-storage.cpp
+++ b/src/ca-storage/ca-storage.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "ca-storage.hpp"
+#include "ca-storage/ca-storage.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/ca-storage.hpp b/src/ca-storage/ca-storage.hpp
similarity index 100%
rename from src/ca-storage.hpp
rename to src/ca-storage/ca-storage.hpp
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 1386d13..2db9c45 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "configuration.hpp"
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include <ndn-cxx/util/io.hpp>
 #include <boost/filesystem.hpp>
 #include <name-assignments/assignment-funcs.hpp>
diff --git a/src/challenge-modules/challenge-credential.cpp b/src/identity-challenge/challenge-credential.cpp
similarity index 100%
rename from src/challenge-modules/challenge-credential.cpp
rename to src/identity-challenge/challenge-credential.cpp
diff --git a/src/challenge-modules/challenge-credential.hpp b/src/identity-challenge/challenge-credential.hpp
similarity index 98%
rename from src/challenge-modules/challenge-credential.hpp
rename to src/identity-challenge/challenge-credential.hpp
index 2354767..0ecfdb2 100644
--- a/src/challenge-modules/challenge-credential.hpp
+++ b/src/identity-challenge/challenge-credential.hpp
@@ -20,7 +20,7 @@
 #ifndef NDNCERT_CHALLENGE_CREDENTIAL_HPP
 #define NDNCERT_CHALLENGE_CREDENTIAL_HPP
 
-#include "../challenge-module.hpp"
+#include "challenge-module.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/challenge-modules/challenge-email.cpp b/src/identity-challenge/challenge-email.cpp
similarity index 100%
rename from src/challenge-modules/challenge-email.cpp
rename to src/identity-challenge/challenge-email.cpp
diff --git a/src/challenge-modules/challenge-email.hpp b/src/identity-challenge/challenge-email.hpp
similarity index 98%
rename from src/challenge-modules/challenge-email.hpp
rename to src/identity-challenge/challenge-email.hpp
index 5d803f1..5cab3cb 100644
--- a/src/challenge-modules/challenge-email.hpp
+++ b/src/identity-challenge/challenge-email.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CHALLENGE_EMAIL_HPP
 #define NDNCERT_CHALLENGE_EMAIL_HPP
 
-#include "../challenge-module.hpp"
+#include "challenge-module.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/challenge-module.cpp b/src/identity-challenge/challenge-module.cpp
similarity index 98%
rename from src/challenge-module.cpp
rename to src/identity-challenge/challenge-module.cpp
index b4bcc45..812a85d 100644
--- a/src/challenge-module.cpp
+++ b/src/identity-challenge/challenge-module.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include <ndn-cxx/util/random.hpp>
 
 namespace ndn {
diff --git a/src/challenge-module.hpp b/src/identity-challenge/challenge-module.hpp
similarity index 100%
rename from src/challenge-module.hpp
rename to src/identity-challenge/challenge-module.hpp
diff --git a/src/challenge-modules/challenge-pin.cpp b/src/identity-challenge/challenge-pin.cpp
similarity index 100%
rename from src/challenge-modules/challenge-pin.cpp
rename to src/identity-challenge/challenge-pin.cpp
diff --git a/src/challenge-modules/challenge-pin.hpp b/src/identity-challenge/challenge-pin.hpp
similarity index 98%
rename from src/challenge-modules/challenge-pin.hpp
rename to src/identity-challenge/challenge-pin.hpp
index cd85eec..53f7a10 100644
--- a/src/challenge-modules/challenge-pin.hpp
+++ b/src/identity-challenge/challenge-pin.hpp
@@ -21,7 +21,7 @@
 #ifndef NDNCERT_CHALLENGE_PIN_HPP
 #define NDNCERT_CHALLENGE_PIN_HPP
 
-#include "../challenge-module.hpp"
+#include "challenge-module.hpp"
 
 namespace ndn {
 namespace ndncert {
diff --git a/src/requester.cpp b/src/requester.cpp
index fda2f4f..22c9d27 100644
--- a/src/requester.cpp
+++ b/src/requester.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "requester.hpp"
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include "crypto-support/enc-tlv.hpp"
 #include "protocol-detail/challenge.hpp"
 #include "protocol-detail/error.hpp"
diff --git a/tests/unit-tests/bench.t.cpp b/tests/unit-tests/bench.t.cpp
index 4a337d4..bf319ae 100644
--- a/tests/unit-tests/bench.t.cpp
+++ b/tests/unit-tests/bench.t.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "challenge-modules/challenge-pin.hpp"
+#include "identity-challenge/challenge-pin.hpp"
 #include "protocol-detail/info.hpp"
 #include "requester.hpp"
 #include "test-common.hpp"
diff --git a/tests/unit-tests/ca-memory.t.cpp b/tests/unit-tests/ca-memory.t.cpp
index ba996d8..77a47e8 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-detail/ca-memory.hpp"
-#include "ca-storage-detail/ca-sqlite.hpp"
+#include "ca-storage/ca-memory.hpp"
+#include "ca-storage/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 3cb60de..9c198df 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "ca-module.hpp"
-#include "challenge-module.hpp"
-#include "challenge-modules/challenge-email.hpp"
-#include "challenge-modules/challenge-pin.hpp"
+#include "identity-challenge/challenge-module.hpp"
+#include "identity-challenge/challenge-email.hpp"
+#include "identity-challenge/challenge-pin.hpp"
 #include "protocol-detail/info.hpp"
 #include "requester.hpp"
 #include "test-common.hpp"
diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index 93d3f72..3699fb6 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-detail/ca-sqlite.hpp"
+#include "ca-storage/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 11910c8..236d274 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-modules/challenge-credential.hpp"
+#include "identity-challenge/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 15de367..137c5d8 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-modules/challenge-email.hpp"
+#include "identity-challenge/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 1b37a28..79abbf0 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-modules/challenge-pin.hpp"
+#include "identity-challenge/challenge-pin.hpp"
 #include "test-common.hpp"
 
 namespace ndn {
diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index fff1e5e..8ac66c9 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -22,7 +22,7 @@
 #include <protocol-detail/probe.hpp>
 #include <ndn-cxx/util/io.hpp>
 #include "requester.hpp"
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include "ca-module.hpp"
 #include "test-common.hpp"
 
diff --git a/tools/ndncert-ca-server.cpp b/tools/ndncert-ca-server.cpp
index 232c0d9..57493e9 100644
--- a/tools/ndncert-ca-server.cpp
+++ b/tools/ndncert-ca-server.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 #include <boost/asio.hpp>
diff --git a/tools/ndncert-ca-status.cpp b/tools/ndncert-ca-status.cpp
index 4b75cb9..bced16a 100644
--- a/tools/ndncert-ca-status.cpp
+++ b/tools/ndncert-ca-status.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ca-module.hpp"
-#include "ca-storage-detail/ca-sqlite.hpp"
+#include "ca-storage/ca-sqlite.hpp"
 #include <iostream>
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
diff --git a/tools/ndncert-client.cpp b/tools/ndncert-client.cpp
index cecb978..b2f4d4e 100644
--- a/tools/ndncert-client.cpp
+++ b/tools/ndncert-client.cpp
@@ -18,7 +18,7 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "challenge-module.hpp"
+#include "identity-challenge/challenge-module.hpp"
 #include "protocol-detail/info.hpp"
 #include "requester.hpp"
 #include <ndn-cxx/security/verification-helpers.hpp>