diff --git a/src/clients/iterative-query-controller.cpp b/src/clients/iterative-query-controller.cpp
index ab64adc..8b582a3 100644
--- a/src/clients/iterative-query-controller.cpp
+++ b/src/clients/iterative-query-controller.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "iterative-query-controller.hpp"
-#include "validator.hpp"
 #include "logger.hpp"
 #include <iostream>
 
diff --git a/src/clients/iterative-query-controller.hpp b/src/clients/iterative-query-controller.hpp
index 037284b..b1a0995 100644
--- a/src/clients/iterative-query-controller.hpp
+++ b/src/clients/iterative-query-controller.hpp
@@ -26,7 +26,7 @@
 #include "query-controller.hpp"
 #include "config.hpp"
 #include "common.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 
 #include <ndn-cxx/common.hpp>
 #include <ndn-cxx/data.hpp>
diff --git a/src/daemon/name-server.hpp b/src/daemon/name-server.hpp
index d62cf79..d54a71b 100644
--- a/src/daemon/name-server.hpp
+++ b/src/daemon/name-server.hpp
@@ -25,7 +25,7 @@
 #include "db-mgr.hpp"
 #include "ndns-label.hpp"
 #include "ndns-tlv.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 #include "common.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
diff --git a/src/validator.cpp b/src/validator/validator.cpp
similarity index 100%
rename from src/validator.cpp
rename to src/validator/validator.cpp
diff --git a/src/validator.hpp b/src/validator/validator.hpp
similarity index 91%
rename from src/validator.hpp
rename to src/validator/validator.hpp
index d082c38..da1cba1 100644
--- a/src/validator.hpp
+++ b/src/validator/validator.hpp
@@ -17,8 +17,8 @@
  * NDNS, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NDNS_VALIDATOR_HPP
-#define NDNS_VALIDATOR_HPP
+#ifndef NDNS_VALIDATOR_VALIDATOR_HPP
+#define NDNS_VALIDATOR_VALIDATOR_HPP
 
 #include "config.hpp"
 
@@ -40,4 +40,4 @@
 } // namespace ndns
 } // namespace ndn
 
-#endif // NDNS_VALIDATOR_HPP
+#endif // NDNS_VALIDATOR_VALIDATOR_HPP
diff --git a/tests/unit/database-test-data.hpp b/tests/unit/database-test-data.hpp
index 5091dd7..0db768c 100644
--- a/tests/unit/database-test-data.hpp
+++ b/tests/unit/database-test-data.hpp
@@ -23,7 +23,7 @@
 #include "daemon/db-mgr.hpp"
 #include "clients/response.hpp"
 #include "clients/query.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 
 #include "test-common.hpp"
 
diff --git a/tests/unit/validator.cpp b/tests/unit/validator/validator.cpp
similarity index 99%
rename from tests/unit/validator.cpp
rename to tests/unit/validator/validator.cpp
index c642875..54d1dd8 100644
--- a/tests/unit/validator.cpp
+++ b/tests/unit/validator/validator.cpp
@@ -17,7 +17,7 @@
  * NDNS, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "validator.hpp"
+#include "validator/validator.hpp"
 
 #include "test-common.hpp"
 #include "util/cert-helper.hpp"
diff --git a/tools/ndns-create-zone.cpp b/tools/ndns-create-zone.cpp
index 4cc4eca..a30875f 100644
--- a/tools/ndns-create-zone.cpp
+++ b/tools/ndns-create-zone.cpp
@@ -26,6 +26,8 @@
 #include <boost/filesystem.hpp>
 #include <string>
 
+NDNS_LOG_INIT("NdnsCreateZone")
+
 int
 main(int argc, char* argv[])
 {
@@ -131,7 +133,7 @@
     ndn::ndns::ManagementTool tool(db, keyChain);
     ndn::ndns::Zone createdZone = tool.createZone(zone, parent, cacheTtl, certTtl, ksk, dsk, dkey);
     ndn::security::v2::Certificate dkeyCert = tool.getZoneDkey(createdZone);
-    std::cout << "Generated DKEY " << dkeyCert.getName() << std::endl;
+    NDNS_LOG_INFO("Generated DKEY " << dkeyCert.getName());
     ndn::io::save(dkeyCert, std::cout);
   }
   catch (const std::exception& ex) {
diff --git a/tools/ndns-dig.cpp b/tools/ndns-dig.cpp
index aebbdf1..888138b 100644
--- a/tools/ndns-dig.cpp
+++ b/tools/ndns-dig.cpp
@@ -22,7 +22,7 @@
 #include "clients/response.hpp"
 #include "clients/query.hpp"
 #include "clients/iterative-query-controller.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 #include "util/util.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
diff --git a/tools/ndns-update.cpp b/tools/ndns-update.cpp
index 5fdbf67..ff75417 100644
--- a/tools/ndns-update.cpp
+++ b/tools/ndns-update.cpp
@@ -20,7 +20,7 @@
 #include "clients/response.hpp"
 #include "clients/query.hpp"
 #include "ndns-label.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 #include "ndns-enum.hpp"
 #include "ndns-tlv.hpp"
 #include "logger.hpp"