diff --git a/include/Makefile.am b/include/Makefile.am
index cab21a1..cf09eae 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,24 +1,24 @@
 # "make install" will install these in the install include directory, for example
-# /usr/local/ndn-cpp/name.hpp.
+# /usr/local/ndn-cpp-dev/name.hpp.
 # These files are included by the application with, for example
-# #include <ndn-cpp/namp.hpp>
+# #include <ndn-cpp-dev/namp.hpp>
 # Internal include headers are not put in this public install directory.
 
 # Public C headers.
 ndn_cpp_c_headers = \
-  $(wildcard ndn-cpp/*.h) \
-  $(wildcard ndn-cpp/c/*.*) \
-  $(wildcard ndn-cpp/c/encoding/*.*) \
-  $(wildcard ndn-cpp/c/util/*.*)
+  $(wildcard ndn-cpp-dev/*.h) \
+  $(wildcard ndn-cpp-dev/c/*.*) \
+  $(wildcard ndn-cpp-dev/c/encoding/*.*) \
+  $(wildcard ndn-cpp-dev/c/util/*.*)
 
 # Public C++ headers.
-# Use ndn-cpp/*.hpp instead of *.* to not overwrite *.h from above.
+# Use ndn-cpp-dev/*.hpp instead of *.* to not overwrite *.h from above.
 ndn_cpp_cpp_headers = \
-  $(wildcard ndn-cpp/*.hpp) \
-  $(wildcard ndn-cpp/encoding/*.*) \
-  $(wildcard ndn-cpp/security/*.*) \
-  $(wildcard ndn-cpp/transport/*.*) \
-  $(wildcard ndn-cpp/util/*.*)
+  $(wildcard ndn-cpp-dev/*.hpp) \
+  $(wildcard ndn-cpp-dev/encoding/*.*) \
+  $(wildcard ndn-cpp-dev/security/*.*) \
+  $(wildcard ndn-cpp-dev/transport/*.*) \
+  $(wildcard ndn-cpp-dev/util/*.*)
 
 ndnboost_headers = \
   $(wildcard ndnboost/*.*) \
diff --git a/include/ndn-cpp/c/common.h b/include/ndn-cpp-dev/c/common.h
similarity index 93%
rename from include/ndn-cpp/c/common.h
rename to include/ndn-cpp-dev/c/common.h
index 0cb68d5..42edcef 100644
--- a/include/ndn-cpp/c/common.h
+++ b/include/ndn-cpp-dev/c/common.h
@@ -7,7 +7,7 @@
 #ifndef NDN_COMMON_H
 #define NDN_COMMON_H
 
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #include <stdint.h>
 // TODO: Is stddef.h portable?
 #include <stddef.h>
diff --git a/include/ndn-cpp/c/data-types.h b/include/ndn-cpp-dev/c/data-types.h
similarity index 100%
rename from include/ndn-cpp/c/data-types.h
rename to include/ndn-cpp-dev/c/data-types.h
diff --git a/include/ndn-cpp/c/encoding/element-listener.h b/include/ndn-cpp-dev/c/encoding/element-listener.h
similarity index 100%
rename from include/ndn-cpp/c/encoding/element-listener.h
rename to include/ndn-cpp-dev/c/encoding/element-listener.h
diff --git a/include/ndn-cpp/c/forwarding-flags.h b/include/ndn-cpp-dev/c/forwarding-flags.h
similarity index 100%
rename from include/ndn-cpp/c/forwarding-flags.h
rename to include/ndn-cpp-dev/c/forwarding-flags.h
diff --git a/include/ndn-cpp/c/interest-types.h b/include/ndn-cpp-dev/c/interest-types.h
similarity index 100%
rename from include/ndn-cpp/c/interest-types.h
rename to include/ndn-cpp-dev/c/interest-types.h
diff --git a/include/ndn-cpp/c/key-types.h b/include/ndn-cpp-dev/c/key-types.h
similarity index 100%
rename from include/ndn-cpp/c/key-types.h
rename to include/ndn-cpp-dev/c/key-types.h
diff --git a/include/ndn-cpp/c/util/crypto.h b/include/ndn-cpp-dev/c/util/crypto.h
similarity index 94%
rename from include/ndn-cpp/c/util/crypto.h
rename to include/ndn-cpp-dev/c/util/crypto.h
index 586108b..43d47eb 100644
--- a/include/ndn-cpp/c/util/crypto.h
+++ b/include/ndn-cpp-dev/c/util/crypto.h
@@ -9,7 +9,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/rsa.h>
-#include <ndn-cpp/c/common.h>
+#include <ndn-cpp-dev/c/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ndn-cpp/common.hpp b/include/ndn-cpp-dev/common.hpp
similarity index 93%
rename from include/ndn-cpp/common.hpp
rename to include/ndn-cpp-dev/common.hpp
index e266750..59c49b5 100644
--- a/include/ndn-cpp/common.hpp
+++ b/include/ndn-cpp-dev/common.hpp
@@ -15,7 +15,7 @@
 #if NDN_CPP_HAVE_CXX11
 
 #if (__cplusplus < 201103L)
-#error "NDN-CPP library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
+#error "NDN-CPP-DEV library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
 #endif
 
 // Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
@@ -43,8 +43,8 @@
 #else // use embedded boost headers
 /* Use the boost header files in this distribution that were extracted with:
 cd <BOOST DEVELOPMENT DIRECTORY WITH boost SUBDIRECTORY>
-dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP ROOT>/include
-cd <NDN-CPP ROOT>/include
+dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP-DEV ROOT>/include
+cd <NDN-CPP-DEV ROOT>/include
 rm -rf boost.css boost.png Jamroot libs
 mv boost ndnboost
 cd ndnboost
diff --git a/include/ndn-cpp/data.hpp b/include/ndn-cpp-dev/data.hpp
similarity index 100%
rename from include/ndn-cpp/data.hpp
rename to include/ndn-cpp-dev/data.hpp
diff --git a/include/ndn-cpp/encoding/binary-xml-wire-format.hpp b/include/ndn-cpp-dev/encoding/binary-xml-wire-format.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/binary-xml-wire-format.hpp
rename to include/ndn-cpp-dev/encoding/binary-xml-wire-format.hpp
diff --git a/include/ndn-cpp/encoding/block-helpers.hpp b/include/ndn-cpp-dev/encoding/block-helpers.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/block-helpers.hpp
rename to include/ndn-cpp-dev/encoding/block-helpers.hpp
diff --git a/include/ndn-cpp/encoding/block.hpp b/include/ndn-cpp-dev/encoding/block.hpp
similarity index 99%
rename from include/ndn-cpp/encoding/block.hpp
rename to include/ndn-cpp-dev/encoding/block.hpp
index 81bc97a..85cdaf5 100644
--- a/include/ndn-cpp/encoding/block.hpp
+++ b/include/ndn-cpp-dev/encoding/block.hpp
@@ -10,7 +10,7 @@
 #ifndef NDN_BLOCK_HPP
 #define NDN_BLOCK_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #include <list>
 #include <exception>
diff --git a/include/ndn-cpp/encoding/buffer.hpp b/include/ndn-cpp-dev/encoding/buffer.hpp
similarity index 98%
rename from include/ndn-cpp/encoding/buffer.hpp
rename to include/ndn-cpp-dev/encoding/buffer.hpp
index ec71112..368b445 100644
--- a/include/ndn-cpp/encoding/buffer.hpp
+++ b/include/ndn-cpp-dev/encoding/buffer.hpp
@@ -10,7 +10,7 @@
 #ifndef NDN_BUFFER_HPP
 #define NDN_BUFFER_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #include <boost/iostreams/detail/ios.hpp>
 #include <boost/iostreams/categories.hpp>
diff --git a/include/ndn-cpp/encoding/element-listener.hpp b/include/ndn-cpp-dev/encoding/element-listener.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/element-listener.hpp
rename to include/ndn-cpp-dev/encoding/element-listener.hpp
diff --git a/include/ndn-cpp/encoding/endian.h b/include/ndn-cpp-dev/encoding/endian.h
similarity index 100%
rename from include/ndn-cpp/encoding/endian.h
rename to include/ndn-cpp-dev/encoding/endian.h
diff --git a/include/ndn-cpp/encoding/oid.hpp b/include/ndn-cpp-dev/encoding/oid.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/oid.hpp
rename to include/ndn-cpp-dev/encoding/oid.hpp
diff --git a/include/ndn-cpp/encoding/tlv-face-management.hpp b/include/ndn-cpp-dev/encoding/tlv-face-management.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/tlv-face-management.hpp
rename to include/ndn-cpp-dev/encoding/tlv-face-management.hpp
diff --git a/include/ndn-cpp/encoding/tlv.hpp b/include/ndn-cpp-dev/encoding/tlv.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/tlv.hpp
rename to include/ndn-cpp-dev/encoding/tlv.hpp
diff --git a/include/ndn-cpp/encoding/wire-format.hpp b/include/ndn-cpp-dev/encoding/wire-format.hpp
similarity index 100%
rename from include/ndn-cpp/encoding/wire-format.hpp
rename to include/ndn-cpp-dev/encoding/wire-format.hpp
diff --git a/include/ndn-cpp/exclude.hpp b/include/ndn-cpp-dev/exclude.hpp
similarity index 100%
rename from include/ndn-cpp/exclude.hpp
rename to include/ndn-cpp-dev/exclude.hpp
diff --git a/include/ndn-cpp/face-instance.hpp b/include/ndn-cpp-dev/face-instance.hpp
similarity index 100%
rename from include/ndn-cpp/face-instance.hpp
rename to include/ndn-cpp-dev/face-instance.hpp
diff --git a/include/ndn-cpp/face.hpp b/include/ndn-cpp-dev/face.hpp
similarity index 100%
rename from include/ndn-cpp/face.hpp
rename to include/ndn-cpp-dev/face.hpp
diff --git a/include/ndn-cpp/forwarding-entry.hpp b/include/ndn-cpp-dev/forwarding-entry.hpp
similarity index 100%
rename from include/ndn-cpp/forwarding-entry.hpp
rename to include/ndn-cpp-dev/forwarding-entry.hpp
diff --git a/include/ndn-cpp/forwarding-flags.hpp b/include/ndn-cpp-dev/forwarding-flags.hpp
similarity index 100%
rename from include/ndn-cpp/forwarding-flags.hpp
rename to include/ndn-cpp-dev/forwarding-flags.hpp
diff --git a/include/ndn-cpp/interest.hpp b/include/ndn-cpp-dev/interest.hpp
similarity index 100%
rename from include/ndn-cpp/interest.hpp
rename to include/ndn-cpp-dev/interest.hpp
diff --git a/include/ndn-cpp/key-locator.hpp b/include/ndn-cpp-dev/key-locator.hpp
similarity index 100%
rename from include/ndn-cpp/key-locator.hpp
rename to include/ndn-cpp-dev/key-locator.hpp
diff --git a/include/ndn-cpp/meta-info.hpp b/include/ndn-cpp-dev/meta-info.hpp
similarity index 100%
rename from include/ndn-cpp/meta-info.hpp
rename to include/ndn-cpp-dev/meta-info.hpp
diff --git a/include/ndn-cpp/name.hpp b/include/ndn-cpp-dev/name.hpp
similarity index 100%
rename from include/ndn-cpp/name.hpp
rename to include/ndn-cpp-dev/name.hpp
diff --git a/include/ndn-cpp/node.hpp b/include/ndn-cpp-dev/node.hpp
similarity index 100%
rename from include/ndn-cpp/node.hpp
rename to include/ndn-cpp-dev/node.hpp
diff --git a/include/ndn-cpp/security/certificate-extension.hpp b/include/ndn-cpp-dev/security/certificate-extension.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate-extension.hpp
rename to include/ndn-cpp-dev/security/certificate-extension.hpp
diff --git a/include/ndn-cpp/security/certificate-subject-description.hpp b/include/ndn-cpp-dev/security/certificate-subject-description.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate-subject-description.hpp
rename to include/ndn-cpp-dev/security/certificate-subject-description.hpp
diff --git a/include/ndn-cpp/security/certificate.hpp b/include/ndn-cpp-dev/security/certificate.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate.hpp
rename to include/ndn-cpp-dev/security/certificate.hpp
diff --git a/include/ndn-cpp/security/encryption-manager.hpp b/include/ndn-cpp-dev/security/encryption-manager.hpp
similarity index 100%
rename from include/ndn-cpp/security/encryption-manager.hpp
rename to include/ndn-cpp-dev/security/encryption-manager.hpp
diff --git a/include/ndn-cpp/security/identity-certificate.hpp b/include/ndn-cpp-dev/security/identity-certificate.hpp
similarity index 100%
rename from include/ndn-cpp/security/identity-certificate.hpp
rename to include/ndn-cpp-dev/security/identity-certificate.hpp
diff --git a/include/ndn-cpp/security/key-chain.hpp b/include/ndn-cpp-dev/security/key-chain.hpp
similarity index 100%
rename from include/ndn-cpp/security/key-chain.hpp
rename to include/ndn-cpp-dev/security/key-chain.hpp
diff --git a/include/ndn-cpp/security/public-key.hpp b/include/ndn-cpp-dev/security/public-key.hpp
similarity index 100%
rename from include/ndn-cpp/security/public-key.hpp
rename to include/ndn-cpp-dev/security/public-key.hpp
diff --git a/include/ndn-cpp/security/sec-policy-no-verify.hpp b/include/ndn-cpp-dev/security/sec-policy-no-verify.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-policy-no-verify.hpp
rename to include/ndn-cpp-dev/security/sec-policy-no-verify.hpp
diff --git a/include/ndn-cpp/security/sec-policy-self-verify.hpp b/include/ndn-cpp-dev/security/sec-policy-self-verify.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-policy-self-verify.hpp
rename to include/ndn-cpp-dev/security/sec-policy-self-verify.hpp
diff --git a/include/ndn-cpp/security/sec-policy.hpp b/include/ndn-cpp-dev/security/sec-policy.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-policy.hpp
rename to include/ndn-cpp-dev/security/sec-policy.hpp
diff --git a/include/ndn-cpp/security/sec-public-info-memory.hpp b/include/ndn-cpp-dev/security/sec-public-info-memory.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-public-info-memory.hpp
rename to include/ndn-cpp-dev/security/sec-public-info-memory.hpp
diff --git a/include/ndn-cpp/security/sec-public-info-sqlite3.hpp b/include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
similarity index 99%
rename from include/ndn-cpp/security/sec-public-info-sqlite3.hpp
rename to include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
index 89ffe6e..f83c27e 100644
--- a/include/ndn-cpp/security/sec-public-info-sqlite3.hpp
+++ b/include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
@@ -10,7 +10,7 @@
 #define NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
 
 // Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #ifdef NDN_CPP_HAVE_SQLITE3
 
 #include <sqlite3.h>
diff --git a/include/ndn-cpp/security/sec-public-info.hpp b/include/ndn-cpp-dev/security/sec-public-info.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-public-info.hpp
rename to include/ndn-cpp-dev/security/sec-public-info.hpp
diff --git a/include/ndn-cpp/security/sec-tpm-memory.hpp b/include/ndn-cpp-dev/security/sec-tpm-memory.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-tpm-memory.hpp
rename to include/ndn-cpp-dev/security/sec-tpm-memory.hpp
diff --git a/include/ndn-cpp/security/sec-tpm-osx.hpp b/include/ndn-cpp-dev/security/sec-tpm-osx.hpp
similarity index 98%
rename from include/ndn-cpp/security/sec-tpm-osx.hpp
rename to include/ndn-cpp-dev/security/sec-tpm-osx.hpp
index 47e83ab..4839e3d 100644
--- a/include/ndn-cpp/security/sec-tpm-osx.hpp
+++ b/include/ndn-cpp-dev/security/sec-tpm-osx.hpp
@@ -9,7 +9,7 @@
 #define NDN_SEC_TPM_OSX_HPP
 
 // Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECURITY 1.
-#include <ndn-cpp/ndn-cpp-config.h>
+#include <ndn-cpp-dev/ndn-cpp-config.h>
 #if NDN_CPP_HAVE_OSX_SECURITY
 
 #include "../common.hpp"
diff --git a/include/ndn-cpp/security/sec-tpm.hpp b/include/ndn-cpp-dev/security/sec-tpm.hpp
similarity index 100%
rename from include/ndn-cpp/security/sec-tpm.hpp
rename to include/ndn-cpp-dev/security/sec-tpm.hpp
diff --git a/include/ndn-cpp/security/security-common.hpp b/include/ndn-cpp-dev/security/security-common.hpp
similarity index 100%
rename from include/ndn-cpp/security/security-common.hpp
rename to include/ndn-cpp-dev/security/security-common.hpp
diff --git a/include/ndn-cpp/security/security-exception.hpp b/include/ndn-cpp-dev/security/security-exception.hpp
similarity index 100%
rename from include/ndn-cpp/security/security-exception.hpp
rename to include/ndn-cpp-dev/security/security-exception.hpp
diff --git a/include/ndn-cpp/security/sha256-with-rsa-handler.hpp b/include/ndn-cpp-dev/security/sha256-with-rsa-handler.hpp
similarity index 100%
rename from include/ndn-cpp/security/sha256-with-rsa-handler.hpp
rename to include/ndn-cpp-dev/security/sha256-with-rsa-handler.hpp
diff --git a/include/ndn-cpp/security/signature-sha256-with-rsa.hpp b/include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp
similarity index 100%
rename from include/ndn-cpp/security/signature-sha256-with-rsa.hpp
rename to include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp
diff --git a/include/ndn-cpp/security/validation-request.hpp b/include/ndn-cpp-dev/security/validation-request.hpp
similarity index 100%
rename from include/ndn-cpp/security/validation-request.hpp
rename to include/ndn-cpp-dev/security/validation-request.hpp
diff --git a/include/ndn-cpp/security/verifier.hpp b/include/ndn-cpp-dev/security/verifier.hpp
similarity index 100%
rename from include/ndn-cpp/security/verifier.hpp
rename to include/ndn-cpp-dev/security/verifier.hpp
diff --git a/include/ndn-cpp/signature.hpp b/include/ndn-cpp-dev/signature.hpp
similarity index 100%
rename from include/ndn-cpp/signature.hpp
rename to include/ndn-cpp-dev/signature.hpp
diff --git a/include/ndn-cpp/status-response.hpp b/include/ndn-cpp-dev/status-response.hpp
similarity index 100%
rename from include/ndn-cpp/status-response.hpp
rename to include/ndn-cpp-dev/status-response.hpp
diff --git a/include/ndn-cpp/transport/transport.hpp b/include/ndn-cpp-dev/transport/transport.hpp
similarity index 98%
rename from include/ndn-cpp/transport/transport.hpp
rename to include/ndn-cpp-dev/transport/transport.hpp
index 064107b..ddbff52 100644
--- a/include/ndn-cpp/transport/transport.hpp
+++ b/include/ndn-cpp-dev/transport/transport.hpp
@@ -8,7 +8,7 @@
 #ifndef NDN_TRANSPORT_HPP
 #define NDN_TRANSPORT_HPP
 
-#include <ndn-cpp/common.hpp>
+#include <ndn-cpp-dev/common.hpp>
 
 #include <vector>
 #include <boost/asio.hpp>
diff --git a/include/ndn-cpp/transport/unix-transport.hpp b/include/ndn-cpp-dev/transport/unix-transport.hpp
similarity index 100%
rename from include/ndn-cpp/transport/unix-transport.hpp
rename to include/ndn-cpp-dev/transport/unix-transport.hpp
diff --git a/include/ndn-cpp/util/blob.hpp b/include/ndn-cpp-dev/util/blob.hpp
similarity index 100%
rename from include/ndn-cpp/util/blob.hpp
rename to include/ndn-cpp-dev/util/blob.hpp
diff --git a/include/ndn-cpp/util/signed-blob.hpp b/include/ndn-cpp-dev/util/signed-blob.hpp
similarity index 100%
rename from include/ndn-cpp/util/signed-blob.hpp
rename to include/ndn-cpp-dev/util/signed-blob.hpp