diff --git a/Makefile b/Makefile
index f6e52137a..05942537a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ DEV ?= --dev
 
 all:
 	@jbuilder build ${DEV} \
-		src/node_main.exe \
-		src/client_main.exe \
+		bin_node/main.exe \
+		bin_client/main.exe \
 		lib_protocol_compiler/main.exe
-	@cp _build/default/src/node_main.exe tezos-node
-	@cp _build/default/src/client_main.exe tezos-client
+	@cp _build/default/bin_node/main.exe tezos-node
+	@cp _build/default/bin_client/main.exe tezos-client
 	@cp _build/default/lib_protocol_compiler/main.exe tezos-protocol-compiler
 
 doc-html:
diff --git a/lib_client_base/jbuild b/lib_client_base/jbuild
index 44d63dc22..ef7b8639c 100644
--- a/lib_client_base/jbuild
+++ b/lib_client_base/jbuild
@@ -4,16 +4,16 @@
  ((name tezos_client_base)
   (public_name tezos-client-base)
   (libraries (tezos-base
+              tezos-storage
               tezos-node-shell
               tezos-node-net
-              tezos-node-db
               tezos-node-updater
               tezos-protocol-compiler))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
+                    -open Tezos_storage
                     -open Tezos_node_net
-                    -open Tezos_node_db
                     -open Tezos_node_updater
                     -open Tezos_node_shell))))
 
diff --git a/lib_node_shell/jbuild b/lib_node_shell/jbuild
index 723d4e7a3..180b11da3 100644
--- a/lib_node_shell/jbuild
+++ b/lib_node_shell/jbuild
@@ -4,13 +4,13 @@
  ((name tezos_node_shell)
   (public_name tezos-node-shell)
   (libraries (tezos-base
+              tezos-storage
               tezos-node-net
-              tezos-node-db
               tezos-node-updater))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
-                    -open Tezos_node_db
+                    -open Tezos_storage
                     -open Tezos_node_net
                     -open Tezos_node_updater))))
 
diff --git a/lib_node_updater/jbuild b/lib_node_updater/jbuild
index 7f974eb39..7abfb5f54 100644
--- a/lib_node_updater/jbuild
+++ b/lib_node_updater/jbuild
@@ -6,16 +6,16 @@
   (libraries (tezos-base
               tezos-micheline
               tezos-protocol-compiler
+              tezos-storage
               tezos-node-net
-              tezos-node-db
               dynlink))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
                     -open Tezos_micheline
                     -open Tezos_protocol_compiler
-                    -open Tezos_node_net
-                    -open Tezos_node_db))))
+                    -open Tezos_storage
+                    -open Tezos_node_net))))
 
 (alias
  ((name runtest_indent)
diff --git a/lib_node_db/context.ml b/lib_storage/context.ml
similarity index 100%
rename from lib_node_db/context.ml
rename to lib_storage/context.ml
diff --git a/lib_node_db/context.mli b/lib_storage/context.mli
similarity index 100%
rename from lib_node_db/context.mli
rename to lib_storage/context.mli
diff --git a/lib_node_db/jbuild b/lib_storage/jbuild
similarity index 87%
rename from lib_node_db/jbuild
rename to lib_storage/jbuild
index c4e5e8233..a9d73a7e3 100644
--- a/lib_node_db/jbuild
+++ b/lib_storage/jbuild
@@ -1,8 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name tezos_node_db)
-  (public_name tezos-node-db)
+ ((name tezos_storage)
+  (public_name tezos-storage)
   (libraries (tezos-base
               leveldb
               irmin-leveldb))
diff --git a/lib_node_db/raw_store.ml b/lib_storage/raw_store.ml
similarity index 100%
rename from lib_node_db/raw_store.ml
rename to lib_storage/raw_store.ml
diff --git a/lib_node_db/raw_store.mli b/lib_storage/raw_store.mli
similarity index 100%
rename from lib_node_db/raw_store.mli
rename to lib_storage/raw_store.mli
diff --git a/lib_node_db/store.ml b/lib_storage/store.ml
similarity index 100%
rename from lib_node_db/store.ml
rename to lib_storage/store.ml
diff --git a/lib_node_db/store.mli b/lib_storage/store.mli
similarity index 100%
rename from lib_node_db/store.mli
rename to lib_storage/store.mli
diff --git a/lib_node_db/store_helpers.ml b/lib_storage/store_helpers.ml
similarity index 100%
rename from lib_node_db/store_helpers.ml
rename to lib_storage/store_helpers.ml
diff --git a/lib_node_db/store_helpers.mli b/lib_storage/store_helpers.mli
similarity index 100%
rename from lib_node_db/store_helpers.mli
rename to lib_storage/store_helpers.mli
diff --git a/lib_node_db/store_sigs.ml b/lib_storage/store_sigs.ml
similarity index 100%
rename from lib_node_db/store_sigs.ml
rename to lib_storage/store_sigs.ml
diff --git a/lib_node_db/tezos-node-db.opam b/lib_storage/tezos-storage.opam
similarity index 100%
rename from lib_node_db/tezos-node-db.opam
rename to lib_storage/tezos-storage.opam
diff --git a/test/shell/jbuild b/test/shell/jbuild
index 93f1fa9f1..534bf5c3d 100644
--- a/test/shell/jbuild
+++ b/test/shell/jbuild
@@ -5,8 +5,8 @@
           test_state
           test_store))
   (libraries (tezos-base
+              tezos-storage
               tezos-node-shell
-              tezos-node-db
               tezos-embedded-protocol-demo
               tezos-embedded-protocol-alpha
               tezos-embedded-protocol-genesis
@@ -14,8 +14,8 @@
   (flags (:standard -w -9-32
                     -safe-string
                     -open Tezos_base__TzPervasives
-                    -open Tezos_node_shell
-                    -open Tezos_node_db))))
+                    -open Tezos_storage
+                    -open Tezos_node_shell))))
 
 (alias
  ((name buildtest)