diff --git a/.jenkins.d/30-coverage.sh b/.jenkins.d/30-coverage.sh
index 5910069..92f2bb8 100755
--- a/.jenkins.d/30-coverage.sh
+++ b/.jenkins.d/30-coverage.sh
@@ -9,7 +9,7 @@
 if [[ $JOB_NAME == *"code-coverage" ]]; then
     gcovr --object-directory=build \
           --output=build/coverage.xml \
-          --filter="$PWD/src" \
+          --filter="$PWD/ndn-cxx" \
           --root=. \
           --xml
 
diff --git a/docs/conf.py b/docs/conf.py
index 0af0eb2..9e76dff 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -65,7 +65,7 @@
 
 # General information about the project.
 project = u'ndn-cxx: NDN C++ library with eXperimental eXtensions'
-copyright = u'Copyright (c) 2013-2017 Regents of the University of California.'
+copyright = u'Copyright (c) 2013-2018 Regents of the University of California.'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 30dd69b..8cb8bcb 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -780,7 +780,7 @@
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src
+INPUT                  = ndn-cxx
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -836,7 +836,7 @@
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */src/detail/* */src/*/detail/*
+EXCLUDE_PATTERNS       = */ndn-cxx/detail/* */ndn-cxx/*/detail/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/examples/consumer-with-timer.cpp b/examples/consumer-with-timer.cpp
index 76f9853..b095d4c 100644
--- a/examples/consumer-with-timer.cpp
+++ b/examples/consumer-with-timer.cpp
@@ -21,11 +21,8 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-// correct way to include ndn-cxx headers
-// #include <ndn-cxx/face.hpp>
-// #include <ndn-cxx/util/scheduler.hpp>
-#include "face.hpp"
-#include "util/scheduler.hpp"
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/util/scheduler.hpp>
 
 #include <boost/asio/io_service.hpp>
 #include <iostream>
diff --git a/examples/consumer.cpp b/examples/consumer.cpp
index c302073..f06ac07 100644
--- a/examples/consumer.cpp
+++ b/examples/consumer.cpp
@@ -21,9 +21,7 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-// correct way to include ndn-cxx headers
-// #include <ndn-cxx/face.hpp>
-#include "face.hpp"
+#include <ndn-cxx/face.hpp>
 
 #include <iostream>
 
diff --git a/examples/producer.cpp b/examples/producer.cpp
index 656ed12..4544ec0 100644
--- a/examples/producer.cpp
+++ b/examples/producer.cpp
@@ -21,11 +21,8 @@
  * @author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
  */
 
-// correct way to include ndn-cxx headers
-// #include <ndn-cxx/face.hpp>
-// #include <ndn-cxx/security/key-chain.hpp>
-#include "face.hpp"
-#include "security/key-chain.hpp"
+#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
 
 #include <iostream>
 
diff --git a/examples/wscript b/examples/wscript
index 52de33f..1073033 100644
--- a/examples/wscript
+++ b/examples/wscript
@@ -3,22 +3,21 @@
 top = '..'
 
 def build(bld):
-    # List all .cpp files (whole example should be in one .cpp)
-    for i in bld.path.ant_glob(['*.cpp']):
-        name = str(i)[:-len(".cpp")]
-        bld(features=['cxx', 'cxxprogram'],
-            target=name,
-            source=[i] + bld.path.ant_glob(['%s/**/*.cpp' % name]),
-            use='ndn-cxx',
-            install_path=None
-            )
+    # List all .cpp files (whole example in one .cpp)
+    for ex in bld.path.ant_glob('*.cpp'):
+        name = ex.change_ext('').path_from(bld.path.get_bld())
+        bld.program(name='example-%s' % name,
+                    target=name,
+                    source=[ex],
+                    use='ndn-cxx',
+                    install_path=None)
 
-    # List all directories files (example can has multiple .cpp in the directory)
-    for name in bld.path.ant_glob(['*'], dir=True, src=False):
-        bld(features=['cxx', 'cxxprogram'],
-            target="%s/%s" % (name, name),
-            source=bld.path.ant_glob(['%s/**/*.cpp' % name]),
-            use='ndn-cxx',
-            install_path=None,
-            includes='%s' % name,
-            )
+    # List all directories (example can have multiple .cpp in the directory)
+    for subdir in bld.path.ant_glob('*', dir=True, src=False):
+        name = subdir.path_from(bld.path)
+        bld.program(name='example-%s' % name,
+                    target=name,
+                    source=subdir.ant_glob('**/*.cpp'),
+                    use='ndn-cxx',
+                    includes=name,
+                    install_path=None)
diff --git a/src/common-pch.hpp b/ndn-cxx/common-pch.hpp
similarity index 100%
rename from src/common-pch.hpp
rename to ndn-cxx/common-pch.hpp
diff --git a/src/common.hpp b/ndn-cxx/common.hpp
similarity index 100%
rename from src/common.hpp
rename to ndn-cxx/common.hpp
diff --git a/src/data.cpp b/ndn-cxx/data.cpp
similarity index 100%
rename from src/data.cpp
rename to ndn-cxx/data.cpp
diff --git a/src/data.hpp b/ndn-cxx/data.hpp
similarity index 100%
rename from src/data.hpp
rename to ndn-cxx/data.hpp
diff --git a/src/delegation-list.cpp b/ndn-cxx/delegation-list.cpp
similarity index 100%
rename from src/delegation-list.cpp
rename to ndn-cxx/delegation-list.cpp
diff --git a/src/delegation-list.hpp b/ndn-cxx/delegation-list.hpp
similarity index 100%
rename from src/delegation-list.hpp
rename to ndn-cxx/delegation-list.hpp
diff --git a/src/delegation.cpp b/ndn-cxx/delegation.cpp
similarity index 95%
rename from src/delegation.cpp
rename to ndn-cxx/delegation.cpp
index 178b1d0..7cc8a5b 100644
--- a/src/delegation.cpp
+++ b/ndn-cxx/delegation.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/delegation.hpp b/ndn-cxx/delegation.hpp
similarity index 95%
rename from src/delegation.hpp
rename to ndn-cxx/delegation.hpp
index 4e73ebe..1abea41 100644
--- a/src/delegation.hpp
+++ b/ndn-cxx/delegation.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/detail/container-with-on-empty-signal.hpp b/ndn-cxx/detail/container-with-on-empty-signal.hpp
similarity index 96%
rename from src/detail/container-with-on-empty-signal.hpp
rename to ndn-cxx/detail/container-with-on-empty-signal.hpp
index ef5f004..4ee314e 100644
--- a/src/detail/container-with-on-empty-signal.hpp
+++ b/ndn-cxx/detail/container-with-on-empty-signal.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/detail/face-impl.hpp b/ndn-cxx/detail/face-impl.hpp
similarity index 99%
rename from src/detail/face-impl.hpp
rename to ndn-cxx/detail/face-impl.hpp
index 86945ba..147024d 100644
--- a/src/detail/face-impl.hpp
+++ b/ndn-cxx/detail/face-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/detail/interest-filter-record.hpp b/ndn-cxx/detail/interest-filter-record.hpp
similarity index 97%
rename from src/detail/interest-filter-record.hpp
rename to ndn-cxx/detail/interest-filter-record.hpp
index 154112c..b4b04a7 100644
--- a/src/detail/interest-filter-record.hpp
+++ b/ndn-cxx/detail/interest-filter-record.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/detail/lp-field-tag.hpp b/ndn-cxx/detail/lp-field-tag.hpp
similarity index 95%
rename from src/detail/lp-field-tag.hpp
rename to ndn-cxx/detail/lp-field-tag.hpp
index 5c01f58..8957a7d 100644
--- a/src/detail/lp-field-tag.hpp
+++ b/ndn-cxx/detail/lp-field-tag.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/detail/name-component-types.hpp b/ndn-cxx/detail/name-component-types.hpp
similarity index 100%
rename from src/detail/name-component-types.hpp
rename to ndn-cxx/detail/name-component-types.hpp
diff --git a/src/detail/pending-interest.hpp b/ndn-cxx/detail/pending-interest.hpp
similarity index 100%
rename from src/detail/pending-interest.hpp
rename to ndn-cxx/detail/pending-interest.hpp
diff --git a/src/detail/registered-prefix.hpp b/ndn-cxx/detail/registered-prefix.hpp
similarity index 97%
rename from src/detail/registered-prefix.hpp
rename to ndn-cxx/detail/registered-prefix.hpp
index 5b08167..1ea2aab 100644
--- a/src/detail/registered-prefix.hpp
+++ b/ndn-cxx/detail/registered-prefix.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/encoding/block-helpers.cpp b/ndn-cxx/encoding/block-helpers.cpp
similarity index 100%
rename from src/encoding/block-helpers.cpp
rename to ndn-cxx/encoding/block-helpers.cpp
diff --git a/src/encoding/block-helpers.hpp b/ndn-cxx/encoding/block-helpers.hpp
similarity index 100%
rename from src/encoding/block-helpers.hpp
rename to ndn-cxx/encoding/block-helpers.hpp
diff --git a/src/encoding/block.cpp b/ndn-cxx/encoding/block.cpp
similarity index 100%
rename from src/encoding/block.cpp
rename to ndn-cxx/encoding/block.cpp
diff --git a/src/encoding/block.hpp b/ndn-cxx/encoding/block.hpp
similarity index 100%
rename from src/encoding/block.hpp
rename to ndn-cxx/encoding/block.hpp
diff --git a/src/encoding/buffer-stream.cpp b/ndn-cxx/encoding/buffer-stream.cpp
similarity index 95%
rename from src/encoding/buffer-stream.cpp
rename to ndn-cxx/encoding/buffer-stream.cpp
index ec501e6..dc46adc 100644
--- a/src/encoding/buffer-stream.cpp
+++ b/ndn-cxx/encoding/buffer-stream.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/encoding/buffer-stream.hpp b/ndn-cxx/encoding/buffer-stream.hpp
similarity index 97%
rename from src/encoding/buffer-stream.hpp
rename to ndn-cxx/encoding/buffer-stream.hpp
index e7dc60f..1eebbdf 100644
--- a/src/encoding/buffer-stream.hpp
+++ b/ndn-cxx/encoding/buffer-stream.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/encoding/buffer.hpp b/ndn-cxx/encoding/buffer.hpp
similarity index 100%
rename from src/encoding/buffer.hpp
rename to ndn-cxx/encoding/buffer.hpp
diff --git a/src/encoding/encoder.cpp b/ndn-cxx/encoding/encoder.cpp
similarity index 100%
rename from src/encoding/encoder.cpp
rename to ndn-cxx/encoding/encoder.cpp
diff --git a/src/encoding/encoder.hpp b/ndn-cxx/encoding/encoder.hpp
similarity index 100%
rename from src/encoding/encoder.hpp
rename to ndn-cxx/encoding/encoder.hpp
diff --git a/src/encoding/encoding-buffer-fwd.hpp b/ndn-cxx/encoding/encoding-buffer-fwd.hpp
similarity index 96%
rename from src/encoding/encoding-buffer-fwd.hpp
rename to ndn-cxx/encoding/encoding-buffer-fwd.hpp
index b9720e9..8abcfbb 100644
--- a/src/encoding/encoding-buffer-fwd.hpp
+++ b/ndn-cxx/encoding/encoding-buffer-fwd.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/encoding/encoding-buffer.hpp b/ndn-cxx/encoding/encoding-buffer.hpp
similarity index 100%
rename from src/encoding/encoding-buffer.hpp
rename to ndn-cxx/encoding/encoding-buffer.hpp
diff --git a/src/encoding/estimator.cpp b/ndn-cxx/encoding/estimator.cpp
similarity index 100%
rename from src/encoding/estimator.cpp
rename to ndn-cxx/encoding/estimator.cpp
diff --git a/src/encoding/estimator.hpp b/ndn-cxx/encoding/estimator.hpp
similarity index 100%
rename from src/encoding/estimator.hpp
rename to ndn-cxx/encoding/estimator.hpp
diff --git a/src/encoding/nfd-constants.cpp b/ndn-cxx/encoding/nfd-constants.cpp
similarity index 100%
rename from src/encoding/nfd-constants.cpp
rename to ndn-cxx/encoding/nfd-constants.cpp
diff --git a/src/encoding/nfd-constants.hpp b/ndn-cxx/encoding/nfd-constants.hpp
similarity index 100%
rename from src/encoding/nfd-constants.hpp
rename to ndn-cxx/encoding/nfd-constants.hpp
diff --git a/src/encoding/tlv-nfd.hpp b/ndn-cxx/encoding/tlv-nfd.hpp
similarity index 100%
rename from src/encoding/tlv-nfd.hpp
rename to ndn-cxx/encoding/tlv-nfd.hpp
diff --git a/src/encoding/tlv-security.hpp b/ndn-cxx/encoding/tlv-security.hpp
similarity index 100%
rename from src/encoding/tlv-security.hpp
rename to ndn-cxx/encoding/tlv-security.hpp
diff --git a/src/encoding/tlv.cpp b/ndn-cxx/encoding/tlv.cpp
similarity index 100%
rename from src/encoding/tlv.cpp
rename to ndn-cxx/encoding/tlv.cpp
diff --git a/src/encoding/tlv.hpp b/ndn-cxx/encoding/tlv.hpp
similarity index 100%
rename from src/encoding/tlv.hpp
rename to ndn-cxx/encoding/tlv.hpp
diff --git a/src/exclude.cpp b/ndn-cxx/exclude.cpp
similarity index 100%
rename from src/exclude.cpp
rename to ndn-cxx/exclude.cpp
diff --git a/src/exclude.hpp b/ndn-cxx/exclude.hpp
similarity index 100%
rename from src/exclude.hpp
rename to ndn-cxx/exclude.hpp
diff --git a/src/face.cpp b/ndn-cxx/face.cpp
similarity index 100%
rename from src/face.cpp
rename to ndn-cxx/face.cpp
diff --git a/src/face.hpp b/ndn-cxx/face.hpp
similarity index 100%
rename from src/face.hpp
rename to ndn-cxx/face.hpp
diff --git a/src/ims/in-memory-storage-entry.cpp b/ndn-cxx/ims/in-memory-storage-entry.cpp
similarity index 95%
rename from src/ims/in-memory-storage-entry.cpp
rename to ndn-cxx/ims/in-memory-storage-entry.cpp
index daf12c5..82fa9b0 100644
--- a/src/ims/in-memory-storage-entry.cpp
+++ b/ndn-cxx/ims/in-memory-storage-entry.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage-entry.hpp b/ndn-cxx/ims/in-memory-storage-entry.hpp
similarity index 97%
rename from src/ims/in-memory-storage-entry.hpp
rename to ndn-cxx/ims/in-memory-storage-entry.hpp
index 721a90d..8002fca 100644
--- a/src/ims/in-memory-storage-entry.hpp
+++ b/ndn-cxx/ims/in-memory-storage-entry.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage-fifo.cpp b/ndn-cxx/ims/in-memory-storage-fifo.cpp
similarity index 96%
rename from src/ims/in-memory-storage-fifo.cpp
rename to ndn-cxx/ims/in-memory-storage-fifo.cpp
index df6e173..136f7b5 100644
--- a/src/ims/in-memory-storage-fifo.cpp
+++ b/ndn-cxx/ims/in-memory-storage-fifo.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage-fifo.hpp b/ndn-cxx/ims/in-memory-storage-fifo.hpp
similarity index 100%
rename from src/ims/in-memory-storage-fifo.hpp
rename to ndn-cxx/ims/in-memory-storage-fifo.hpp
diff --git a/src/ims/in-memory-storage-lfu.cpp b/ndn-cxx/ims/in-memory-storage-lfu.cpp
similarity index 96%
rename from src/ims/in-memory-storage-lfu.cpp
rename to ndn-cxx/ims/in-memory-storage-lfu.cpp
index a155f60..c0ffff0 100644
--- a/src/ims/in-memory-storage-lfu.cpp
+++ b/ndn-cxx/ims/in-memory-storage-lfu.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage-lfu.hpp b/ndn-cxx/ims/in-memory-storage-lfu.hpp
similarity index 100%
rename from src/ims/in-memory-storage-lfu.hpp
rename to ndn-cxx/ims/in-memory-storage-lfu.hpp
diff --git a/src/ims/in-memory-storage-lru.cpp b/ndn-cxx/ims/in-memory-storage-lru.cpp
similarity index 96%
rename from src/ims/in-memory-storage-lru.cpp
rename to ndn-cxx/ims/in-memory-storage-lru.cpp
index 22c463d..c3b0bc6 100644
--- a/src/ims/in-memory-storage-lru.cpp
+++ b/ndn-cxx/ims/in-memory-storage-lru.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage-lru.hpp b/ndn-cxx/ims/in-memory-storage-lru.hpp
similarity index 100%
rename from src/ims/in-memory-storage-lru.hpp
rename to ndn-cxx/ims/in-memory-storage-lru.hpp
diff --git a/src/ims/in-memory-storage-persistent.cpp b/ndn-cxx/ims/in-memory-storage-persistent.cpp
similarity index 95%
rename from src/ims/in-memory-storage-persistent.cpp
rename to ndn-cxx/ims/in-memory-storage-persistent.cpp
index ff6a3a9..dba17cf 100644
--- a/src/ims/in-memory-storage-persistent.cpp
+++ b/ndn-cxx/ims/in-memory-storage-persistent.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage-persistent.hpp b/ndn-cxx/ims/in-memory-storage-persistent.hpp
similarity index 96%
rename from src/ims/in-memory-storage-persistent.hpp
rename to ndn-cxx/ims/in-memory-storage-persistent.hpp
index 5920ef3..9b31e80 100644
--- a/src/ims/in-memory-storage-persistent.hpp
+++ b/ndn-cxx/ims/in-memory-storage-persistent.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/ims/in-memory-storage.cpp b/ndn-cxx/ims/in-memory-storage.cpp
similarity index 100%
rename from src/ims/in-memory-storage.cpp
rename to ndn-cxx/ims/in-memory-storage.cpp
diff --git a/src/ims/in-memory-storage.hpp b/ndn-cxx/ims/in-memory-storage.hpp
similarity index 100%
rename from src/ims/in-memory-storage.hpp
rename to ndn-cxx/ims/in-memory-storage.hpp
diff --git a/src/interest-filter.cpp b/ndn-cxx/interest-filter.cpp
similarity index 96%
rename from src/interest-filter.cpp
rename to ndn-cxx/interest-filter.cpp
index 36e08f1..f2f34b9 100644
--- a/src/interest-filter.cpp
+++ b/ndn-cxx/interest-filter.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/interest-filter.hpp b/ndn-cxx/interest-filter.hpp
similarity index 100%
rename from src/interest-filter.hpp
rename to ndn-cxx/interest-filter.hpp
diff --git a/src/interest.cpp b/ndn-cxx/interest.cpp
similarity index 100%
rename from src/interest.cpp
rename to ndn-cxx/interest.cpp
diff --git a/src/interest.hpp b/ndn-cxx/interest.hpp
similarity index 100%
rename from src/interest.hpp
rename to ndn-cxx/interest.hpp
diff --git a/src/key-locator.cpp b/ndn-cxx/key-locator.cpp
similarity index 98%
rename from src/key-locator.cpp
rename to ndn-cxx/key-locator.cpp
index 9692ecc..ff455d1 100644
--- a/src/key-locator.cpp
+++ b/ndn-cxx/key-locator.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/key-locator.hpp b/ndn-cxx/key-locator.hpp
similarity index 100%
rename from src/key-locator.hpp
rename to ndn-cxx/key-locator.hpp
diff --git a/src/link.cpp b/ndn-cxx/link.cpp
similarity index 97%
rename from src/link.cpp
rename to ndn-cxx/link.cpp
index 1276904..14da742 100644
--- a/src/link.cpp
+++ b/ndn-cxx/link.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/link.hpp b/ndn-cxx/link.hpp
similarity index 100%
rename from src/link.hpp
rename to ndn-cxx/link.hpp
diff --git a/src/lp/cache-policy.cpp b/ndn-cxx/lp/cache-policy.cpp
similarity index 97%
rename from src/lp/cache-policy.cpp
rename to ndn-cxx/lp/cache-policy.cpp
index aea7d05..e5c3b8c 100644
--- a/src/lp/cache-policy.cpp
+++ b/ndn-cxx/lp/cache-policy.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/cache-policy.hpp b/ndn-cxx/lp/cache-policy.hpp
similarity index 100%
rename from src/lp/cache-policy.hpp
rename to ndn-cxx/lp/cache-policy.hpp
diff --git a/src/lp/empty-value.hpp b/ndn-cxx/lp/empty-value.hpp
similarity index 94%
rename from src/lp/empty-value.hpp
rename to ndn-cxx/lp/empty-value.hpp
index 1587046..9485ce2 100644
--- a/src/lp/empty-value.hpp
+++ b/ndn-cxx/lp/empty-value.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/field-decl.hpp b/ndn-cxx/lp/field-decl.hpp
similarity index 100%
rename from src/lp/field-decl.hpp
rename to ndn-cxx/lp/field-decl.hpp
diff --git a/src/lp/field.hpp b/ndn-cxx/lp/field.hpp
similarity index 96%
rename from src/lp/field.hpp
rename to ndn-cxx/lp/field.hpp
index 37105e8..113cf42 100644
--- a/src/lp/field.hpp
+++ b/ndn-cxx/lp/field.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/fields.hpp b/ndn-cxx/lp/fields.hpp
similarity index 100%
rename from src/lp/fields.hpp
rename to ndn-cxx/lp/fields.hpp
diff --git a/src/lp/nack-header.cpp b/ndn-cxx/lp/nack-header.cpp
similarity index 97%
rename from src/lp/nack-header.cpp
rename to ndn-cxx/lp/nack-header.cpp
index f289c86..e593e54 100644
--- a/src/lp/nack-header.cpp
+++ b/ndn-cxx/lp/nack-header.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/nack-header.hpp b/ndn-cxx/lp/nack-header.hpp
similarity index 97%
rename from src/lp/nack-header.hpp
rename to ndn-cxx/lp/nack-header.hpp
index e4b8c14..cc03e4f 100644
--- a/src/lp/nack-header.hpp
+++ b/ndn-cxx/lp/nack-header.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/nack.cpp b/ndn-cxx/lp/nack.cpp
similarity index 94%
rename from src/lp/nack.cpp
rename to ndn-cxx/lp/nack.cpp
index 56b183d..e89e5ce 100644
--- a/src/lp/nack.cpp
+++ b/ndn-cxx/lp/nack.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/nack.hpp b/ndn-cxx/lp/nack.hpp
similarity index 96%
rename from src/lp/nack.hpp
rename to ndn-cxx/lp/nack.hpp
index 2a60e64..530e2e9 100644
--- a/src/lp/nack.hpp
+++ b/ndn-cxx/lp/nack.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/packet.cpp b/ndn-cxx/lp/packet.cpp
similarity index 100%
rename from src/lp/packet.cpp
rename to ndn-cxx/lp/packet.cpp
diff --git a/src/lp/packet.hpp b/ndn-cxx/lp/packet.hpp
similarity index 100%
rename from src/lp/packet.hpp
rename to ndn-cxx/lp/packet.hpp
diff --git a/src/lp/prefix-announcement-header.cpp b/ndn-cxx/lp/prefix-announcement-header.cpp
similarity index 100%
rename from src/lp/prefix-announcement-header.cpp
rename to ndn-cxx/lp/prefix-announcement-header.cpp
diff --git a/src/lp/prefix-announcement-header.hpp b/ndn-cxx/lp/prefix-announcement-header.hpp
similarity index 100%
rename from src/lp/prefix-announcement-header.hpp
rename to ndn-cxx/lp/prefix-announcement-header.hpp
diff --git a/src/lp/sequence.hpp b/ndn-cxx/lp/sequence.hpp
similarity index 94%
rename from src/lp/sequence.hpp
rename to ndn-cxx/lp/sequence.hpp
index ccfa1bc..64162bb 100644
--- a/src/lp/sequence.hpp
+++ b/ndn-cxx/lp/sequence.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/lp/tags.hpp b/ndn-cxx/lp/tags.hpp
similarity index 100%
rename from src/lp/tags.hpp
rename to ndn-cxx/lp/tags.hpp
diff --git a/src/lp/tlv.hpp b/ndn-cxx/lp/tlv.hpp
similarity index 100%
rename from src/lp/tlv.hpp
rename to ndn-cxx/lp/tlv.hpp
diff --git a/src/meta-info.cpp b/ndn-cxx/meta-info.cpp
similarity index 100%
rename from src/meta-info.cpp
rename to ndn-cxx/meta-info.cpp
diff --git a/src/meta-info.hpp b/ndn-cxx/meta-info.hpp
similarity index 100%
rename from src/meta-info.hpp
rename to ndn-cxx/meta-info.hpp
diff --git a/src/mgmt/control-parameters.hpp b/ndn-cxx/mgmt/control-parameters.hpp
similarity index 95%
rename from src/mgmt/control-parameters.hpp
rename to ndn-cxx/mgmt/control-parameters.hpp
index 50646a7..b365801 100644
--- a/src/mgmt/control-parameters.hpp
+++ b/ndn-cxx/mgmt/control-parameters.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/control-response.cpp b/ndn-cxx/mgmt/control-response.cpp
similarity index 97%
rename from src/mgmt/control-response.cpp
rename to ndn-cxx/mgmt/control-response.cpp
index 3045783..48264de 100644
--- a/src/mgmt/control-response.cpp
+++ b/ndn-cxx/mgmt/control-response.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/control-response.hpp b/ndn-cxx/mgmt/control-response.hpp
similarity index 100%
rename from src/mgmt/control-response.hpp
rename to ndn-cxx/mgmt/control-response.hpp
diff --git a/src/mgmt/dispatcher.cpp b/ndn-cxx/mgmt/dispatcher.cpp
similarity index 100%
rename from src/mgmt/dispatcher.cpp
rename to ndn-cxx/mgmt/dispatcher.cpp
diff --git a/src/mgmt/dispatcher.hpp b/ndn-cxx/mgmt/dispatcher.hpp
similarity index 100%
rename from src/mgmt/dispatcher.hpp
rename to ndn-cxx/mgmt/dispatcher.hpp
diff --git a/src/mgmt/nfd/channel-status.cpp b/ndn-cxx/mgmt/nfd/channel-status.cpp
similarity index 97%
rename from src/mgmt/nfd/channel-status.cpp
rename to ndn-cxx/mgmt/nfd/channel-status.cpp
index 5fd93b1..121ec4c 100644
--- a/src/mgmt/nfd/channel-status.cpp
+++ b/ndn-cxx/mgmt/nfd/channel-status.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/channel-status.hpp b/ndn-cxx/mgmt/nfd/channel-status.hpp
similarity index 100%
rename from src/mgmt/nfd/channel-status.hpp
rename to ndn-cxx/mgmt/nfd/channel-status.hpp
diff --git a/src/mgmt/nfd/command-options.cpp b/ndn-cxx/mgmt/nfd/command-options.cpp
similarity index 96%
rename from src/mgmt/nfd/command-options.cpp
rename to ndn-cxx/mgmt/nfd/command-options.cpp
index 1a2bf7c..2eb1229 100644
--- a/src/mgmt/nfd/command-options.cpp
+++ b/ndn-cxx/mgmt/nfd/command-options.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/command-options.hpp b/ndn-cxx/mgmt/nfd/command-options.hpp
similarity index 97%
rename from src/mgmt/nfd/command-options.hpp
rename to ndn-cxx/mgmt/nfd/command-options.hpp
index 72cfa1c..b4e6bde 100644
--- a/src/mgmt/nfd/command-options.hpp
+++ b/ndn-cxx/mgmt/nfd/command-options.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/control-command.cpp b/ndn-cxx/mgmt/nfd/control-command.cpp
similarity index 100%
rename from src/mgmt/nfd/control-command.cpp
rename to ndn-cxx/mgmt/nfd/control-command.cpp
diff --git a/src/mgmt/nfd/control-command.hpp b/ndn-cxx/mgmt/nfd/control-command.hpp
similarity index 100%
rename from src/mgmt/nfd/control-command.hpp
rename to ndn-cxx/mgmt/nfd/control-command.hpp
diff --git a/src/mgmt/nfd/control-parameters.cpp b/ndn-cxx/mgmt/nfd/control-parameters.cpp
similarity index 100%
rename from src/mgmt/nfd/control-parameters.cpp
rename to ndn-cxx/mgmt/nfd/control-parameters.cpp
diff --git a/src/mgmt/nfd/control-parameters.hpp b/ndn-cxx/mgmt/nfd/control-parameters.hpp
similarity index 100%
rename from src/mgmt/nfd/control-parameters.hpp
rename to ndn-cxx/mgmt/nfd/control-parameters.hpp
diff --git a/src/mgmt/nfd/control-response.hpp b/ndn-cxx/mgmt/nfd/control-response.hpp
similarity index 94%
rename from src/mgmt/nfd/control-response.hpp
rename to ndn-cxx/mgmt/nfd/control-response.hpp
index 3d9921b..076ff3e 100644
--- a/src/mgmt/nfd/control-response.hpp
+++ b/ndn-cxx/mgmt/nfd/control-response.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/controller.cpp b/ndn-cxx/mgmt/nfd/controller.cpp
similarity index 100%
rename from src/mgmt/nfd/controller.cpp
rename to ndn-cxx/mgmt/nfd/controller.cpp
diff --git a/src/mgmt/nfd/controller.hpp b/ndn-cxx/mgmt/nfd/controller.hpp
similarity index 100%
rename from src/mgmt/nfd/controller.hpp
rename to ndn-cxx/mgmt/nfd/controller.hpp
diff --git a/src/mgmt/nfd/cs-info.cpp b/ndn-cxx/mgmt/nfd/cs-info.cpp
similarity index 100%
rename from src/mgmt/nfd/cs-info.cpp
rename to ndn-cxx/mgmt/nfd/cs-info.cpp
diff --git a/src/mgmt/nfd/cs-info.hpp b/ndn-cxx/mgmt/nfd/cs-info.hpp
similarity index 100%
rename from src/mgmt/nfd/cs-info.hpp
rename to ndn-cxx/mgmt/nfd/cs-info.hpp
diff --git a/src/mgmt/nfd/face-event-notification.cpp b/ndn-cxx/mgmt/nfd/face-event-notification.cpp
similarity index 98%
rename from src/mgmt/nfd/face-event-notification.cpp
rename to ndn-cxx/mgmt/nfd/face-event-notification.cpp
index 653a9d9..1bc6b52 100644
--- a/src/mgmt/nfd/face-event-notification.cpp
+++ b/ndn-cxx/mgmt/nfd/face-event-notification.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/face-event-notification.hpp b/ndn-cxx/mgmt/nfd/face-event-notification.hpp
similarity index 97%
rename from src/mgmt/nfd/face-event-notification.hpp
rename to ndn-cxx/mgmt/nfd/face-event-notification.hpp
index c933fbf..77db59f 100644
--- a/src/mgmt/nfd/face-event-notification.hpp
+++ b/ndn-cxx/mgmt/nfd/face-event-notification.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/face-monitor.cpp b/ndn-cxx/mgmt/nfd/face-monitor.cpp
similarity index 95%
rename from src/mgmt/nfd/face-monitor.cpp
rename to ndn-cxx/mgmt/nfd/face-monitor.cpp
index 1331b09..85a3eca 100644
--- a/src/mgmt/nfd/face-monitor.cpp
+++ b/ndn-cxx/mgmt/nfd/face-monitor.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017 Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/src/mgmt/nfd/face-monitor.hpp b/ndn-cxx/mgmt/nfd/face-monitor.hpp
similarity index 96%
rename from src/mgmt/nfd/face-monitor.hpp
rename to ndn-cxx/mgmt/nfd/face-monitor.hpp
index 430172b..acc6f03 100644
--- a/src/mgmt/nfd/face-monitor.hpp
+++ b/ndn-cxx/mgmt/nfd/face-monitor.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017 Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/src/mgmt/nfd/face-query-filter.cpp b/ndn-cxx/mgmt/nfd/face-query-filter.cpp
similarity index 98%
rename from src/mgmt/nfd/face-query-filter.cpp
rename to ndn-cxx/mgmt/nfd/face-query-filter.cpp
index 5204aa9..f4bac46 100644
--- a/src/mgmt/nfd/face-query-filter.cpp
+++ b/ndn-cxx/mgmt/nfd/face-query-filter.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/face-query-filter.hpp b/ndn-cxx/mgmt/nfd/face-query-filter.hpp
similarity index 100%
rename from src/mgmt/nfd/face-query-filter.hpp
rename to ndn-cxx/mgmt/nfd/face-query-filter.hpp
diff --git a/src/mgmt/nfd/face-status.cpp b/ndn-cxx/mgmt/nfd/face-status.cpp
similarity index 100%
rename from src/mgmt/nfd/face-status.cpp
rename to ndn-cxx/mgmt/nfd/face-status.cpp
diff --git a/src/mgmt/nfd/face-status.hpp b/ndn-cxx/mgmt/nfd/face-status.hpp
similarity index 100%
rename from src/mgmt/nfd/face-status.hpp
rename to ndn-cxx/mgmt/nfd/face-status.hpp
diff --git a/src/mgmt/nfd/face-traits.hpp b/ndn-cxx/mgmt/nfd/face-traits.hpp
similarity index 100%
rename from src/mgmt/nfd/face-traits.hpp
rename to ndn-cxx/mgmt/nfd/face-traits.hpp
diff --git a/src/mgmt/nfd/fib-entry.cpp b/ndn-cxx/mgmt/nfd/fib-entry.cpp
similarity index 98%
rename from src/mgmt/nfd/fib-entry.cpp
rename to ndn-cxx/mgmt/nfd/fib-entry.cpp
index ef47f6a..b3792c8 100644
--- a/src/mgmt/nfd/fib-entry.cpp
+++ b/ndn-cxx/mgmt/nfd/fib-entry.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/fib-entry.hpp b/ndn-cxx/mgmt/nfd/fib-entry.hpp
similarity index 100%
rename from src/mgmt/nfd/fib-entry.hpp
rename to ndn-cxx/mgmt/nfd/fib-entry.hpp
diff --git a/src/mgmt/nfd/forwarder-status.cpp b/ndn-cxx/mgmt/nfd/forwarder-status.cpp
similarity index 100%
rename from src/mgmt/nfd/forwarder-status.cpp
rename to ndn-cxx/mgmt/nfd/forwarder-status.cpp
diff --git a/src/mgmt/nfd/forwarder-status.hpp b/ndn-cxx/mgmt/nfd/forwarder-status.hpp
similarity index 100%
rename from src/mgmt/nfd/forwarder-status.hpp
rename to ndn-cxx/mgmt/nfd/forwarder-status.hpp
diff --git a/src/mgmt/nfd/rib-entry.cpp b/ndn-cxx/mgmt/nfd/rib-entry.cpp
similarity index 98%
rename from src/mgmt/nfd/rib-entry.cpp
rename to ndn-cxx/mgmt/nfd/rib-entry.cpp
index c4c2d82..ac10aed 100644
--- a/src/mgmt/nfd/rib-entry.cpp
+++ b/ndn-cxx/mgmt/nfd/rib-entry.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/rib-entry.hpp b/ndn-cxx/mgmt/nfd/rib-entry.hpp
similarity index 100%
rename from src/mgmt/nfd/rib-entry.hpp
rename to ndn-cxx/mgmt/nfd/rib-entry.hpp
diff --git a/src/mgmt/nfd/route-flags-traits.hpp b/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
similarity index 88%
rename from src/mgmt/nfd/route-flags-traits.hpp
rename to ndn-cxx/mgmt/nfd/route-flags-traits.hpp
index 08bf86a..4e58ba7 100644
--- a/src/mgmt/nfd/route-flags-traits.hpp
+++ b/ndn-cxx/mgmt/nfd/route-flags-traits.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_MGMT_NFD_RIB_FLAGS_HPP
-#define NDN_MGMT_NFD_RIB_FLAGS_HPP
+#ifndef NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
+#define NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
 
 #include "../../encoding/nfd-constants.hpp"
 
@@ -57,4 +57,4 @@
 } // namespace nfd
 } // namespace ndn
 
-#endif // NDN_MGMT_NFD_RIB_FLAGS_HPP
+#endif // NDN_MGMT_NFD_ROUTE_FLAGS_TRAITS_HPP
diff --git a/src/mgmt/nfd/status-dataset.cpp b/ndn-cxx/mgmt/nfd/status-dataset.cpp
similarity index 100%
rename from src/mgmt/nfd/status-dataset.cpp
rename to ndn-cxx/mgmt/nfd/status-dataset.cpp
diff --git a/src/mgmt/nfd/status-dataset.hpp b/ndn-cxx/mgmt/nfd/status-dataset.hpp
similarity index 100%
rename from src/mgmt/nfd/status-dataset.hpp
rename to ndn-cxx/mgmt/nfd/status-dataset.hpp
diff --git a/src/mgmt/nfd/strategy-choice.cpp b/ndn-cxx/mgmt/nfd/strategy-choice.cpp
similarity index 97%
rename from src/mgmt/nfd/strategy-choice.cpp
rename to ndn-cxx/mgmt/nfd/strategy-choice.cpp
index e0496d6..aaa5924 100644
--- a/src/mgmt/nfd/strategy-choice.cpp
+++ b/ndn-cxx/mgmt/nfd/strategy-choice.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/mgmt/nfd/strategy-choice.hpp b/ndn-cxx/mgmt/nfd/strategy-choice.hpp
similarity index 100%
rename from src/mgmt/nfd/strategy-choice.hpp
rename to ndn-cxx/mgmt/nfd/strategy-choice.hpp
diff --git a/src/mgmt/status-dataset-context.cpp b/ndn-cxx/mgmt/status-dataset-context.cpp
similarity index 100%
rename from src/mgmt/status-dataset-context.cpp
rename to ndn-cxx/mgmt/status-dataset-context.cpp
diff --git a/src/mgmt/status-dataset-context.hpp b/ndn-cxx/mgmt/status-dataset-context.hpp
similarity index 98%
rename from src/mgmt/status-dataset-context.hpp
rename to ndn-cxx/mgmt/status-dataset-context.hpp
index 42ad0c1..8cb80e6 100644
--- a/src/mgmt/status-dataset-context.hpp
+++ b/ndn-cxx/mgmt/status-dataset-context.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/name-component.cpp b/ndn-cxx/name-component.cpp
similarity index 100%
rename from src/name-component.cpp
rename to ndn-cxx/name-component.cpp
diff --git a/src/name-component.hpp b/ndn-cxx/name-component.hpp
similarity index 100%
rename from src/name-component.hpp
rename to ndn-cxx/name-component.hpp
diff --git a/src/name.cpp b/ndn-cxx/name.cpp
similarity index 100%
rename from src/name.cpp
rename to ndn-cxx/name.cpp
diff --git a/src/name.hpp b/ndn-cxx/name.hpp
similarity index 100%
rename from src/name.hpp
rename to ndn-cxx/name.hpp
diff --git a/src/net/asio-fwd.hpp b/ndn-cxx/net/asio-fwd.hpp
similarity index 100%
rename from src/net/asio-fwd.hpp
rename to ndn-cxx/net/asio-fwd.hpp
diff --git a/src/net/detail/link-type-helper-osx.mm b/ndn-cxx/net/detail/link-type-helper-osx.mm
similarity index 96%
rename from src/net/detail/link-type-helper-osx.mm
rename to ndn-cxx/net/detail/link-type-helper-osx.mm
index c45fa04..fe78151 100644
--- a/src/net/detail/link-type-helper-osx.mm
+++ b/ndn-cxx/net/detail/link-type-helper-osx.mm
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/detail/link-type-helper.cpp b/ndn-cxx/net/detail/link-type-helper.cpp
similarity index 94%
rename from src/net/detail/link-type-helper.cpp
rename to ndn-cxx/net/detail/link-type-helper.cpp
index 36d51de..97c1f8c 100644
--- a/src/net/detail/link-type-helper.cpp
+++ b/ndn-cxx/net/detail/link-type-helper.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/detail/link-type-helper.hpp b/ndn-cxx/net/detail/link-type-helper.hpp
similarity index 94%
rename from src/net/detail/link-type-helper.hpp
rename to ndn-cxx/net/detail/link-type-helper.hpp
index 9512f31..6c38c35 100644
--- a/src/net/detail/link-type-helper.hpp
+++ b/ndn-cxx/net/detail/link-type-helper.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/detail/linux-if-constants.cpp b/ndn-cxx/net/detail/linux-if-constants.cpp
similarity index 96%
rename from src/net/detail/linux-if-constants.cpp
rename to ndn-cxx/net/detail/linux-if-constants.cpp
index dbcf54b..c04c864 100644
--- a/src/net/detail/linux-if-constants.cpp
+++ b/ndn-cxx/net/detail/linux-if-constants.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/detail/linux-if-constants.hpp b/ndn-cxx/net/detail/linux-if-constants.hpp
similarity index 96%
rename from src/net/detail/linux-if-constants.hpp
rename to ndn-cxx/net/detail/linux-if-constants.hpp
index 0670e70..1bfece7 100644
--- a/src/net/detail/linux-if-constants.hpp
+++ b/ndn-cxx/net/detail/linux-if-constants.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/detail/netlink-message.hpp b/ndn-cxx/net/detail/netlink-message.hpp
similarity index 100%
rename from src/net/detail/netlink-message.hpp
rename to ndn-cxx/net/detail/netlink-message.hpp
diff --git a/src/net/detail/netlink-socket.cpp b/ndn-cxx/net/detail/netlink-socket.cpp
similarity index 100%
rename from src/net/detail/netlink-socket.cpp
rename to ndn-cxx/net/detail/netlink-socket.cpp
diff --git a/src/net/detail/netlink-socket.hpp b/ndn-cxx/net/detail/netlink-socket.hpp
similarity index 100%
rename from src/net/detail/netlink-socket.hpp
rename to ndn-cxx/net/detail/netlink-socket.hpp
diff --git a/src/net/detail/network-monitor-impl-netlink.cpp b/ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
similarity index 100%
rename from src/net/detail/network-monitor-impl-netlink.cpp
rename to ndn-cxx/net/detail/network-monitor-impl-netlink.cpp
diff --git a/src/net/detail/network-monitor-impl-netlink.hpp b/ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
similarity index 100%
rename from src/net/detail/network-monitor-impl-netlink.hpp
rename to ndn-cxx/net/detail/network-monitor-impl-netlink.hpp
diff --git a/src/net/detail/network-monitor-impl-noop.hpp b/ndn-cxx/net/detail/network-monitor-impl-noop.hpp
similarity index 100%
rename from src/net/detail/network-monitor-impl-noop.hpp
rename to ndn-cxx/net/detail/network-monitor-impl-noop.hpp
diff --git a/src/net/detail/network-monitor-impl-osx.cpp b/ndn-cxx/net/detail/network-monitor-impl-osx.cpp
similarity index 100%
rename from src/net/detail/network-monitor-impl-osx.cpp
rename to ndn-cxx/net/detail/network-monitor-impl-osx.cpp
diff --git a/src/net/detail/network-monitor-impl-osx.hpp b/ndn-cxx/net/detail/network-monitor-impl-osx.hpp
similarity index 100%
rename from src/net/detail/network-monitor-impl-osx.hpp
rename to ndn-cxx/net/detail/network-monitor-impl-osx.hpp
diff --git a/src/net/dns.cpp b/ndn-cxx/net/dns.cpp
similarity index 100%
rename from src/net/dns.cpp
rename to ndn-cxx/net/dns.cpp
diff --git a/src/net/dns.hpp b/ndn-cxx/net/dns.hpp
similarity index 100%
rename from src/net/dns.hpp
rename to ndn-cxx/net/dns.hpp
diff --git a/src/net/ethernet.cpp b/ndn-cxx/net/ethernet.cpp
similarity index 98%
rename from src/net/ethernet.cpp
rename to ndn-cxx/net/ethernet.cpp
index 4cda2cc..cfd4b9e 100644
--- a/src/net/ethernet.cpp
+++ b/ndn-cxx/net/ethernet.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2017 Regents of the University of California,
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/src/net/ethernet.hpp b/ndn-cxx/net/ethernet.hpp
similarity index 97%
rename from src/net/ethernet.hpp
rename to ndn-cxx/net/ethernet.hpp
index d4b8f47..f5485da 100644
--- a/src/net/ethernet.hpp
+++ b/ndn-cxx/net/ethernet.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017 Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/src/net/face-uri.cpp b/ndn-cxx/net/face-uri.cpp
similarity index 100%
rename from src/net/face-uri.cpp
rename to ndn-cxx/net/face-uri.cpp
diff --git a/src/net/face-uri.hpp b/ndn-cxx/net/face-uri.hpp
similarity index 98%
rename from src/net/face-uri.hpp
rename to ndn-cxx/net/face-uri.hpp
index 7461576..75bb9a3 100644
--- a/src/net/face-uri.hpp
+++ b/ndn-cxx/net/face-uri.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California,
+ * Copyright (c) 2013-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/src/net/network-address.cpp b/ndn-cxx/net/network-address.cpp
similarity index 96%
rename from src/net/network-address.cpp
rename to ndn-cxx/net/network-address.cpp
index 748cd00..20e1d85 100644
--- a/src/net/network-address.cpp
+++ b/ndn-cxx/net/network-address.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/network-address.hpp b/ndn-cxx/net/network-address.hpp
similarity index 97%
rename from src/net/network-address.hpp
rename to ndn-cxx/net/network-address.hpp
index fc13c22..f0e801a 100644
--- a/src/net/network-address.hpp
+++ b/ndn-cxx/net/network-address.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/network-interface.cpp b/ndn-cxx/net/network-interface.cpp
similarity index 98%
rename from src/net/network-interface.cpp
rename to ndn-cxx/net/network-interface.cpp
index a03d850..b979769 100644
--- a/src/net/network-interface.cpp
+++ b/ndn-cxx/net/network-interface.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/network-interface.hpp b/ndn-cxx/net/network-interface.hpp
similarity index 98%
rename from src/net/network-interface.hpp
rename to ndn-cxx/net/network-interface.hpp
index b58072f..994756b 100644
--- a/src/net/network-interface.hpp
+++ b/ndn-cxx/net/network-interface.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/network-monitor-stub.cpp b/ndn-cxx/net/network-monitor-stub.cpp
similarity index 97%
rename from src/net/network-monitor-stub.cpp
rename to ndn-cxx/net/network-monitor-stub.cpp
index 9c3425b..636bc52 100644
--- a/src/net/network-monitor-stub.cpp
+++ b/ndn-cxx/net/network-monitor-stub.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/network-monitor-stub.hpp b/ndn-cxx/net/network-monitor-stub.hpp
similarity index 97%
rename from src/net/network-monitor-stub.hpp
rename to ndn-cxx/net/network-monitor-stub.hpp
index 97b9d46..441d3a2 100644
--- a/src/net/network-monitor-stub.hpp
+++ b/ndn-cxx/net/network-monitor-stub.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/net/network-monitor.cpp b/ndn-cxx/net/network-monitor.cpp
similarity index 100%
rename from src/net/network-monitor.cpp
rename to ndn-cxx/net/network-monitor.cpp
diff --git a/src/net/network-monitor.hpp b/ndn-cxx/net/network-monitor.hpp
similarity index 100%
rename from src/net/network-monitor.hpp
rename to ndn-cxx/net/network-monitor.hpp
diff --git a/src/packet-base.cpp b/ndn-cxx/packet-base.cpp
similarity index 95%
rename from src/packet-base.cpp
rename to ndn-cxx/packet-base.cpp
index 173a8d9..31540c9 100644
--- a/src/packet-base.cpp
+++ b/ndn-cxx/packet-base.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/packet-base.hpp b/ndn-cxx/packet-base.hpp
similarity index 95%
rename from src/packet-base.hpp
rename to ndn-cxx/packet-base.hpp
index ff76732..f815de2 100644
--- a/src/packet-base.hpp
+++ b/ndn-cxx/packet-base.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/prefix-announcement.cpp b/ndn-cxx/prefix-announcement.cpp
similarity index 100%
rename from src/prefix-announcement.cpp
rename to ndn-cxx/prefix-announcement.cpp
diff --git a/src/prefix-announcement.hpp b/ndn-cxx/prefix-announcement.hpp
similarity index 100%
rename from src/prefix-announcement.hpp
rename to ndn-cxx/prefix-announcement.hpp
diff --git a/src/security/command-interest-signer.cpp b/ndn-cxx/security/command-interest-signer.cpp
similarity index 100%
rename from src/security/command-interest-signer.cpp
rename to ndn-cxx/security/command-interest-signer.cpp
diff --git a/src/security/command-interest-signer.hpp b/ndn-cxx/security/command-interest-signer.hpp
similarity index 97%
rename from src/security/command-interest-signer.hpp
rename to ndn-cxx/security/command-interest-signer.hpp
index 730260d..e170117 100644
--- a/src/security/command-interest-signer.hpp
+++ b/ndn-cxx/security/command-interest-signer.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/detail/openssl-helper.cpp b/ndn-cxx/security/detail/openssl-helper.cpp
similarity index 100%
rename from src/security/detail/openssl-helper.cpp
rename to ndn-cxx/security/detail/openssl-helper.cpp
diff --git a/src/security/detail/openssl-helper.hpp b/ndn-cxx/security/detail/openssl-helper.hpp
similarity index 96%
rename from src/security/detail/openssl-helper.hpp
rename to ndn-cxx/security/detail/openssl-helper.hpp
index 58690ca..18ecd1d 100644
--- a/src/security/detail/openssl-helper.hpp
+++ b/ndn-cxx/security/detail/openssl-helper.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/detail/openssl.hpp b/ndn-cxx/security/detail/openssl.hpp
similarity index 100%
rename from src/security/detail/openssl.hpp
rename to ndn-cxx/security/detail/openssl.hpp
diff --git a/src/security/digest-sha256.cpp b/ndn-cxx/security/digest-sha256.cpp
similarity index 95%
rename from src/security/digest-sha256.cpp
rename to ndn-cxx/security/digest-sha256.cpp
index 3c8867c..cba1c04 100644
--- a/src/security/digest-sha256.cpp
+++ b/ndn-cxx/security/digest-sha256.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/digest-sha256.hpp b/ndn-cxx/security/digest-sha256.hpp
similarity index 96%
rename from src/security/digest-sha256.hpp
rename to ndn-cxx/security/digest-sha256.hpp
index fe226d8..d2276d6 100644
--- a/src/security/digest-sha256.hpp
+++ b/ndn-cxx/security/digest-sha256.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/key-chain.hpp b/ndn-cxx/security/key-chain.hpp
similarity index 94%
rename from src/security/key-chain.hpp
rename to ndn-cxx/security/key-chain.hpp
index 2bd847b..63f410b 100644
--- a/src/security/key-chain.hpp
+++ b/ndn-cxx/security/key-chain.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/key-params.cpp b/ndn-cxx/security/key-params.cpp
similarity index 100%
rename from src/security/key-params.cpp
rename to ndn-cxx/security/key-params.cpp
diff --git a/src/security/key-params.hpp b/ndn-cxx/security/key-params.hpp
similarity index 100%
rename from src/security/key-params.hpp
rename to ndn-cxx/security/key-params.hpp
diff --git a/src/security/pib/certificate-container.cpp b/ndn-cxx/security/pib/certificate-container.cpp
similarity index 98%
rename from src/security/pib/certificate-container.cpp
rename to ndn-cxx/security/pib/certificate-container.cpp
index a671cb0..f3fe411 100644
--- a/src/security/pib/certificate-container.cpp
+++ b/ndn-cxx/security/pib/certificate-container.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/certificate-container.hpp b/ndn-cxx/security/pib/certificate-container.hpp
similarity index 100%
rename from src/security/pib/certificate-container.hpp
rename to ndn-cxx/security/pib/certificate-container.hpp
diff --git a/src/security/pib/detail/identity-impl.cpp b/ndn-cxx/security/pib/detail/identity-impl.cpp
similarity index 97%
rename from src/security/pib/detail/identity-impl.cpp
rename to ndn-cxx/security/pib/detail/identity-impl.cpp
index 45b07b0..3397534 100644
--- a/src/security/pib/detail/identity-impl.cpp
+++ b/ndn-cxx/security/pib/detail/identity-impl.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/detail/identity-impl.hpp b/ndn-cxx/security/pib/detail/identity-impl.hpp
similarity index 98%
rename from src/security/pib/detail/identity-impl.hpp
rename to ndn-cxx/security/pib/detail/identity-impl.hpp
index b4823a1..f9c4d3f 100644
--- a/src/security/pib/detail/identity-impl.hpp
+++ b/ndn-cxx/security/pib/detail/identity-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/detail/key-impl.cpp b/ndn-cxx/security/pib/detail/key-impl.cpp
similarity index 98%
rename from src/security/pib/detail/key-impl.cpp
rename to ndn-cxx/security/pib/detail/key-impl.cpp
index c4c65c2..f36967d 100644
--- a/src/security/pib/detail/key-impl.cpp
+++ b/ndn-cxx/security/pib/detail/key-impl.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/detail/key-impl.hpp b/ndn-cxx/security/pib/detail/key-impl.hpp
similarity index 98%
rename from src/security/pib/detail/key-impl.hpp
rename to ndn-cxx/security/pib/detail/key-impl.hpp
index c889a76..12fcc48 100644
--- a/src/security/pib/detail/key-impl.hpp
+++ b/ndn-cxx/security/pib/detail/key-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/identity-container.cpp b/ndn-cxx/security/pib/identity-container.cpp
similarity index 100%
rename from src/security/pib/identity-container.cpp
rename to ndn-cxx/security/pib/identity-container.cpp
diff --git a/src/security/pib/identity-container.hpp b/ndn-cxx/security/pib/identity-container.hpp
similarity index 100%
rename from src/security/pib/identity-container.hpp
rename to ndn-cxx/security/pib/identity-container.hpp
diff --git a/src/security/pib/identity.cpp b/ndn-cxx/security/pib/identity.cpp
similarity index 97%
rename from src/security/pib/identity.cpp
rename to ndn-cxx/security/pib/identity.cpp
index 3239ac3..c46b683 100644
--- a/src/security/pib/identity.cpp
+++ b/ndn-cxx/security/pib/identity.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/identity.hpp b/ndn-cxx/security/pib/identity.hpp
similarity index 98%
rename from src/security/pib/identity.hpp
rename to ndn-cxx/security/pib/identity.hpp
index 7c9f714..34a41bb 100644
--- a/src/security/pib/identity.hpp
+++ b/ndn-cxx/security/pib/identity.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/key-container.cpp b/ndn-cxx/security/pib/key-container.cpp
similarity index 100%
rename from src/security/pib/key-container.cpp
rename to ndn-cxx/security/pib/key-container.cpp
diff --git a/src/security/pib/key-container.hpp b/ndn-cxx/security/pib/key-container.hpp
similarity index 100%
rename from src/security/pib/key-container.hpp
rename to ndn-cxx/security/pib/key-container.hpp
diff --git a/src/security/pib/key.cpp b/ndn-cxx/security/pib/key.cpp
similarity index 97%
rename from src/security/pib/key.cpp
rename to ndn-cxx/security/pib/key.cpp
index efb7df5..8577768 100644
--- a/src/security/pib/key.cpp
+++ b/ndn-cxx/security/pib/key.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/key.hpp b/ndn-cxx/security/pib/key.hpp
similarity index 98%
rename from src/security/pib/key.hpp
rename to ndn-cxx/security/pib/key.hpp
index b691960..2f2d975 100644
--- a/src/security/pib/key.hpp
+++ b/ndn-cxx/security/pib/key.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/pib-impl.hpp b/ndn-cxx/security/pib/pib-impl.hpp
similarity index 100%
rename from src/security/pib/pib-impl.hpp
rename to ndn-cxx/security/pib/pib-impl.hpp
diff --git a/src/security/pib/pib-memory.cpp b/ndn-cxx/security/pib/pib-memory.cpp
similarity index 98%
rename from src/security/pib/pib-memory.cpp
rename to ndn-cxx/security/pib/pib-memory.cpp
index 2d6aa7d..0756aec 100644
--- a/src/security/pib/pib-memory.cpp
+++ b/ndn-cxx/security/pib/pib-memory.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/pib-memory.hpp b/ndn-cxx/security/pib/pib-memory.hpp
similarity index 100%
rename from src/security/pib/pib-memory.hpp
rename to ndn-cxx/security/pib/pib-memory.hpp
diff --git a/src/security/pib/pib-sqlite3.cpp b/ndn-cxx/security/pib/pib-sqlite3.cpp
similarity index 99%
rename from src/security/pib/pib-sqlite3.cpp
rename to ndn-cxx/security/pib/pib-sqlite3.cpp
index 238a0f8..e14d7a4 100644
--- a/src/security/pib/pib-sqlite3.cpp
+++ b/ndn-cxx/security/pib/pib-sqlite3.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/pib-sqlite3.hpp b/ndn-cxx/security/pib/pib-sqlite3.hpp
similarity index 98%
rename from src/security/pib/pib-sqlite3.hpp
rename to ndn-cxx/security/pib/pib-sqlite3.hpp
index d27dab6..30f0402 100644
--- a/src/security/pib/pib-sqlite3.hpp
+++ b/ndn-cxx/security/pib/pib-sqlite3.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/pib/pib.cpp b/ndn-cxx/security/pib/pib.cpp
similarity index 100%
rename from src/security/pib/pib.cpp
rename to ndn-cxx/security/pib/pib.cpp
diff --git a/src/security/pib/pib.hpp b/ndn-cxx/security/pib/pib.hpp
similarity index 100%
rename from src/security/pib/pib.hpp
rename to ndn-cxx/security/pib/pib.hpp
diff --git a/src/security/safe-bag.cpp b/ndn-cxx/security/safe-bag.cpp
similarity index 97%
rename from src/security/safe-bag.cpp
rename to ndn-cxx/security/safe-bag.cpp
index 4c8a82d..5d24859 100644
--- a/src/security/safe-bag.cpp
+++ b/ndn-cxx/security/safe-bag.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/safe-bag.hpp b/ndn-cxx/security/safe-bag.hpp
similarity index 97%
rename from src/security/safe-bag.hpp
rename to ndn-cxx/security/safe-bag.hpp
index 13a2410..424a541 100644
--- a/src/security/safe-bag.hpp
+++ b/ndn-cxx/security/safe-bag.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/security-common.cpp b/ndn-cxx/security/security-common.cpp
similarity index 100%
rename from src/security/security-common.cpp
rename to ndn-cxx/security/security-common.cpp
diff --git a/src/security/security-common.hpp b/ndn-cxx/security/security-common.hpp
similarity index 100%
rename from src/security/security-common.hpp
rename to ndn-cxx/security/security-common.hpp
diff --git a/src/security/signature-sha256-with-ecdsa.cpp b/ndn-cxx/security/signature-sha256-with-ecdsa.cpp
similarity index 96%
rename from src/security/signature-sha256-with-ecdsa.cpp
rename to ndn-cxx/security/signature-sha256-with-ecdsa.cpp
index bb86839..a66c244 100644
--- a/src/security/signature-sha256-with-ecdsa.cpp
+++ b/ndn-cxx/security/signature-sha256-with-ecdsa.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signature-sha256-with-ecdsa.hpp b/ndn-cxx/security/signature-sha256-with-ecdsa.hpp
similarity index 96%
rename from src/security/signature-sha256-with-ecdsa.hpp
rename to ndn-cxx/security/signature-sha256-with-ecdsa.hpp
index c75ffc9..1f2da4f 100644
--- a/src/security/signature-sha256-with-ecdsa.hpp
+++ b/ndn-cxx/security/signature-sha256-with-ecdsa.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signature-sha256-with-rsa.cpp b/ndn-cxx/security/signature-sha256-with-rsa.cpp
similarity index 96%
rename from src/security/signature-sha256-with-rsa.cpp
rename to ndn-cxx/security/signature-sha256-with-rsa.cpp
index 97946f8..f182d92 100644
--- a/src/security/signature-sha256-with-rsa.cpp
+++ b/ndn-cxx/security/signature-sha256-with-rsa.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signature-sha256-with-rsa.hpp b/ndn-cxx/security/signature-sha256-with-rsa.hpp
similarity index 96%
rename from src/security/signature-sha256-with-rsa.hpp
rename to ndn-cxx/security/signature-sha256-with-rsa.hpp
index 2466018..2f0dd94 100644
--- a/src/security/signature-sha256-with-rsa.hpp
+++ b/ndn-cxx/security/signature-sha256-with-rsa.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signing-helpers.cpp b/ndn-cxx/security/signing-helpers.cpp
similarity index 96%
rename from src/security/signing-helpers.cpp
rename to ndn-cxx/security/signing-helpers.cpp
index 4011623..081b3a6 100644
--- a/src/security/signing-helpers.cpp
+++ b/ndn-cxx/security/signing-helpers.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signing-helpers.hpp b/ndn-cxx/security/signing-helpers.hpp
similarity index 96%
rename from src/security/signing-helpers.hpp
rename to ndn-cxx/security/signing-helpers.hpp
index 8a01597..ad18d4d 100644
--- a/src/security/signing-helpers.hpp
+++ b/ndn-cxx/security/signing-helpers.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signing-info.cpp b/ndn-cxx/security/signing-info.cpp
similarity index 98%
rename from src/security/signing-info.cpp
rename to ndn-cxx/security/signing-info.cpp
index ec17cda..dba168b 100644
--- a/src/security/signing-info.cpp
+++ b/ndn-cxx/security/signing-info.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/signing-info.hpp b/ndn-cxx/security/signing-info.hpp
similarity index 100%
rename from src/security/signing-info.hpp
rename to ndn-cxx/security/signing-info.hpp
diff --git a/src/security/tpm/back-end-file.cpp b/ndn-cxx/security/tpm/back-end-file.cpp
similarity index 100%
rename from src/security/tpm/back-end-file.cpp
rename to ndn-cxx/security/tpm/back-end-file.cpp
diff --git a/src/security/tpm/back-end-file.hpp b/ndn-cxx/security/tpm/back-end-file.hpp
similarity index 100%
rename from src/security/tpm/back-end-file.hpp
rename to ndn-cxx/security/tpm/back-end-file.hpp
diff --git a/src/security/tpm/back-end-mem.cpp b/ndn-cxx/security/tpm/back-end-mem.cpp
similarity index 100%
rename from src/security/tpm/back-end-mem.cpp
rename to ndn-cxx/security/tpm/back-end-mem.cpp
diff --git a/src/security/tpm/back-end-mem.hpp b/ndn-cxx/security/tpm/back-end-mem.hpp
similarity index 100%
rename from src/security/tpm/back-end-mem.hpp
rename to ndn-cxx/security/tpm/back-end-mem.hpp
diff --git a/src/security/tpm/back-end-osx.cpp b/ndn-cxx/security/tpm/back-end-osx.cpp
similarity index 100%
rename from src/security/tpm/back-end-osx.cpp
rename to ndn-cxx/security/tpm/back-end-osx.cpp
diff --git a/src/security/tpm/back-end-osx.hpp b/ndn-cxx/security/tpm/back-end-osx.hpp
similarity index 100%
rename from src/security/tpm/back-end-osx.hpp
rename to ndn-cxx/security/tpm/back-end-osx.hpp
diff --git a/src/security/tpm/back-end.cpp b/ndn-cxx/security/tpm/back-end.cpp
similarity index 98%
rename from src/security/tpm/back-end.cpp
rename to ndn-cxx/security/tpm/back-end.cpp
index f15962c..22ccf76 100644
--- a/src/security/tpm/back-end.cpp
+++ b/ndn-cxx/security/tpm/back-end.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/tpm/back-end.hpp b/ndn-cxx/security/tpm/back-end.hpp
similarity index 100%
rename from src/security/tpm/back-end.hpp
rename to ndn-cxx/security/tpm/back-end.hpp
diff --git a/src/security/tpm/key-handle-mem.cpp b/ndn-cxx/security/tpm/key-handle-mem.cpp
similarity index 96%
rename from src/security/tpm/key-handle-mem.cpp
rename to ndn-cxx/security/tpm/key-handle-mem.cpp
index d9fb590..d04379b 100644
--- a/src/security/tpm/key-handle-mem.cpp
+++ b/ndn-cxx/security/tpm/key-handle-mem.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/tpm/key-handle-mem.hpp b/ndn-cxx/security/tpm/key-handle-mem.hpp
similarity index 96%
rename from src/security/tpm/key-handle-mem.hpp
rename to ndn-cxx/security/tpm/key-handle-mem.hpp
index 006c4ec..c5baf27 100644
--- a/src/security/tpm/key-handle-mem.hpp
+++ b/ndn-cxx/security/tpm/key-handle-mem.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/tpm/key-handle-osx.cpp b/ndn-cxx/security/tpm/key-handle-osx.cpp
similarity index 96%
rename from src/security/tpm/key-handle-osx.cpp
rename to ndn-cxx/security/tpm/key-handle-osx.cpp
index 05e7023..64e5c37 100644
--- a/src/security/tpm/key-handle-osx.cpp
+++ b/ndn-cxx/security/tpm/key-handle-osx.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/tpm/key-handle-osx.hpp b/ndn-cxx/security/tpm/key-handle-osx.hpp
similarity index 100%
rename from src/security/tpm/key-handle-osx.hpp
rename to ndn-cxx/security/tpm/key-handle-osx.hpp
diff --git a/src/security/tpm/key-handle.cpp b/ndn-cxx/security/tpm/key-handle.cpp
similarity index 95%
rename from src/security/tpm/key-handle.cpp
rename to ndn-cxx/security/tpm/key-handle.cpp
index 70553b4..9936574 100644
--- a/src/security/tpm/key-handle.cpp
+++ b/ndn-cxx/security/tpm/key-handle.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/tpm/key-handle.hpp b/ndn-cxx/security/tpm/key-handle.hpp
similarity index 100%
rename from src/security/tpm/key-handle.hpp
rename to ndn-cxx/security/tpm/key-handle.hpp
diff --git a/src/security/tpm/key-ref-osx.hpp b/ndn-cxx/security/tpm/key-ref-osx.hpp
similarity index 100%
rename from src/security/tpm/key-ref-osx.hpp
rename to ndn-cxx/security/tpm/key-ref-osx.hpp
diff --git a/src/security/tpm/tpm.cpp b/ndn-cxx/security/tpm/tpm.cpp
similarity index 98%
rename from src/security/tpm/tpm.cpp
rename to ndn-cxx/security/tpm/tpm.cpp
index d72440b..20c6560 100644
--- a/src/security/tpm/tpm.cpp
+++ b/ndn-cxx/security/tpm/tpm.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/tpm/tpm.hpp b/ndn-cxx/security/tpm/tpm.hpp
similarity index 100%
rename from src/security/tpm/tpm.hpp
rename to ndn-cxx/security/tpm/tpm.hpp
diff --git a/src/security/transform.hpp b/ndn-cxx/security/transform.hpp
similarity index 96%
rename from src/security/transform.hpp
rename to ndn-cxx/security/transform.hpp
index bc38619..08b0ae5 100644
--- a/src/security/transform.hpp
+++ b/ndn-cxx/security/transform.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/base64-decode.cpp b/ndn-cxx/security/transform/base64-decode.cpp
similarity index 97%
rename from src/security/transform/base64-decode.cpp
rename to ndn-cxx/security/transform/base64-decode.cpp
index 5033b63..1a75acd 100644
--- a/src/security/transform/base64-decode.cpp
+++ b/ndn-cxx/security/transform/base64-decode.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/base64-decode.hpp b/ndn-cxx/security/transform/base64-decode.hpp
similarity index 97%
rename from src/security/transform/base64-decode.hpp
rename to ndn-cxx/security/transform/base64-decode.hpp
index 203716f..47acaed 100644
--- a/src/security/transform/base64-decode.hpp
+++ b/ndn-cxx/security/transform/base64-decode.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/base64-encode.cpp b/ndn-cxx/security/transform/base64-encode.cpp
similarity index 97%
rename from src/security/transform/base64-encode.cpp
rename to ndn-cxx/security/transform/base64-encode.cpp
index d9a8a7a..554a7b8 100644
--- a/src/security/transform/base64-encode.cpp
+++ b/ndn-cxx/security/transform/base64-encode.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/base64-encode.hpp b/ndn-cxx/security/transform/base64-encode.hpp
similarity index 97%
rename from src/security/transform/base64-encode.hpp
rename to ndn-cxx/security/transform/base64-encode.hpp
index 34ad577..f8874f5 100644
--- a/src/security/transform/base64-encode.hpp
+++ b/ndn-cxx/security/transform/base64-encode.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/block-cipher.cpp b/ndn-cxx/security/transform/block-cipher.cpp
similarity index 98%
rename from src/security/transform/block-cipher.cpp
rename to ndn-cxx/security/transform/block-cipher.cpp
index 678a161..748504e 100644
--- a/src/security/transform/block-cipher.cpp
+++ b/ndn-cxx/security/transform/block-cipher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/block-cipher.hpp b/ndn-cxx/security/transform/block-cipher.hpp
similarity index 97%
rename from src/security/transform/block-cipher.hpp
rename to ndn-cxx/security/transform/block-cipher.hpp
index feb7827..92b8140 100644
--- a/src/security/transform/block-cipher.hpp
+++ b/ndn-cxx/security/transform/block-cipher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/bool-sink.cpp b/ndn-cxx/security/transform/bool-sink.cpp
similarity index 95%
rename from src/security/transform/bool-sink.cpp
rename to ndn-cxx/security/transform/bool-sink.cpp
index 1c45c76..02fddd3 100644
--- a/src/security/transform/bool-sink.cpp
+++ b/ndn-cxx/security/transform/bool-sink.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/bool-sink.hpp b/ndn-cxx/security/transform/bool-sink.hpp
similarity index 96%
rename from src/security/transform/bool-sink.hpp
rename to ndn-cxx/security/transform/bool-sink.hpp
index d7d02e3..9214cd0 100644
--- a/src/security/transform/bool-sink.hpp
+++ b/ndn-cxx/security/transform/bool-sink.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/buffer-source.cpp b/ndn-cxx/security/transform/buffer-source.cpp
similarity index 96%
rename from src/security/transform/buffer-source.cpp
rename to ndn-cxx/security/transform/buffer-source.cpp
index 3f45c85..dfa9651 100644
--- a/src/security/transform/buffer-source.cpp
+++ b/ndn-cxx/security/transform/buffer-source.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/buffer-source.hpp b/ndn-cxx/security/transform/buffer-source.hpp
similarity index 96%
rename from src/security/transform/buffer-source.hpp
rename to ndn-cxx/security/transform/buffer-source.hpp
index c091d98..0fd0eb8 100644
--- a/src/security/transform/buffer-source.hpp
+++ b/ndn-cxx/security/transform/buffer-source.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/digest-filter.cpp b/ndn-cxx/security/transform/digest-filter.cpp
similarity index 97%
rename from src/security/transform/digest-filter.cpp
rename to ndn-cxx/security/transform/digest-filter.cpp
index 04a2f5c..e70660b 100644
--- a/src/security/transform/digest-filter.cpp
+++ b/ndn-cxx/security/transform/digest-filter.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/digest-filter.hpp b/ndn-cxx/security/transform/digest-filter.hpp
similarity index 96%
rename from src/security/transform/digest-filter.hpp
rename to ndn-cxx/security/transform/digest-filter.hpp
index fe23586..2dcbeb0 100644
--- a/src/security/transform/digest-filter.hpp
+++ b/ndn-cxx/security/transform/digest-filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/hex-decode.cpp b/ndn-cxx/security/transform/hex-decode.cpp
similarity index 98%
rename from src/security/transform/hex-decode.cpp
rename to ndn-cxx/security/transform/hex-decode.cpp
index c887626..86bd3d4 100644
--- a/src/security/transform/hex-decode.cpp
+++ b/ndn-cxx/security/transform/hex-decode.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/hex-decode.hpp b/ndn-cxx/security/transform/hex-decode.hpp
similarity index 96%
rename from src/security/transform/hex-decode.hpp
rename to ndn-cxx/security/transform/hex-decode.hpp
index 5601ca4..7afe583 100644
--- a/src/security/transform/hex-decode.hpp
+++ b/ndn-cxx/security/transform/hex-decode.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/hex-encode.cpp b/ndn-cxx/security/transform/hex-encode.cpp
similarity index 96%
rename from src/security/transform/hex-encode.cpp
rename to ndn-cxx/security/transform/hex-encode.cpp
index 8264eee..9c657f6 100644
--- a/src/security/transform/hex-encode.cpp
+++ b/ndn-cxx/security/transform/hex-encode.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/hex-encode.hpp b/ndn-cxx/security/transform/hex-encode.hpp
similarity index 96%
rename from src/security/transform/hex-encode.hpp
rename to ndn-cxx/security/transform/hex-encode.hpp
index 14a9b41..e5e6a86 100644
--- a/src/security/transform/hex-encode.hpp
+++ b/ndn-cxx/security/transform/hex-encode.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/hmac-filter.cpp b/ndn-cxx/security/transform/hmac-filter.cpp
similarity index 97%
rename from src/security/transform/hmac-filter.cpp
rename to ndn-cxx/security/transform/hmac-filter.cpp
index 12de2ea..c82898a 100644
--- a/src/security/transform/hmac-filter.cpp
+++ b/ndn-cxx/security/transform/hmac-filter.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/hmac-filter.hpp b/ndn-cxx/security/transform/hmac-filter.hpp
similarity index 96%
rename from src/security/transform/hmac-filter.hpp
rename to ndn-cxx/security/transform/hmac-filter.hpp
index 92c1905..69b441d 100644
--- a/src/security/transform/hmac-filter.hpp
+++ b/ndn-cxx/security/transform/hmac-filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/private-key.cpp b/ndn-cxx/security/transform/private-key.cpp
similarity index 100%
rename from src/security/transform/private-key.cpp
rename to ndn-cxx/security/transform/private-key.cpp
diff --git a/src/security/transform/private-key.hpp b/ndn-cxx/security/transform/private-key.hpp
similarity index 100%
rename from src/security/transform/private-key.hpp
rename to ndn-cxx/security/transform/private-key.hpp
diff --git a/src/security/transform/public-key.cpp b/ndn-cxx/security/transform/public-key.cpp
similarity index 98%
rename from src/security/transform/public-key.cpp
rename to ndn-cxx/security/transform/public-key.cpp
index 1cf7e2e..5a1142e 100644
--- a/src/security/transform/public-key.cpp
+++ b/ndn-cxx/security/transform/public-key.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/public-key.hpp b/ndn-cxx/security/transform/public-key.hpp
similarity index 100%
rename from src/security/transform/public-key.hpp
rename to ndn-cxx/security/transform/public-key.hpp
diff --git a/src/security/transform/signer-filter.cpp b/ndn-cxx/security/transform/signer-filter.cpp
similarity index 97%
rename from src/security/transform/signer-filter.cpp
rename to ndn-cxx/security/transform/signer-filter.cpp
index 2fbe647..e9bb48a 100644
--- a/src/security/transform/signer-filter.cpp
+++ b/ndn-cxx/security/transform/signer-filter.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/signer-filter.hpp b/ndn-cxx/security/transform/signer-filter.hpp
similarity index 96%
rename from src/security/transform/signer-filter.hpp
rename to ndn-cxx/security/transform/signer-filter.hpp
index fda45f1..45fc351 100644
--- a/src/security/transform/signer-filter.hpp
+++ b/ndn-cxx/security/transform/signer-filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/step-source.cpp b/ndn-cxx/security/transform/step-source.cpp
similarity index 94%
rename from src/security/transform/step-source.cpp
rename to ndn-cxx/security/transform/step-source.cpp
index 432ebd9..d334f0f 100644
--- a/src/security/transform/step-source.cpp
+++ b/ndn-cxx/security/transform/step-source.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/step-source.hpp b/ndn-cxx/security/transform/step-source.hpp
similarity index 97%
rename from src/security/transform/step-source.hpp
rename to ndn-cxx/security/transform/step-source.hpp
index a017fc6..92e3060 100644
--- a/src/security/transform/step-source.hpp
+++ b/ndn-cxx/security/transform/step-source.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/stream-sink.cpp b/ndn-cxx/security/transform/stream-sink.cpp
similarity index 95%
rename from src/security/transform/stream-sink.cpp
rename to ndn-cxx/security/transform/stream-sink.cpp
index 543e532..eda48ef 100644
--- a/src/security/transform/stream-sink.cpp
+++ b/ndn-cxx/security/transform/stream-sink.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/stream-sink.hpp b/ndn-cxx/security/transform/stream-sink.hpp
similarity index 96%
rename from src/security/transform/stream-sink.hpp
rename to ndn-cxx/security/transform/stream-sink.hpp
index ae5d567..5991854 100644
--- a/src/security/transform/stream-sink.hpp
+++ b/ndn-cxx/security/transform/stream-sink.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/stream-source.cpp b/ndn-cxx/security/transform/stream-source.cpp
similarity index 96%
rename from src/security/transform/stream-source.cpp
rename to ndn-cxx/security/transform/stream-source.cpp
index 33b26ae..c0a63ae 100644
--- a/src/security/transform/stream-source.cpp
+++ b/ndn-cxx/security/transform/stream-source.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/stream-source.hpp b/ndn-cxx/security/transform/stream-source.hpp
similarity index 96%
rename from src/security/transform/stream-source.hpp
rename to ndn-cxx/security/transform/stream-source.hpp
index d19daec..513a53a 100644
--- a/src/security/transform/stream-source.hpp
+++ b/ndn-cxx/security/transform/stream-source.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/strip-space.cpp b/ndn-cxx/security/transform/strip-space.cpp
similarity index 96%
rename from src/security/transform/strip-space.cpp
rename to ndn-cxx/security/transform/strip-space.cpp
index dad2cc3..4866f9b 100644
--- a/src/security/transform/strip-space.cpp
+++ b/ndn-cxx/security/transform/strip-space.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/strip-space.hpp b/ndn-cxx/security/transform/strip-space.hpp
similarity index 96%
rename from src/security/transform/strip-space.hpp
rename to ndn-cxx/security/transform/strip-space.hpp
index d0e50aa..a850cb6 100644
--- a/src/security/transform/strip-space.hpp
+++ b/ndn-cxx/security/transform/strip-space.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/transform-base.cpp b/ndn-cxx/security/transform/transform-base.cpp
similarity index 97%
rename from src/security/transform/transform-base.cpp
rename to ndn-cxx/security/transform/transform-base.cpp
index 2a65281..cfcb14c 100644
--- a/src/security/transform/transform-base.cpp
+++ b/ndn-cxx/security/transform/transform-base.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/transform-base.hpp b/ndn-cxx/security/transform/transform-base.hpp
similarity index 98%
rename from src/security/transform/transform-base.hpp
rename to ndn-cxx/security/transform/transform-base.hpp
index aca3a00..e138227 100644
--- a/src/security/transform/transform-base.hpp
+++ b/ndn-cxx/security/transform/transform-base.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/transform/verifier-filter.cpp b/ndn-cxx/security/transform/verifier-filter.cpp
similarity index 100%
rename from src/security/transform/verifier-filter.cpp
rename to ndn-cxx/security/transform/verifier-filter.cpp
diff --git a/src/security/transform/verifier-filter.hpp b/ndn-cxx/security/transform/verifier-filter.hpp
similarity index 96%
rename from src/security/transform/verifier-filter.hpp
rename to ndn-cxx/security/transform/verifier-filter.hpp
index 34e3c1d..2b794a0 100644
--- a/src/security/transform/verifier-filter.hpp
+++ b/ndn-cxx/security/transform/verifier-filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/additional-description.cpp b/ndn-cxx/security/v2/additional-description.cpp
similarity index 98%
rename from src/security/v2/additional-description.cpp
rename to ndn-cxx/security/v2/additional-description.cpp
index 63b5ee6..233eecd 100644
--- a/src/security/v2/additional-description.cpp
+++ b/ndn-cxx/security/v2/additional-description.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/additional-description.hpp b/ndn-cxx/security/v2/additional-description.hpp
similarity index 100%
rename from src/security/v2/additional-description.hpp
rename to ndn-cxx/security/v2/additional-description.hpp
diff --git a/src/security/v2/certificate-bundle-fetcher.cpp b/ndn-cxx/security/v2/certificate-bundle-fetcher.cpp
similarity index 100%
rename from src/security/v2/certificate-bundle-fetcher.cpp
rename to ndn-cxx/security/v2/certificate-bundle-fetcher.cpp
diff --git a/src/security/v2/certificate-bundle-fetcher.hpp b/ndn-cxx/security/v2/certificate-bundle-fetcher.hpp
similarity index 98%
rename from src/security/v2/certificate-bundle-fetcher.hpp
rename to ndn-cxx/security/v2/certificate-bundle-fetcher.hpp
index bcd2f36..efb8aea 100644
--- a/src/security/v2/certificate-bundle-fetcher.hpp
+++ b/ndn-cxx/security/v2/certificate-bundle-fetcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/certificate-cache.cpp b/ndn-cxx/security/v2/certificate-cache.cpp
similarity index 100%
rename from src/security/v2/certificate-cache.cpp
rename to ndn-cxx/security/v2/certificate-cache.cpp
diff --git a/src/security/v2/certificate-cache.hpp b/ndn-cxx/security/v2/certificate-cache.hpp
similarity index 100%
rename from src/security/v2/certificate-cache.hpp
rename to ndn-cxx/security/v2/certificate-cache.hpp
diff --git a/src/security/v2/certificate-fetcher-direct-fetch.cpp b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.cpp
similarity index 100%
rename from src/security/v2/certificate-fetcher-direct-fetch.cpp
rename to ndn-cxx/security/v2/certificate-fetcher-direct-fetch.cpp
diff --git a/src/security/v2/certificate-fetcher-direct-fetch.hpp b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp
similarity index 96%
rename from src/security/v2/certificate-fetcher-direct-fetch.hpp
rename to ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp
index 5eba1f0..62734ed 100644
--- a/src/security/v2/certificate-fetcher-direct-fetch.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-direct-fetch.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/certificate-fetcher-from-network.cpp b/ndn-cxx/security/v2/certificate-fetcher-from-network.cpp
similarity index 100%
rename from src/security/v2/certificate-fetcher-from-network.cpp
rename to ndn-cxx/security/v2/certificate-fetcher-from-network.cpp
diff --git a/src/security/v2/certificate-fetcher-from-network.hpp b/ndn-cxx/security/v2/certificate-fetcher-from-network.hpp
similarity index 100%
rename from src/security/v2/certificate-fetcher-from-network.hpp
rename to ndn-cxx/security/v2/certificate-fetcher-from-network.hpp
diff --git a/src/security/v2/certificate-fetcher-offline.cpp b/ndn-cxx/security/v2/certificate-fetcher-offline.cpp
similarity index 100%
rename from src/security/v2/certificate-fetcher-offline.cpp
rename to ndn-cxx/security/v2/certificate-fetcher-offline.cpp
diff --git a/src/security/v2/certificate-fetcher-offline.hpp b/ndn-cxx/security/v2/certificate-fetcher-offline.hpp
similarity index 95%
rename from src/security/v2/certificate-fetcher-offline.hpp
rename to ndn-cxx/security/v2/certificate-fetcher-offline.hpp
index 9cfa176..a46fa30 100644
--- a/src/security/v2/certificate-fetcher-offline.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher-offline.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/certificate-fetcher.cpp b/ndn-cxx/security/v2/certificate-fetcher.cpp
similarity index 100%
rename from src/security/v2/certificate-fetcher.cpp
rename to ndn-cxx/security/v2/certificate-fetcher.cpp
diff --git a/src/security/v2/certificate-fetcher.hpp b/ndn-cxx/security/v2/certificate-fetcher.hpp
similarity index 97%
rename from src/security/v2/certificate-fetcher.hpp
rename to ndn-cxx/security/v2/certificate-fetcher.hpp
index cbf221b..14c786f 100644
--- a/src/security/v2/certificate-fetcher.hpp
+++ b/ndn-cxx/security/v2/certificate-fetcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/certificate-request.hpp b/ndn-cxx/security/v2/certificate-request.hpp
similarity index 100%
rename from src/security/v2/certificate-request.hpp
rename to ndn-cxx/security/v2/certificate-request.hpp
diff --git a/src/security/v2/certificate-storage.cpp b/ndn-cxx/security/v2/certificate-storage.cpp
similarity index 100%
rename from src/security/v2/certificate-storage.cpp
rename to ndn-cxx/security/v2/certificate-storage.cpp
diff --git a/src/security/v2/certificate-storage.hpp b/ndn-cxx/security/v2/certificate-storage.hpp
similarity index 98%
rename from src/security/v2/certificate-storage.hpp
rename to ndn-cxx/security/v2/certificate-storage.hpp
index 5f3e608..7289d47 100644
--- a/src/security/v2/certificate-storage.hpp
+++ b/ndn-cxx/security/v2/certificate-storage.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/certificate.cpp b/ndn-cxx/security/v2/certificate.cpp
similarity index 98%
rename from src/security/v2/certificate.cpp
rename to ndn-cxx/security/v2/certificate.cpp
index 31cb81d..ffb4cfd 100644
--- a/src/security/v2/certificate.cpp
+++ b/ndn-cxx/security/v2/certificate.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/certificate.hpp b/ndn-cxx/security/v2/certificate.hpp
similarity index 98%
rename from src/security/v2/certificate.hpp
rename to ndn-cxx/security/v2/certificate.hpp
index c5e2c97..1654934 100644
--- a/src/security/v2/certificate.hpp
+++ b/ndn-cxx/security/v2/certificate.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/key-chain.cpp b/ndn-cxx/security/v2/key-chain.cpp
similarity index 100%
rename from src/security/v2/key-chain.cpp
rename to ndn-cxx/security/v2/key-chain.cpp
diff --git a/src/security/v2/key-chain.hpp b/ndn-cxx/security/v2/key-chain.hpp
similarity index 100%
rename from src/security/v2/key-chain.hpp
rename to ndn-cxx/security/v2/key-chain.hpp
diff --git a/src/security/v2/trust-anchor-container.cpp b/ndn-cxx/security/v2/trust-anchor-container.cpp
similarity index 100%
rename from src/security/v2/trust-anchor-container.cpp
rename to ndn-cxx/security/v2/trust-anchor-container.cpp
diff --git a/src/security/v2/trust-anchor-container.hpp b/ndn-cxx/security/v2/trust-anchor-container.hpp
similarity index 100%
rename from src/security/v2/trust-anchor-container.hpp
rename to ndn-cxx/security/v2/trust-anchor-container.hpp
diff --git a/src/security/v2/trust-anchor-group.cpp b/ndn-cxx/security/v2/trust-anchor-group.cpp
similarity index 98%
rename from src/security/v2/trust-anchor-group.cpp
rename to ndn-cxx/security/v2/trust-anchor-group.cpp
index 6d702ab..0c1d80d 100644
--- a/src/security/v2/trust-anchor-group.cpp
+++ b/ndn-cxx/security/v2/trust-anchor-group.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/trust-anchor-group.hpp b/ndn-cxx/security/v2/trust-anchor-group.hpp
similarity index 98%
rename from src/security/v2/trust-anchor-group.hpp
rename to ndn-cxx/security/v2/trust-anchor-group.hpp
index 8e41ebb..3482a93 100644
--- a/src/security/v2/trust-anchor-group.hpp
+++ b/ndn-cxx/security/v2/trust-anchor-group.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-callback.hpp b/ndn-cxx/security/v2/validation-callback.hpp
similarity index 96%
rename from src/security/v2/validation-callback.hpp
rename to ndn-cxx/security/v2/validation-callback.hpp
index 7ef4564..d67e126 100644
--- a/src/security/v2/validation-callback.hpp
+++ b/ndn-cxx/security/v2/validation-callback.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-error.cpp b/ndn-cxx/security/v2/validation-error.cpp
similarity index 97%
rename from src/security/v2/validation-error.cpp
rename to ndn-cxx/security/v2/validation-error.cpp
index 5868a6d..effb896 100644
--- a/src/security/v2/validation-error.cpp
+++ b/ndn-cxx/security/v2/validation-error.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-error.hpp b/ndn-cxx/security/v2/validation-error.hpp
similarity index 96%
rename from src/security/v2/validation-error.hpp
rename to ndn-cxx/security/v2/validation-error.hpp
index e737e87..e146496 100644
--- a/src/security/v2/validation-error.hpp
+++ b/ndn-cxx/security/v2/validation-error.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-policy-accept-all.hpp b/ndn-cxx/security/v2/validation-policy-accept-all.hpp
similarity index 96%
rename from src/security/v2/validation-policy-accept-all.hpp
rename to ndn-cxx/security/v2/validation-policy-accept-all.hpp
index 0d955db..df508df 100644
--- a/src/security/v2/validation-policy-accept-all.hpp
+++ b/ndn-cxx/security/v2/validation-policy-accept-all.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-policy-command-interest.cpp b/ndn-cxx/security/v2/validation-policy-command-interest.cpp
similarity index 100%
rename from src/security/v2/validation-policy-command-interest.cpp
rename to ndn-cxx/security/v2/validation-policy-command-interest.cpp
diff --git a/src/security/v2/validation-policy-command-interest.hpp b/ndn-cxx/security/v2/validation-policy-command-interest.hpp
similarity index 100%
rename from src/security/v2/validation-policy-command-interest.hpp
rename to ndn-cxx/security/v2/validation-policy-command-interest.hpp
diff --git a/src/security/v2/validation-policy-config.cpp b/ndn-cxx/security/v2/validation-policy-config.cpp
similarity index 100%
rename from src/security/v2/validation-policy-config.cpp
rename to ndn-cxx/security/v2/validation-policy-config.cpp
diff --git a/src/security/v2/validation-policy-config.hpp b/ndn-cxx/security/v2/validation-policy-config.hpp
similarity index 100%
rename from src/security/v2/validation-policy-config.hpp
rename to ndn-cxx/security/v2/validation-policy-config.hpp
diff --git a/src/security/v2/validation-policy-simple-hierarchy.cpp b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.cpp
similarity index 100%
rename from src/security/v2/validation-policy-simple-hierarchy.cpp
rename to ndn-cxx/security/v2/validation-policy-simple-hierarchy.cpp
diff --git a/src/security/v2/validation-policy-simple-hierarchy.hpp b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp
similarity index 96%
rename from src/security/v2/validation-policy-simple-hierarchy.hpp
rename to ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp
index ac08c8a..c46b722 100644
--- a/src/security/v2/validation-policy-simple-hierarchy.hpp
+++ b/ndn-cxx/security/v2/validation-policy-simple-hierarchy.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-policy.cpp b/ndn-cxx/security/v2/validation-policy.cpp
similarity index 100%
rename from src/security/v2/validation-policy.cpp
rename to ndn-cxx/security/v2/validation-policy.cpp
diff --git a/src/security/v2/validation-policy.hpp b/ndn-cxx/security/v2/validation-policy.hpp
similarity index 100%
rename from src/security/v2/validation-policy.hpp
rename to ndn-cxx/security/v2/validation-policy.hpp
diff --git a/src/security/v2/validation-state.cpp b/ndn-cxx/security/v2/validation-state.cpp
similarity index 98%
rename from src/security/v2/validation-state.cpp
rename to ndn-cxx/security/v2/validation-state.cpp
index 76d0b97..74b72fd 100644
--- a/src/security/v2/validation-state.cpp
+++ b/ndn-cxx/security/v2/validation-state.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validation-state.hpp b/ndn-cxx/security/v2/validation-state.hpp
similarity index 98%
rename from src/security/v2/validation-state.hpp
rename to ndn-cxx/security/v2/validation-state.hpp
index 8d0e5ba..0f3c8bb 100644
--- a/src/security/v2/validation-state.hpp
+++ b/ndn-cxx/security/v2/validation-state.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator-config/checker.cpp b/ndn-cxx/security/v2/validator-config/checker.cpp
similarity index 100%
rename from src/security/v2/validator-config/checker.cpp
rename to ndn-cxx/security/v2/validator-config/checker.cpp
diff --git a/src/security/v2/validator-config/checker.hpp b/ndn-cxx/security/v2/validator-config/checker.hpp
similarity index 98%
rename from src/security/v2/validator-config/checker.hpp
rename to ndn-cxx/security/v2/validator-config/checker.hpp
index 390dc08..6093c4e 100644
--- a/src/security/v2/validator-config/checker.hpp
+++ b/ndn-cxx/security/v2/validator-config/checker.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator-config/common.hpp b/ndn-cxx/security/v2/validator-config/common.hpp
similarity index 95%
rename from src/security/v2/validator-config/common.hpp
rename to ndn-cxx/security/v2/validator-config/common.hpp
index 1663e5a..a46bf41 100644
--- a/src/security/v2/validator-config/common.hpp
+++ b/ndn-cxx/security/v2/validator-config/common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator-config/filter.cpp b/ndn-cxx/security/v2/validator-config/filter.cpp
similarity index 100%
rename from src/security/v2/validator-config/filter.cpp
rename to ndn-cxx/security/v2/validator-config/filter.cpp
diff --git a/src/security/v2/validator-config/filter.hpp b/ndn-cxx/security/v2/validator-config/filter.hpp
similarity index 97%
rename from src/security/v2/validator-config/filter.hpp
rename to ndn-cxx/security/v2/validator-config/filter.hpp
index cbd5275..f9f9a7f 100644
--- a/src/security/v2/validator-config/filter.hpp
+++ b/ndn-cxx/security/v2/validator-config/filter.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator-config/name-relation.cpp b/ndn-cxx/security/v2/validator-config/name-relation.cpp
similarity index 97%
rename from src/security/v2/validator-config/name-relation.cpp
rename to ndn-cxx/security/v2/validator-config/name-relation.cpp
index ad65e9a..96ee409 100644
--- a/src/security/v2/validator-config/name-relation.cpp
+++ b/ndn-cxx/security/v2/validator-config/name-relation.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator-config/name-relation.hpp b/ndn-cxx/security/v2/validator-config/name-relation.hpp
similarity index 96%
rename from src/security/v2/validator-config/name-relation.hpp
rename to ndn-cxx/security/v2/validator-config/name-relation.hpp
index 5aa0dcf..054e3ca 100644
--- a/src/security/v2/validator-config/name-relation.hpp
+++ b/ndn-cxx/security/v2/validator-config/name-relation.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator-config/rule.cpp b/ndn-cxx/security/v2/validator-config/rule.cpp
similarity index 100%
rename from src/security/v2/validator-config/rule.cpp
rename to ndn-cxx/security/v2/validator-config/rule.cpp
diff --git a/src/security/v2/validator-config/rule.hpp b/ndn-cxx/security/v2/validator-config/rule.hpp
similarity index 97%
rename from src/security/v2/validator-config/rule.hpp
rename to ndn-cxx/security/v2/validator-config/rule.hpp
index 66d6d6a..2f6deb7 100644
--- a/src/security/v2/validator-config/rule.hpp
+++ b/ndn-cxx/security/v2/validator-config/rule.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/v2/validator.cpp b/ndn-cxx/security/v2/validator.cpp
similarity index 100%
rename from src/security/v2/validator.cpp
rename to ndn-cxx/security/v2/validator.cpp
diff --git a/src/security/v2/validator.hpp b/ndn-cxx/security/v2/validator.hpp
similarity index 98%
rename from src/security/v2/validator.hpp
rename to ndn-cxx/security/v2/validator.hpp
index 14e9c7f..9d77c83 100644
--- a/src/security/v2/validator.hpp
+++ b/ndn-cxx/security/v2/validator.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/validator-config.cpp b/ndn-cxx/security/validator-config.cpp
similarity index 96%
rename from src/security/validator-config.cpp
rename to ndn-cxx/security/validator-config.cpp
index a8c5abc..1ddd035 100644
--- a/src/security/validator-config.cpp
+++ b/ndn-cxx/security/validator-config.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/validator-config.hpp b/ndn-cxx/security/validator-config.hpp
similarity index 96%
rename from src/security/validator-config.hpp
rename to ndn-cxx/security/validator-config.hpp
index bc42e52..c54ea48 100644
--- a/src/security/validator-config.hpp
+++ b/ndn-cxx/security/validator-config.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/validator-null.cpp b/ndn-cxx/security/validator-null.cpp
similarity index 95%
rename from src/security/validator-null.cpp
rename to ndn-cxx/security/validator-null.cpp
index 6ca3174..498f74f 100644
--- a/src/security/validator-null.cpp
+++ b/ndn-cxx/security/validator-null.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/validator-null.hpp b/ndn-cxx/security/validator-null.hpp
similarity index 95%
rename from src/security/validator-null.hpp
rename to ndn-cxx/security/validator-null.hpp
index f8f48ce..a4edcc7 100644
--- a/src/security/validator-null.hpp
+++ b/ndn-cxx/security/validator-null.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/validity-period.cpp b/ndn-cxx/security/validity-period.cpp
similarity index 100%
rename from src/security/validity-period.cpp
rename to ndn-cxx/security/validity-period.cpp
diff --git a/src/security/validity-period.hpp b/ndn-cxx/security/validity-period.hpp
similarity index 100%
rename from src/security/validity-period.hpp
rename to ndn-cxx/security/validity-period.hpp
diff --git a/src/security/verification-helpers.cpp b/ndn-cxx/security/verification-helpers.cpp
similarity index 98%
rename from src/security/verification-helpers.cpp
rename to ndn-cxx/security/verification-helpers.cpp
index 8c42937..887e6f0 100644
--- a/src/security/verification-helpers.cpp
+++ b/ndn-cxx/security/verification-helpers.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/security/verification-helpers.hpp b/ndn-cxx/security/verification-helpers.hpp
similarity index 97%
rename from src/security/verification-helpers.hpp
rename to ndn-cxx/security/verification-helpers.hpp
index 8b45892..c17318c 100644
--- a/src/security/verification-helpers.hpp
+++ b/ndn-cxx/security/verification-helpers.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/selectors.cpp b/ndn-cxx/selectors.cpp
similarity index 98%
rename from src/selectors.cpp
rename to ndn-cxx/selectors.cpp
index 80c891f..0ba0ad2 100644
--- a/src/selectors.cpp
+++ b/ndn-cxx/selectors.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/selectors.hpp b/ndn-cxx/selectors.hpp
similarity index 100%
rename from src/selectors.hpp
rename to ndn-cxx/selectors.hpp
diff --git a/src/signature-info.cpp b/ndn-cxx/signature-info.cpp
similarity index 98%
rename from src/signature-info.cpp
rename to ndn-cxx/signature-info.cpp
index 6210eff..cc59bd2 100644
--- a/src/signature-info.cpp
+++ b/ndn-cxx/signature-info.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/signature-info.hpp b/ndn-cxx/signature-info.hpp
similarity index 100%
rename from src/signature-info.hpp
rename to ndn-cxx/signature-info.hpp
diff --git a/src/signature.cpp b/ndn-cxx/signature.cpp
similarity index 96%
rename from src/signature.cpp
rename to ndn-cxx/signature.cpp
index 4ac9d59..3e9433b 100644
--- a/src/signature.cpp
+++ b/ndn-cxx/signature.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/signature.hpp b/ndn-cxx/signature.hpp
similarity index 100%
rename from src/signature.hpp
rename to ndn-cxx/signature.hpp
diff --git a/src/tag-host.hpp b/ndn-cxx/tag-host.hpp
similarity index 100%
rename from src/tag-host.hpp
rename to ndn-cxx/tag-host.hpp
diff --git a/src/tag.hpp b/ndn-cxx/tag.hpp
similarity index 100%
rename from src/tag.hpp
rename to ndn-cxx/tag.hpp
diff --git a/src/transport/stream-transport-impl.hpp b/ndn-cxx/transport/stream-transport-impl.hpp
similarity index 100%
rename from src/transport/stream-transport-impl.hpp
rename to ndn-cxx/transport/stream-transport-impl.hpp
diff --git a/src/transport/stream-transport-with-resolver-impl.hpp b/ndn-cxx/transport/stream-transport-with-resolver-impl.hpp
similarity index 97%
rename from src/transport/stream-transport-with-resolver-impl.hpp
rename to ndn-cxx/transport/stream-transport-with-resolver-impl.hpp
index b9150d8..6e14c56 100644
--- a/src/transport/stream-transport-with-resolver-impl.hpp
+++ b/ndn-cxx/transport/stream-transport-with-resolver-impl.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/transport/tcp-transport.cpp b/ndn-cxx/transport/tcp-transport.cpp
similarity index 97%
rename from src/transport/tcp-transport.cpp
rename to ndn-cxx/transport/tcp-transport.cpp
index 8b99f3e..1f8f0c0 100644
--- a/src/transport/tcp-transport.cpp
+++ b/ndn-cxx/transport/tcp-transport.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/transport/tcp-transport.hpp b/ndn-cxx/transport/tcp-transport.hpp
similarity index 97%
rename from src/transport/tcp-transport.hpp
rename to ndn-cxx/transport/tcp-transport.hpp
index 6e8977f..11aa182 100644
--- a/src/transport/tcp-transport.hpp
+++ b/ndn-cxx/transport/tcp-transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/transport/transport.cpp b/ndn-cxx/transport/transport.cpp
similarity index 95%
rename from src/transport/transport.cpp
rename to ndn-cxx/transport/transport.cpp
index 0ea5bee..cb290e2 100644
--- a/src/transport/transport.cpp
+++ b/ndn-cxx/transport/transport.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/transport/transport.hpp b/ndn-cxx/transport/transport.hpp
similarity index 98%
rename from src/transport/transport.hpp
rename to ndn-cxx/transport/transport.hpp
index b177fad..fb557d9 100644
--- a/src/transport/transport.hpp
+++ b/ndn-cxx/transport/transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/transport/unix-transport.cpp b/ndn-cxx/transport/unix-transport.cpp
similarity index 97%
rename from src/transport/unix-transport.cpp
rename to ndn-cxx/transport/unix-transport.cpp
index 34ccf83..cb0c1bf 100644
--- a/src/transport/unix-transport.cpp
+++ b/ndn-cxx/transport/unix-transport.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/transport/unix-transport.hpp b/ndn-cxx/transport/unix-transport.hpp
similarity index 96%
rename from src/transport/unix-transport.hpp
rename to ndn-cxx/transport/unix-transport.hpp
index d337252..f8fe383 100644
--- a/src/transport/unix-transport.hpp
+++ b/ndn-cxx/transport/unix-transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/backports-ostream-joiner.hpp b/ndn-cxx/util/backports-ostream-joiner.hpp
similarity index 100%
rename from src/util/backports-ostream-joiner.hpp
rename to ndn-cxx/util/backports-ostream-joiner.hpp
diff --git a/src/util/backports.hpp b/ndn-cxx/util/backports.hpp
similarity index 100%
rename from src/util/backports.hpp
rename to ndn-cxx/util/backports.hpp
diff --git a/src/util/cf-releaser-osx.hpp b/ndn-cxx/util/cf-releaser-osx.hpp
similarity index 97%
rename from src/util/cf-releaser-osx.hpp
rename to ndn-cxx/util/cf-releaser-osx.hpp
index 6c73ae8..8d7d577 100644
--- a/src/util/cf-releaser-osx.hpp
+++ b/ndn-cxx/util/cf-releaser-osx.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/cf-string-osx.cpp b/ndn-cxx/util/cf-string-osx.cpp
similarity index 100%
rename from src/util/cf-string-osx.cpp
rename to ndn-cxx/util/cf-string-osx.cpp
diff --git a/src/util/cf-string-osx.hpp b/ndn-cxx/util/cf-string-osx.hpp
similarity index 100%
rename from src/util/cf-string-osx.hpp
rename to ndn-cxx/util/cf-string-osx.hpp
diff --git a/src/util/concepts.hpp b/ndn-cxx/util/concepts.hpp
similarity index 98%
rename from src/util/concepts.hpp
rename to ndn-cxx/util/concepts.hpp
index 4b4d758..e68be91 100644
--- a/src/util/concepts.hpp
+++ b/ndn-cxx/util/concepts.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2017 Regents of the University of California,
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/src/util/config-file.cpp b/ndn-cxx/util/config-file.cpp
similarity index 96%
rename from src/util/config-file.cpp
rename to ndn-cxx/util/config-file.cpp
index aa467a2..e921ec6 100644
--- a/src/util/config-file.cpp
+++ b/ndn-cxx/util/config-file.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -90,8 +90,6 @@
   return path();
 }
 
-
-
 bool
 ConfigFile::open()
 {
@@ -117,7 +115,6 @@
     }
 }
 
-
 const ConfigFile::Parsed&
 ConfigFile::parse()
 {
@@ -145,4 +142,4 @@
   return m_config;
 }
 
-}
+} // namespace ndn
diff --git a/src/util/config-file.hpp b/ndn-cxx/util/config-file.hpp
similarity index 100%
rename from src/util/config-file.hpp
rename to ndn-cxx/util/config-file.hpp
diff --git a/src/util/detail/steady-timer.hpp b/ndn-cxx/util/detail/steady-timer.hpp
similarity index 100%
rename from src/util/detail/steady-timer.hpp
rename to ndn-cxx/util/detail/steady-timer.hpp
diff --git a/src/util/dummy-client-face.cpp b/ndn-cxx/util/dummy-client-face.cpp
similarity index 100%
rename from src/util/dummy-client-face.cpp
rename to ndn-cxx/util/dummy-client-face.cpp
diff --git a/src/util/dummy-client-face.hpp b/ndn-cxx/util/dummy-client-face.hpp
similarity index 98%
rename from src/util/dummy-client-face.hpp
rename to ndn-cxx/util/dummy-client-face.hpp
index 7d40f65..9f6c2b6 100644
--- a/src/util/dummy-client-face.hpp
+++ b/ndn-cxx/util/dummy-client-face.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/indented-stream.cpp b/ndn-cxx/util/indented-stream.cpp
similarity index 96%
rename from src/util/indented-stream.cpp
rename to ndn-cxx/util/indented-stream.cpp
index b875db4..946dd30 100644
--- a/src/util/indented-stream.cpp
+++ b/ndn-cxx/util/indented-stream.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/indented-stream.hpp b/ndn-cxx/util/indented-stream.hpp
similarity index 96%
rename from src/util/indented-stream.hpp
rename to ndn-cxx/util/indented-stream.hpp
index 32b60e8..7b1376c 100644
--- a/src/util/indented-stream.hpp
+++ b/ndn-cxx/util/indented-stream.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/io.cpp b/ndn-cxx/util/io.cpp
similarity index 100%
rename from src/util/io.cpp
rename to ndn-cxx/util/io.cpp
diff --git a/src/util/io.hpp b/ndn-cxx/util/io.hpp
similarity index 100%
rename from src/util/io.hpp
rename to ndn-cxx/util/io.hpp
diff --git a/src/util/logger.cpp b/ndn-cxx/util/logger.cpp
similarity index 100%
rename from src/util/logger.cpp
rename to ndn-cxx/util/logger.cpp
diff --git a/src/util/logger.hpp b/ndn-cxx/util/logger.hpp
similarity index 100%
rename from src/util/logger.hpp
rename to ndn-cxx/util/logger.hpp
diff --git a/src/util/logging.cpp b/ndn-cxx/util/logging.cpp
similarity index 100%
rename from src/util/logging.cpp
rename to ndn-cxx/util/logging.cpp
diff --git a/src/util/logging.hpp b/ndn-cxx/util/logging.hpp
similarity index 100%
rename from src/util/logging.hpp
rename to ndn-cxx/util/logging.hpp
diff --git a/src/util/nonstd/any.hpp b/ndn-cxx/util/nonstd/any.hpp
similarity index 100%
rename from src/util/nonstd/any.hpp
rename to ndn-cxx/util/nonstd/any.hpp
diff --git a/src/util/nonstd/optional.hpp b/ndn-cxx/util/nonstd/optional.hpp
similarity index 100%
rename from src/util/nonstd/optional.hpp
rename to ndn-cxx/util/nonstd/optional.hpp
diff --git a/src/util/nonstd/variant.hpp b/ndn-cxx/util/nonstd/variant.hpp
similarity index 100%
rename from src/util/nonstd/variant.hpp
rename to ndn-cxx/util/nonstd/variant.hpp
diff --git a/src/util/notification-stream.hpp b/ndn-cxx/util/notification-stream.hpp
similarity index 100%
rename from src/util/notification-stream.hpp
rename to ndn-cxx/util/notification-stream.hpp
diff --git a/src/util/notification-subscriber.cpp b/ndn-cxx/util/notification-subscriber.cpp
similarity index 100%
rename from src/util/notification-subscriber.cpp
rename to ndn-cxx/util/notification-subscriber.cpp
diff --git a/src/util/notification-subscriber.hpp b/ndn-cxx/util/notification-subscriber.hpp
similarity index 100%
rename from src/util/notification-subscriber.hpp
rename to ndn-cxx/util/notification-subscriber.hpp
diff --git a/src/util/random.cpp b/ndn-cxx/util/random.cpp
similarity index 96%
rename from src/util/random.cpp
rename to ndn-cxx/util/random.cpp
index f6722b9..bb20e81 100644
--- a/src/util/random.cpp
+++ b/ndn-cxx/util/random.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/random.hpp b/ndn-cxx/util/random.hpp
similarity index 96%
rename from src/util/random.hpp
rename to ndn-cxx/util/random.hpp
index 68dbe86..058b71b 100644
--- a/src/util/random.hpp
+++ b/ndn-cxx/util/random.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex.hpp b/ndn-cxx/util/regex.hpp
similarity index 94%
rename from src/util/regex.hpp
rename to ndn-cxx/util/regex.hpp
index dd07faa..96a97df 100644
--- a/src/util/regex.hpp
+++ b/ndn-cxx/util/regex.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2014 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-backref-manager.cpp b/ndn-cxx/util/regex/regex-backref-manager.cpp
similarity index 95%
rename from src/util/regex/regex-backref-manager.cpp
rename to ndn-cxx/util/regex/regex-backref-manager.cpp
index 23c4a0a..09126f6 100644
--- a/src/util/regex/regex-backref-manager.cpp
+++ b/ndn-cxx/util/regex/regex-backref-manager.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-backref-manager.hpp b/ndn-cxx/util/regex/regex-backref-manager.hpp
similarity index 95%
rename from src/util/regex/regex-backref-manager.hpp
rename to ndn-cxx/util/regex/regex-backref-manager.hpp
index 1a6d14e..1896680 100644
--- a/src/util/regex/regex-backref-manager.hpp
+++ b/ndn-cxx/util/regex/regex-backref-manager.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-backref-matcher.cpp b/ndn-cxx/util/regex/regex-backref-matcher.cpp
similarity index 96%
rename from src/util/regex/regex-backref-matcher.cpp
rename to ndn-cxx/util/regex/regex-backref-matcher.cpp
index 5895b8b..fda4c01 100644
--- a/src/util/regex/regex-backref-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-backref-matcher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-backref-matcher.hpp b/ndn-cxx/util/regex/regex-backref-matcher.hpp
similarity index 95%
rename from src/util/regex/regex-backref-matcher.hpp
rename to ndn-cxx/util/regex/regex-backref-matcher.hpp
index 565331b..6fcf8a2 100644
--- a/src/util/regex/regex-backref-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-backref-matcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-component-matcher.cpp b/ndn-cxx/util/regex/regex-component-matcher.cpp
similarity index 100%
rename from src/util/regex/regex-component-matcher.cpp
rename to ndn-cxx/util/regex/regex-component-matcher.cpp
diff --git a/src/util/regex/regex-component-matcher.hpp b/ndn-cxx/util/regex/regex-component-matcher.hpp
similarity index 100%
rename from src/util/regex/regex-component-matcher.hpp
rename to ndn-cxx/util/regex/regex-component-matcher.hpp
diff --git a/src/util/regex/regex-component-set-matcher.cpp b/ndn-cxx/util/regex/regex-component-set-matcher.cpp
similarity index 98%
rename from src/util/regex/regex-component-set-matcher.cpp
rename to ndn-cxx/util/regex/regex-component-set-matcher.cpp
index bc922dd..c014f28 100644
--- a/src/util/regex/regex-component-set-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-component-set-matcher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-component-set-matcher.hpp b/ndn-cxx/util/regex/regex-component-set-matcher.hpp
similarity index 96%
rename from src/util/regex/regex-component-set-matcher.hpp
rename to ndn-cxx/util/regex/regex-component-set-matcher.hpp
index 5cb9d1f..014a919 100644
--- a/src/util/regex/regex-component-set-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-component-set-matcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-matcher.cpp b/ndn-cxx/util/regex/regex-matcher.cpp
similarity index 96%
rename from src/util/regex/regex-matcher.cpp
rename to ndn-cxx/util/regex/regex-matcher.cpp
index f460f92..5f2d075 100644
--- a/src/util/regex/regex-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-matcher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-matcher.hpp b/ndn-cxx/util/regex/regex-matcher.hpp
similarity index 100%
rename from src/util/regex/regex-matcher.hpp
rename to ndn-cxx/util/regex/regex-matcher.hpp
diff --git a/src/util/regex/regex-pattern-list-matcher.cpp b/ndn-cxx/util/regex/regex-pattern-list-matcher.cpp
similarity index 98%
rename from src/util/regex/regex-pattern-list-matcher.cpp
rename to ndn-cxx/util/regex/regex-pattern-list-matcher.cpp
index 9f18441..45da38f 100644
--- a/src/util/regex/regex-pattern-list-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-pattern-list-matcher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-pattern-list-matcher.hpp b/ndn-cxx/util/regex/regex-pattern-list-matcher.hpp
similarity index 95%
rename from src/util/regex/regex-pattern-list-matcher.hpp
rename to ndn-cxx/util/regex/regex-pattern-list-matcher.hpp
index 79c1d3e..44ccd8d 100644
--- a/src/util/regex/regex-pattern-list-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-pattern-list-matcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-pseudo-matcher.cpp b/ndn-cxx/util/regex/regex-pseudo-matcher.cpp
similarity index 95%
rename from src/util/regex/regex-pseudo-matcher.cpp
rename to ndn-cxx/util/regex/regex-pseudo-matcher.cpp
index 5c792d5..de7cb84 100644
--- a/src/util/regex/regex-pseudo-matcher.cpp
+++ b/ndn-cxx/util/regex/regex-pseudo-matcher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-pseudo-matcher.hpp b/ndn-cxx/util/regex/regex-pseudo-matcher.hpp
similarity index 95%
rename from src/util/regex/regex-pseudo-matcher.hpp
rename to ndn-cxx/util/regex/regex-pseudo-matcher.hpp
index 628b883..1d880f5 100644
--- a/src/util/regex/regex-pseudo-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-pseudo-matcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-repeat-matcher.cpp b/ndn-cxx/util/regex/regex-repeat-matcher.cpp
similarity index 100%
rename from src/util/regex/regex-repeat-matcher.cpp
rename to ndn-cxx/util/regex/regex-repeat-matcher.cpp
diff --git a/src/util/regex/regex-repeat-matcher.hpp b/ndn-cxx/util/regex/regex-repeat-matcher.hpp
similarity index 96%
rename from src/util/regex/regex-repeat-matcher.hpp
rename to ndn-cxx/util/regex/regex-repeat-matcher.hpp
index de29e02..3a7f0d9 100644
--- a/src/util/regex/regex-repeat-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-repeat-matcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/regex/regex-top-matcher.cpp b/ndn-cxx/util/regex/regex-top-matcher.cpp
similarity index 100%
rename from src/util/regex/regex-top-matcher.cpp
rename to ndn-cxx/util/regex/regex-top-matcher.cpp
diff --git a/src/util/regex/regex-top-matcher.hpp b/ndn-cxx/util/regex/regex-top-matcher.hpp
similarity index 96%
rename from src/util/regex/regex-top-matcher.hpp
rename to ndn-cxx/util/regex/regex-top-matcher.hpp
index a60e758..90a1842 100644
--- a/src/util/regex/regex-top-matcher.hpp
+++ b/ndn-cxx/util/regex/regex-top-matcher.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/rtt-estimator.cpp b/ndn-cxx/util/rtt-estimator.cpp
similarity index 100%
rename from src/util/rtt-estimator.cpp
rename to ndn-cxx/util/rtt-estimator.cpp
diff --git a/src/util/rtt-estimator.hpp b/ndn-cxx/util/rtt-estimator.hpp
similarity index 100%
rename from src/util/rtt-estimator.hpp
rename to ndn-cxx/util/rtt-estimator.hpp
diff --git a/src/util/scheduler-scoped-event-id.cpp b/ndn-cxx/util/scheduler-scoped-event-id.cpp
similarity index 100%
rename from src/util/scheduler-scoped-event-id.cpp
rename to ndn-cxx/util/scheduler-scoped-event-id.cpp
diff --git a/src/util/scheduler-scoped-event-id.hpp b/ndn-cxx/util/scheduler-scoped-event-id.hpp
similarity index 100%
rename from src/util/scheduler-scoped-event-id.hpp
rename to ndn-cxx/util/scheduler-scoped-event-id.hpp
diff --git a/src/util/scheduler.cpp b/ndn-cxx/util/scheduler.cpp
similarity index 100%
rename from src/util/scheduler.cpp
rename to ndn-cxx/util/scheduler.cpp
diff --git a/src/util/scheduler.hpp b/ndn-cxx/util/scheduler.hpp
similarity index 100%
rename from src/util/scheduler.hpp
rename to ndn-cxx/util/scheduler.hpp
diff --git a/src/util/segment-fetcher.cpp b/ndn-cxx/util/segment-fetcher.cpp
similarity index 100%
rename from src/util/segment-fetcher.cpp
rename to ndn-cxx/util/segment-fetcher.cpp
diff --git a/src/util/segment-fetcher.hpp b/ndn-cxx/util/segment-fetcher.hpp
similarity index 100%
rename from src/util/segment-fetcher.hpp
rename to ndn-cxx/util/segment-fetcher.hpp
diff --git a/src/util/sha256.cpp b/ndn-cxx/util/sha256.cpp
similarity index 97%
rename from src/util/sha256.cpp
rename to ndn-cxx/util/sha256.cpp
index 034d12e..0f66122 100644
--- a/src/util/sha256.cpp
+++ b/ndn-cxx/util/sha256.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/sha256.hpp b/ndn-cxx/util/sha256.hpp
similarity index 100%
rename from src/util/sha256.hpp
rename to ndn-cxx/util/sha256.hpp
diff --git a/src/util/signal.hpp b/ndn-cxx/util/signal.hpp
similarity index 94%
rename from src/util/signal.hpp
rename to ndn-cxx/util/signal.hpp
index 12f2247..5c20385 100644
--- a/src/util/signal.hpp
+++ b/ndn-cxx/util/signal.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/signal/connection.cpp b/ndn-cxx/util/signal/connection.cpp
similarity index 100%
rename from src/util/signal/connection.cpp
rename to ndn-cxx/util/signal/connection.cpp
diff --git a/src/util/signal/connection.hpp b/ndn-cxx/util/signal/connection.hpp
similarity index 100%
rename from src/util/signal/connection.hpp
rename to ndn-cxx/util/signal/connection.hpp
diff --git a/src/util/signal/emit.hpp b/ndn-cxx/util/signal/emit.hpp
similarity index 97%
rename from src/util/signal/emit.hpp
rename to ndn-cxx/util/signal/emit.hpp
index a28872c..c073f1f 100644
--- a/src/util/signal/emit.hpp
+++ b/ndn-cxx/util/signal/emit.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/signal/scoped-connection.cpp b/ndn-cxx/util/signal/scoped-connection.cpp
similarity index 100%
rename from src/util/signal/scoped-connection.cpp
rename to ndn-cxx/util/signal/scoped-connection.cpp
diff --git a/src/util/signal/scoped-connection.hpp b/ndn-cxx/util/signal/scoped-connection.hpp
similarity index 100%
rename from src/util/signal/scoped-connection.hpp
rename to ndn-cxx/util/signal/scoped-connection.hpp
diff --git a/src/util/signal/signal.hpp b/ndn-cxx/util/signal/signal.hpp
similarity index 100%
rename from src/util/signal/signal.hpp
rename to ndn-cxx/util/signal/signal.hpp
diff --git a/src/util/sqlite3-statement.cpp b/ndn-cxx/util/sqlite3-statement.cpp
similarity index 97%
rename from src/util/sqlite3-statement.cpp
rename to ndn-cxx/util/sqlite3-statement.cpp
index 736b266..597da37 100644
--- a/src/util/sqlite3-statement.cpp
+++ b/ndn-cxx/util/sqlite3-statement.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/sqlite3-statement.hpp b/ndn-cxx/util/sqlite3-statement.hpp
similarity index 97%
rename from src/util/sqlite3-statement.hpp
rename to ndn-cxx/util/sqlite3-statement.hpp
index 82480d9..eb2cb16 100644
--- a/src/util/sqlite3-statement.hpp
+++ b/ndn-cxx/util/sqlite3-statement.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/src/util/string-helper.cpp b/ndn-cxx/util/string-helper.cpp
similarity index 100%
rename from src/util/string-helper.cpp
rename to ndn-cxx/util/string-helper.cpp
diff --git a/src/util/string-helper.hpp b/ndn-cxx/util/string-helper.hpp
similarity index 100%
rename from src/util/string-helper.hpp
rename to ndn-cxx/util/string-helper.hpp
diff --git a/src/util/time-custom-clock.hpp b/ndn-cxx/util/time-custom-clock.hpp
similarity index 100%
rename from src/util/time-custom-clock.hpp
rename to ndn-cxx/util/time-custom-clock.hpp
diff --git a/src/util/time-unit-test-clock.cpp b/ndn-cxx/util/time-unit-test-clock.cpp
similarity index 100%
rename from src/util/time-unit-test-clock.cpp
rename to ndn-cxx/util/time-unit-test-clock.cpp
diff --git a/src/util/time-unit-test-clock.hpp b/ndn-cxx/util/time-unit-test-clock.hpp
similarity index 100%
rename from src/util/time-unit-test-clock.hpp
rename to ndn-cxx/util/time-unit-test-clock.hpp
diff --git a/src/util/time.cpp b/ndn-cxx/util/time.cpp
similarity index 100%
rename from src/util/time.cpp
rename to ndn-cxx/util/time.cpp
diff --git a/src/util/time.hpp b/ndn-cxx/util/time.hpp
similarity index 100%
rename from src/util/time.hpp
rename to ndn-cxx/util/time.hpp
diff --git a/src/version.hpp.in b/ndn-cxx/version.hpp.in
similarity index 96%
rename from src/version.hpp.in
rename to ndn-cxx/version.hpp.in
index f7369f5..cbd5a63 100644
--- a/src/version.hpp.in
+++ b/ndn-cxx/version.hpp.in
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2014 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/integrated/wscript b/tests/integrated/wscript
index 5d04422..21327a9 100644
--- a/tests/integrated/wscript
+++ b/tests/integrated/wscript
@@ -1,13 +1,12 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
-from waflib import Utils
-
 top = '../..'
 
 def build(bld):
     for test in bld.path.ant_glob('*.cpp'):
         name = test.change_ext('').path_from(bld.path.get_bld())
-        bld.program(target=name,
+        bld.program(name='test-%s' % name,
+                    target=name,
                     source=[test],
-                    use='ndn-cxx tests-base BOOST',
+                    use='tests-base',
                     install_path=None)
diff --git a/tests/wscript b/tests/wscript
index 720cf30..20c49da 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -1,7 +1,5 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
-from waflib import Utils
-
 top = '..'
 
 def build(bld):
@@ -9,7 +7,7 @@
     bld.objects(target='tests-base',
                 features='pch',
                 source=bld.path.ant_glob('*.cpp', excl=['main.cpp']),
-                headers=['../src/common-pch.hpp', 'boost-test.hpp'],
+                headers=['../ndn-cxx/common-pch.hpp', 'boost-test.hpp'],
                 includes='.',
                 export_includes='.',
                 use='ndn-cxx BOOST')
@@ -17,7 +15,7 @@
     config_path = 'UNIT_TEST_CONFIG_PATH="%s"' % bld.bldnode.make_node('tmp-files')
 
     # unit test objects
-    src = bld.path.ant_glob(['unit-tests/**/*.cpp'],
+    src = bld.path.ant_glob('unit-tests/**/*.cpp',
                             excl=['**/*-osx.t.cpp', '**/*-sqlite3.t.cpp'])
     if bld.env['HAVE_OSX_FRAMEWORKS']:
         src += bld.path.ant_glob('unit-tests/**/*-osx.t.cpp')
@@ -25,7 +23,7 @@
     # In case we want to make it optional later
     src += bld.path.ant_glob('unit-tests/**/*-sqlite3.t.cpp')
 
-    bld.objects(target='unit-test-objects',
+    bld.objects(target='unit-tests-objects',
                 source=src,
                 use='tests-base',
                 defines=[config_path])
@@ -34,7 +32,7 @@
     bld.program(target='../unit-tests',
                 name='unit-tests',
                 source='main.cpp',
-                use='unit-test-objects',
+                use='unit-tests-objects',
                 install_path=None)
 
     bld.recurse('integrated')
diff --git a/tools/ndnsec/list.cpp b/tools/ndnsec/list.cpp
index 955fb6f..336a574 100644
--- a/tools/ndnsec/list.cpp
+++ b/tools/ndnsec/list.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,7 +21,8 @@
 
 #include "ndnsec.hpp"
 #include "util.hpp"
-#include "util/indented-stream.hpp"
+
+#include <ndn-cxx/util/indented-stream.hpp>
 
 namespace ndn {
 namespace ndnsec {
diff --git a/tools/ndnsec/main.cpp b/tools/ndnsec/main.cpp
index 351c29b..0db6d54 100644
--- a/tools/ndnsec/main.cpp
+++ b/tools/ndnsec/main.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,8 +21,9 @@
 
 #include "ndnsec.hpp"
 #include "util.hpp"
-#include "version.hpp"
-#include "util/logger.hpp"
+
+#include <ndn-cxx/util/logger.hpp>
+#include <ndn-cxx/version.hpp>
 
 #include <boost/exception/get_error_info.hpp>
 
diff --git a/tools/ndnsec/util.cpp b/tools/ndnsec/util.cpp
index 6a34f53..b97e934 100644
--- a/tools/ndnsec/util.cpp
+++ b/tools/ndnsec/util.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,7 +21,7 @@
 
 #include "util.hpp"
 
-#include "security/detail/openssl.hpp"
+#include <ndn-cxx/security/detail/openssl.hpp>
 
 namespace ndn {
 namespace ndnsec {
diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index 61b6b52..65b88e7 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -22,11 +22,11 @@
 #ifndef NDN_TOOLS_NDNSEC_UTIL_HPP
 #define NDN_TOOLS_NDNSEC_UTIL_HPP
 
-#include "encoding/buffer-stream.hpp"
-#include "security/transform.hpp"
-#include "security/key-chain.hpp"
-#include "security/v2/additional-description.hpp"
-#include "util/io.hpp"
+#include <ndn-cxx/encoding/buffer-stream.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/security/transform.hpp>
+#include <ndn-cxx/security/v2/additional-description.hpp>
+#include <ndn-cxx/util/io.hpp>
 
 #include <fstream>
 #include <iostream>
diff --git a/tools/wscript b/tools/wscript
index 3e2fd0b..57066f0 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -11,7 +11,7 @@
     # These tools cannot be unit-tested.
     for tool in bld.path.ant_glob('*.cpp'):
         name = tool.change_ext('').path_from(bld.path.get_bld())
-        bld.program(name=name,
+        bld.program(name='tool-%s' % name,
                     target='../bin/%s' % name,
                     source=[tool],
                     use='ndn-cxx')
@@ -30,14 +30,14 @@
         srcFiles = subdir.ant_glob('**/*.cpp', excl=['main.cpp'])
         srcObjects = ''
         if srcFiles:
-            srcObjects = 'tools-%s-objects' % name
+            srcObjects = 'tool-%s-objects' % name
             bld.objects(target=srcObjects,
                         source=srcFiles,
                         use='ndn-cxx',
                         includes=name)
             testableObjects.append(srcObjects)
 
-        bld.program(name=name,
+        bld.program(name='tool-%s' % name,
                     target='../bin/%s' % name,
                     source=[mainFile],
                     use='ndn-cxx ' + srcObjects,
@@ -50,7 +50,7 @@
 
     # Tool wrappers
     wrapperFiles = bld.path.ant_glob('wrapper/*.sh')
-    bld(name='wrappers',
+    bld(name='tool-wrappers',
         features='subst',
         source=wrapperFiles,
         target=['../bin/%s' % node.change_ext('', '.sh').path_from(bld.path.find_dir('wrapper').get_bld())
diff --git a/wscript b/wscript
index e65ae22..2b0fe1e 100644
--- a/wscript
+++ b/wscript
@@ -139,15 +139,15 @@
     # config file will contain all defines that were added using conf.define('xxx'...)
     # Everything that was added directly to conf.env['DEFINES'] will not appear in the
     # config file and will be added using compiler directives in the command line.
-    conf.write_config_header('src/ndn-cxx-config.hpp', define_prefix='NDN_CXX_')
+    conf.write_config_header('ndn-cxx/ndn-cxx-config.hpp', define_prefix='NDN_CXX_')
 
 def build(bld):
     version(bld)
 
     bld(features='subst',
         name='version.hpp',
-        source='src/version.hpp.in',
-        target='src/version.hpp',
+        source='ndn-cxx/version.hpp.in',
+        target='ndn-cxx/version.hpp',
         install_path=None,
         VERSION_STRING=VERSION_BASE,
         VERSION_BUILD=VERSION,
@@ -161,34 +161,33 @@
     if bld.env['HAVE_OSX_FRAMEWORKS']:
         # Need to disable precompiled headers for Objective-C++ code
         bld(features=['cxx'],
-            target='ndn-cxx-mm',
-            name='ndn-cxx-mm',
-            source=bld.path.ant_glob(['src/**/*-osx.mm']),
-            use='version BOOST OPENSSL SQLITE3 RT PTHREAD OSX_COREFOUNDATION OSX_SECURITY OSX_SYSTEMCONFIGURATION OSX_FOUNDATION OSX_COREWLAN',
-            includes='src')
+            target='ndn-cxx-mm-objects',
+            source=bld.path.ant_glob('ndn-cxx/**/*-osx.mm'),
+            use='BOOST PTHREAD OSX_COREFOUNDATION OSX_SECURITY OSX_SYSTEMCONFIGURATION OSX_FOUNDATION OSX_COREWLAN',
+            includes='. ndn-cxx')
 
     libndn_cxx = dict(
         target='ndn-cxx',
-        source=bld.path.ant_glob('src/**/*.cpp',
-                                 excl=['src/**/*-osx.cpp',
-                                       'src/**/*netlink*.cpp',
-                                       'src/**/*-sqlite3.cpp']),
+        source=bld.path.ant_glob('ndn-cxx/**/*.cpp',
+                                 excl=['ndn-cxx/**/*-osx.cpp',
+                                       'ndn-cxx/**/*netlink*.cpp',
+                                       'ndn-cxx/**/*-sqlite3.cpp']),
         features='pch',
-        headers='src/common-pch.hpp',
-        use='version ndn-cxx-mm BOOST OPENSSL SQLITE3 RT PTHREAD',
-        includes='. src',
-        export_includes='src',
+        headers='ndn-cxx/common-pch.hpp',
+        use='ndn-cxx-mm-objects version BOOST OPENSSL SQLITE3 RT PTHREAD',
+        includes='. ndn-cxx',
+        export_includes='. ndn-cxx',
         install_path='${LIBDIR}')
 
     if bld.env['HAVE_OSX_FRAMEWORKS']:
-        libndn_cxx['source'] += bld.path.ant_glob('src/**/*-osx.cpp')
+        libndn_cxx['source'] += bld.path.ant_glob('ndn-cxx/**/*-osx.cpp')
         libndn_cxx['use'] += ' OSX_COREFOUNDATION OSX_SECURITY OSX_SYSTEMCONFIGURATION OSX_FOUNDATION OSX_COREWLAN'
 
     if bld.env['HAVE_NETLINK']:
-        libndn_cxx['source'] += bld.path.ant_glob('src/**/*netlink*.cpp')
+        libndn_cxx['source'] += bld.path.ant_glob('ndn-cxx/**/*netlink*.cpp')
 
     # In case we want to make it optional later
-    libndn_cxx['source'] += bld.path.ant_glob('src/**/*-sqlite3.cpp')
+    libndn_cxx['source'] += bld.path.ant_glob('ndn-cxx/**/*-sqlite3.cpp')
 
     if bld.env.enable_shared:
         bld.shlib(name='ndn-cxx',
@@ -250,29 +249,28 @@
     if bld.env['WITH_EXAMPLES']:
         bld.recurse('examples')
 
-    headers = bld.path.ant_glob('src/**/*.hpp',
-                                excl=['src/**/*-osx.hpp',
-                                      'src/**/*netlink*.hpp',
-                                      'src/**/*-sqlite3.hpp',
-                                      'src/**/detail/**/*'])
+    headers = bld.path.ant_glob('ndn-cxx/**/*.hpp',
+                                excl=['ndn-cxx/**/*-osx.hpp',
+                                      'ndn-cxx/**/*netlink*.hpp',
+                                      'ndn-cxx/**/*-sqlite3.hpp',
+                                      'ndn-cxx/**/detail/**/*'])
 
     if bld.env['HAVE_OSX_FRAMEWORKS']:
-        headers += bld.path.ant_glob('src/**/*-osx.hpp', excl='src/**/detail/**/*')
+        headers += bld.path.ant_glob('ndn-cxx/**/*-osx.hpp', excl='ndn-cxx/**/detail/**/*')
 
     if bld.env['HAVE_NETLINK']:
-        headers += bld.path.ant_glob('src/**/*netlink*.hpp', excl='src/**/detail/**/*')
+        headers += bld.path.ant_glob('ndn-cxx/**/*netlink*.hpp', excl='ndn-cxx/**/detail/**/*')
 
     # In case we want to make it optional later
-    headers += bld.path.ant_glob('src/**/*-sqlite3.hpp', excl='src/**/detail/**/*')
+    headers += bld.path.ant_glob('ndn-cxx/**/*-sqlite3.hpp', excl='ndn-cxx/**/detail/**/*')
 
-    bld.install_files('%s/ndn-cxx' % bld.env['INCLUDEDIR'], headers,
-                      relative_trick=True, cwd=bld.path.find_node('src'))
+    bld.install_files(bld.env['INCLUDEDIR'], headers, relative_trick=True)
 
     bld.install_files('%s/ndn-cxx' % bld.env['INCLUDEDIR'],
-                      bld.path.find_resource('src/ndn-cxx-config.hpp'))
+                      bld.path.find_resource('ndn-cxx/ndn-cxx-config.hpp'))
 
     bld.install_files('%s/ndn-cxx' % bld.env['INCLUDEDIR'],
-                      bld.path.find_resource('src/version.hpp'))
+                      bld.path.find_resource('ndn-cxx/version.hpp'))
 
     bld.install_files('${SYSCONFDIR}/ndn', 'client.conf.sample')