diff --git a/src/security/certificate-container.cpp b/src/security/pib/certificate-container.cpp
similarity index 100%
rename from src/security/certificate-container.cpp
rename to src/security/pib/certificate-container.cpp
diff --git a/src/security/certificate-container.hpp b/src/security/pib/certificate-container.hpp
similarity index 91%
rename from src/security/certificate-container.hpp
rename to src/security/pib/certificate-container.hpp
index f0cc408..8e77e43 100644
--- a/src/security/certificate-container.hpp
+++ b/src/security/pib/certificate-container.hpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_CERTIFICATE_CONTAINER_HPP
-#define NDN_SECURITY_CERTIFICATE_CONTAINER_HPP
+#ifndef NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
+#define NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
 
 #include <set>
-#include "v1/identity-certificate.hpp"
+#include "../v1/identity-certificate.hpp"
 
 namespace ndn {
 namespace security {
@@ -90,4 +90,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_CERTIFICATE_CONTAINER_HPP
+#endif // NDN_SECURITY_PIB_CERTIFICATE_CONTAINER_HPP
diff --git a/src/security/identity-container.cpp b/src/security/pib/identity-container.cpp
similarity index 97%
rename from src/security/identity-container.cpp
rename to src/security/pib/identity-container.cpp
index 756a75a..605be8b 100644
--- a/src/security/identity-container.cpp
+++ b/src/security/pib/identity-container.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-2016 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/identity-container.hpp b/src/security/pib/identity-container.hpp
similarity index 90%
rename from src/security/identity-container.hpp
rename to src/security/pib/identity-container.hpp
index dee80dd..1de18c7 100644
--- a/src/security/identity-container.hpp
+++ b/src/security/pib/identity-container.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-2016 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_SECURITY_IDENTITY_CONTAINER_HPP
-#define NDN_SECURITY_IDENTITY_CONTAINER_HPP
+#ifndef NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
+#define NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
 
 #include <set>
 #include "identity.hpp"
@@ -91,4 +91,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_IDENTITY_CONTAINER_HPP
+#endif // NDN_SECURITY_PIB_IDENTITY_CONTAINER_HPP
diff --git a/src/security/identity.cpp b/src/security/pib/identity.cpp
similarity index 100%
rename from src/security/identity.cpp
rename to src/security/pib/identity.cpp
diff --git a/src/security/identity.hpp b/src/security/pib/identity.hpp
similarity index 97%
rename from src/security/identity.hpp
rename to src/security/pib/identity.hpp
index 1e4bd2c..3c081ef 100644
--- a/src/security/identity.hpp
+++ b/src/security/pib/identity.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_IDENTITY_HPP
-#define NDN_SECURITY_IDENTITY_HPP
+#ifndef NDN_SECURITY_PIB_IDENTITY_HPP
+#define NDN_SECURITY_PIB_IDENTITY_HPP
 
 #include "key-container.hpp"
 
@@ -191,4 +191,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_IDENTITY_HPP
+#endif // NDN_SECURITY_PIB_IDENTITY_HPP
diff --git a/src/security/key-container.cpp b/src/security/pib/key-container.cpp
similarity index 97%
rename from src/security/key-container.cpp
rename to src/security/pib/key-container.cpp
index 51ffac5..ca30ab9 100644
--- a/src/security/key-container.cpp
+++ b/src/security/pib/key-container.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-2016 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-container.hpp b/src/security/pib/key-container.hpp
similarity index 91%
rename from src/security/key-container.hpp
rename to src/security/pib/key-container.hpp
index 9799d03..7d88da9 100644
--- a/src/security/key-container.hpp
+++ b/src/security/pib/key-container.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-2016 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_SECURITY_KEY_CONTAINER_HPP
-#define NDN_SECURITY_KEY_CONTAINER_HPP
+#ifndef NDN_SECURITY_PIB_KEY_CONTAINER_HPP
+#define NDN_SECURITY_PIB_KEY_CONTAINER_HPP
 
 #include <set>
 #include "key.hpp"
@@ -96,4 +96,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_KEY_CONTAINER_HPP
+#endif // NDN_SECURITY_PIB_KEY_CONTAINER_HPP
diff --git a/src/security/key.cpp b/src/security/pib/key.cpp
similarity index 100%
rename from src/security/key.cpp
rename to src/security/pib/key.cpp
diff --git a/src/security/key.hpp b/src/security/pib/key.hpp
similarity index 97%
rename from src/security/key.hpp
rename to src/security/pib/key.hpp
index a237a38..7118149 100644
--- a/src/security/key.hpp
+++ b/src/security/pib/key.hpp
@@ -19,10 +19,10 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_KEY_HPP
-#define NDN_SECURITY_KEY_HPP
+#ifndef NDN_SECURITY_PIB_KEY_HPP
+#define NDN_SECURITY_PIB_KEY_HPP
 
-#include "v1/identity-certificate.hpp"
+#include "../v1/identity-certificate.hpp"
 #include "certificate-container.hpp"
 
 namespace ndn {
@@ -204,4 +204,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_HPP
+#endif // NDN_SECURITY_PIB_PIB_HPP
diff --git a/src/security/pib-impl.hpp b/src/security/pib/pib-impl.hpp
similarity index 98%
rename from src/security/pib-impl.hpp
rename to src/security/pib/pib-impl.hpp
index d2b2324..7aa47a2 100644
--- a/src/security/pib-impl.hpp
+++ b/src/security/pib/pib-impl.hpp
@@ -19,11 +19,11 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_IMPL_HPP
-#define NDN_SECURITY_PIB_IMPL_HPP
+#ifndef NDN_SECURITY_PIB_PIB_IMPL_HPP
+#define NDN_SECURITY_PIB_PIB_IMPL_HPP
 
 #include <set>
-#include "v1/identity-certificate.hpp"
+#include "../v1/identity-certificate.hpp"
 
 namespace ndn {
 namespace security {
@@ -301,4 +301,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_IMPL_HPP
+#endif // NDN_SECURITY_PIB_PIB_IMPL_HPP
diff --git a/src/security/pib-memory.cpp b/src/security/pib/pib-memory.cpp
similarity index 100%
rename from src/security/pib-memory.cpp
rename to src/security/pib/pib-memory.cpp
diff --git a/src/security/pib-memory.hpp b/src/security/pib/pib-memory.hpp
similarity index 96%
rename from src/security/pib-memory.hpp
rename to src/security/pib/pib-memory.hpp
index 50da3dd..0cfe7c1 100644
--- a/src/security/pib-memory.hpp
+++ b/src/security/pib/pib-memory.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITY_PIB_MEMORY_HPP
-#define NDN_SECURITY_PIB_MEMORY_HPP
+#ifndef NDN_SECURITY_PIB_PIB_MEMORY_HPP
+#define NDN_SECURITY_PIB_PIB_MEMORY_HPP
 
 #include "pib-impl.hpp"
 
@@ -150,4 +150,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_MEMORY_HPP
+#endif // NDN_SECURITY_PIB_PIB_MEMORY_HPP
diff --git a/src/security/pib-sqlite3.cpp b/src/security/pib/pib-sqlite3.cpp
similarity index 100%
rename from src/security/pib-sqlite3.cpp
rename to src/security/pib/pib-sqlite3.cpp
diff --git a/src/security/pib-sqlite3.hpp b/src/security/pib/pib-sqlite3.hpp
similarity index 96%
rename from src/security/pib-sqlite3.hpp
rename to src/security/pib/pib-sqlite3.hpp
index 9093957..7e4b2c5 100644
--- a/src/security/pib-sqlite3.hpp
+++ b/src/security/pib/pib-sqlite3.hpp
@@ -19,8 +19,8 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#ifndef NDN_SECURITTY_PIB_SQLITE3_HPP
-#define NDN_SECURITTY_PIB_SQLITE3_HPP
+#ifndef NDN_SECURITTY_PIB_PIB_SQLITE3_HPP
+#define NDN_SECURITTY_PIB_PIB_SQLITE3_HPP
 
 #include "pib-impl.hpp"
 
@@ -140,4 +140,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITTY_PIB_SQLITE3_HPP
+#endif // NDN_SECURITTY_PIB_PIB_SQLITE3_HPP
diff --git a/src/security/pib.cpp b/src/security/pib/pib.cpp
similarity index 97%
rename from src/security/pib.cpp
rename to src/security/pib/pib.cpp
index df366c9..511c96a 100644
--- a/src/security/pib.cpp
+++ b/src/security/pib/pib.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-2016 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.hpp b/src/security/pib/pib.hpp
similarity index 96%
rename from src/security/pib.hpp
rename to src/security/pib/pib.hpp
index 1fd2006..5c5a11c 100644
--- a/src/security/pib.hpp
+++ b/src/security/pib/pib.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-2016 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_SECURITY_PIB_HPP
-#define NDN_SECURITY_PIB_HPP
+#ifndef NDN_SECURITY_PIB_PIB_HPP
+#define NDN_SECURITY_PIB_PIB_HPP
 
 #include "identity-container.hpp"
 
@@ -184,4 +184,4 @@
 } // namespace security
 } // namespace ndn
 
-#endif // NDN_SECURITY_PIB_HPP
+#endif // NDN_SECURITY_PIB_PIB_HPP