diff --git a/src/blobstore/implementations/onblocks/CMakeLists.txt b/src/blobstore/implementations/onblocks/CMakeLists.txt
index f69ee85d..ee9bb22d 100644
--- a/src/blobstore/implementations/onblocks/CMakeLists.txt
+++ b/src/blobstore/implementations/onblocks/CMakeLists.txt
@@ -1,3 +1,5 @@
-add_library(blobstore_onblocks BlobOnBlocks.cpp BlobStoreOnBlocks.cpp impl/DataNode.cpp impl/DataLeafNode.cpp impl/DataInnerNode.cpp impl/DataNodeStore.cpp)
+add_subdirectory(datanodestore)
 
-target_link_libraries(blobstore_onblocks blockstore_interface)
+add_library(blobstore_onblocks BlobOnBlocks.cpp BlobStoreOnBlocks.cpp)
+
+target_link_libraries(blobstore_onblocks blobstore_onblocks_datanodestore)
diff --git a/src/blobstore/implementations/onblocks/datanodestore/CMakeLists.txt b/src/blobstore/implementations/onblocks/datanodestore/CMakeLists.txt
new file mode 100644
index 00000000..ecb185ef
--- /dev/null
+++ b/src/blobstore/implementations/onblocks/datanodestore/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(blobstore_onblocks_datanodestore DataInnerNode.cpp DataLeafNode.cpp DataNode.cpp DataNodeStore.cpp)
+
+target_link_libraries(blobstore_onblocks_datanodestore blockstore_interface)
diff --git a/src/blobstore/implementations/onblocks/impl/DataInnerNode.cpp b/src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.cpp
similarity index 95%
rename from src/blobstore/implementations/onblocks/impl/DataInnerNode.cpp
rename to src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.cpp
index ff726cc1..97ef9d8e 100644
--- a/src/blobstore/implementations/onblocks/impl/DataInnerNode.cpp
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.cpp
@@ -1,5 +1,5 @@
-#include <blobstore/implementations/onblocks/impl/DataNodeStore.h>
-#include "DataInnerNode.h"
+#include <blobstore/implementations/onblocks/datanodestore/DataInnerNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeStore.h>
 
 
 using std::unique_ptr;
diff --git a/src/blobstore/implementations/onblocks/impl/DataInnerNode.h b/src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.h
similarity index 85%
rename from src/blobstore/implementations/onblocks/impl/DataInnerNode.h
rename to src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.h
index b138823e..50040d50 100644
--- a/src/blobstore/implementations/onblocks/impl/DataInnerNode.h
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.h
@@ -1,8 +1,8 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATAINNERNODE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATAINNERNODE_H_
+#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_H_
+#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_H_
 
-#include "DataNode.h"
+#include <blobstore/implementations/onblocks/datanodestore/DataNode.h>
 
 namespace blobstore {
 namespace onblocks {
diff --git a/src/blobstore/implementations/onblocks/impl/DataLeafNode.cpp b/src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.cpp
similarity index 95%
rename from src/blobstore/implementations/onblocks/impl/DataLeafNode.cpp
rename to src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.cpp
index 3ecceb26..f8d5f886 100644
--- a/src/blobstore/implementations/onblocks/impl/DataLeafNode.cpp
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.cpp
@@ -1,4 +1,4 @@
-#include "DataLeafNode.h"
+#include <blobstore/implementations/onblocks/datanodestore/DataLeafNode.h>
 
 using std::unique_ptr;
 using blockstore::Block;
diff --git a/src/blobstore/implementations/onblocks/impl/DataLeafNode.h b/src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.h
similarity index 75%
rename from src/blobstore/implementations/onblocks/impl/DataLeafNode.h
rename to src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.h
index 9b25aad8..d64947e5 100644
--- a/src/blobstore/implementations/onblocks/impl/DataLeafNode.h
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.h
@@ -1,8 +1,8 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATALEAFNODE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATALEAFNODE_H_
+#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATALEAFNODE_H_
+#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATALEAFNODE_H_
 
-#include "DataNode.h"
+#include <blobstore/implementations/onblocks/datanodestore/DataNode.h>
 
 namespace blobstore {
 namespace onblocks {
diff --git a/src/blobstore/implementations/onblocks/impl/DataNode.cpp b/src/blobstore/implementations/onblocks/datanodestore/DataNode.cpp
similarity index 73%
rename from src/blobstore/implementations/onblocks/impl/DataNode.cpp
rename to src/blobstore/implementations/onblocks/datanodestore/DataNode.cpp
index 7d3581b4..ea3b786f 100644
--- a/src/blobstore/implementations/onblocks/impl/DataNode.cpp
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNode.cpp
@@ -1,8 +1,8 @@
-#include <blobstore/implementations/onblocks/impl/DataNodeStore.h>
-#include "DataNode.h"
-
 #include "DataInnerNode.h"
-#include "DataLeafNode.h"
+#include <blobstore/implementations/onblocks/datanodestore/DataInnerNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataLeafNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeStore.h>
 
 using blockstore::Block;
 
diff --git a/src/blobstore/implementations/onblocks/impl/DataNode.h b/src/blobstore/implementations/onblocks/datanodestore/DataNode.h
similarity index 80%
rename from src/blobstore/implementations/onblocks/impl/DataNode.h
rename to src/blobstore/implementations/onblocks/datanodestore/DataNode.h
index 711b3a94..e338e01c 100644
--- a/src/blobstore/implementations/onblocks/impl/DataNode.h
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNode.h
@@ -1,9 +1,8 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATANODE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATANODE_H_
-
-#include "DataNodeView.h"
+#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
+#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
 
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeView.h>
 #include "blockstore/utils/Data.h"
 
 namespace blobstore {
diff --git a/src/blobstore/implementations/onblocks/impl/DataNodeStore.cpp b/src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.cpp
similarity index 88%
rename from src/blobstore/implementations/onblocks/impl/DataNodeStore.cpp
rename to src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.cpp
index 18860840..3b3006cd 100644
--- a/src/blobstore/implementations/onblocks/impl/DataNodeStore.cpp
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.cpp
@@ -1,9 +1,9 @@
-#include <blobstore/implementations/onblocks/impl/DataNodeStore.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataInnerNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataLeafNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeStore.h>
 #include "blockstore/interface/BlockStore.h"
 #include "blockstore/interface/Block.h"
 
-#include "DataLeafNode.h"
-#include "DataInnerNode.h"
 
 using blockstore::BlockStore;
 using blockstore::Block;
diff --git a/src/blobstore/implementations/onblocks/impl/DataNodeStore.h b/src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.h
similarity index 85%
rename from src/blobstore/implementations/onblocks/impl/DataNodeStore.h
rename to src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.h
index 8bfd1309..4d55b906 100644
--- a/src/blobstore/implementations/onblocks/impl/DataNodeStore.h
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATANODESTORE_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATANODESTORE_H_
+#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
+#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
 
 #include <memory>
 #include "fspp/utils/macros.h"
diff --git a/src/blobstore/implementations/onblocks/impl/DataNodeView.h b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
similarity index 94%
rename from src/blobstore/implementations/onblocks/impl/DataNodeView.h
rename to src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
index 24c1d1f5..4c2c42f4 100644
--- a/src/blobstore/implementations/onblocks/impl/DataNodeView.h
+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATANODEVIEW_H_
-#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_IMPL_DATANODEVIEW_H_
+#ifndef BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
+#define BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
 
 #include "blockstore/interface/Block.h"
 #include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
diff --git a/src/test/blobstore/implementations/onblocks/impl/DataLeafNodeTest.cpp b/src/test/blobstore/implementations/onblocks/impl/DataLeafNodeTest.cpp
index b3477ba6..997e8406 100644
--- a/src/test/blobstore/implementations/onblocks/impl/DataLeafNodeTest.cpp
+++ b/src/test/blobstore/implementations/onblocks/impl/DataLeafNodeTest.cpp
@@ -1,10 +1,10 @@
-#include <blobstore/implementations/onblocks/impl/DataNodeStore.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataLeafNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeStore.h>
 #include <gtest/gtest.h>
 
 #include "blockstore/implementations/testfake/FakeBlockStore.h"
 #include "blockstore/implementations/testfake/FakeBlock.h"
 #include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
-#include "blobstore/implementations/onblocks/impl/DataLeafNode.h"
 #include "test/testutils/DataBlockFixture.h"
 
 using ::testing::Test;
diff --git a/src/test/blobstore/implementations/onblocks/impl/DataNodeTest.cpp b/src/test/blobstore/implementations/onblocks/impl/DataNodeTest.cpp
index 1da6de53..10f3c0da 100644
--- a/src/test/blobstore/implementations/onblocks/impl/DataNodeTest.cpp
+++ b/src/test/blobstore/implementations/onblocks/impl/DataNodeTest.cpp
@@ -1,12 +1,12 @@
-#include <blobstore/implementations/onblocks/impl/DataNodeStore.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataInnerNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataLeafNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNode.h>
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeStore.h>
 #include <gtest/gtest.h>
 
 #include "blockstore/implementations/testfake/FakeBlockStore.h"
 #include "blockstore/implementations/testfake/FakeBlock.h"
 #include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
-#include "blobstore/implementations/onblocks/impl/DataNode.h"
-#include "blobstore/implementations/onblocks/impl/DataLeafNode.h"
-#include "blobstore/implementations/onblocks/impl/DataInnerNode.h"
 
 using ::testing::Test;
 using std::unique_ptr;
diff --git a/src/test/blobstore/implementations/onblocks/impl/DataNodeViewTest.cpp b/src/test/blobstore/implementations/onblocks/impl/DataNodeViewTest.cpp
index b8cab8c0..20a98581 100644
--- a/src/test/blobstore/implementations/onblocks/impl/DataNodeViewTest.cpp
+++ b/src/test/blobstore/implementations/onblocks/impl/DataNodeViewTest.cpp
@@ -1,9 +1,9 @@
+#include <blobstore/implementations/onblocks/datanodestore/DataNodeView.h>
 #include <gtest/gtest.h>
 
 #include "blockstore/implementations/testfake/FakeBlockStore.h"
 #include "blockstore/implementations/testfake/FakeBlock.h"
 #include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
-#include "blobstore/implementations/onblocks/impl/DataNodeView.h"
 #include "test/testutils/DataBlockFixture.h"
 
 using ::testing::Test;