diff --git a/src/storage/repo-storage.cpp b/src/storage/repo-storage.cpp
new file mode 100644
index 0000000..381ccaa
--- /dev/null
+++ b/src/storage/repo-storage.cpp
@@ -0,0 +1,116 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014,  Regents of the University of California.
+ *
+ * This file is part of NDN repo-ng (Next generation of NDN repository).
+ * See AUTHORS.md for complete list of repo-ng authors and contributors.
+ *
+ * repo-ng is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * repo-ng is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * repo-ng, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "repo-storage.hpp"
+#include "../../build/src/config.hpp"
+#include <istream>
+
+namespace repo {
+
+static void
+insertItemToIndex(Index* index, const Storage::ItemMeta& item)
+{
+  index->insert(item.fullName, item.id, item.keyLocatorHash);
+}
+
+RepoStorage::RepoStorage(const int64_t& nMaxPackets, Storage& store)
+  : m_index(nMaxPackets)
+  , m_storage(store)
+{
+}
+
+void
+RepoStorage::initialize()
+{
+  m_storage.fullEnumerate(bind(&insertItemToIndex, &m_index, _1));
+}
+
+bool
+RepoStorage::insertData(const Data& data)
+{
+   bool isExist = m_index.hasData(data);
+   if (isExist)
+     throw Error("The Entry Has Already In the Skiplist. Cannot be Inserted!");
+   int64_t id = m_storage.insert(data);
+   if (id == -1)
+     return false;
+   return m_index.insert(data, id);
+}
+
+ssize_t
+RepoStorage::deleteData(const Name& name)
+{
+  bool hasError = false;
+  std::pair<int64_t,ndn::Name> idName = m_index.find(name);
+  if (idName.first == 0)
+    return false;
+  int64_t count = 0;
+  while (idName.first != 0) {
+    bool resultDb = m_storage.erase(idName.first);
+    bool resultIndex = m_index.erase(idName.second); //full name
+    if (resultDb && resultIndex)
+      count++;
+    else
+      hasError = true;
+    idName = m_index.find(name);
+  }
+  if (hasError)
+    return -1;
+  else
+    return count;
+}
+
+ssize_t
+RepoStorage::deleteData(const Interest& interest)
+{
+  Interest interestDelete = interest;
+  interestDelete.setChildSelector(0);  //to disable the child selector in delete handle
+  int64_t count = 0;
+  bool hasError = false;
+  std::pair<int64_t,ndn::Name> idName = m_index.find(interestDelete);
+  while (idName.first != 0) {
+    bool resultDb = m_storage.erase(idName.first);
+    bool resultIndex = m_index.erase(idName.second); //full name
+    if (resultDb && resultIndex)
+      count++;
+    else
+      hasError = true;
+    idName = m_index.find(interestDelete);
+  }
+  if (hasError)
+    return -1;
+  else
+    return count;
+}
+
+shared_ptr<Data>
+RepoStorage::readData(const Interest& interest) const
+{
+  std::pair<int64_t,ndn::Name> idName = m_index.find(interest);
+  if (idName.first != 0) {
+    shared_ptr<Data> data = m_storage.read(idName.first);
+    if (data) {
+      return data;
+    }
+  }
+  return shared_ptr<Data>();
+}
+
+
+} // namespace repo