diff --git a/vendors/ocplib-resto/ocplib-ezresto-directory.opam b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam
similarity index 100%
rename from vendors/ocplib-resto/ocplib-ezresto-directory.opam
rename to vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam
diff --git a/vendors/ocplib-resto/test/ezDirectory.ml b/vendors/ocplib-resto/lib_ezresto-directory/test/ezDirectory.ml
similarity index 100%
rename from vendors/ocplib-resto/test/ezDirectory.ml
rename to vendors/ocplib-resto/lib_ezresto-directory/test/ezDirectory.ml
diff --git a/vendors/ocplib-resto/test/ezResto_test.ml b/vendors/ocplib-resto/lib_ezresto-directory/test/ezResto_test.ml
similarity index 100%
rename from vendors/ocplib-resto/test/ezResto_test.ml
rename to vendors/ocplib-resto/lib_ezresto-directory/test/ezResto_test.ml
diff --git a/vendors/ocplib-resto/test/ezServices.ml b/vendors/ocplib-resto/lib_ezresto-directory/test/ezServices.ml
similarity index 100%
rename from vendors/ocplib-resto/test/ezServices.ml
rename to vendors/ocplib-resto/lib_ezresto-directory/test/ezServices.ml
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild b/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild
new file mode 100644
index 000000000..d400977f1
--- /dev/null
+++ b/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild
@@ -0,0 +1,14 @@
+(jbuild_version 1)
+
+(executable
+ ((name ezResto_test)
+  (modules (EzServices EzDirectory EzResto_test))
+  (libraries (ocplib-ezresto-directory lwt.unix))))
+
+(alias
+((name runtest_ezresto)
+ (action (run ${path:ezResto_test.exe}))))
+
+(alias
+((name runtest)
+ (deps ((alias runtest_ezresto)))))
diff --git a/vendors/ocplib-resto/ocplib-ezresto.opam b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam
similarity index 100%
rename from vendors/ocplib-resto/ocplib-ezresto.opam
rename to vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam
diff --git a/vendors/ocplib-resto/ocplib-resto-cohttp.opam b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam
similarity index 100%
rename from vendors/ocplib-resto/ocplib-resto-cohttp.opam
rename to vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam
diff --git a/vendors/ocplib-resto/ocplib-resto-directory.opam b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam
similarity index 87%
rename from vendors/ocplib-resto/ocplib-resto-directory.opam
rename to vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam
index b43cb610a..51da62a65 100644
--- a/vendors/ocplib-resto/ocplib-resto-directory.opam
+++ b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam
@@ -19,6 +19,7 @@ build-test: [
 depends: [
   "ocamlfind" {build}
   "jbuilder" {build}
-  "ocplib-resto"
-  "lwt"
+  "ocplib-resto" {= "dev" }
+  "ocplib-resto-json" {= "dev" & test }
+  "lwt" { >= "3.0.0" }
 ]
diff --git a/vendors/ocplib-resto/test/directory.ml b/vendors/ocplib-resto/lib_resto-directory/test/directory.ml
similarity index 100%
rename from vendors/ocplib-resto/test/directory.ml
rename to vendors/ocplib-resto/lib_resto-directory/test/directory.ml
diff --git a/vendors/ocplib-resto/lib_resto-directory/test/jbuild b/vendors/ocplib-resto/lib_resto-directory/test/jbuild
new file mode 100644
index 000000000..dd4c3daba
--- /dev/null
+++ b/vendors/ocplib-resto/lib_resto-directory/test/jbuild
@@ -0,0 +1,14 @@
+(jbuild_version 1)
+
+(executable
+ ((name resto_test)
+  (modules (Services Directory Resto_test))
+  (libraries (ocplib-resto-directory ocplib-resto-json lwt.unix))))
+
+(alias
+((name runtest_resto)
+ (action (run ${path:resto_test.exe}))))
+
+(alias
+((name runtest)
+ (deps ((alias runtest_resto)))))
diff --git a/vendors/ocplib-resto/test/resto_test.ml b/vendors/ocplib-resto/lib_resto-directory/test/resto_test.ml
similarity index 100%
rename from vendors/ocplib-resto/test/resto_test.ml
rename to vendors/ocplib-resto/lib_resto-directory/test/resto_test.ml
diff --git a/vendors/ocplib-resto/test/services.ml b/vendors/ocplib-resto/lib_resto-directory/test/services.ml
similarity index 100%
rename from vendors/ocplib-resto/test/services.ml
rename to vendors/ocplib-resto/lib_resto-directory/test/services.ml
diff --git a/vendors/ocplib-resto/ocplib-resto-json.opam b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
similarity index 100%
rename from vendors/ocplib-resto/ocplib-resto-json.opam
rename to vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
diff --git a/vendors/ocplib-resto/ocplib-resto.opam b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam
similarity index 100%
rename from vendors/ocplib-resto/ocplib-resto.opam
rename to vendors/ocplib-resto/lib_resto/ocplib-resto.opam
diff --git a/vendors/ocplib-resto/test/jbuild b/vendors/ocplib-resto/test/jbuild
deleted file mode 100644
index 9d8543209..000000000
--- a/vendors/ocplib-resto/test/jbuild
+++ /dev/null
@@ -1,24 +0,0 @@
-(jbuild_version 1)
-
-(executable
- ((name resto_test)
-  (modules (Services Directory Resto_test))
-  (libraries (ocplib-resto-directory ocplib-resto-json lwt.unix))))
-
-(alias
-((name runtest_resto)
- (action (run ${path:resto_test.exe}))))
-
-(executable
- ((name ezResto_test)
-  (modules (EzServices EzDirectory EzResto_test))
-  (libraries (ocplib-ezresto-directory lwt.unix))))
-
-(alias
-((name runtest_ezresto)
- (action (run ${path:ezResto_test.exe}))))
-
-(alias
-((name runtest)
- (deps ((alias runtest_resto)
-        (alias runtest_ezresto)))))