diff --git a/core/manager-base.hpp b/core/manager-base.hpp
index cb90541..e947b8d 100644
--- a/core/manager-base.hpp
+++ b/core/manager-base.hpp
@@ -29,9 +29,9 @@
 #include "common.hpp"
 
 #include <ndn-cxx/mgmt/dispatcher.hpp>
-#include <ndn-cxx/management/nfd-control-command.hpp>
-#include <ndn-cxx/management/nfd-control-response.hpp>
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-response.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index 2caa74c..783d21a 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -32,9 +32,9 @@
 #include "fw/face-table.hpp"
 
 #include <ndn-cxx/lp/tags.hpp>
-#include <ndn-cxx/management/nfd-channel-status.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
-#include <ndn-cxx/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/mgmt/nfd/channel-status.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/face-event-notification.hpp>
 
 #ifdef HAVE_UNIX_SOCKETS
 #include "face/unix-stream-factory.hpp"
diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index b168da4..3a20dbd 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -27,8 +27,8 @@
 #define NFD_DAEMON_MGMT_FACE_MANAGER_HPP
 
 #include "nfd-manager-base.hpp"
-#include <ndn-cxx/management/nfd-face-status.hpp>
-#include <ndn-cxx/management/nfd-face-query-filter.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/face-query-filter.hpp>
 #include "face/face.hpp"
 
 namespace nfd {
diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index 623c71e..14675b8 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -26,7 +26,7 @@
 #include "fib-manager.hpp"
 #include "fw/face-table.hpp"
 #include <ndn-cxx/lp/tags.hpp>
-#include <ndn-cxx/management/nfd-fib-entry.hpp>
+#include <ndn-cxx/mgmt/nfd/fib-entry.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/forwarder-status-manager.hpp b/daemon/mgmt/forwarder-status-manager.hpp
index 03c10e2..343d7d4 100644
--- a/daemon/mgmt/forwarder-status-manager.hpp
+++ b/daemon/mgmt/forwarder-status-manager.hpp
@@ -27,7 +27,7 @@
 #define NFD_DAEMON_MGMT_FORWARDER_STATUS_MANAGER_HPP
 
 #include "core/manager-base.hpp"
-#include <ndn-cxx/management/nfd-forwarder-status.hpp>
+#include <ndn-cxx/mgmt/nfd/forwarder-status.hpp>
 
 namespace nfd {
 
diff --git a/daemon/mgmt/strategy-choice-manager.cpp b/daemon/mgmt/strategy-choice-manager.cpp
index 312a35c..cff7cef 100644
--- a/daemon/mgmt/strategy-choice-manager.cpp
+++ b/daemon/mgmt/strategy-choice-manager.cpp
@@ -25,7 +25,7 @@
 
 #include "strategy-choice-manager.hpp"
 #include "table/strategy-choice.hpp"
-#include <ndn-cxx/management/nfd-strategy-choice.hpp>
+#include <ndn-cxx/mgmt/nfd/strategy-choice.hpp>
 
 namespace nfd {
 
diff --git a/rib/auto-prefix-propagator.hpp b/rib/auto-prefix-propagator.hpp
index bd3ef50..efc48cb 100644
--- a/rib/auto-prefix-propagator.hpp
+++ b/rib/auto-prefix-propagator.hpp
@@ -31,10 +31,10 @@
 #include "propagated-entry.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
-#include <ndn-cxx/management/nfd-control-command.hpp>
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
-#include <ndn-cxx/management/nfd-command-options.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/command-options.hpp>
 #include <ndn-cxx/util/signal.hpp>
 
 namespace nfd {
diff --git a/rib/fib-updater.cpp b/rib/fib-updater.cpp
index c6b4f09..a430c68 100644
--- a/rib/fib-updater.cpp
+++ b/rib/fib-updater.cpp
@@ -27,7 +27,7 @@
 
 #include "core/logger.hpp"
 
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/fib-updater.hpp b/rib/fib-updater.hpp
index fed7aed..d68210c 100644
--- a/rib/fib-updater.hpp
+++ b/rib/fib-updater.hpp
@@ -31,7 +31,7 @@
 #include "rib.hpp"
 #include "rib-update-batch.hpp"
 
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib-entry.cpp b/rib/rib-entry.cpp
index 64e7195..7d4cff8 100644
--- a/rib/rib-entry.cpp
+++ b/rib/rib-entry.cpp
@@ -27,7 +27,7 @@
 
 #include "core/logger.hpp"
 
-#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
 
 NFD_LOG_INIT("RibEntry");
 
diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index b291a22..c0c6ce8 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -28,8 +28,8 @@
 #include "core/logger.hpp"
 #include "core/scheduler.hpp"
 #include <ndn-cxx/lp/tags.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
-#include <ndn-cxx/management/nfd-rib-entry.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib-manager.hpp b/rib/rib-manager.hpp
index c28ea71..686ecd7 100644
--- a/rib/rib-manager.hpp
+++ b/rib/rib-manager.hpp
@@ -34,11 +34,11 @@
 
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 #include <ndn-cxx/security/validator-config.hpp>
-#include <ndn-cxx/management/nfd-face-monitor.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
-#include <ndn-cxx/management/nfd-control-command.hpp>
-#include <ndn-cxx/management/nfd-control-response.hpp>
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-response.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/rib/rib.hpp b/rib/rib.hpp
index db452b4..4c9e608 100644
--- a/rib/rib.hpp
+++ b/rib/rib.hpp
@@ -29,7 +29,7 @@
 #include "rib-entry.hpp"
 #include "rib-update-batch.hpp"
 
-#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
 
 namespace nfd {
 namespace rib {
diff --git a/tests/core/manager-base.t.cpp b/tests/core/manager-base.t.cpp
index 6e696ff..49f35b9 100644
--- a/tests/core/manager-base.t.cpp
+++ b/tests/core/manager-base.t.cpp
@@ -27,7 +27,7 @@
 #include "manager-common-fixture.hpp"
 
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/management/nfd-control-command.hpp>
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index 95f82b9..3c34cb2 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -31,8 +31,8 @@
 
 #include <ndn-cxx/util/random.hpp>
 #include <ndn-cxx/encoding/tlv.hpp>
-#include <ndn-cxx/management/nfd-channel-status.hpp>
-#include <ndn-cxx/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/mgmt/nfd/channel-status.hpp>
+#include <ndn-cxx/mgmt/nfd/face-event-notification.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/fib-manager.t.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
index fbea4c0..4bc642e 100644
--- a/tests/daemon/mgmt/fib-manager.t.cpp
+++ b/tests/daemon/mgmt/fib-manager.t.cpp
@@ -28,7 +28,7 @@
 #include "table/fib-nexthop.hpp"
 #include "../face/dummy-face.hpp"
 #include <ndn-cxx/lp/tags.hpp>
-#include <ndn-cxx/management/nfd-fib-entry.hpp>
+#include <ndn-cxx/mgmt/nfd/fib-entry.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/daemon/mgmt/strategy-choice-manager.t.cpp b/tests/daemon/mgmt/strategy-choice-manager.t.cpp
index bc4ae70..1d8e135 100644
--- a/tests/daemon/mgmt/strategy-choice-manager.t.cpp
+++ b/tests/daemon/mgmt/strategy-choice-manager.t.cpp
@@ -37,7 +37,7 @@
 #include "tests/daemon/fw/install-strategy.hpp"
 
 #include <ndn-cxx/util/random.hpp>
-#include <ndn-cxx/management/nfd-strategy-choice.hpp>
+#include <ndn-cxx/mgmt/nfd/strategy-choice.hpp>
 
 namespace nfd {
 namespace tests {
diff --git a/tests/rib/rib-manager.t.cpp b/tests/rib/rib-manager.t.cpp
index cfe0b3f..9bd8f72 100644
--- a/tests/rib/rib-manager.t.cpp
+++ b/tests/rib/rib-manager.t.cpp
@@ -27,9 +27,9 @@
 #include "manager-common-fixture.hpp"
 
 #include <ndn-cxx/lp/tags.hpp>
-#include <ndn-cxx/management/nfd-rib-entry.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
-#include <ndn-cxx/management/nfd-face-event-notification.hpp>
+#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/face-event-notification.hpp>
 #include <ndn-cxx/util/random.hpp>
 
 namespace nfd {
diff --git a/tools/ndn-autoconfig/base.hpp b/tools/ndn-autoconfig/base.hpp
index c4c3a9b..e66020c 100644
--- a/tools/ndn-autoconfig/base.hpp
+++ b/tools/ndn-autoconfig/base.hpp
@@ -30,8 +30,8 @@
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 #include <ndn-cxx/util/face-uri.hpp>
 
diff --git a/tools/nfd-autoreg.cpp b/tools/nfd-autoreg.cpp
index 996c03c..9cc4d57 100644
--- a/tools/nfd-autoreg.cpp
+++ b/tools/nfd-autoreg.cpp
@@ -28,9 +28,9 @@
 
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/util/face-uri.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
-#include <ndn-cxx/management/nfd-face-monitor.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
+#include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 
 #include <boost/program_options/options_description.hpp>
diff --git a/tools/nfdc/face-id-fetcher.cpp b/tools/nfdc/face-id-fetcher.cpp
index 08bc9ff..458b9bb 100644
--- a/tools/nfdc/face-id-fetcher.cpp
+++ b/tools/nfdc/face-id-fetcher.cpp
@@ -28,8 +28,8 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
 
-#include <ndn-cxx/management/nfd-face-query-filter.hpp>
-#include <ndn-cxx/management/nfd-face-status.hpp>
+#include <ndn-cxx/mgmt/nfd/face-query-filter.hpp>
+#include <ndn-cxx/mgmt/nfd/face-status.hpp>
 #include <ndn-cxx/util/segment-fetcher.hpp>
 
 namespace nfd {
diff --git a/tools/nfdc/face-id-fetcher.hpp b/tools/nfdc/face-id-fetcher.hpp
index cf0eb6f..1afeaf5 100644
--- a/tools/nfdc/face-id-fetcher.hpp
+++ b/tools/nfdc/face-id-fetcher.hpp
@@ -28,7 +28,7 @@
 
 #include "core/common.hpp"
 #include <ndn-cxx/face.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 #include <ndn-cxx/util/face-uri.hpp>
 #include <ndn-cxx/security/validator-null.hpp>
 
diff --git a/tools/nfdc/legacy-nfdc.hpp b/tools/nfdc/legacy-nfdc.hpp
index 8828afb..1c3772b 100644
--- a/tools/nfdc/legacy-nfdc.hpp
+++ b/tools/nfdc/legacy-nfdc.hpp
@@ -29,7 +29,7 @@
 #include "core/common.hpp"
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 
 namespace nfd {
 namespace tools {
diff --git a/tools/nfdc/module.hpp b/tools/nfdc/module.hpp
index fae4ce7..553c14f 100644
--- a/tools/nfdc/module.hpp
+++ b/tools/nfdc/module.hpp
@@ -27,7 +27,7 @@
 #define NFD_TOOLS_NFDC_MODULE_HPP
 
 #include "core/common.hpp"
-#include <ndn-cxx/management/nfd-controller.hpp>
+#include <ndn-cxx/mgmt/nfd/controller.hpp>
 
 namespace nfd {
 namespace tools {