diff --git a/nano/node/CMakeLists.txt b/nano/node/CMakeLists.txt
index 17dca7e3cd..01afab48f9 100644
--- a/nano/node/CMakeLists.txt
+++ b/nano/node/CMakeLists.txt
@@ -112,20 +112,6 @@ add_library(
   json_handler.cpp
   ledger_walker.hpp
   ledger_walker.cpp
-  lmdb/account_store.cpp
-  lmdb/block_store.cpp
-  lmdb/confirmation_height_store.cpp
-  lmdb/final_vote_store.cpp
-  lmdb/frontier_store.cpp
-  lmdb/online_weight_store.cpp
-  lmdb/peer_store.cpp
-  lmdb/pending_store.cpp
-  lmdb/pruned_store.cpp
-  lmdb/version_store.cpp
-  lmdb/lmdb.cpp
-  lmdb/lmdb_env.cpp
-  lmdb/lmdb_txn.cpp
-  lmdb/wallet_value.cpp
   logging.hpp
   logging.cpp
   make_store.hpp
@@ -156,18 +142,6 @@ add_library(
   repcrawler.cpp
   request_aggregator.hpp
   request_aggregator.cpp
-  rocksdb/account_store.cpp
-  rocksdb/block_store.cpp
-  rocksdb/confirmation_height_store.cpp
-  rocksdb/final_vote_store.cpp
-  rocksdb/frontier_store.cpp
-  rocksdb/online_weight_store.cpp
-  rocksdb/peer_store.cpp
-  rocksdb/pending_store.cpp
-  rocksdb/pruned_store.cpp
-  rocksdb/version_store.cpp
-  rocksdb/rocksdb.cpp
-  rocksdb/rocksdb_txn.cpp
   scheduler/bucket.cpp
   scheduler/bucket.hpp
   scheduler/buckets.cpp
@@ -232,10 +206,10 @@ endif()
 
 target_link_libraries(
   node
+  nano_store
   rpc
   secure
   nano_lib
-  nano_store
   libminiupnpc-static
   argon2
   lmdb
@@ -262,6 +236,5 @@ add_dependencies(node ipc_flatbuffers_lib)
 
 include_directories(${CMAKE_SOURCE_DIR}/submodules)
 include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)
-include_directories(${CMAKE_SOURCE_DIR}/submodules/lmdb)
 include_directories(
   ${CMAKE_SOURCE_DIR}/submodules/nano-pow-server/deps/cpptoml/include)
diff --git a/nano/secure/CMakeLists.txt b/nano/secure/CMakeLists.txt
index 06526287ff..6b06aa7256 100644
--- a/nano/secure/CMakeLists.txt
+++ b/nano/secure/CMakeLists.txt
@@ -48,7 +48,6 @@ add_library(
   network_filter.cpp
   utility.hpp
   utility.cpp
-  versioning.cpp
   working.hpp)
 
 target_link_libraries(
diff --git a/nano/store/CMakeLists.txt b/nano/store/CMakeLists.txt
index df47f0a232..75c9027cf8 100644
--- a/nano/store/CMakeLists.txt
+++ b/nano/store/CMakeLists.txt
@@ -6,13 +6,17 @@ add_library(
   lmdb/confirmation_height.hpp
   lmdb/final_vote.hpp
   lmdb/frontier.hpp
+  lmdb/lmdb.hpp
+  lmdb/lmdb_env.hpp
   lmdb/iterator.hpp
+  lmdb/transaction_impl.hpp
   lmdb/online_weight.hpp
   lmdb/peer.hpp
   lmdb/pending.hpp
   lmdb/pruned.hpp
   lmdb/transaction_impl.hpp
   lmdb/version.hpp
+  lmdb/wallet_value.hpp
   rocksdb/account.hpp
   rocksdb/block.hpp
   rocksdb/confirmation_height.hpp
@@ -23,10 +27,38 @@ add_library(
   rocksdb/peer.hpp
   rocksdb/pending.hpp
   rocksdb/pruned.hpp
+  rocksdb/rocksdb.hpp
   rocksdb/transaction_impl.hpp
   rocksdb/version.hpp
   versioning.hpp
-  component.cpp)
+  component.cpp
+  lmdb/account.cpp
+  lmdb/block.cpp
+  lmdb/confirmation_height.cpp
+  lmdb/final_vote.cpp
+  lmdb/frontier.cpp
+  lmdb/lmdb.cpp
+  lmdb/lmdb_env.cpp
+  lmdb/transaction.cpp
+  lmdb/online_weight.cpp
+  lmdb/peer.cpp
+  lmdb/pending.cpp
+  lmdb/pruned.cpp
+  lmdb/version.cpp
+  lmdb/wallet_value.cpp
+  rocksdb/account.cpp
+  rocksdb/block.cpp
+  rocksdb/confirmation_height.cpp
+  rocksdb/final_vote.cpp
+  rocksdb/frontier.cpp
+  rocksdb/online_weight.cpp
+  rocksdb/peer.cpp
+  rocksdb/pending.cpp
+  rocksdb/pruned.cpp
+  rocksdb/rocksdb.cpp
+  rocksdb/transaction.cpp
+  rocksdb/version.cpp
+  versioning.cpp)
 
 target_link_libraries(
   nano_store
diff --git a/nano/node/lmdb/account_store.cpp b/nano/store/lmdb/account.cpp
similarity index 100%
rename from nano/node/lmdb/account_store.cpp
rename to nano/store/lmdb/account.cpp
diff --git a/nano/node/lmdb/block_store.cpp b/nano/store/lmdb/block.cpp
similarity index 100%
rename from nano/node/lmdb/block_store.cpp
rename to nano/store/lmdb/block.cpp
diff --git a/nano/node/lmdb/confirmation_height_store.cpp b/nano/store/lmdb/confirmation_height.cpp
similarity index 100%
rename from nano/node/lmdb/confirmation_height_store.cpp
rename to nano/store/lmdb/confirmation_height.cpp
diff --git a/nano/node/lmdb/final_vote_store.cpp b/nano/store/lmdb/final_vote.cpp
similarity index 100%
rename from nano/node/lmdb/final_vote_store.cpp
rename to nano/store/lmdb/final_vote.cpp
diff --git a/nano/node/lmdb/frontier_store.cpp b/nano/store/lmdb/frontier.cpp
similarity index 100%
rename from nano/node/lmdb/frontier_store.cpp
rename to nano/store/lmdb/frontier.cpp
diff --git a/nano/node/lmdb/lmdb.cpp b/nano/store/lmdb/lmdb.cpp
similarity index 99%
rename from nano/node/lmdb/lmdb.cpp
rename to nano/store/lmdb/lmdb.cpp
index d91381bb3d..94593dbce6 100644
--- a/nano/node/lmdb/lmdb.cpp
+++ b/nano/store/lmdb/lmdb.cpp
@@ -1,5 +1,4 @@
 #include <nano/lib/utility.hpp>
-#include <nano/node/common.hpp>
 #include <nano/secure/buffer.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/store/lmdb/lmdb.hpp>
diff --git a/nano/store/lmdb/lmdb.hpp b/nano/store/lmdb/lmdb.hpp
index e2ed33c005..0fb962f7a2 100644
--- a/nano/store/lmdb/lmdb.hpp
+++ b/nano/store/lmdb/lmdb.hpp
@@ -4,20 +4,20 @@
 #include <nano/lib/lmdbconfig.hpp>
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/numbers.hpp>
+#include <nano/secure/common.hpp>
 #include <nano/store/lmdb/account.hpp>
 #include <nano/store/lmdb/block.hpp>
 #include <nano/store/lmdb/confirmation_height.hpp>
 #include <nano/store/lmdb/final_vote.hpp>
 #include <nano/store/lmdb/frontier.hpp>
-#include <nano/store/lmdb/lmdb_env.hpp>
 #include <nano/store/lmdb/iterator.hpp>
-#include <nano/store/lmdb/transaction_impl.hpp>
+#include <nano/store/lmdb/lmdb_env.hpp>
 #include <nano/store/lmdb/online_weight.hpp>
 #include <nano/store/lmdb/peer.hpp>
 #include <nano/store/lmdb/pending.hpp>
 #include <nano/store/lmdb/pruned.hpp>
+#include <nano/store/lmdb/transaction_impl.hpp>
 #include <nano/store/lmdb/version.hpp>
-#include <nano/secure/common.hpp>
 #include <nano/store/versioning.hpp>
 
 #include <boost/optional.hpp>
diff --git a/nano/node/lmdb/lmdb_env.cpp b/nano/store/lmdb/lmdb_env.cpp
similarity index 100%
rename from nano/node/lmdb/lmdb_env.cpp
rename to nano/store/lmdb/lmdb_env.cpp
diff --git a/nano/store/lmdb/lmdb_env.hpp b/nano/store/lmdb/lmdb_env.hpp
index f7038443f6..f02e9a4dda 100644
--- a/nano/store/lmdb/lmdb_env.hpp
+++ b/nano/store/lmdb/lmdb_env.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <nano/lib/lmdbconfig.hpp>
-#include <nano/store/lmdb/transaction_impl.hpp>
 #include <nano/store/component.hpp>
+#include <nano/store/lmdb/transaction_impl.hpp>
 
 namespace nano
 {
diff --git a/nano/node/lmdb/online_weight_store.cpp b/nano/store/lmdb/online_weight.cpp
similarity index 100%
rename from nano/node/lmdb/online_weight_store.cpp
rename to nano/store/lmdb/online_weight.cpp
diff --git a/nano/node/lmdb/peer_store.cpp b/nano/store/lmdb/peer.cpp
similarity index 100%
rename from nano/node/lmdb/peer_store.cpp
rename to nano/store/lmdb/peer.cpp
diff --git a/nano/node/lmdb/pending_store.cpp b/nano/store/lmdb/pending.cpp
similarity index 100%
rename from nano/node/lmdb/pending_store.cpp
rename to nano/store/lmdb/pending.cpp
diff --git a/nano/node/lmdb/pruned_store.cpp b/nano/store/lmdb/pruned.cpp
similarity index 100%
rename from nano/node/lmdb/pruned_store.cpp
rename to nano/store/lmdb/pruned.cpp
diff --git a/nano/node/lmdb/lmdb_txn.cpp b/nano/store/lmdb/transaction.cpp
similarity index 100%
rename from nano/node/lmdb/lmdb_txn.cpp
rename to nano/store/lmdb/transaction.cpp
diff --git a/nano/node/lmdb/version_store.cpp b/nano/store/lmdb/version.cpp
similarity index 100%
rename from nano/node/lmdb/version_store.cpp
rename to nano/store/lmdb/version.cpp
diff --git a/nano/node/lmdb/wallet_value.cpp b/nano/store/lmdb/wallet_value.cpp
similarity index 100%
rename from nano/node/lmdb/wallet_value.cpp
rename to nano/store/lmdb/wallet_value.cpp
diff --git a/nano/node/rocksdb/account_store.cpp b/nano/store/rocksdb/account.cpp
similarity index 100%
rename from nano/node/rocksdb/account_store.cpp
rename to nano/store/rocksdb/account.cpp
diff --git a/nano/node/rocksdb/block_store.cpp b/nano/store/rocksdb/block.cpp
similarity index 100%
rename from nano/node/rocksdb/block_store.cpp
rename to nano/store/rocksdb/block.cpp
diff --git a/nano/node/rocksdb/confirmation_height_store.cpp b/nano/store/rocksdb/confirmation_height.cpp
similarity index 100%
rename from nano/node/rocksdb/confirmation_height_store.cpp
rename to nano/store/rocksdb/confirmation_height.cpp
diff --git a/nano/node/rocksdb/final_vote_store.cpp b/nano/store/rocksdb/final_vote.cpp
similarity index 100%
rename from nano/node/rocksdb/final_vote_store.cpp
rename to nano/store/rocksdb/final_vote.cpp
diff --git a/nano/node/rocksdb/frontier_store.cpp b/nano/store/rocksdb/frontier.cpp
similarity index 100%
rename from nano/node/rocksdb/frontier_store.cpp
rename to nano/store/rocksdb/frontier.cpp
diff --git a/nano/node/rocksdb/online_weight_store.cpp b/nano/store/rocksdb/online_weight.cpp
similarity index 100%
rename from nano/node/rocksdb/online_weight_store.cpp
rename to nano/store/rocksdb/online_weight.cpp
diff --git a/nano/node/rocksdb/peer_store.cpp b/nano/store/rocksdb/peer.cpp
similarity index 100%
rename from nano/node/rocksdb/peer_store.cpp
rename to nano/store/rocksdb/peer.cpp
diff --git a/nano/node/rocksdb/pending_store.cpp b/nano/store/rocksdb/pending.cpp
similarity index 100%
rename from nano/node/rocksdb/pending_store.cpp
rename to nano/store/rocksdb/pending.cpp
diff --git a/nano/node/rocksdb/pruned_store.cpp b/nano/store/rocksdb/pruned.cpp
similarity index 100%
rename from nano/node/rocksdb/pruned_store.cpp
rename to nano/store/rocksdb/pruned.cpp
diff --git a/nano/node/rocksdb/rocksdb.cpp b/nano/store/rocksdb/rocksdb.cpp
similarity index 100%
rename from nano/node/rocksdb/rocksdb.cpp
rename to nano/store/rocksdb/rocksdb.cpp
diff --git a/nano/store/rocksdb/rocksdb.hpp b/nano/store/rocksdb/rocksdb.hpp
index 435a77ed3e..39c03b5c20 100644
--- a/nano/store/rocksdb/rocksdb.hpp
+++ b/nano/store/rocksdb/rocksdb.hpp
@@ -4,18 +4,18 @@
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/rocksdbconfig.hpp>
+#include <nano/secure/common.hpp>
 #include <nano/store/rocksdb/account.hpp>
 #include <nano/store/rocksdb/block.hpp>
 #include <nano/store/rocksdb/confirmation_height.hpp>
 #include <nano/store/rocksdb/final_vote.hpp>
 #include <nano/store/rocksdb/frontier.hpp>
+#include <nano/store/rocksdb/iterator.hpp>
 #include <nano/store/rocksdb/online_weight.hpp>
 #include <nano/store/rocksdb/peer.hpp>
 #include <nano/store/rocksdb/pending.hpp>
 #include <nano/store/rocksdb/pruned.hpp>
-#include <nano/store/rocksdb/iterator.hpp>
 #include <nano/store/rocksdb/version.hpp>
-#include <nano/secure/common.hpp>
 
 #include <rocksdb/db.h>
 #include <rocksdb/filter_policy.h>
diff --git a/nano/node/rocksdb/rocksdb_txn.cpp b/nano/store/rocksdb/transaction.cpp
similarity index 100%
rename from nano/node/rocksdb/rocksdb_txn.cpp
rename to nano/store/rocksdb/transaction.cpp
diff --git a/nano/node/rocksdb/version_store.cpp b/nano/store/rocksdb/version.cpp
similarity index 100%
rename from nano/node/rocksdb/version_store.cpp
rename to nano/store/rocksdb/version.cpp
diff --git a/nano/secure/versioning.cpp b/nano/store/versioning.cpp
similarity index 100%
rename from nano/secure/versioning.cpp
rename to nano/store/versioning.cpp