diff --git a/src/lib_protocol_updater/jbuild b/src/lib_protocol_updater/jbuild
index c23993b30..785dc51a9 100644
--- a/src/lib_protocol_updater/jbuild
+++ b/src/lib_protocol_updater/jbuild
@@ -7,15 +7,13 @@
               tezos-micheline
               tezos-protocol-compiler
               tezos-storage
-              tezos-rpc-http
               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_storage
-                    -open Tezos_rpc_http))))
+                    -open Tezos_storage))))
 
 (alias
  ((name runtest_indent)
diff --git a/src/lib_protocol_updater/tezos-protocol-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam
index 65140d5a2..9a4a54471 100644
--- a/src/lib_protocol_updater/tezos-protocol-updater.opam
+++ b/src/lib_protocol_updater/tezos-protocol-updater.opam
@@ -13,9 +13,6 @@ depends: [
   "tezos-micheline"
   "tezos-protocol-compiler"
   "tezos-storage"
-  "tezos-rpc-http"
-  "tezos-p2p-services"
-  "tezos-shell-services"
 ]
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]
diff --git a/src/lib_rpc_http/RPC_answer.ml b/src/lib_rpc/RPC_answer.ml
similarity index 100%
rename from src/lib_rpc_http/RPC_answer.ml
rename to src/lib_rpc/RPC_answer.ml
diff --git a/src/lib_rpc_http/RPC_answer.mli b/src/lib_rpc/RPC_answer.mli
similarity index 100%
rename from src/lib_rpc_http/RPC_answer.mli
rename to src/lib_rpc/RPC_answer.mli
diff --git a/src/lib_rpc_http/RPC_directory.ml b/src/lib_rpc/RPC_directory.ml
similarity index 100%
rename from src/lib_rpc_http/RPC_directory.ml
rename to src/lib_rpc/RPC_directory.ml
diff --git a/src/lib_rpc_http/RPC_directory.mli b/src/lib_rpc/RPC_directory.mli
similarity index 100%
rename from src/lib_rpc_http/RPC_directory.mli
rename to src/lib_rpc/RPC_directory.mli
diff --git a/src/lib_rpc/jbuild b/src/lib_rpc/jbuild
index 497f3795c..b5c505309 100644
--- a/src/lib_rpc/jbuild
+++ b/src/lib_rpc/jbuild
@@ -5,7 +5,8 @@
   (public_name tezos-rpc)
   (libraries (tezos-data-encoding
               tezos-error-monad
-              ocplib-resto))
+              ocplib-resto
+              ocplib-resto-directory))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_data_encoding
diff --git a/src/lib_rpc/tezos-rpc.opam b/src/lib_rpc/tezos-rpc.opam
index 8eb6aba45..d74a8f5c5 100644
--- a/src/lib_rpc/tezos-rpc.opam
+++ b/src/lib_rpc/tezos-rpc.opam
@@ -11,6 +11,7 @@ depends: [
   "jbuilder" { build & >= "1.0+beta15" }
   "tezos-data-encoding"
   "ocplib-resto"
+  "ocplib-resto-directory"
 ]
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]
diff --git a/src/lib_rpc_http/jbuild b/src/lib_rpc_http/jbuild
index db8713afb..ff5a770e8 100644
--- a/src/lib_rpc_http/jbuild
+++ b/src/lib_rpc_http/jbuild
@@ -4,7 +4,6 @@
  ((name tezos_rpc_http)
   (public_name tezos-rpc-http)
   (libraries (tezos-base
-              ocplib-resto-directory
               ocplib-resto-cohttp))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string