diff --git a/.gitignore b/.gitignore
index 78030176..c322b39e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@ nimble.paths
 .env
 
 .update.timestamp
-codex.nims
+storage.nims
 nimbus-build-system.paths
 docker/hostdatadir
 docker/prometheus-data
diff --git a/.nph.toml b/.nph.toml
new file mode 100644
index 00000000..ac1b9524
--- /dev/null
+++ b/.nph.toml
@@ -0,0 +1,5 @@
+# Add to default exclusions (recommended - doesn't lose the defaults)
+extend-exclude = [
+#   "tests/fixtures",
+  "vendor",
+]
\ No newline at end of file
diff --git a/build.nims b/build.nims
index 612c5725..b74a931f 100644
--- a/build.nims
+++ b/build.nims
@@ -62,15 +62,15 @@ proc test(name: string, outName = name, srcDir = "tests/", params = "", lang = "
   exec "build/" & outName
 
 task storage, "build logos storage binary":
-  buildBinary "codex",
+  buildBinary "storage",
     outname = "storage",
     params = "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE"
 
 task testStorage, "Build & run Logos Storage tests":
-  test "testCodex", outName = "testStorage"
+  test "testStorage", outName = "testStorage"
 
 task testIntegration, "Run integration tests":
-  buildBinary "codex",
+  buildBinary "storage",
     outName = "storage",
     params = "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE"
   test "testIntegration"
@@ -110,7 +110,7 @@ task coverage, "generates code coverage report":
     echo "  *****************************************************************"
 
   var nimSrcs = " "
-  for f in walkDirRec("codex", {pcFile}):
+  for f in walkDirRec("storage", {pcFile}):
     if f.endswith(".nim"):
       nimSrcs.add " " & f.absolutePath.quoteShell()
 
diff --git a/config.nims b/config.nims
index 4b24ba54..dd912d06 100644
--- a/config.nims
+++ b/config.nims
@@ -93,11 +93,11 @@ else:
 --warningAsError:
   "ProveField:on"
 --define:
-  "libp2p_multicodec_exts:../../../codex/multicodec_exts.nim"
+  "libp2p_multicodec_exts:../../../storage/multicodec_exts.nim"
 --define:
-  "libp2p_multihash_exts:../../../codex/multihash_exts.nim"
+  "libp2p_multihash_exts:../../../storage/multihash_exts.nim"
 --define:
-  "libp2p_contentids_exts:../../../codex/contentids_exts.nim"
+  "libp2p_contentids_exts:../../../storage/contentids_exts.nim"
 
 when (NimMajor, NimMinor) >= (1, 4):
   --warning:
@@ -142,8 +142,8 @@ switch("warning", "LockLevel:off")
 
 switch("define", "libp2p_pki_schemes=secp256k1")
 #TODO this infects everything in this folder, ideally it would only
-# apply to codex.nim, but since codex.nims is used for other purpose
-# we can't use it. And codex.cfg doesn't work
+# apply to storage.nim, but since storage.nims is used for other purpose
+# we can't use it. And storage.cfg doesn't work
 switch("define", "chronicles_sinks=textlines[dynamic],json[dynamic],textlines[dynamic]")
 
 # Workaround for assembler incompatibility between constantine and secp256k1
diff --git a/codex.nim b/storage.nim
similarity index 100%
rename from codex.nim
rename to storage.nim
diff --git a/codex.nimble b/storage.nimble
similarity index 100%
rename from codex.nimble
rename to storage.nimble
diff --git a/codex/blockexchange.nim b/storage/blockexchange.nim
similarity index 100%
rename from codex/blockexchange.nim
rename to storage/blockexchange.nim
diff --git a/codex/blockexchange/engine.nim b/storage/blockexchange/engine.nim
similarity index 100%
rename from codex/blockexchange/engine.nim
rename to storage/blockexchange/engine.nim
diff --git a/codex/blockexchange/engine/advertiser.nim b/storage/blockexchange/engine/advertiser.nim
similarity index 100%
rename from codex/blockexchange/engine/advertiser.nim
rename to storage/blockexchange/engine/advertiser.nim
diff --git a/codex/blockexchange/engine/discovery.nim b/storage/blockexchange/engine/discovery.nim
similarity index 100%
rename from codex/blockexchange/engine/discovery.nim
rename to storage/blockexchange/engine/discovery.nim
diff --git a/codex/blockexchange/engine/engine.nim b/storage/blockexchange/engine/engine.nim
similarity index 100%
rename from codex/blockexchange/engine/engine.nim
rename to storage/blockexchange/engine/engine.nim
diff --git a/codex/blockexchange/engine/pendingblocks.nim b/storage/blockexchange/engine/pendingblocks.nim
similarity index 100%
rename from codex/blockexchange/engine/pendingblocks.nim
rename to storage/blockexchange/engine/pendingblocks.nim
diff --git a/codex/blockexchange/network.nim b/storage/blockexchange/network.nim
similarity index 100%
rename from codex/blockexchange/network.nim
rename to storage/blockexchange/network.nim
diff --git a/codex/blockexchange/network/network.nim b/storage/blockexchange/network/network.nim
similarity index 100%
rename from codex/blockexchange/network/network.nim
rename to storage/blockexchange/network/network.nim
diff --git a/codex/blockexchange/network/networkpeer.nim b/storage/blockexchange/network/networkpeer.nim
similarity index 100%
rename from codex/blockexchange/network/networkpeer.nim
rename to storage/blockexchange/network/networkpeer.nim
diff --git a/codex/blockexchange/peers.nim b/storage/blockexchange/peers.nim
similarity index 100%
rename from codex/blockexchange/peers.nim
rename to storage/blockexchange/peers.nim
diff --git a/codex/blockexchange/peers/peercontext.nim b/storage/blockexchange/peers/peercontext.nim
similarity index 100%
rename from codex/blockexchange/peers/peercontext.nim
rename to storage/blockexchange/peers/peercontext.nim
diff --git a/codex/blockexchange/peers/peerctxstore.nim b/storage/blockexchange/peers/peerctxstore.nim
similarity index 100%
rename from codex/blockexchange/peers/peerctxstore.nim
rename to storage/blockexchange/peers/peerctxstore.nim
diff --git a/codex/blockexchange/protobuf/blockexc.nim b/storage/blockexchange/protobuf/blockexc.nim
similarity index 100%
rename from codex/blockexchange/protobuf/blockexc.nim
rename to storage/blockexchange/protobuf/blockexc.nim
diff --git a/codex/blockexchange/protobuf/message.nim b/storage/blockexchange/protobuf/message.nim
similarity index 100%
rename from codex/blockexchange/protobuf/message.nim
rename to storage/blockexchange/protobuf/message.nim
diff --git a/codex/blockexchange/protobuf/message.proto b/storage/blockexchange/protobuf/message.proto
similarity index 100%
rename from codex/blockexchange/protobuf/message.proto
rename to storage/blockexchange/protobuf/message.proto
diff --git a/codex/blockexchange/protobuf/message.proto.license b/storage/blockexchange/protobuf/message.proto.license
similarity index 100%
rename from codex/blockexchange/protobuf/message.proto.license
rename to storage/blockexchange/protobuf/message.proto.license
diff --git a/codex/blockexchange/protobuf/presence.nim b/storage/blockexchange/protobuf/presence.nim
similarity index 100%
rename from codex/blockexchange/protobuf/presence.nim
rename to storage/blockexchange/protobuf/presence.nim
diff --git a/codex/blocktype.nim b/storage/blocktype.nim
similarity index 100%
rename from codex/blocktype.nim
rename to storage/blocktype.nim
diff --git a/codex/chunker.nim b/storage/chunker.nim
similarity index 100%
rename from codex/chunker.nim
rename to storage/chunker.nim
diff --git a/codex/clock.nim b/storage/clock.nim
similarity index 100%
rename from codex/clock.nim
rename to storage/clock.nim
diff --git a/codex/codextypes.nim b/storage/codextypes.nim
similarity index 100%
rename from codex/codextypes.nim
rename to storage/codextypes.nim
diff --git a/codex/conf.nim b/storage/conf.nim
similarity index 100%
rename from codex/conf.nim
rename to storage/conf.nim
diff --git a/codex/contentids_exts.nim b/storage/contentids_exts.nim
similarity index 100%
rename from codex/contentids_exts.nim
rename to storage/contentids_exts.nim
diff --git a/codex/discovery.nim b/storage/discovery.nim
similarity index 100%
rename from codex/discovery.nim
rename to storage/discovery.nim
diff --git a/codex/errors.nim b/storage/errors.nim
similarity index 100%
rename from codex/errors.nim
rename to storage/errors.nim
diff --git a/codex/logutils.nim b/storage/logutils.nim
similarity index 100%
rename from codex/logutils.nim
rename to storage/logutils.nim
diff --git a/codex/manifest.nim b/storage/manifest.nim
similarity index 100%
rename from codex/manifest.nim
rename to storage/manifest.nim
diff --git a/codex/manifest/coders.nim b/storage/manifest/coders.nim
similarity index 100%
rename from codex/manifest/coders.nim
rename to storage/manifest/coders.nim
diff --git a/codex/manifest/manifest.nim b/storage/manifest/manifest.nim
similarity index 100%
rename from codex/manifest/manifest.nim
rename to storage/manifest/manifest.nim
diff --git a/codex/merkletree.nim b/storage/merkletree.nim
similarity index 100%
rename from codex/merkletree.nim
rename to storage/merkletree.nim
diff --git a/codex/merkletree/coders.nim b/storage/merkletree/coders.nim
similarity index 100%
rename from codex/merkletree/coders.nim
rename to storage/merkletree/coders.nim
diff --git a/codex/merkletree/merkletree.nim b/storage/merkletree/merkletree.nim
similarity index 100%
rename from codex/merkletree/merkletree.nim
rename to storage/merkletree/merkletree.nim
diff --git a/codex/multicodec_exts.nim b/storage/multicodec_exts.nim
similarity index 100%
rename from codex/multicodec_exts.nim
rename to storage/multicodec_exts.nim
diff --git a/codex/multihash_exts.nim b/storage/multihash_exts.nim
similarity index 100%
rename from codex/multihash_exts.nim
rename to storage/multihash_exts.nim
diff --git a/codex/namespaces.nim b/storage/namespaces.nim
similarity index 100%
rename from codex/namespaces.nim
rename to storage/namespaces.nim
diff --git a/codex/nat.nim b/storage/nat.nim
similarity index 100%
rename from codex/nat.nim
rename to storage/nat.nim
diff --git a/codex/node.nim b/storage/node.nim
similarity index 100%
rename from codex/node.nim
rename to storage/node.nim
diff --git a/codex/rest/api.nim b/storage/rest/api.nim
similarity index 100%
rename from codex/rest/api.nim
rename to storage/rest/api.nim
diff --git a/codex/rest/coders.nim b/storage/rest/coders.nim
similarity index 100%
rename from codex/rest/coders.nim
rename to storage/rest/coders.nim
diff --git a/codex/rest/json.nim b/storage/rest/json.nim
similarity index 100%
rename from codex/rest/json.nim
rename to storage/rest/json.nim
diff --git a/codex/rng.nim b/storage/rng.nim
similarity index 100%
rename from codex/rng.nim
rename to storage/rng.nim
diff --git a/codex/codex.nim b/storage/storage.nim
similarity index 100%
rename from codex/codex.nim
rename to storage/storage.nim
diff --git a/codex/stores.nim b/storage/stores.nim
similarity index 100%
rename from codex/stores.nim
rename to storage/stores.nim
diff --git a/codex/stores/blockstore.nim b/storage/stores/blockstore.nim
similarity index 100%
rename from codex/stores/blockstore.nim
rename to storage/stores/blockstore.nim
diff --git a/codex/stores/cachestore.nim b/storage/stores/cachestore.nim
similarity index 100%
rename from codex/stores/cachestore.nim
rename to storage/stores/cachestore.nim
diff --git a/codex/stores/keyutils.nim b/storage/stores/keyutils.nim
similarity index 100%
rename from codex/stores/keyutils.nim
rename to storage/stores/keyutils.nim
diff --git a/codex/stores/maintenance.nim b/storage/stores/maintenance.nim
similarity index 100%
rename from codex/stores/maintenance.nim
rename to storage/stores/maintenance.nim
diff --git a/codex/stores/networkstore.nim b/storage/stores/networkstore.nim
similarity index 100%
rename from codex/stores/networkstore.nim
rename to storage/stores/networkstore.nim
diff --git a/codex/stores/queryiterhelper.nim b/storage/stores/queryiterhelper.nim
similarity index 100%
rename from codex/stores/queryiterhelper.nim
rename to storage/stores/queryiterhelper.nim
diff --git a/codex/stores/repostore.nim b/storage/stores/repostore.nim
similarity index 100%
rename from codex/stores/repostore.nim
rename to storage/stores/repostore.nim
diff --git a/codex/stores/repostore/coders.nim b/storage/stores/repostore/coders.nim
similarity index 100%
rename from codex/stores/repostore/coders.nim
rename to storage/stores/repostore/coders.nim
diff --git a/codex/stores/repostore/operations.nim b/storage/stores/repostore/operations.nim
similarity index 100%
rename from codex/stores/repostore/operations.nim
rename to storage/stores/repostore/operations.nim
diff --git a/codex/stores/repostore/store.nim b/storage/stores/repostore/store.nim
similarity index 100%
rename from codex/stores/repostore/store.nim
rename to storage/stores/repostore/store.nim
diff --git a/codex/stores/repostore/types.nim b/storage/stores/repostore/types.nim
similarity index 100%
rename from codex/stores/repostore/types.nim
rename to storage/stores/repostore/types.nim
diff --git a/codex/stores/treehelper.nim b/storage/stores/treehelper.nim
similarity index 100%
rename from codex/stores/treehelper.nim
rename to storage/stores/treehelper.nim
diff --git a/codex/streams.nim b/storage/streams.nim
similarity index 100%
rename from codex/streams.nim
rename to storage/streams.nim
diff --git a/codex/streams/asyncstreamwrapper.nim b/storage/streams/asyncstreamwrapper.nim
similarity index 100%
rename from codex/streams/asyncstreamwrapper.nim
rename to storage/streams/asyncstreamwrapper.nim
diff --git a/codex/streams/seekablestream.nim b/storage/streams/seekablestream.nim
similarity index 100%
rename from codex/streams/seekablestream.nim
rename to storage/streams/seekablestream.nim
diff --git a/codex/streams/storestream.nim b/storage/streams/storestream.nim
similarity index 100%
rename from codex/streams/storestream.nim
rename to storage/streams/storestream.nim
diff --git a/codex/systemclock.nim b/storage/systemclock.nim
similarity index 100%
rename from codex/systemclock.nim
rename to storage/systemclock.nim
diff --git a/codex/units.nim b/storage/units.nim
similarity index 100%
rename from codex/units.nim
rename to storage/units.nim
diff --git a/codex/utils.nim b/storage/utils.nim
similarity index 100%
rename from codex/utils.nim
rename to storage/utils.nim
diff --git a/codex/utils/addrutils.nim b/storage/utils/addrutils.nim
similarity index 100%
rename from codex/utils/addrutils.nim
rename to storage/utils/addrutils.nim
diff --git a/codex/utils/arrayutils.nim b/storage/utils/arrayutils.nim
similarity index 100%
rename from codex/utils/arrayutils.nim
rename to storage/utils/arrayutils.nim
diff --git a/codex/utils/asyncheapqueue.nim b/storage/utils/asyncheapqueue.nim
similarity index 100%
rename from codex/utils/asyncheapqueue.nim
rename to storage/utils/asyncheapqueue.nim
diff --git a/codex/utils/asynciter.nim b/storage/utils/asynciter.nim
similarity index 100%
rename from codex/utils/asynciter.nim
rename to storage/utils/asynciter.nim
diff --git a/codex/utils/asyncstatemachine.nim b/storage/utils/asyncstatemachine.nim
similarity index 100%
rename from codex/utils/asyncstatemachine.nim
rename to storage/utils/asyncstatemachine.nim
diff --git a/codex/utils/digest.nim b/storage/utils/digest.nim
similarity index 100%
rename from codex/utils/digest.nim
rename to storage/utils/digest.nim
diff --git a/codex/utils/exceptions.nim b/storage/utils/exceptions.nim
similarity index 100%
rename from codex/utils/exceptions.nim
rename to storage/utils/exceptions.nim
diff --git a/codex/utils/fileutils.nim b/storage/utils/fileutils.nim
similarity index 100%
rename from codex/utils/fileutils.nim
rename to storage/utils/fileutils.nim
diff --git a/codex/utils/iter.nim b/storage/utils/iter.nim
similarity index 100%
rename from codex/utils/iter.nim
rename to storage/utils/iter.nim
diff --git a/codex/utils/json.nim b/storage/utils/json.nim
similarity index 100%
rename from codex/utils/json.nim
rename to storage/utils/json.nim
diff --git a/codex/utils/keyutils.nim b/storage/utils/keyutils.nim
similarity index 100%
rename from codex/utils/keyutils.nim
rename to storage/utils/keyutils.nim
diff --git a/codex/utils/natutils.nim b/storage/utils/natutils.nim
similarity index 100%
rename from codex/utils/natutils.nim
rename to storage/utils/natutils.nim
diff --git a/codex/utils/options.nim b/storage/utils/options.nim
similarity index 100%
rename from codex/utils/options.nim
rename to storage/utils/options.nim
diff --git a/codex/utils/safeasynciter.nim b/storage/utils/safeasynciter.nim
similarity index 100%
rename from codex/utils/safeasynciter.nim
rename to storage/utils/safeasynciter.nim
diff --git a/codex/utils/sharedbuf.nim b/storage/utils/sharedbuf.nim
similarity index 100%
rename from codex/utils/sharedbuf.nim
rename to storage/utils/sharedbuf.nim
diff --git a/codex/utils/stintutils.nim b/storage/utils/stintutils.nim
similarity index 100%
rename from codex/utils/stintutils.nim
rename to storage/utils/stintutils.nim
diff --git a/codex/utils/timer.nim b/storage/utils/timer.nim
similarity index 100%
rename from codex/utils/timer.nim
rename to storage/utils/timer.nim
diff --git a/codex/utils/trackedfutures.nim b/storage/utils/trackedfutures.nim
similarity index 100%
rename from codex/utils/trackedfutures.nim
rename to storage/utils/trackedfutures.nim
diff --git a/codex/utils/uniqueptr.nim b/storage/utils/uniqueptr.nim
similarity index 100%
rename from codex/utils/uniqueptr.nim
rename to storage/utils/uniqueptr.nim
diff --git a/tests/integration/codexclient.nim b/tests/integration/storageclient.nim
similarity index 100%
rename from tests/integration/codexclient.nim
rename to tests/integration/storageclient.nim
diff --git a/tests/integration/codexconfig.nim b/tests/integration/storageconfig.nim
similarity index 100%
rename from tests/integration/codexconfig.nim
rename to tests/integration/storageconfig.nim
diff --git a/tests/integration/codexprocess.nim b/tests/integration/storageprocess.nim
similarity index 100%
rename from tests/integration/codexprocess.nim
rename to tests/integration/storageprocess.nim
diff --git a/tests/codex/blockexchange/discovery/testdiscovery.nim b/tests/storage/blockexchange/discovery/testdiscovery.nim
similarity index 100%
rename from tests/codex/blockexchange/discovery/testdiscovery.nim
rename to tests/storage/blockexchange/discovery/testdiscovery.nim
diff --git a/tests/codex/blockexchange/discovery/testdiscoveryengine.nim b/tests/storage/blockexchange/discovery/testdiscoveryengine.nim
similarity index 100%
rename from tests/codex/blockexchange/discovery/testdiscoveryengine.nim
rename to tests/storage/blockexchange/discovery/testdiscoveryengine.nim
diff --git a/tests/codex/blockexchange/engine/testadvertiser.nim b/tests/storage/blockexchange/engine/testadvertiser.nim
similarity index 100%
rename from tests/codex/blockexchange/engine/testadvertiser.nim
rename to tests/storage/blockexchange/engine/testadvertiser.nim
diff --git a/tests/codex/blockexchange/engine/testblockexc.nim b/tests/storage/blockexchange/engine/testblockexc.nim
similarity index 100%
rename from tests/codex/blockexchange/engine/testblockexc.nim
rename to tests/storage/blockexchange/engine/testblockexc.nim
diff --git a/tests/codex/blockexchange/engine/testengine.nim b/tests/storage/blockexchange/engine/testengine.nim
similarity index 100%
rename from tests/codex/blockexchange/engine/testengine.nim
rename to tests/storage/blockexchange/engine/testengine.nim
diff --git a/tests/codex/blockexchange/protobuf/testpresence.nim b/tests/storage/blockexchange/protobuf/testpresence.nim
similarity index 100%
rename from tests/codex/blockexchange/protobuf/testpresence.nim
rename to tests/storage/blockexchange/protobuf/testpresence.nim
diff --git a/tests/codex/blockexchange/testdiscovery.nim b/tests/storage/blockexchange/testdiscovery.nim
similarity index 100%
rename from tests/codex/blockexchange/testdiscovery.nim
rename to tests/storage/blockexchange/testdiscovery.nim
diff --git a/tests/codex/blockexchange/testengine.nim b/tests/storage/blockexchange/testengine.nim
similarity index 100%
rename from tests/codex/blockexchange/testengine.nim
rename to tests/storage/blockexchange/testengine.nim
diff --git a/tests/codex/blockexchange/testnetwork.nim b/tests/storage/blockexchange/testnetwork.nim
similarity index 100%
rename from tests/codex/blockexchange/testnetwork.nim
rename to tests/storage/blockexchange/testnetwork.nim
diff --git a/tests/codex/blockexchange/testpeerctxstore.nim b/tests/storage/blockexchange/testpeerctxstore.nim
similarity index 100%
rename from tests/codex/blockexchange/testpeerctxstore.nim
rename to tests/storage/blockexchange/testpeerctxstore.nim
diff --git a/tests/codex/blockexchange/testpendingblocks.nim b/tests/storage/blockexchange/testpendingblocks.nim
similarity index 100%
rename from tests/codex/blockexchange/testpendingblocks.nim
rename to tests/storage/blockexchange/testpendingblocks.nim
diff --git a/tests/codex/blockexchange/testprotobuf.nim b/tests/storage/blockexchange/testprotobuf.nim
similarity index 100%
rename from tests/codex/blockexchange/testprotobuf.nim
rename to tests/storage/blockexchange/testprotobuf.nim
diff --git a/tests/codex/examples.nim b/tests/storage/examples.nim
similarity index 100%
rename from tests/codex/examples.nim
rename to tests/storage/examples.nim
diff --git a/tests/codex/helpers.nim b/tests/storage/helpers.nim
similarity index 100%
rename from tests/codex/helpers.nim
rename to tests/storage/helpers.nim
diff --git a/tests/codex/helpers/always.nim b/tests/storage/helpers/always.nim
similarity index 100%
rename from tests/codex/helpers/always.nim
rename to tests/storage/helpers/always.nim
diff --git a/tests/codex/helpers/datasetutils.nim b/tests/storage/helpers/datasetutils.nim
similarity index 100%
rename from tests/codex/helpers/datasetutils.nim
rename to tests/storage/helpers/datasetutils.nim
diff --git a/tests/codex/helpers/mockchunker.nim b/tests/storage/helpers/mockchunker.nim
similarity index 100%
rename from tests/codex/helpers/mockchunker.nim
rename to tests/storage/helpers/mockchunker.nim
diff --git a/tests/codex/helpers/mockclock.nim b/tests/storage/helpers/mockclock.nim
similarity index 100%
rename from tests/codex/helpers/mockclock.nim
rename to tests/storage/helpers/mockclock.nim
diff --git a/tests/codex/helpers/mockdiscovery.nim b/tests/storage/helpers/mockdiscovery.nim
similarity index 100%
rename from tests/codex/helpers/mockdiscovery.nim
rename to tests/storage/helpers/mockdiscovery.nim
diff --git a/tests/codex/helpers/mockrepostore.nim b/tests/storage/helpers/mockrepostore.nim
similarity index 100%
rename from tests/codex/helpers/mockrepostore.nim
rename to tests/storage/helpers/mockrepostore.nim
diff --git a/tests/codex/helpers/mocktimer.nim b/tests/storage/helpers/mocktimer.nim
similarity index 100%
rename from tests/codex/helpers/mocktimer.nim
rename to tests/storage/helpers/mocktimer.nim
diff --git a/tests/codex/helpers/nodeutils.nim b/tests/storage/helpers/nodeutils.nim
similarity index 100%
rename from tests/codex/helpers/nodeutils.nim
rename to tests/storage/helpers/nodeutils.nim
diff --git a/tests/codex/helpers/randomchunker.nim b/tests/storage/helpers/randomchunker.nim
similarity index 100%
rename from tests/codex/helpers/randomchunker.nim
rename to tests/storage/helpers/randomchunker.nim
diff --git a/tests/codex/merkletree/helpers.nim b/tests/storage/merkletree/helpers.nim
similarity index 100%
rename from tests/codex/merkletree/helpers.nim
rename to tests/storage/merkletree/helpers.nim
diff --git a/tests/codex/merkletree/testcodexcoders.nim b/tests/storage/merkletree/teststoragecoders.nim
similarity index 100%
rename from tests/codex/merkletree/testcodexcoders.nim
rename to tests/storage/merkletree/teststoragecoders.nim
diff --git a/tests/codex/merkletree/testcodextree.nim b/tests/storage/merkletree/teststoragetree.nim
similarity index 100%
rename from tests/codex/merkletree/testcodextree.nim
rename to tests/storage/merkletree/teststoragetree.nim
diff --git a/tests/codex/node/helpers.nim b/tests/storage/node/helpers.nim
similarity index 100%
rename from tests/codex/node/helpers.nim
rename to tests/storage/node/helpers.nim
diff --git a/tests/codex/node/testnode.nim b/tests/storage/node/testnode.nim
similarity index 100%
rename from tests/codex/node/testnode.nim
rename to tests/storage/node/testnode.nim
diff --git a/tests/codex/slots/helpers.nim b/tests/storage/slots/helpers.nim
similarity index 100%
rename from tests/codex/slots/helpers.nim
rename to tests/storage/slots/helpers.nim
diff --git a/tests/codex/stores/commonstoretests.nim b/tests/storage/stores/commonstoretests.nim
similarity index 100%
rename from tests/codex/stores/commonstoretests.nim
rename to tests/storage/stores/commonstoretests.nim
diff --git a/tests/codex/stores/repostore/testcoders.nim b/tests/storage/stores/repostore/testcoders.nim
similarity index 100%
rename from tests/codex/stores/repostore/testcoders.nim
rename to tests/storage/stores/repostore/testcoders.nim
diff --git a/tests/codex/stores/testcachestore.nim b/tests/storage/stores/testcachestore.nim
similarity index 100%
rename from tests/codex/stores/testcachestore.nim
rename to tests/storage/stores/testcachestore.nim
diff --git a/tests/codex/stores/testkeyutils.nim b/tests/storage/stores/testkeyutils.nim
similarity index 100%
rename from tests/codex/stores/testkeyutils.nim
rename to tests/storage/stores/testkeyutils.nim
diff --git a/tests/codex/stores/testmaintenance.nim b/tests/storage/stores/testmaintenance.nim
similarity index 100%
rename from tests/codex/stores/testmaintenance.nim
rename to tests/storage/stores/testmaintenance.nim
diff --git a/tests/codex/stores/testqueryiterhelper.nim b/tests/storage/stores/testqueryiterhelper.nim
similarity index 100%
rename from tests/codex/stores/testqueryiterhelper.nim
rename to tests/storage/stores/testqueryiterhelper.nim
diff --git a/tests/codex/stores/testrepostore.nim b/tests/storage/stores/testrepostore.nim
similarity index 100%
rename from tests/codex/stores/testrepostore.nim
rename to tests/storage/stores/testrepostore.nim
diff --git a/tests/codex/testasyncheapqueue.nim b/tests/storage/testasyncheapqueue.nim
similarity index 100%
rename from tests/codex/testasyncheapqueue.nim
rename to tests/storage/testasyncheapqueue.nim
diff --git a/tests/codex/testasyncstreamwrapper.nim b/tests/storage/testasyncstreamwrapper.nim
similarity index 100%
rename from tests/codex/testasyncstreamwrapper.nim
rename to tests/storage/testasyncstreamwrapper.nim
diff --git a/tests/codex/testblockexchange.nim b/tests/storage/testblockexchange.nim
similarity index 100%
rename from tests/codex/testblockexchange.nim
rename to tests/storage/testblockexchange.nim
diff --git a/tests/codex/testblocktype.nim b/tests/storage/testblocktype.nim
similarity index 100%
rename from tests/codex/testblocktype.nim
rename to tests/storage/testblocktype.nim
diff --git a/tests/codex/testchunking.nim b/tests/storage/testchunking.nim
similarity index 100%
rename from tests/codex/testchunking.nim
rename to tests/storage/testchunking.nim
diff --git a/tests/codex/testclock.nim b/tests/storage/testclock.nim
similarity index 100%
rename from tests/codex/testclock.nim
rename to tests/storage/testclock.nim
diff --git a/tests/codex/testlogutils.nim b/tests/storage/testlogutils.nim
similarity index 100%
rename from tests/codex/testlogutils.nim
rename to tests/storage/testlogutils.nim
diff --git a/tests/codex/testmanifest.nim b/tests/storage/testmanifest.nim
similarity index 100%
rename from tests/codex/testmanifest.nim
rename to tests/storage/testmanifest.nim
diff --git a/tests/codex/testmerkletree.nim b/tests/storage/testmerkletree.nim
similarity index 100%
rename from tests/codex/testmerkletree.nim
rename to tests/storage/testmerkletree.nim
diff --git a/tests/codex/testnat.nim b/tests/storage/testnat.nim
similarity index 100%
rename from tests/codex/testnat.nim
rename to tests/storage/testnat.nim
diff --git a/tests/codex/testnode.nim b/tests/storage/testnode.nim
similarity index 100%
rename from tests/codex/testnode.nim
rename to tests/storage/testnode.nim
diff --git a/tests/codex/testrng.nim b/tests/storage/testrng.nim
similarity index 100%
rename from tests/codex/testrng.nim
rename to tests/storage/testrng.nim
diff --git a/tests/codex/teststores.nim b/tests/storage/teststores.nim
similarity index 100%
rename from tests/codex/teststores.nim
rename to tests/storage/teststores.nim
diff --git a/tests/codex/teststorestream.nim b/tests/storage/teststorestream.nim
similarity index 100%
rename from tests/codex/teststorestream.nim
rename to tests/storage/teststorestream.nim
diff --git a/tests/codex/testsystemclock.nim b/tests/storage/testsystemclock.nim
similarity index 100%
rename from tests/codex/testsystemclock.nim
rename to tests/storage/testsystemclock.nim
diff --git a/tests/codex/testutils.nim b/tests/storage/testutils.nim
similarity index 100%
rename from tests/codex/testutils.nim
rename to tests/storage/testutils.nim
diff --git a/tests/codex/utils/testasynciter.nim b/tests/storage/utils/testasynciter.nim
similarity index 100%
rename from tests/codex/utils/testasynciter.nim
rename to tests/storage/utils/testasynciter.nim
diff --git a/tests/codex/utils/testasyncstatemachine.nim b/tests/storage/utils/testasyncstatemachine.nim
similarity index 100%
rename from tests/codex/utils/testasyncstatemachine.nim
rename to tests/storage/utils/testasyncstatemachine.nim
diff --git a/tests/codex/utils/testiter.nim b/tests/storage/utils/testiter.nim
similarity index 100%
rename from tests/codex/utils/testiter.nim
rename to tests/storage/utils/testiter.nim
diff --git a/tests/codex/utils/testkeyutils.nim b/tests/storage/utils/testkeyutils.nim
similarity index 100%
rename from tests/codex/utils/testkeyutils.nim
rename to tests/storage/utils/testkeyutils.nim
diff --git a/tests/codex/utils/testoptions.nim b/tests/storage/utils/testoptions.nim
similarity index 100%
rename from tests/codex/utils/testoptions.nim
rename to tests/storage/utils/testoptions.nim
diff --git a/tests/codex/utils/testsafeasynciter.nim b/tests/storage/utils/testsafeasynciter.nim
similarity index 100%
rename from tests/codex/utils/testsafeasynciter.nim
rename to tests/storage/utils/testsafeasynciter.nim
diff --git a/tests/codex/utils/testtimer.nim b/tests/storage/utils/testtimer.nim
similarity index 100%
rename from tests/codex/utils/testtimer.nim
rename to tests/storage/utils/testtimer.nim
diff --git a/tests/codex/utils/testtrackedfutures.nim b/tests/storage/utils/testtrackedfutures.nim
similarity index 100%
rename from tests/codex/utils/testtrackedfutures.nim
rename to tests/storage/utils/testtrackedfutures.nim
diff --git a/tests/codex/utils/testutils.nim b/tests/storage/utils/testutils.nim
similarity index 100%
rename from tests/codex/utils/testutils.nim
rename to tests/storage/utils/testutils.nim