diff --git a/manifest/main.ml b/manifest/main.ml
index 392362bbfcc62a5757e1215b3bd542fc2e51f2c2..534ff45169eb038dc43d0b0e6ad2e8f02a25f03f 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3711,7 +3711,7 @@ end = struct
     type t = {main : target; embedded : target}
 
     let make_tests ?test_helpers ?parameters ?plugin ?client ?benchmark
-        ?benchmark_type_inference ?sc_rollup ~main ~name () =
+        ?benchmark_type_inference ?octez_sc_rollup ~main ~name () =
       let name_dash = Name.name_dash name in
       let number = Name.number name in
       let path = Name.base_path name in
@@ -3904,7 +3904,7 @@ end = struct
               octez_benchmark;
               benchmark |> if_some |> open_;
               benchmark_type_inference |> if_some |> open_;
-              sc_rollup |> if_some |> if_ N.(number >= 016) |> open_;
+              octez_sc_rollup |> if_some |> if_ N.(number >= 016) |> open_;
               octez_crypto_dal |> if_ N.(number >= 016) |> open_;
               octez_base_test_helpers |> if_ N.(number >= 016) |> open_;
               parameters |> if_some |> if_ N.(number >= 016) |> open_;
@@ -4898,7 +4898,7 @@ module Protocol = Protocol
         ~inline_tests:ppx_expect
         ~linkall:true
     in
-    let sc_rollup =
+    let octez_sc_rollup =
       only_if N.(number >= 016) @@ fun () ->
       public_lib
         (sf "tezos-smart-rollup-%s" name_dash)
@@ -4917,46 +4917,16 @@ module Protocol = Protocol
         ~inline_tests:ppx_expect
         ~linkall:true
     in
-    let _sc_rollup_client =
+    let octez_sc_rollup_node =
       only_if (active && N.(number >= 016)) @@ fun () ->
-      public_exe
-        (sf "octez-smart-rollup-client-%s" short_hash)
-        ~internal_name:(sf "main_sc_rollup_client_%s" name_underscore)
-        ~path:(path // "bin_sc_rollup_client")
-        ~synopsis:
-          "Tezos/Protocol: `octez-smart-rollup-client-alpha` client binary"
-        ~release_status:executable_release_status
-        ~deps:
-          [
-            octez_base |> open_ ~m:"TzPervasives"
-            |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
-            octez_clic;
-            octez_client_base;
-            client |> if_some |> open_;
-            octez_client_commands |> open_;
-            octez_stdlib_unix |> open_;
-            octez_client_base_unix |> open_;
-            octez_rpc_http;
-            octez_rpc_http_client_unix |> open_;
-            main |> open_;
-            sc_rollup |> if_some |> open_;
-            uri;
-          ]
-    in
-    let _sc_rollup_node =
-      only_if (active && N.(number >= 016)) @@ fun () ->
-      public_exe
-        (sf "octez-smart-rollup-node-%s" short_hash)
-        ~internal_name:(sf "main_sc_rollup_node_%s" name_underscore)
-        ~path:(path // "bin_sc_rollup_node")
-        ~synopsis:"Tezos/Protocol: Smart Rollup node binary"
-        ~release_status:executable_release_status
+      private_lib
+        (sf "octez_smart_rollup_node_%s" short_hash)
+        ~path:(path // "lib_sc_rollup_node")
+        ~opam:(sf "octez-smart-rollup-node-%s" short_hash)
         ~deps:
           [
             octez_base |> open_ |> open_ ~m:"TzPervasives"
             |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
-            octez_clic;
-            octez_client_commands |> open_;
             octez_stdlib_unix |> open_;
             octez_client_base |> open_;
             octez_client_base_unix |> open_;
@@ -4973,7 +4943,7 @@ module Protocol = Protocol
             octez_dal_node_services;
             octez_dal_node_lib |> open_;
             octez_shell_services |> open_;
-            sc_rollup |> if_some |> open_;
+            octez_sc_rollup |> if_some |> open_;
             layer2_utils |> if_some |> open_;
             octez_layer2_store |> open_;
             tree_encoding;
@@ -4991,6 +4961,63 @@ module Protocol = Protocol
             octez_node_config |> if_ N.(number >= 016);
           ]
     in
+    let octez_sc_rollup_client =
+      only_if (active && N.(number >= 016)) @@ fun () ->
+      private_lib
+        (sf "octez_smart_rollup_client_%s" short_hash)
+        ~path:(path // "lib_sc_rollup_client")
+        ~opam:(sf "octez-smart-rollup-client-%s" short_hash)
+        ~deps:
+          [
+            octez_base |> open_ |> open_ ~m:"TzPervasives"
+            |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
+            main |> open_;
+            octez_client_commands |> open_;
+            octez_client_base |> open_;
+            octez_client_base_unix |> open_;
+            client |> if_some |> open_;
+            octez_sc_rollup |> if_some |> open_;
+          ]
+    in
+    let _sc_rollup_client =
+      only_if (active && N.(number >= 016)) @@ fun () ->
+      public_exe
+        (sf "octez-smart-rollup-client-%s" short_hash)
+        ~internal_name:(sf "main_sc_rollup_client_%s" name_underscore)
+        ~path:(path // "bin_sc_rollup_client")
+        ~synopsis:"Tezos/Protocol: Smart rollup client"
+        ~release_status:executable_release_status
+        ~deps:
+          [
+            octez_base |> open_ ~m:"TzPervasives"
+            |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
+            octez_clic;
+            main |> open_;
+            octez_sc_rollup_client |> if_some |> open_;
+          ]
+    in
+    let _sc_rollup_node =
+      only_if (active && N.(number >= 016)) @@ fun () ->
+      public_exe
+        (sf "octez-smart-rollup-node-%s" short_hash)
+        ~internal_name:(sf "main_sc_rollup_node_%s" name_underscore)
+        ~path:(path // "bin_sc_rollup_node")
+        ~synopsis:"Tezos/Protocol: protocol specific Smart rollup node"
+        ~release_status:executable_release_status
+        ~deps:
+          [
+            octez_base |> open_ |> open_ ~m:"TzPervasives"
+            |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
+            octez_clic;
+            main |> open_;
+            octez_shell_services |> open_;
+            octez_client_base |> open_;
+            octez_client_base_unix |> open_;
+            octez_client_commands |> open_;
+            client |> if_some |> open_;
+            octez_sc_rollup_node |> if_some |> open_;
+          ]
+    in
     let tx_rollup =
       only_if (active && N.(number >= 013 && number <= 015)) @@ fun () ->
       public_lib
@@ -5301,7 +5328,7 @@ module Protocol = Protocol
           ?client
           ?benchmark:(Option.bind benchmark Fun.id)
           ?benchmark_type_inference
-          ?sc_rollup
+          ?octez_sc_rollup
           ~main
           ~name
           ()
diff --git a/opam/octez-smart-rollup-client-PtMumbai.opam b/opam/octez-smart-rollup-client-PtMumbai.opam
index 8c4b049cb522cee88fb2a03e31a979bc01f39294..1c00923206105bb668b1a20372c56aae59505c9d 100644
--- a/opam/octez-smart-rollup-client-PtMumbai.opam
+++ b/opam/octez-smart-rollup-client-PtMumbai.opam
@@ -10,21 +10,17 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "tezos-base"
-  "tezos-clic"
-  "tezos-client-base"
-  "tezos-client-016-PtMumbai"
+  "tezos-protocol-016-PtMumbai"
   "tezos-client-commands"
-  "tezos-stdlib-unix"
+  "tezos-client-base"
   "tezos-client-base-unix"
-  "tezos-rpc-http"
-  "tezos-rpc-http-client-unix"
-  "tezos-protocol-016-PtMumbai"
+  "tezos-client-016-PtMumbai"
   "tezos-smart-rollup-016-PtMumbai"
-  "uri" { >= "3.1.0" }
+  "tezos-clic"
 ]
 build: [
   ["rm" "-r" "vendors"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: `octez-smart-rollup-client-alpha` client binary"
+synopsis: "Tezos/Protocol: Smart rollup client"
diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam
index 9b3690d5a19ff306a0f1285f3499123e7f6cee71..d7ab22730122ebc20273a848eaebeb4c0723961e 100644
--- a/opam/octez-smart-rollup-client-alpha.opam
+++ b/opam/octez-smart-rollup-client-alpha.opam
@@ -10,21 +10,17 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "tezos-base"
-  "tezos-clic"
-  "tezos-client-base"
-  "tezos-client-alpha"
+  "tezos-protocol-alpha"
   "tezos-client-commands"
-  "tezos-stdlib-unix"
+  "tezos-client-base"
   "tezos-client-base-unix"
-  "tezos-rpc-http"
-  "tezos-rpc-http-client-unix"
-  "tezos-protocol-alpha"
+  "tezos-client-alpha"
   "tezos-smart-rollup-alpha"
-  "uri" { >= "3.1.0" }
+  "tezos-clic"
 ]
 build: [
   ["rm" "-r" "vendors"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: `octez-smart-rollup-client-alpha` client binary"
+synopsis: "Tezos/Protocol: Smart rollup client"
diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam
index c8d14a4db1b8dc1df7509e11a654fec5e87dc31d..1c67e3d577eab789ba4d9acf1d18627e01d3921f 100644
--- a/opam/octez-smart-rollup-node-PtMumbai.opam
+++ b/opam/octez-smart-rollup-node-PtMumbai.opam
@@ -10,8 +10,6 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "tezos-base"
-  "tezos-clic"
-  "tezos-client-commands"
   "tezos-stdlib-unix"
   "tezos-client-base"
   "tezos-client-base-unix"
@@ -41,10 +39,12 @@ depends: [
   "tezos-crypto-dal"
   "prometheus-app" { >= "1.2" }
   "octez-node-config"
+  "tezos-clic"
+  "tezos-client-commands"
 ]
 build: [
   ["rm" "-r" "vendors"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: Smart Rollup node binary"
+synopsis: "Tezos/Protocol: protocol specific Smart rollup node"
diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam
index 42d842500f29f16220ad87a46235097a4ac6edb7..12f4606428b9022b098faa0763476f7ddf8d3ba3 100644
--- a/opam/octez-smart-rollup-node-alpha.opam
+++ b/opam/octez-smart-rollup-node-alpha.opam
@@ -10,8 +10,6 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "tezos-base"
-  "tezos-clic"
-  "tezos-client-commands"
   "tezos-stdlib-unix"
   "tezos-client-base"
   "tezos-client-base-unix"
@@ -41,10 +39,12 @@ depends: [
   "tezos-crypto-dal"
   "prometheus-app" { >= "1.2" }
   "octez-node-config"
+  "tezos-clic"
+  "tezos-client-commands"
 ]
 build: [
   ["rm" "-r" "vendors"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: Smart Rollup node binary"
+synopsis: "Tezos/Protocol: protocol specific Smart rollup node"
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune
index ee90085777a9969caab503edee6e6b28ed5cf173..d6a550094c862e71c114e0736d8340ef9f27b69e 100644
--- a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune
+++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune
@@ -9,16 +9,8 @@
  (libraries
   tezos-base
   tezos-clic
-  tezos-client-base
-  tezos-client-016-PtMumbai
-  tezos-client-commands
-  tezos-stdlib-unix
-  tezos-client-base-unix
-  tezos-rpc-http
-  tezos-rpc-http-client-unix
   tezos-protocol-016-PtMumbai
-  tezos-smart-rollup-016-PtMumbai
-  uri)
+  octez_smart_rollup_client_PtMumbai)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp))
@@ -26,10 +18,5 @@
   (:standard)
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-  -open Tezos_client_016_PtMumbai
-  -open Tezos_client_commands
-  -open Tezos_stdlib_unix
-  -open Tezos_client_base_unix
-  -open Tezos_rpc_http_client_unix
   -open Tezos_protocol_016_PtMumbai
-  -open Tezos_smart_rollup_016_PtMumbai))
+  -open Octez_smart_rollup_client_PtMumbai))
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune
index ab2242dd09a024ae96e28683743ede3dc2fa53c3..5db5ae0463f4cf8257e3d9bad862e87326bd6b58 100644
--- a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune
+++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune
@@ -9,39 +9,13 @@
  (libraries
   tezos-base
   tezos-clic
-  tezos-client-commands
-  tezos-stdlib-unix
+  tezos-protocol-016-PtMumbai
+  tezos-shell-services
   tezos-client-base
   tezos-client-base-unix
+  tezos-client-commands
   tezos-client-016-PtMumbai
-  tezos-context.encoding
-  tezos-context.helpers
-  tezos-protocol-016-PtMumbai
-  tezos-protocol-plugin-016-PtMumbai
-  tezos-protocol-016-PtMumbai.parameters
-  tezos-rpc
-  tezos-rpc-http
-  tezos-rpc-http-server
-  tezos-workers
-  tezos_dal_node_services
-  tezos_dal_node_lib
-  tezos-shell-services
-  tezos-smart-rollup-016-PtMumbai
-  tezos-layer2-utils-016-PtMumbai
-  tezos_layer2_store
-  tezos-tree-encoding
-  data-encoding
-  irmin-pack
-  irmin-pack.unix
-  irmin
-  aches
-  aches-lwt
-  tezos-injector-016-PtMumbai
-  tezos-scoru-wasm
-  tezos-scoru-wasm-fast
-  tezos-crypto-dal
-  prometheus-app
-  octez-node-config)
+  octez_smart_rollup_node_PtMumbai)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp))
@@ -50,19 +24,10 @@
   -open Tezos_base
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-  -open Tezos_client_commands
-  -open Tezos_stdlib_unix
+  -open Tezos_protocol_016_PtMumbai
+  -open Tezos_shell_services
   -open Tezos_client_base
   -open Tezos_client_base_unix
+  -open Tezos_client_commands
   -open Tezos_client_016_PtMumbai
-  -open Tezos_protocol_016_PtMumbai
-  -open Tezos_protocol_plugin_016_PtMumbai
-  -open Tezos_protocol_016_PtMumbai_parameters
-  -open Tezos_workers
-  -open Tezos_dal_node_lib
-  -open Tezos_shell_services
-  -open Tezos_smart_rollup_016_PtMumbai
-  -open Tezos_layer2_utils_016_PtMumbai
-  -open Tezos_layer2_store
-  -open Tezos_injector_016_PtMumbai
-  -open Tezos_crypto_dal))
+  -open Octez_smart_rollup_node_PtMumbai))
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/RPC.ml b/src/proto_016_PtMumbai/lib_sc_rollup_client/RPC.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_client/RPC.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_client/RPC.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.ml b/src/proto_016_PtMumbai/lib_sc_rollup_client/commands.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_client/commands.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_client/commands.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.mli b/src/proto_016_PtMumbai/lib_sc_rollup_client/commands.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_client/commands.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_client/commands.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.ml b/src/proto_016_PtMumbai/lib_sc_rollup_client/configuration.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_client/configuration.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.mli b/src/proto_016_PtMumbai/lib_sc_rollup_client/configuration.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_client/configuration.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_client/configuration.mli
diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_client/dune b/src/proto_016_PtMumbai/lib_sc_rollup_client/dune
new file mode 100644
index 0000000000000000000000000000000000000000..648cce5758d10748d1ee1e2acb21faa7ba6081a2
--- /dev/null
+++ b/src/proto_016_PtMumbai/lib_sc_rollup_client/dune
@@ -0,0 +1,26 @@
+; This file was automatically generated, do not edit.
+; Edit file manifest/main.ml instead.
+
+(library
+ (name octez_smart_rollup_client_PtMumbai)
+ (package octez-smart-rollup-client-PtMumbai)
+ (instrumentation (backend bisect_ppx))
+ (libraries
+  tezos-base
+  tezos-protocol-016-PtMumbai
+  tezos-client-commands
+  tezos-client-base
+  tezos-client-base-unix
+  tezos-client-016-PtMumbai
+  tezos-smart-rollup-016-PtMumbai)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_016_PtMumbai
+  -open Tezos_client_commands
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_016_PtMumbai
+  -open Tezos_smart_rollup_016_PtMumbai))
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_directory_helpers.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_directory_helpers.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_directory_helpers.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_directory_helpers.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_directory_helpers.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_server.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_server.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_server.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_server.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_server.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_server.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/RPC_server.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/RPC_server.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/arith_pvm.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/arith_pvm.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/arith_pvm.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/arith_pvm.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/batcher.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/batcher.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/batcher.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/batcher.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/batcher.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/batcher_events.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher_events.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/batcher_events.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/batcher_events.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/batcher_worker_types.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher_worker_types.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/batcher_worker_types.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/batcher_worker_types.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/batcher_worker_types.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/batcher_worker_types.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/batcher_worker_types.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/batcher_worker_types.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/commitment.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/commitment.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/commitment.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/commitment_event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment_event.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_event.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/commitment_event.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_sig.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/commitment_sig.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/commitment_sig.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/commitment_sig.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/components.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/components.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/components.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/components.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/configuration.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/configuration.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/configuration.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/configuration.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/configuration.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/context.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/context.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/context.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/context.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/context.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/context.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/context.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/context.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/daemon.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/daemon.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/daemon.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/daemon_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/daemon_event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/daemon_event.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/daemon_event.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/daemon_event.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dal_pages_request.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/dal_pages_request.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/dal_pages_request.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/dal_pages_request.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dal_pages_request.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/dal_pages_request.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/dal_pages_request.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/dal_pages_request.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dal_slots_tracker.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/dal_slots_tracker.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/dal_slots_tracker.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/dal_slots_tracker.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dal_slots_tracker.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/dal_slots_tracker.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/dal_slots_tracker.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/dal_slots_tracker.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dal_slots_tracker_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/dal_slots_tracker_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/dal_slots_tracker_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/dal_slots_tracker_event.ml
diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/dune b/src/proto_016_PtMumbai/lib_sc_rollup_node/dune
new file mode 100644
index 0000000000000000000000000000000000000000..c6bfbee80eb4070b780038837436e5ce00846223
--- /dev/null
+++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/dune
@@ -0,0 +1,61 @@
+; This file was automatically generated, do not edit.
+; Edit file manifest/main.ml instead.
+
+(library
+ (name octez_smart_rollup_node_PtMumbai)
+ (package octez-smart-rollup-node-PtMumbai)
+ (instrumentation (backend bisect_ppx))
+ (libraries
+  tezos-base
+  tezos-stdlib-unix
+  tezos-client-base
+  tezos-client-base-unix
+  tezos-client-016-PtMumbai
+  tezos-context.encoding
+  tezos-context.helpers
+  tezos-protocol-016-PtMumbai
+  tezos-protocol-plugin-016-PtMumbai
+  tezos-protocol-016-PtMumbai.parameters
+  tezos-rpc
+  tezos-rpc-http
+  tezos-rpc-http-server
+  tezos-workers
+  tezos_dal_node_services
+  tezos_dal_node_lib
+  tezos-shell-services
+  tezos-smart-rollup-016-PtMumbai
+  tezos-layer2-utils-016-PtMumbai
+  tezos_layer2_store
+  tezos-tree-encoding
+  data-encoding
+  irmin-pack
+  irmin-pack.unix
+  irmin
+  aches
+  aches-lwt
+  tezos-injector-016-PtMumbai
+  tezos-scoru-wasm
+  tezos-scoru-wasm-fast
+  tezos-crypto-dal
+  prometheus-app
+  octez-node-config)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_016_PtMumbai
+  -open Tezos_protocol_016_PtMumbai
+  -open Tezos_protocol_plugin_016_PtMumbai
+  -open Tezos_protocol_016_PtMumbai_parameters
+  -open Tezos_workers
+  -open Tezos_dal_node_lib
+  -open Tezos_shell_services
+  -open Tezos_smart_rollup_016_PtMumbai
+  -open Tezos_layer2_utils_016_PtMumbai
+  -open Tezos_layer2_store
+  -open Tezos_injector_016_PtMumbai
+  -open Tezos_crypto_dal))
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/event.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/event.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/event.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/event.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/fuel.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/fuel.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/fuel.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/fuel.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/fueled_pvm.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/fueled_pvm.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/fueled_pvm.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/fueled_pvm.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/inbox.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/inbox.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/inbox.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/inbox_event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/inbox_event.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/inbox_event.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/inbox_event.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/injector.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/injector.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/injector.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/injector.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/injector.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/injector.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/injector.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/injector.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/interpreter.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/interpreter.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/interpreter.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/interpreter.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/interpreter.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/interpreter.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/interpreter.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/interpreter.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/interpreter_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/interpreter_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/interpreter_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/interpreter_event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/layer1.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/layer1.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/layer1.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/layer1.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/layer1.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/layer1.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/layer1_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/layer1_event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/layer1_event.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/layer1_event.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/layer1_event.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/loser_mode.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/loser_mode.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/loser_mode.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/loser_mode.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/loser_mode.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/loser_mode.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/loser_mode.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/loser_mode.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/metrics.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/metrics.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/metrics.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/metrics.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/metrics.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/metrics.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/metrics.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/metrics.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/node_context.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/node_context.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/outbox.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/outbox.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/outbox.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/outbox.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/outbox.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/outbox.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/outbox.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/outbox.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/pvm.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/pvm.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/pvm.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/pvm.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/refutation_game.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/refutation_game.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/refutation_game.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/refutation_game.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/refutation_game.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/refutation_game.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/refutation_game.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/refutation_game.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/refutation_game_event.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/refutation_game_event.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/refutation_game_event.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/refutation_game_event.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/reveals.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/reveals.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/reveals.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/reveals.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/reveals.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/reveals.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/reveals.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/reveals.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/sc_rollup_node_errors.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/sc_rollup_node_errors.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/sc_rollup_node_errors.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/sc_rollup_node_errors.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/simulation.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/simulation.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/simulation.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/simulation.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/simulation.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/simulation.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/simulation.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/simulation.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/store.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/store.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/store.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/store.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/store.mli b/src/proto_016_PtMumbai/lib_sc_rollup_node/store.mli
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/store.mli
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/store.mli
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/wasm_2_0_0_pvm.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/wasm_2_0_0_pvm.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/wasm_2_0_0_pvm.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/wasm_2_0_0_pvm.ml
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/wasm_2_0_0_rpc.ml b/src/proto_016_PtMumbai/lib_sc_rollup_node/wasm_2_0_0_rpc.ml
similarity index 100%
rename from src/proto_016_PtMumbai/bin_sc_rollup_node/wasm_2_0_0_rpc.ml
rename to src/proto_016_PtMumbai/lib_sc_rollup_node/wasm_2_0_0_rpc.ml
diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune
index b9d8eb981b3994b82a30412fb9794b4c26b26184..996260fe7cba5232d0289c73ffb665354b1ecf36 100644
--- a/src/proto_alpha/bin_sc_rollup_client/dune
+++ b/src/proto_alpha/bin_sc_rollup_client/dune
@@ -9,16 +9,8 @@
  (libraries
   tezos-base
   tezos-clic
-  tezos-client-base
-  tezos-client-alpha
-  tezos-client-commands
-  tezos-stdlib-unix
-  tezos-client-base-unix
-  tezos-rpc-http
-  tezos-rpc-http-client-unix
   tezos-protocol-alpha
-  tezos-smart-rollup-alpha
-  uri)
+  octez_smart_rollup_client_alpha)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp))
@@ -26,10 +18,5 @@
   (:standard)
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-  -open Tezos_client_alpha
-  -open Tezos_client_commands
-  -open Tezos_stdlib_unix
-  -open Tezos_client_base_unix
-  -open Tezos_rpc_http_client_unix
   -open Tezos_protocol_alpha
-  -open Tezos_smart_rollup_alpha))
+  -open Octez_smart_rollup_client_alpha))
diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune
index d311dd66eb4ccfd04a51f2a8d0b1e167ba6e175d..45a95636a605452686c43bf9850c6ecbfe684ab5 100644
--- a/src/proto_alpha/bin_sc_rollup_node/dune
+++ b/src/proto_alpha/bin_sc_rollup_node/dune
@@ -9,39 +9,13 @@
  (libraries
   tezos-base
   tezos-clic
-  tezos-client-commands
-  tezos-stdlib-unix
+  tezos-protocol-alpha
+  tezos-shell-services
   tezos-client-base
   tezos-client-base-unix
+  tezos-client-commands
   tezos-client-alpha
-  tezos-context.encoding
-  tezos-context.helpers
-  tezos-protocol-alpha
-  tezos-protocol-plugin-alpha
-  tezos-protocol-alpha.parameters
-  tezos-rpc
-  tezos-rpc-http
-  tezos-rpc-http-server
-  tezos-workers
-  tezos_dal_node_services
-  tezos_dal_node_lib
-  tezos-shell-services
-  tezos-smart-rollup-alpha
-  tezos-layer2-utils-alpha
-  tezos_layer2_store
-  tezos-tree-encoding
-  data-encoding
-  irmin-pack
-  irmin-pack.unix
-  irmin
-  aches
-  aches-lwt
-  tezos-injector-alpha
-  tezos-scoru-wasm
-  tezos-scoru-wasm-fast
-  tezos-crypto-dal
-  prometheus-app
-  octez-node-config)
+  octez_smart_rollup_node_alpha)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp))
@@ -50,19 +24,10 @@
   -open Tezos_base
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-  -open Tezos_client_commands
-  -open Tezos_stdlib_unix
+  -open Tezos_protocol_alpha
+  -open Tezos_shell_services
   -open Tezos_client_base
   -open Tezos_client_base_unix
+  -open Tezos_client_commands
   -open Tezos_client_alpha
-  -open Tezos_protocol_alpha
-  -open Tezos_protocol_plugin_alpha
-  -open Tezos_protocol_alpha_parameters
-  -open Tezos_workers
-  -open Tezos_dal_node_lib
-  -open Tezos_shell_services
-  -open Tezos_smart_rollup_alpha
-  -open Tezos_layer2_utils_alpha
-  -open Tezos_layer2_store
-  -open Tezos_injector_alpha
-  -open Tezos_crypto_dal))
+  -open Octez_smart_rollup_node_alpha))
diff --git a/src/proto_alpha/bin_sc_rollup_client/RPC.ml b/src/proto_alpha/lib_sc_rollup_client/RPC.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_client/RPC.ml
rename to src/proto_alpha/lib_sc_rollup_client/RPC.ml
diff --git a/src/proto_alpha/bin_sc_rollup_client/commands.ml b/src/proto_alpha/lib_sc_rollup_client/commands.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_client/commands.ml
rename to src/proto_alpha/lib_sc_rollup_client/commands.ml
diff --git a/src/proto_alpha/bin_sc_rollup_client/commands.mli b/src/proto_alpha/lib_sc_rollup_client/commands.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_client/commands.mli
rename to src/proto_alpha/lib_sc_rollup_client/commands.mli
diff --git a/src/proto_alpha/bin_sc_rollup_client/configuration.ml b/src/proto_alpha/lib_sc_rollup_client/configuration.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_client/configuration.ml
rename to src/proto_alpha/lib_sc_rollup_client/configuration.ml
diff --git a/src/proto_alpha/bin_sc_rollup_client/configuration.mli b/src/proto_alpha/lib_sc_rollup_client/configuration.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_client/configuration.mli
rename to src/proto_alpha/lib_sc_rollup_client/configuration.mli
diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune
new file mode 100644
index 0000000000000000000000000000000000000000..0a201e58a5bcda066d6f1afb04e756a578fcc11f
--- /dev/null
+++ b/src/proto_alpha/lib_sc_rollup_client/dune
@@ -0,0 +1,26 @@
+; This file was automatically generated, do not edit.
+; Edit file manifest/main.ml instead.
+
+(library
+ (name octez_smart_rollup_client_alpha)
+ (package octez-smart-rollup-client-alpha)
+ (instrumentation (backend bisect_ppx))
+ (libraries
+  tezos-base
+  tezos-protocol-alpha
+  tezos-client-commands
+  tezos-client-base
+  tezos-client-base-unix
+  tezos-client-alpha
+  tezos-smart-rollup-alpha)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_client_commands
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_alpha
+  -open Tezos_smart_rollup_alpha))
diff --git a/src/proto_alpha/bin_sc_rollup_node/RPC_directory_helpers.ml b/src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/RPC_directory_helpers.ml
rename to src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/RPC_directory_helpers.mli b/src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/RPC_directory_helpers.mli
rename to src/proto_alpha/lib_sc_rollup_node/RPC_directory_helpers.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml b/src/proto_alpha/lib_sc_rollup_node/RPC_server.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/RPC_server.ml
rename to src/proto_alpha/lib_sc_rollup_node/RPC_server.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/RPC_server.mli b/src/proto_alpha/lib_sc_rollup_node/RPC_server.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/RPC_server.mli
rename to src/proto_alpha/lib_sc_rollup_node/RPC_server.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/arith_pvm.ml b/src/proto_alpha/lib_sc_rollup_node/arith_pvm.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/arith_pvm.ml
rename to src/proto_alpha/lib_sc_rollup_node/arith_pvm.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/batcher.ml b/src/proto_alpha/lib_sc_rollup_node/batcher.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/batcher.ml
rename to src/proto_alpha/lib_sc_rollup_node/batcher.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/batcher.mli b/src/proto_alpha/lib_sc_rollup_node/batcher.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/batcher.mli
rename to src/proto_alpha/lib_sc_rollup_node/batcher.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/batcher_events.ml b/src/proto_alpha/lib_sc_rollup_node/batcher_events.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/batcher_events.ml
rename to src/proto_alpha/lib_sc_rollup_node/batcher_events.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/batcher_worker_types.ml b/src/proto_alpha/lib_sc_rollup_node/batcher_worker_types.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/batcher_worker_types.ml
rename to src/proto_alpha/lib_sc_rollup_node/batcher_worker_types.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/batcher_worker_types.mli b/src/proto_alpha/lib_sc_rollup_node/batcher_worker_types.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/batcher_worker_types.mli
rename to src/proto_alpha/lib_sc_rollup_node/batcher_worker_types.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment.ml b/src/proto_alpha/lib_sc_rollup_node/commitment.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/commitment.ml
rename to src/proto_alpha/lib_sc_rollup_node/commitment.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment.mli b/src/proto_alpha/lib_sc_rollup_node/commitment.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/commitment.mli
rename to src/proto_alpha/lib_sc_rollup_node/commitment.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment_event.ml b/src/proto_alpha/lib_sc_rollup_node/commitment_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/commitment_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/commitment_event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment_event.mli b/src/proto_alpha/lib_sc_rollup_node/commitment_event.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/commitment_event.mli
rename to src/proto_alpha/lib_sc_rollup_node/commitment_event.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/commitment_sig.ml b/src/proto_alpha/lib_sc_rollup_node/commitment_sig.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/commitment_sig.ml
rename to src/proto_alpha/lib_sc_rollup_node/commitment_sig.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/components.ml b/src/proto_alpha/lib_sc_rollup_node/components.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/components.ml
rename to src/proto_alpha/lib_sc_rollup_node/components.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/configuration.ml b/src/proto_alpha/lib_sc_rollup_node/configuration.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/configuration.ml
rename to src/proto_alpha/lib_sc_rollup_node/configuration.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/configuration.mli b/src/proto_alpha/lib_sc_rollup_node/configuration.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/configuration.mli
rename to src/proto_alpha/lib_sc_rollup_node/configuration.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/context.ml b/src/proto_alpha/lib_sc_rollup_node/context.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/context.ml
rename to src/proto_alpha/lib_sc_rollup_node/context.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/context.mli b/src/proto_alpha/lib_sc_rollup_node/context.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/context.mli
rename to src/proto_alpha/lib_sc_rollup_node/context.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/daemon.ml b/src/proto_alpha/lib_sc_rollup_node/daemon.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/daemon.ml
rename to src/proto_alpha/lib_sc_rollup_node/daemon.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/daemon_event.ml b/src/proto_alpha/lib_sc_rollup_node/daemon_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/daemon_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/daemon_event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/daemon_event.mli b/src/proto_alpha/lib_sc_rollup_node/daemon_event.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/daemon_event.mli
rename to src/proto_alpha/lib_sc_rollup_node/daemon_event.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/dal_pages_request.ml b/src/proto_alpha/lib_sc_rollup_node/dal_pages_request.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/dal_pages_request.ml
rename to src/proto_alpha/lib_sc_rollup_node/dal_pages_request.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/dal_pages_request.mli b/src/proto_alpha/lib_sc_rollup_node/dal_pages_request.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/dal_pages_request.mli
rename to src/proto_alpha/lib_sc_rollup_node/dal_pages_request.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.ml b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.ml
rename to src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.mli b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.mli
rename to src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker_event.ml b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker_event.ml
diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune
new file mode 100644
index 0000000000000000000000000000000000000000..9b7a75bd0fbe5bd79f3bf54e322d605b418f758f
--- /dev/null
+++ b/src/proto_alpha/lib_sc_rollup_node/dune
@@ -0,0 +1,61 @@
+; This file was automatically generated, do not edit.
+; Edit file manifest/main.ml instead.
+
+(library
+ (name octez_smart_rollup_node_alpha)
+ (package octez-smart-rollup-node-alpha)
+ (instrumentation (backend bisect_ppx))
+ (libraries
+  tezos-base
+  tezos-stdlib-unix
+  tezos-client-base
+  tezos-client-base-unix
+  tezos-client-alpha
+  tezos-context.encoding
+  tezos-context.helpers
+  tezos-protocol-alpha
+  tezos-protocol-plugin-alpha
+  tezos-protocol-alpha.parameters
+  tezos-rpc
+  tezos-rpc-http
+  tezos-rpc-http-server
+  tezos-workers
+  tezos_dal_node_services
+  tezos_dal_node_lib
+  tezos-shell-services
+  tezos-smart-rollup-alpha
+  tezos-layer2-utils-alpha
+  tezos_layer2_store
+  tezos-tree-encoding
+  data-encoding
+  irmin-pack
+  irmin-pack.unix
+  irmin
+  aches
+  aches-lwt
+  tezos-injector-alpha
+  tezos-scoru-wasm
+  tezos-scoru-wasm-fast
+  tezos-crypto-dal
+  prometheus-app
+  octez-node-config)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_workers
+  -open Tezos_dal_node_lib
+  -open Tezos_shell_services
+  -open Tezos_smart_rollup_alpha
+  -open Tezos_layer2_utils_alpha
+  -open Tezos_layer2_store
+  -open Tezos_injector_alpha
+  -open Tezos_crypto_dal))
diff --git a/src/proto_alpha/bin_sc_rollup_node/event.ml b/src/proto_alpha/lib_sc_rollup_node/event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/event.ml
rename to src/proto_alpha/lib_sc_rollup_node/event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/event.mli b/src/proto_alpha/lib_sc_rollup_node/event.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/event.mli
rename to src/proto_alpha/lib_sc_rollup_node/event.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/fuel.ml b/src/proto_alpha/lib_sc_rollup_node/fuel.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/fuel.ml
rename to src/proto_alpha/lib_sc_rollup_node/fuel.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/fueled_pvm.ml b/src/proto_alpha/lib_sc_rollup_node/fueled_pvm.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/fueled_pvm.ml
rename to src/proto_alpha/lib_sc_rollup_node/fueled_pvm.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/inbox.ml b/src/proto_alpha/lib_sc_rollup_node/inbox.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/inbox.ml
rename to src/proto_alpha/lib_sc_rollup_node/inbox.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/inbox.mli b/src/proto_alpha/lib_sc_rollup_node/inbox.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/inbox.mli
rename to src/proto_alpha/lib_sc_rollup_node/inbox.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/inbox_event.ml b/src/proto_alpha/lib_sc_rollup_node/inbox_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/inbox_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/inbox_event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/inbox_event.mli b/src/proto_alpha/lib_sc_rollup_node/inbox_event.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/inbox_event.mli
rename to src/proto_alpha/lib_sc_rollup_node/inbox_event.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/injector.ml b/src/proto_alpha/lib_sc_rollup_node/injector.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/injector.ml
rename to src/proto_alpha/lib_sc_rollup_node/injector.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/injector.mli b/src/proto_alpha/lib_sc_rollup_node/injector.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/injector.mli
rename to src/proto_alpha/lib_sc_rollup_node/injector.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/interpreter.ml b/src/proto_alpha/lib_sc_rollup_node/interpreter.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/interpreter.ml
rename to src/proto_alpha/lib_sc_rollup_node/interpreter.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/interpreter.mli b/src/proto_alpha/lib_sc_rollup_node/interpreter.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/interpreter.mli
rename to src/proto_alpha/lib_sc_rollup_node/interpreter.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/interpreter_event.ml b/src/proto_alpha/lib_sc_rollup_node/interpreter_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/interpreter_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/interpreter_event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/layer1.ml b/src/proto_alpha/lib_sc_rollup_node/layer1.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/layer1.ml
rename to src/proto_alpha/lib_sc_rollup_node/layer1.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/layer1.mli b/src/proto_alpha/lib_sc_rollup_node/layer1.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/layer1.mli
rename to src/proto_alpha/lib_sc_rollup_node/layer1.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/layer1_event.ml b/src/proto_alpha/lib_sc_rollup_node/layer1_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/layer1_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/layer1_event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/layer1_event.mli b/src/proto_alpha/lib_sc_rollup_node/layer1_event.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/layer1_event.mli
rename to src/proto_alpha/lib_sc_rollup_node/layer1_event.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/loser_mode.ml b/src/proto_alpha/lib_sc_rollup_node/loser_mode.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/loser_mode.ml
rename to src/proto_alpha/lib_sc_rollup_node/loser_mode.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/loser_mode.mli b/src/proto_alpha/lib_sc_rollup_node/loser_mode.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/loser_mode.mli
rename to src/proto_alpha/lib_sc_rollup_node/loser_mode.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/metrics.ml b/src/proto_alpha/lib_sc_rollup_node/metrics.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/metrics.ml
rename to src/proto_alpha/lib_sc_rollup_node/metrics.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/metrics.mli b/src/proto_alpha/lib_sc_rollup_node/metrics.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/metrics.mli
rename to src/proto_alpha/lib_sc_rollup_node/metrics.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/node_context.ml b/src/proto_alpha/lib_sc_rollup_node/node_context.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/node_context.ml
rename to src/proto_alpha/lib_sc_rollup_node/node_context.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/node_context.mli b/src/proto_alpha/lib_sc_rollup_node/node_context.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/node_context.mli
rename to src/proto_alpha/lib_sc_rollup_node/node_context.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/outbox.ml b/src/proto_alpha/lib_sc_rollup_node/outbox.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/outbox.ml
rename to src/proto_alpha/lib_sc_rollup_node/outbox.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/outbox.mli b/src/proto_alpha/lib_sc_rollup_node/outbox.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/outbox.mli
rename to src/proto_alpha/lib_sc_rollup_node/outbox.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/pvm.ml b/src/proto_alpha/lib_sc_rollup_node/pvm.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/pvm.ml
rename to src/proto_alpha/lib_sc_rollup_node/pvm.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/refutation_game.ml b/src/proto_alpha/lib_sc_rollup_node/refutation_game.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/refutation_game.ml
rename to src/proto_alpha/lib_sc_rollup_node/refutation_game.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/refutation_game.mli b/src/proto_alpha/lib_sc_rollup_node/refutation_game.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/refutation_game.mli
rename to src/proto_alpha/lib_sc_rollup_node/refutation_game.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml b/src/proto_alpha/lib_sc_rollup_node/refutation_game_event.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/refutation_game_event.ml
rename to src/proto_alpha/lib_sc_rollup_node/refutation_game_event.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/reveals.ml b/src/proto_alpha/lib_sc_rollup_node/reveals.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/reveals.ml
rename to src/proto_alpha/lib_sc_rollup_node/reveals.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/reveals.mli b/src/proto_alpha/lib_sc_rollup_node/reveals.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/reveals.mli
rename to src/proto_alpha/lib_sc_rollup_node/reveals.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/sc_rollup_node_errors.ml b/src/proto_alpha/lib_sc_rollup_node/sc_rollup_node_errors.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/sc_rollup_node_errors.ml
rename to src/proto_alpha/lib_sc_rollup_node/sc_rollup_node_errors.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/simulation.ml b/src/proto_alpha/lib_sc_rollup_node/simulation.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/simulation.ml
rename to src/proto_alpha/lib_sc_rollup_node/simulation.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/simulation.mli b/src/proto_alpha/lib_sc_rollup_node/simulation.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/simulation.mli
rename to src/proto_alpha/lib_sc_rollup_node/simulation.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/store.ml b/src/proto_alpha/lib_sc_rollup_node/store.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/store.ml
rename to src/proto_alpha/lib_sc_rollup_node/store.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/store.mli b/src/proto_alpha/lib_sc_rollup_node/store.mli
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/store.mli
rename to src/proto_alpha/lib_sc_rollup_node/store.mli
diff --git a/src/proto_alpha/bin_sc_rollup_node/wasm_2_0_0_pvm.ml b/src/proto_alpha/lib_sc_rollup_node/wasm_2_0_0_pvm.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/wasm_2_0_0_pvm.ml
rename to src/proto_alpha/lib_sc_rollup_node/wasm_2_0_0_pvm.ml
diff --git a/src/proto_alpha/bin_sc_rollup_node/wasm_2_0_0_rpc.ml b/src/proto_alpha/lib_sc_rollup_node/wasm_2_0_0_rpc.ml
similarity index 100%
rename from src/proto_alpha/bin_sc_rollup_node/wasm_2_0_0_rpc.ml
rename to src/proto_alpha/lib_sc_rollup_node/wasm_2_0_0_rpc.ml