diff --git a/nano/core_test/processor_service.cpp b/nano/core_test/processor_service.cpp
index ddb59b65..42893a97 100644
--- a/nano/core_test/processor_service.cpp
+++ b/nano/core_test/processor_service.cpp
@@ -2,8 +2,8 @@
 #include <nano/lib/work.hpp>
 #include <nano/node/make_store.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
 #include <nano/secure/utility.hpp>
+#include <nano/store/component.hpp>
 #include <nano/test_common/testutil.hpp>
 
 #include <gtest/gtest.h>
diff --git a/nano/lib/rep_weights.cpp b/nano/lib/rep_weights.cpp
index 17968e78..65a0604b 100644
--- a/nano/lib/rep_weights.cpp
+++ b/nano/lib/rep_weights.cpp
@@ -1,5 +1,5 @@
 #include <nano/lib/rep_weights.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 void nano::rep_weights::representation_add (nano::account const & source_rep_a, nano::uint128_t const & amount_a)
 {
diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp
index ca00132a..cab66d9a 100644
--- a/nano/node/active_transactions.cpp
+++ b/nano/node/active_transactions.cpp
@@ -7,7 +7,7 @@
 #include <nano/node/repcrawler.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/backlog_population.cpp b/nano/node/backlog_population.cpp
index 517eb982..3222da3e 100644
--- a/nano/node/backlog_population.cpp
+++ b/nano/node/backlog_population.cpp
@@ -2,7 +2,7 @@
 #include <nano/node/backlog_population.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/scheduler/priority.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::backlog_population::backlog_population (const config & config_a, nano::store & store_a, nano::stats & stats_a) :
 	config_m{ config_a },
diff --git a/nano/node/blockprocessor.cpp b/nano/node/blockprocessor.cpp
index 20d61894..9a844337 100644
--- a/nano/node/blockprocessor.cpp
+++ b/nano/node/blockprocessor.cpp
@@ -2,7 +2,7 @@
 #include <nano/lib/timer.hpp>
 #include <nano/node/blockprocessor.hpp>
 #include <nano/node/node.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/bootstrap/bootstrap_server.cpp b/nano/node/bootstrap/bootstrap_server.cpp
index 7e0e6743..87730a59 100644
--- a/nano/node/bootstrap/bootstrap_server.cpp
+++ b/nano/node/bootstrap/bootstrap_server.cpp
@@ -2,7 +2,7 @@
 #include <nano/node/transport/channel.hpp>
 #include <nano/node/transport/transport.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 // TODO: Make threads configurable
 nano::bootstrap_server::bootstrap_server (nano::store & store_a, nano::ledger & ledger_a, nano::network_constants const & network_constants_a, nano::stats & stats_a) :
diff --git a/nano/node/bootstrap_ascending/iterators.cpp b/nano/node/bootstrap_ascending/iterators.cpp
index 1ba41b9d..30d39363 100644
--- a/nano/node/bootstrap_ascending/iterators.cpp
+++ b/nano/node/bootstrap_ascending/iterators.cpp
@@ -1,7 +1,7 @@
 #include <nano/lib/utility.hpp>
 #include <nano/node/bootstrap_ascending/iterators.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 /*
  * database_iterator
diff --git a/nano/node/bootstrap_ascending/service.cpp b/nano/node/bootstrap_ascending/service.cpp
index db05849b..87682a04 100644
--- a/nano/node/bootstrap_ascending/service.cpp
+++ b/nano/node/bootstrap_ascending/service.cpp
@@ -6,7 +6,7 @@
 #include <nano/node/transport/transport.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 using namespace std::chrono_literals;
 
diff --git a/nano/node/confirmation_height_bounded.hpp b/nano/node/confirmation_height_bounded.hpp
index 5676e492..768f1e73 100644
--- a/nano/node/confirmation_height_bounded.hpp
+++ b/nano/node/confirmation_height_bounded.hpp
@@ -4,7 +4,7 @@
 #include <nano/lib/relaxed_atomic.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/circular_buffer.hpp>
 
diff --git a/nano/node/confirmation_height_processor.hpp b/nano/node/confirmation_height_processor.hpp
index a32b48f3..88f2d1a1 100644
--- a/nano/node/confirmation_height_processor.hpp
+++ b/nano/node/confirmation_height_processor.hpp
@@ -5,7 +5,7 @@
 #include <nano/node/confirmation_height_bounded.hpp>
 #include <nano/node/confirmation_height_unbounded.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
diff --git a/nano/node/confirmation_height_unbounded.hpp b/nano/node/confirmation_height_unbounded.hpp
index cf7f5afa..accf3409 100644
--- a/nano/node/confirmation_height_unbounded.hpp
+++ b/nano/node/confirmation_height_unbounded.hpp
@@ -4,7 +4,7 @@
 #include <nano/lib/relaxed_atomic.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <chrono>
 #include <unordered_map>
diff --git a/nano/node/election.hpp b/nano/node/election.hpp
index 1acc6eb9..72150385 100644
--- a/nano/node/election.hpp
+++ b/nano/node/election.hpp
@@ -2,7 +2,7 @@
 
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/nano/node/gap_cache.cpp b/nano/node/gap_cache.cpp
index 24342787..022544e9 100644
--- a/nano/node/gap_cache.cpp
+++ b/nano/node/gap_cache.cpp
@@ -1,6 +1,6 @@
 #include <nano/node/gap_cache.hpp>
 #include <nano/node/node.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/ledger_walker.cpp b/nano/node/ledger_walker.cpp
index 17d24c1f..a2484d5a 100644
--- a/nano/node/ledger_walker.cpp
+++ b/nano/node/ledger_walker.cpp
@@ -5,8 +5,8 @@
 #include <nano/lib/errors.hpp>
 #include <nano/node/ledger_walker.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
 #include <nano/secure/utility.hpp>
+#include <nano/store/component.hpp>
 
 #include <algorithm>
 #include <limits>
diff --git a/nano/node/lmdb/account_store.hpp b/nano/node/lmdb/account_store.hpp
index ea93b257..e78947c5 100644
--- a/nano/node/lmdb/account_store.hpp
+++ b/nano/node/lmdb/account_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/block_store.hpp b/nano/node/lmdb/block_store.hpp
index 6976fd1d..c690d853 100644
--- a/nano/node/lmdb/block_store.hpp
+++ b/nano/node/lmdb/block_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/confirmation_height_store.hpp b/nano/node/lmdb/confirmation_height_store.hpp
index ed814994..68ca1a15 100644
--- a/nano/node/lmdb/confirmation_height_store.hpp
+++ b/nano/node/lmdb/confirmation_height_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/final_vote_store.hpp b/nano/node/lmdb/final_vote_store.hpp
index 8e957641..5612fab9 100644
--- a/nano/node/lmdb/final_vote_store.hpp
+++ b/nano/node/lmdb/final_vote_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/frontier_store.hpp b/nano/node/lmdb/frontier_store.hpp
index faf0d2cf..b493f339 100644
--- a/nano/node/lmdb/frontier_store.hpp
+++ b/nano/node/lmdb/frontier_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/lmdb_env.hpp b/nano/node/lmdb/lmdb_env.hpp
index 6fa3a082..0253bda4 100644
--- a/nano/node/lmdb/lmdb_env.hpp
+++ b/nano/node/lmdb/lmdb_env.hpp
@@ -2,7 +2,7 @@
 
 #include <nano/lib/lmdbconfig.hpp>
 #include <nano/node/lmdb/lmdb_txn.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/lmdb/lmdb_iterator.hpp b/nano/node/lmdb/lmdb_iterator.hpp
index e1e6e47b..5d74d176 100644
--- a/nano/node/lmdb/lmdb_iterator.hpp
+++ b/nano/node/lmdb/lmdb_iterator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/lmdb_txn.cpp b/nano/node/lmdb/lmdb_txn.cpp
index a8ef80d4..18929ec7 100644
--- a/nano/node/lmdb/lmdb_txn.cpp
+++ b/nano/node/lmdb/lmdb_txn.cpp
@@ -4,7 +4,7 @@
 #include <nano/lib/utility.hpp>
 #include <nano/node/lmdb/lmdb_env.hpp>
 #include <nano/node/lmdb/lmdb_txn.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/lmdb/lmdb_txn.hpp b/nano/node/lmdb/lmdb_txn.hpp
index 884da8b4..c44ea31a 100644
--- a/nano/node/lmdb/lmdb_txn.hpp
+++ b/nano/node/lmdb/lmdb_txn.hpp
@@ -2,7 +2,7 @@
 
 #include <nano/lib/diagnosticsconfig.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/stacktrace/stacktrace_fwd.hpp>
diff --git a/nano/node/lmdb/online_weight_store.hpp b/nano/node/lmdb/online_weight_store.hpp
index 88ed78c5..7827b36f 100644
--- a/nano/node/lmdb/online_weight_store.hpp
+++ b/nano/node/lmdb/online_weight_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/peer_store.hpp b/nano/node/lmdb/peer_store.hpp
index 018b85e9..2cbc274a 100644
--- a/nano/node/lmdb/peer_store.hpp
+++ b/nano/node/lmdb/peer_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/pending_store.hpp b/nano/node/lmdb/pending_store.hpp
index 30896d65..bc3d7115 100644
--- a/nano/node/lmdb/pending_store.hpp
+++ b/nano/node/lmdb/pending_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/pruned_store.hpp b/nano/node/lmdb/pruned_store.hpp
index 859d017d..b166f11d 100644
--- a/nano/node/lmdb/pruned_store.hpp
+++ b/nano/node/lmdb/pruned_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/lmdb/version_store.hpp b/nano/node/lmdb/version_store.hpp
index 9f4a6909..47300a9d 100644
--- a/nano/node/lmdb/version_store.hpp
+++ b/nano/node/lmdb/version_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/lmdb/wallet_value.hpp b/nano/node/lmdb/wallet_value.hpp
index 929ff13d..2ef9b139 100644
--- a/nano/node/lmdb/wallet_value.hpp
+++ b/nano/node/lmdb/wallet_value.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <nano/lib/numbers.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
diff --git a/nano/node/online_reps.cpp b/nano/node/online_reps.cpp
index bf3fe789..bbf1299b 100644
--- a/nano/node/online_reps.cpp
+++ b/nano/node/online_reps.cpp
@@ -1,7 +1,7 @@
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/online_reps.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::online_reps::online_reps (nano::ledger & ledger_a, nano::node_config const & config_a) :
 	ledger{ ledger_a },
diff --git a/nano/node/process_live_dispatcher.cpp b/nano/node/process_live_dispatcher.cpp
index 2b231a52..361bba21 100644
--- a/nano/node/process_live_dispatcher.cpp
+++ b/nano/node/process_live_dispatcher.cpp
@@ -6,7 +6,7 @@
 #include <nano/node/websocket.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::process_live_dispatcher::process_live_dispatcher (nano::ledger & ledger, nano::scheduler::priority & scheduler, nano::vote_cache & inactive_vote_cache, nano::websocket_server & websocket) :
 	ledger{ ledger },
diff --git a/nano/node/request_aggregator.cpp b/nano/node/request_aggregator.cpp
index 59acea18..cb84ba60 100644
--- a/nano/node/request_aggregator.cpp
+++ b/nano/node/request_aggregator.cpp
@@ -8,7 +8,7 @@
 #include <nano/node/voting.hpp>
 #include <nano/node/wallet.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::request_aggregator::request_aggregator (nano::node_config const & config_a, nano::stats & stats_a, nano::vote_generator & generator_a, nano::vote_generator & final_generator_a, nano::local_vote_history & history_a, nano::ledger & ledger_a, nano::wallets & wallets_a, nano::active_transactions & active_a) :
 	config{ config_a },
diff --git a/nano/node/rocksdb/account_store.hpp b/nano/node/rocksdb/account_store.hpp
index b8ea1527..445ee5ab 100644
--- a/nano/node/rocksdb/account_store.hpp
+++ b/nano/node/rocksdb/account_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/block_store.hpp b/nano/node/rocksdb/block_store.hpp
index b3e3873e..cc9ad528 100644
--- a/nano/node/rocksdb/block_store.hpp
+++ b/nano/node/rocksdb/block_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <rocksdb/slice.h>
 
diff --git a/nano/node/rocksdb/confirmation_height_store.hpp b/nano/node/rocksdb/confirmation_height_store.hpp
index c7787c1f..a4e7f726 100644
--- a/nano/node/rocksdb/confirmation_height_store.hpp
+++ b/nano/node/rocksdb/confirmation_height_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/final_vote_store.hpp b/nano/node/rocksdb/final_vote_store.hpp
index 71c7e315..f8af2c23 100644
--- a/nano/node/rocksdb/final_vote_store.hpp
+++ b/nano/node/rocksdb/final_vote_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/frontier_store.hpp b/nano/node/rocksdb/frontier_store.hpp
index 5b3131d3..d0d346a2 100644
--- a/nano/node/rocksdb/frontier_store.hpp
+++ b/nano/node/rocksdb/frontier_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/online_weight_store.hpp b/nano/node/rocksdb/online_weight_store.hpp
index 740518ee..fbc9f056 100644
--- a/nano/node/rocksdb/online_weight_store.hpp
+++ b/nano/node/rocksdb/online_weight_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/peer_store.hpp b/nano/node/rocksdb/peer_store.hpp
index 9d35c3b8..66b6da19 100644
--- a/nano/node/rocksdb/peer_store.hpp
+++ b/nano/node/rocksdb/peer_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/pending_store.hpp b/nano/node/rocksdb/pending_store.hpp
index 8268fa35..256197de 100644
--- a/nano/node/rocksdb/pending_store.hpp
+++ b/nano/node/rocksdb/pending_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/pruned_store.hpp b/nano/node/rocksdb/pruned_store.hpp
index 22e1f2e0..ad8b6e1e 100644
--- a/nano/node/rocksdb/pruned_store.hpp
+++ b/nano/node/rocksdb/pruned_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/rocksdb_iterator.hpp b/nano/node/rocksdb/rocksdb_iterator.hpp
index c4d40137..a11a5132 100644
--- a/nano/node/rocksdb/rocksdb_iterator.hpp
+++ b/nano/node/rocksdb/rocksdb_iterator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <rocksdb/db.h>
 #include <rocksdb/filter_policy.h>
diff --git a/nano/node/rocksdb/rocksdb_txn.hpp b/nano/node/rocksdb/rocksdb_txn.hpp
index f77463da..c7894581 100644
--- a/nano/node/rocksdb/rocksdb_txn.hpp
+++ b/nano/node/rocksdb/rocksdb_txn.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <rocksdb/db.h>
 #include <rocksdb/options.h>
diff --git a/nano/node/rocksdb/version_store.hpp b/nano/node/rocksdb/version_store.hpp
index acf252ca..73d69bc7 100644
--- a/nano/node/rocksdb/version_store.hpp
+++ b/nano/node/rocksdb/version_store.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 namespace nano
 {
diff --git a/nano/node/voting.cpp b/nano/node/voting.cpp
index 97e77bcb..fc59290f 100644
--- a/nano/node/voting.cpp
+++ b/nano/node/voting.cpp
@@ -8,7 +8,7 @@
 #include <nano/node/voting.hpp>
 #include <nano/node/wallet.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <chrono>
 
diff --git a/nano/node/wallet.hpp b/nano/node/wallet.hpp
index 32016486..1e81d441 100644
--- a/nano/node/wallet.hpp
+++ b/nano/node/wallet.hpp
@@ -7,7 +7,7 @@
 #include <nano/node/lmdb/wallet_value.hpp>
 #include <nano/node/openclwork.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <atomic>
 #include <mutex>
diff --git a/nano/secure/CMakeLists.txt b/nano/secure/CMakeLists.txt
index 3ad32ee8..af15d0bd 100644
--- a/nano/secure/CMakeLists.txt
+++ b/nano/secure/CMakeLists.txt
@@ -39,7 +39,6 @@ add_library(
   ${PLATFORM_SECURE_SOURCE}
   ${CMAKE_BINARY_DIR}/bootstrap_weights_live.cpp
   ${CMAKE_BINARY_DIR}/bootstrap_weights_beta.cpp
-  store.hpp
   store.cpp
   buffer.hpp
   common.hpp
diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp
index d5be9a65..c26b32f8 100644
--- a/nano/secure/common.cpp
+++ b/nano/secure/common.cpp
@@ -3,7 +3,7 @@
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/endian/conversion.hpp>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/nano/secure/ledger.cpp b/nano/secure/ledger.cpp
index 3bf4a4c4..7495c1f5 100644
--- a/nano/secure/ledger.cpp
+++ b/nano/secure/ledger.cpp
@@ -5,7 +5,7 @@
 #include <nano/node/make_store.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 #include <boost/filesystem.hpp>
 
diff --git a/nano/secure/store.cpp b/nano/secure/store.cpp
index 64bd19a2..4fcd2984 100644
--- a/nano/secure/store.cpp
+++ b/nano/secure/store.cpp
@@ -1,6 +1,6 @@
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/secure/store.hpp>
+#include <nano/store/component.hpp>
 
 nano::read_transaction::read_transaction (std::unique_ptr<nano::read_transaction_impl> read_transaction_impl) :
 	impl (std::move (read_transaction_impl))
diff --git a/nano/secure/store.hpp b/nano/store/component.hpp
similarity index 100%
rename from nano/secure/store.hpp
rename to nano/store/component.hpp