diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
index d322a66890..e298cc755e 100644
--- a/nano/core_test/block_store.cpp
+++ b/nano/core_test/block_store.cpp
@@ -5,12 +5,12 @@
 #include <nano/lib/utility.hpp>
 #include <nano/lib/work.hpp>
 #include <nano/node/common.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/node/make_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/secure/utility.hpp>
-#include <nano/secure/versioning.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
+#include <nano/store/versioning.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
 
diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp
index 8118d3c3da..ecfbe22751 100644
--- a/nano/core_test/ledger.cpp
+++ b/nano/core_test/ledger.cpp
@@ -2,10 +2,10 @@
 #include <nano/lib/threading.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/make_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
 #include <nano/node/transport/inproc.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 #include <nano/test_common/ledger.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp
index 1e0363fcdd..ef50e24088 100644
--- a/nano/core_test/wallet.cpp
+++ b/nano/core_test/wallet.cpp
@@ -1,7 +1,7 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/threading.hpp>
-#include <nano/node/lmdb/wallet_value.hpp>
+#include <nano/store/lmdb/wallet_value.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
 
diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp
index ad9e6df496..4ded766f96 100644
--- a/nano/core_test/wallets.cpp
+++ b/nano/core_test/wallets.cpp
@@ -1,4 +1,4 @@
-#include <nano/secure/versioning.hpp>
+#include <nano/store/versioning.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
 
diff --git a/nano/node/CMakeLists.txt b/nano/node/CMakeLists.txt
index 9e770f9223..17dca7e3cd 100644
--- a/nano/node/CMakeLists.txt
+++ b/nano/node/CMakeLists.txt
@@ -112,34 +112,19 @@ add_library(
   json_handler.cpp
   ledger_walker.hpp
   ledger_walker.cpp
-  lmdb/account_store.hpp
   lmdb/account_store.cpp
-  lmdb/block_store.hpp
   lmdb/block_store.cpp
-  lmdb/confirmation_height_store.hpp
   lmdb/confirmation_height_store.cpp
-  lmdb/final_vote_store.hpp
   lmdb/final_vote_store.cpp
-  lmdb/frontier_store.hpp
   lmdb/frontier_store.cpp
-  lmdb/online_weight_store.hpp
   lmdb/online_weight_store.cpp
-  lmdb/peer_store.hpp
   lmdb/peer_store.cpp
-  lmdb/pending_store.hpp
   lmdb/pending_store.cpp
-  lmdb/pruned_store.hpp
   lmdb/pruned_store.cpp
-  lmdb/version_store.hpp
   lmdb/version_store.cpp
-  lmdb/lmdb.hpp
   lmdb/lmdb.cpp
-  lmdb/lmdb_env.hpp
   lmdb/lmdb_env.cpp
-  lmdb/lmdb_iterator.hpp
-  lmdb/lmdb_txn.hpp
   lmdb/lmdb_txn.cpp
-  lmdb/wallet_value.hpp
   lmdb/wallet_value.cpp
   logging.hpp
   logging.cpp
@@ -171,30 +156,17 @@ add_library(
   repcrawler.cpp
   request_aggregator.hpp
   request_aggregator.cpp
-  rocksdb/account_store.hpp
   rocksdb/account_store.cpp
-  rocksdb/block_store.hpp
   rocksdb/block_store.cpp
-  rocksdb/confirmation_height_store.hpp
   rocksdb/confirmation_height_store.cpp
-  rocksdb/final_vote_store.hpp
   rocksdb/final_vote_store.cpp
-  rocksdb/frontier_store.hpp
   rocksdb/frontier_store.cpp
-  rocksdb/online_weight_store.hpp
   rocksdb/online_weight_store.cpp
-  rocksdb/peer_store.hpp
   rocksdb/peer_store.cpp
-  rocksdb/pending_store.hpp
   rocksdb/pending_store.cpp
-  rocksdb/pruned_store.hpp
   rocksdb/pruned_store.cpp
-  rocksdb/version_store.hpp
   rocksdb/version_store.cpp
-  rocksdb/rocksdb.hpp
   rocksdb/rocksdb.cpp
-  rocksdb/rocksdb_iterator.hpp
-  rocksdb/rocksdb_txn.hpp
   rocksdb/rocksdb_txn.cpp
   scheduler/bucket.cpp
   scheduler/bucket.hpp
diff --git a/nano/node/lmdb/account_store.cpp b/nano/node/lmdb/account_store.cpp
index 53b1749b49..e890cae690 100644
--- a/nano/node/lmdb/account_store.cpp
+++ b/nano/node/lmdb/account_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/account_store.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/account.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
 
 nano::lmdb::account_store::account_store (nano::lmdb::store & store_a) :
 	store (store_a){};
diff --git a/nano/node/lmdb/block_store.cpp b/nano/node/lmdb/block_store.cpp
index d244db6935..affb70e8af 100644
--- a/nano/node/lmdb/block_store.cpp
+++ b/nano/node/lmdb/block_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/block_store.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/block.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
 
 namespace nano
 {
diff --git a/nano/node/lmdb/confirmation_height_store.cpp b/nano/node/lmdb/confirmation_height_store.cpp
index 139b263a43..97617bf463 100644
--- a/nano/node/lmdb/confirmation_height_store.cpp
+++ b/nano/node/lmdb/confirmation_height_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/confirmation_height_store.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/confirmation_height.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
 
 nano::lmdb::confirmation_height_store::confirmation_height_store (nano::lmdb::store & store) :
 	store{ store }
diff --git a/nano/node/lmdb/final_vote_store.cpp b/nano/node/lmdb/final_vote_store.cpp
index 6b7dfccf76..9e6f14e94f 100644
--- a/nano/node/lmdb/final_vote_store.cpp
+++ b/nano/node/lmdb/final_vote_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/final_vote_store.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/final_vote.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
 
 nano::lmdb::final_vote_store::final_vote_store (nano::lmdb::store & store) :
 	store{ store } {};
diff --git a/nano/node/lmdb/frontier_store.cpp b/nano/node/lmdb/frontier_store.cpp
index f10ff9ffa5..ed541b7b1d 100644
--- a/nano/node/lmdb/frontier_store.cpp
+++ b/nano/node/lmdb/frontier_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/frontier_store.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/frontier.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
 
 nano::lmdb::frontier_store::frontier_store (nano::lmdb::store & store) :
 	store{ store }
diff --git a/nano/node/lmdb/lmdb.cpp b/nano/node/lmdb/lmdb.cpp
index 9bf16f0a1c..d91381bb3d 100644
--- a/nano/node/lmdb/lmdb.cpp
+++ b/nano/node/lmdb/lmdb.cpp
@@ -1,11 +1,11 @@
 #include <nano/lib/utility.hpp>
 #include <nano/node/common.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/lmdb_iterator.hpp>
-#include <nano/node/lmdb/wallet_value.hpp>
 #include <nano/secure/buffer.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/versioning.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/iterator.hpp>
+#include <nano/store/lmdb/wallet_value.hpp>
+#include <nano/store/versioning.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
diff --git a/nano/node/lmdb/lmdb_env.cpp b/nano/node/lmdb/lmdb_env.cpp
index 394b13ea6b..fc666d1f26 100644
--- a/nano/node/lmdb/lmdb_env.cpp
+++ b/nano/node/lmdb/lmdb_env.cpp
@@ -1,4 +1,4 @@
-#include <nano/node/lmdb/lmdb_env.hpp>
+#include <nano/store/lmdb/lmdb_env.hpp>
 
 #include <boost/filesystem/operations.hpp>
 
diff --git a/nano/node/lmdb/lmdb_txn.cpp b/nano/node/lmdb/lmdb_txn.cpp
index 18929ec745..40ef653c35 100644
--- a/nano/node/lmdb/lmdb_txn.cpp
+++ b/nano/node/lmdb/lmdb_txn.cpp
@@ -2,9 +2,9 @@
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/utility.hpp>
-#include <nano/node/lmdb/lmdb_env.hpp>
-#include <nano/node/lmdb/lmdb_txn.hpp>
 #include <nano/store/component.hpp>
+#include <nano/store/lmdb/lmdb_env.hpp>
+#include <nano/store/lmdb/transaction_impl.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/lmdb/online_weight_store.cpp b/nano/node/lmdb/online_weight_store.cpp
index 17eaa81a64..0807f5e39b 100644
--- a/nano/node/lmdb/online_weight_store.cpp
+++ b/nano/node/lmdb/online_weight_store.cpp
@@ -1,5 +1,5 @@
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/online_weight_store.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/online_weight.hpp>
 
 nano::lmdb::online_weight_store::online_weight_store (nano::lmdb::store & store_a) :
 	store{ store_a }
diff --git a/nano/node/lmdb/peer_store.cpp b/nano/node/lmdb/peer_store.cpp
index 738bddee85..c51eced207 100644
--- a/nano/node/lmdb/peer_store.cpp
+++ b/nano/node/lmdb/peer_store.cpp
@@ -1,5 +1,5 @@
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/peer_store.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/peer.hpp>
 
 nano::lmdb::peer_store::peer_store (nano::lmdb::store & store) :
 	store{ store } {};
diff --git a/nano/node/lmdb/pending_store.cpp b/nano/node/lmdb/pending_store.cpp
index dc4e77691b..351747d4dd 100644
--- a/nano/node/lmdb/pending_store.cpp
+++ b/nano/node/lmdb/pending_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/pending_store.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/pending.hpp>
 
 nano::lmdb::pending_store::pending_store (nano::lmdb::store & store) :
 	store{ store } {};
diff --git a/nano/node/lmdb/pruned_store.cpp b/nano/node/lmdb/pruned_store.cpp
index 60f833ee08..7865a031ec 100644
--- a/nano/node/lmdb/pruned_store.cpp
+++ b/nano/node/lmdb/pruned_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/pruned_store.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/pruned.hpp>
 
 nano::lmdb::pruned_store::pruned_store (nano::lmdb::store & store_a) :
 	store{ store_a } {};
diff --git a/nano/node/lmdb/version_store.cpp b/nano/node/lmdb/version_store.cpp
index deee22ef67..be80c52885 100644
--- a/nano/node/lmdb/version_store.cpp
+++ b/nano/node/lmdb/version_store.cpp
@@ -1,5 +1,5 @@
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/version_store.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/version.hpp>
 
 nano::lmdb::version_store::version_store (nano::lmdb::store & store_a) :
 	store{ store_a } {};
diff --git a/nano/node/lmdb/wallet_value.cpp b/nano/node/lmdb/wallet_value.cpp
index c9512df636..8aabe272ab 100644
--- a/nano/node/lmdb/wallet_value.cpp
+++ b/nano/node/lmdb/wallet_value.cpp
@@ -1,4 +1,4 @@
-#include <nano/node/lmdb/wallet_value.hpp>
+#include <nano/store/lmdb/wallet_value.hpp>
 
 nano::wallet_value::wallet_value (nano::db_val<MDB_val> const & val_a)
 {
diff --git a/nano/node/make_store.cpp b/nano/node/make_store.cpp
index c07f41dbe1..bb577acc9b 100644
--- a/nano/node/make_store.cpp
+++ b/nano/node/make_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/lmdb.hpp>
 #include <nano/node/make_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 #include <boost/filesystem/path.hpp>
 
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index a9fb40a02f..34c6c43b03 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -5,7 +5,6 @@
 #include <nano/node/daemonconfig.hpp>
 #include <nano/node/make_store.hpp>
 #include <nano/node/node.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/hinted.hpp>
 #include <nano/node/scheduler/manual.hpp>
@@ -15,6 +14,7 @@
 #include <nano/node/websocket.hpp>
 #include <nano/secure/buffer.hpp>
 #include <nano/store/component.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/nano/node/rocksdb/account_store.cpp b/nano/node/rocksdb/account_store.cpp
index 8cbb5b8ab9..2cf5e6d094 100644
--- a/nano/node/rocksdb/account_store.cpp
+++ b/nano/node/rocksdb/account_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/rocksdb/account_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/rocksdb/account.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::account_store::account_store (nano::rocksdb::store & store_a) :
 	store (store_a){};
diff --git a/nano/node/rocksdb/block_store.cpp b/nano/node/rocksdb/block_store.cpp
index 331697345f..69e0118513 100644
--- a/nano/node/rocksdb/block_store.cpp
+++ b/nano/node/rocksdb/block_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/rocksdb/block_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/rocksdb/block.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/confirmation_height_store.cpp b/nano/node/rocksdb/confirmation_height_store.cpp
index 8db8a6999e..0ac8d61118 100644
--- a/nano/node/rocksdb/confirmation_height_store.cpp
+++ b/nano/node/rocksdb/confirmation_height_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/rocksdb/confirmation_height_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/rocksdb/confirmation_height.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::confirmation_height_store::confirmation_height_store (nano::rocksdb::store & store) :
 	store{ store }
diff --git a/nano/node/rocksdb/final_vote_store.cpp b/nano/node/rocksdb/final_vote_store.cpp
index 6809425ed2..eb03e75fec 100644
--- a/nano/node/rocksdb/final_vote_store.cpp
+++ b/nano/node/rocksdb/final_vote_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/rocksdb/final_vote_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/rocksdb/final_vote.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::final_vote_store::final_vote_store (nano::rocksdb::store & store) :
 	store{ store } {};
diff --git a/nano/node/rocksdb/frontier_store.cpp b/nano/node/rocksdb/frontier_store.cpp
index ffc71290c6..51c02815e7 100644
--- a/nano/node/rocksdb/frontier_store.cpp
+++ b/nano/node/rocksdb/frontier_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/rocksdb/frontier_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/rocksdb/frontier.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::frontier_store::frontier_store (nano::rocksdb::store & store) :
 	store{ store }
diff --git a/nano/node/rocksdb/online_weight_store.cpp b/nano/node/rocksdb/online_weight_store.cpp
index 43d2b8b9fd..f8f88ea1ca 100644
--- a/nano/node/rocksdb/online_weight_store.cpp
+++ b/nano/node/rocksdb/online_weight_store.cpp
@@ -1,5 +1,5 @@
-#include <nano/node/rocksdb/online_weight_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
+#include <nano/store/rocksdb/online_weight.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::online_weight_store::online_weight_store (nano::rocksdb::store & store_a) :
 	store{ store_a }
diff --git a/nano/node/rocksdb/peer_store.cpp b/nano/node/rocksdb/peer_store.cpp
index fd31281f7b..22d620ecc3 100644
--- a/nano/node/rocksdb/peer_store.cpp
+++ b/nano/node/rocksdb/peer_store.cpp
@@ -1,5 +1,5 @@
-#include <nano/node/rocksdb/peer_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
+#include <nano/store/rocksdb/peer.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::peer_store::peer_store (nano::rocksdb::store & store) :
 	store{ store } {};
diff --git a/nano/node/rocksdb/pending_store.cpp b/nano/node/rocksdb/pending_store.cpp
index b8f323582a..935f368b1f 100644
--- a/nano/node/rocksdb/pending_store.cpp
+++ b/nano/node/rocksdb/pending_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/lmdb/pending_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/lmdb/pending.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::pending_store::pending_store (nano::rocksdb::store & store) :
 	store{ store } {};
diff --git a/nano/node/rocksdb/pruned_store.cpp b/nano/node/rocksdb/pruned_store.cpp
index b02423aab9..6024682d19 100644
--- a/nano/node/rocksdb/pruned_store.cpp
+++ b/nano/node/rocksdb/pruned_store.cpp
@@ -1,6 +1,6 @@
-#include <nano/node/rocksdb/pruned_store.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/parallel_traversal.hpp>
+#include <nano/store/rocksdb/pruned.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
 
 nano::rocksdb::pruned_store::pruned_store (nano::rocksdb::store & store_a) :
 	store{ store_a } {};
diff --git a/nano/node/rocksdb/rocksdb.cpp b/nano/node/rocksdb/rocksdb.cpp
index 6155811c31..ba37fef785 100644
--- a/nano/node/rocksdb/rocksdb.cpp
+++ b/nano/node/rocksdb/rocksdb.cpp
@@ -1,7 +1,7 @@
 #include <nano/lib/rocksdbconfig.hpp>
-#include <nano/node/rocksdb/rocksdb.hpp>
-#include <nano/node/rocksdb/rocksdb_iterator.hpp>
-#include <nano/node/rocksdb/rocksdb_txn.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
+#include <nano/store/rocksdb/iterator.hpp>
+#include <nano/store/rocksdb/transaction_impl.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
diff --git a/nano/node/rocksdb/rocksdb_txn.cpp b/nano/node/rocksdb/rocksdb_txn.cpp
index 8bdeada2a0..a4b3a361d7 100644
--- a/nano/node/rocksdb/rocksdb_txn.cpp
+++ b/nano/node/rocksdb/rocksdb_txn.cpp
@@ -1,4 +1,4 @@
-#include <nano/node/rocksdb/rocksdb_txn.hpp>
+#include <nano/store/rocksdb/transaction_impl.hpp>
 
 nano::read_rocksdb_txn::read_rocksdb_txn (rocksdb::DB * db_a) :
 	db (db_a)
diff --git a/nano/node/rocksdb/version_store.cpp b/nano/node/rocksdb/version_store.cpp
index 04ea7c0036..0f7d0039ac 100644
--- a/nano/node/rocksdb/version_store.cpp
+++ b/nano/node/rocksdb/version_store.cpp
@@ -1,5 +1,5 @@
-#include <nano/node/rocksdb/rocksdb.hpp>
-#include <nano/node/rocksdb/version_store.hpp>
+#include <nano/store/rocksdb/rocksdb.hpp>
+#include <nano/store/rocksdb/version.hpp>
 
 nano::rocksdb::version_store::version_store (nano::rocksdb::store & store_a) :
 	store{ store_a } {};
diff --git a/nano/node/wallet.cpp b/nano/node/wallet.cpp
index ef17591b53..7f94064d9a 100644
--- a/nano/node/wallet.cpp
+++ b/nano/node/wallet.cpp
@@ -2,9 +2,9 @@
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/election.hpp>
-#include <nano/node/lmdb/lmdb_iterator.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/wallet.hpp>
+#include <nano/store/lmdb/iterator.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
diff --git a/nano/node/wallet.hpp b/nano/node/wallet.hpp
index 3c6581edcb..8a23f11d93 100644
--- a/nano/node/wallet.hpp
+++ b/nano/node/wallet.hpp
@@ -3,11 +3,11 @@
 #include <nano/lib/lmdbconfig.hpp>
 #include <nano/lib/locks.hpp>
 #include <nano/lib/work.hpp>
-#include <nano/node/lmdb/lmdb.hpp>
-#include <nano/node/lmdb/wallet_value.hpp>
 #include <nano/node/openclwork.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/store/component.hpp>
+#include <nano/store/lmdb/lmdb.hpp>
+#include <nano/store/lmdb/wallet_value.hpp>
 
 #include <atomic>
 #include <mutex>
diff --git a/nano/secure/CMakeLists.txt b/nano/secure/CMakeLists.txt
index e2a5739546..06526287ff 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.hpp
   versioning.cpp
   working.hpp)
 
diff --git a/nano/secure/versioning.cpp b/nano/secure/versioning.cpp
index 1ab31d5819..58a40271b6 100644
--- a/nano/secure/versioning.cpp
+++ b/nano/secure/versioning.cpp
@@ -1,4 +1,4 @@
-#include <nano/secure/versioning.hpp>
+#include <nano/store/versioning.hpp>
 
 #include <boost/endian/conversion.hpp>
 
diff --git a/nano/store/CMakeLists.txt b/nano/store/CMakeLists.txt
index af1b0f4425..df47f0a232 100644
--- a/nano/store/CMakeLists.txt
+++ b/nano/store/CMakeLists.txt
@@ -1,4 +1,32 @@
-add_library(nano_store component.cpp component.hpp)
+add_library(
+  nano_store
+  component.hpp
+  lmdb/account.hpp
+  lmdb/block.hpp
+  lmdb/confirmation_height.hpp
+  lmdb/final_vote.hpp
+  lmdb/frontier.hpp
+  lmdb/iterator.hpp
+  lmdb/online_weight.hpp
+  lmdb/peer.hpp
+  lmdb/pending.hpp
+  lmdb/pruned.hpp
+  lmdb/transaction_impl.hpp
+  lmdb/version.hpp
+  rocksdb/account.hpp
+  rocksdb/block.hpp
+  rocksdb/confirmation_height.hpp
+  rocksdb/final_vote.hpp
+  rocksdb/frontier.hpp
+  rocksdb/iterator.hpp
+  rocksdb/online_weight.hpp
+  rocksdb/peer.hpp
+  rocksdb/pending.hpp
+  rocksdb/pruned.hpp
+  rocksdb/transaction_impl.hpp
+  rocksdb/version.hpp
+  versioning.hpp
+  component.cpp)
 
 target_link_libraries(
   nano_store
diff --git a/nano/store/component.hpp b/nano/store/component.hpp
index 9b620d4097..e6fa1a4a1f 100644
--- a/nano/store/component.hpp
+++ b/nano/store/component.hpp
@@ -4,7 +4,7 @@
 #include <nano/lib/memory.hpp>
 #include <nano/secure/buffer.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/versioning.hpp>
+#include <nano/store/versioning.hpp>
 
 #include <boost/endian/conversion.hpp>
 #include <boost/polymorphic_cast.hpp>
diff --git a/nano/node/lmdb/account_store.hpp b/nano/store/lmdb/account.hpp
similarity index 100%
rename from nano/node/lmdb/account_store.hpp
rename to nano/store/lmdb/account.hpp
diff --git a/nano/node/lmdb/block_store.hpp b/nano/store/lmdb/block.hpp
similarity index 100%
rename from nano/node/lmdb/block_store.hpp
rename to nano/store/lmdb/block.hpp
diff --git a/nano/node/lmdb/confirmation_height_store.hpp b/nano/store/lmdb/confirmation_height.hpp
similarity index 100%
rename from nano/node/lmdb/confirmation_height_store.hpp
rename to nano/store/lmdb/confirmation_height.hpp
diff --git a/nano/node/lmdb/final_vote_store.hpp b/nano/store/lmdb/final_vote.hpp
similarity index 100%
rename from nano/node/lmdb/final_vote_store.hpp
rename to nano/store/lmdb/final_vote.hpp
diff --git a/nano/node/lmdb/frontier_store.hpp b/nano/store/lmdb/frontier.hpp
similarity index 100%
rename from nano/node/lmdb/frontier_store.hpp
rename to nano/store/lmdb/frontier.hpp
diff --git a/nano/node/lmdb/lmdb_iterator.hpp b/nano/store/lmdb/iterator.hpp
similarity index 100%
rename from nano/node/lmdb/lmdb_iterator.hpp
rename to nano/store/lmdb/iterator.hpp
diff --git a/nano/node/lmdb/lmdb.hpp b/nano/store/lmdb/lmdb.hpp
similarity index 93%
rename from nano/node/lmdb/lmdb.hpp
rename to nano/store/lmdb/lmdb.hpp
index ee75896994..e2ed33c005 100644
--- a/nano/node/lmdb/lmdb.hpp
+++ b/nano/store/lmdb/lmdb.hpp
@@ -4,21 +4,21 @@
 #include <nano/lib/lmdbconfig.hpp>
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/node/lmdb/account_store.hpp>
-#include <nano/node/lmdb/block_store.hpp>
-#include <nano/node/lmdb/confirmation_height_store.hpp>
-#include <nano/node/lmdb/final_vote_store.hpp>
-#include <nano/node/lmdb/frontier_store.hpp>
-#include <nano/node/lmdb/lmdb_env.hpp>
-#include <nano/node/lmdb/lmdb_iterator.hpp>
-#include <nano/node/lmdb/lmdb_txn.hpp>
-#include <nano/node/lmdb/online_weight_store.hpp>
-#include <nano/node/lmdb/peer_store.hpp>
-#include <nano/node/lmdb/pending_store.hpp>
-#include <nano/node/lmdb/pruned_store.hpp>
-#include <nano/node/lmdb/version_store.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/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/version.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/versioning.hpp>
+#include <nano/store/versioning.hpp>
 
 #include <boost/optional.hpp>
 
diff --git a/nano/node/lmdb/lmdb_env.hpp b/nano/store/lmdb/lmdb_env.hpp
similarity index 97%
rename from nano/node/lmdb/lmdb_env.hpp
rename to nano/store/lmdb/lmdb_env.hpp
index 0253bda444..f7038443f6 100644
--- a/nano/node/lmdb/lmdb_env.hpp
+++ b/nano/store/lmdb/lmdb_env.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <nano/lib/lmdbconfig.hpp>
-#include <nano/node/lmdb/lmdb_txn.hpp>
+#include <nano/store/lmdb/transaction_impl.hpp>
 #include <nano/store/component.hpp>
 
 namespace nano
diff --git a/nano/node/lmdb/online_weight_store.hpp b/nano/store/lmdb/online_weight.hpp
similarity index 100%
rename from nano/node/lmdb/online_weight_store.hpp
rename to nano/store/lmdb/online_weight.hpp
diff --git a/nano/node/lmdb/peer_store.hpp b/nano/store/lmdb/peer.hpp
similarity index 100%
rename from nano/node/lmdb/peer_store.hpp
rename to nano/store/lmdb/peer.hpp
diff --git a/nano/node/lmdb/pending_store.hpp b/nano/store/lmdb/pending.hpp
similarity index 100%
rename from nano/node/lmdb/pending_store.hpp
rename to nano/store/lmdb/pending.hpp
diff --git a/nano/node/lmdb/pruned_store.hpp b/nano/store/lmdb/pruned.hpp
similarity index 100%
rename from nano/node/lmdb/pruned_store.hpp
rename to nano/store/lmdb/pruned.hpp
diff --git a/nano/node/lmdb/lmdb_txn.hpp b/nano/store/lmdb/transaction_impl.hpp
similarity index 100%
rename from nano/node/lmdb/lmdb_txn.hpp
rename to nano/store/lmdb/transaction_impl.hpp
diff --git a/nano/node/lmdb/version_store.hpp b/nano/store/lmdb/version.hpp
similarity index 100%
rename from nano/node/lmdb/version_store.hpp
rename to nano/store/lmdb/version.hpp
diff --git a/nano/node/lmdb/wallet_value.hpp b/nano/store/lmdb/wallet_value.hpp
similarity index 100%
rename from nano/node/lmdb/wallet_value.hpp
rename to nano/store/lmdb/wallet_value.hpp
diff --git a/nano/node/rocksdb/account_store.hpp b/nano/store/rocksdb/account.hpp
similarity index 100%
rename from nano/node/rocksdb/account_store.hpp
rename to nano/store/rocksdb/account.hpp
diff --git a/nano/node/rocksdb/block_store.hpp b/nano/store/rocksdb/block.hpp
similarity index 100%
rename from nano/node/rocksdb/block_store.hpp
rename to nano/store/rocksdb/block.hpp
diff --git a/nano/node/rocksdb/confirmation_height_store.hpp b/nano/store/rocksdb/confirmation_height.hpp
similarity index 100%
rename from nano/node/rocksdb/confirmation_height_store.hpp
rename to nano/store/rocksdb/confirmation_height.hpp
diff --git a/nano/node/rocksdb/final_vote_store.hpp b/nano/store/rocksdb/final_vote.hpp
similarity index 100%
rename from nano/node/rocksdb/final_vote_store.hpp
rename to nano/store/rocksdb/final_vote.hpp
diff --git a/nano/node/rocksdb/frontier_store.hpp b/nano/store/rocksdb/frontier.hpp
similarity index 100%
rename from nano/node/rocksdb/frontier_store.hpp
rename to nano/store/rocksdb/frontier.hpp
diff --git a/nano/node/rocksdb/rocksdb_iterator.hpp b/nano/store/rocksdb/iterator.hpp
similarity index 100%
rename from nano/node/rocksdb/rocksdb_iterator.hpp
rename to nano/store/rocksdb/iterator.hpp
diff --git a/nano/node/rocksdb/online_weight_store.hpp b/nano/store/rocksdb/online_weight.hpp
similarity index 100%
rename from nano/node/rocksdb/online_weight_store.hpp
rename to nano/store/rocksdb/online_weight.hpp
diff --git a/nano/node/rocksdb/peer_store.hpp b/nano/store/rocksdb/peer.hpp
similarity index 100%
rename from nano/node/rocksdb/peer_store.hpp
rename to nano/store/rocksdb/peer.hpp
diff --git a/nano/node/rocksdb/pending_store.hpp b/nano/store/rocksdb/pending.hpp
similarity index 100%
rename from nano/node/rocksdb/pending_store.hpp
rename to nano/store/rocksdb/pending.hpp
diff --git a/nano/node/rocksdb/pruned_store.hpp b/nano/store/rocksdb/pruned.hpp
similarity index 100%
rename from nano/node/rocksdb/pruned_store.hpp
rename to nano/store/rocksdb/pruned.hpp
diff --git a/nano/node/rocksdb/rocksdb.hpp b/nano/store/rocksdb/rocksdb.hpp
similarity index 93%
rename from nano/node/rocksdb/rocksdb.hpp
rename to nano/store/rocksdb/rocksdb.hpp
index 402fbcbbaa..435a77ed3e 100644
--- a/nano/node/rocksdb/rocksdb.hpp
+++ b/nano/store/rocksdb/rocksdb.hpp
@@ -4,17 +4,17 @@
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/rocksdbconfig.hpp>
-#include <nano/node/rocksdb/account_store.hpp>
-#include <nano/node/rocksdb/block_store.hpp>
-#include <nano/node/rocksdb/confirmation_height_store.hpp>
-#include <nano/node/rocksdb/final_vote_store.hpp>
-#include <nano/node/rocksdb/frontier_store.hpp>
-#include <nano/node/rocksdb/online_weight_store.hpp>
-#include <nano/node/rocksdb/peer_store.hpp>
-#include <nano/node/rocksdb/pending_store.hpp>
-#include <nano/node/rocksdb/pruned_store.hpp>
-#include <nano/node/rocksdb/rocksdb_iterator.hpp>
-#include <nano/node/rocksdb/version_store.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/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>
diff --git a/nano/node/rocksdb/rocksdb_txn.hpp b/nano/store/rocksdb/transaction_impl.hpp
similarity index 100%
rename from nano/node/rocksdb/rocksdb_txn.hpp
rename to nano/store/rocksdb/transaction_impl.hpp
diff --git a/nano/node/rocksdb/version_store.hpp b/nano/store/rocksdb/version.hpp
similarity index 100%
rename from nano/node/rocksdb/version_store.hpp
rename to nano/store/rocksdb/version.hpp
diff --git a/nano/secure/versioning.hpp b/nano/store/versioning.hpp
similarity index 100%
rename from nano/secure/versioning.hpp
rename to nano/store/versioning.hpp