diff --git a/lib/xapi-fd-test/dune b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/dune
similarity index 100%
rename from lib/xapi-fd-test/dune
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/dune
diff --git a/lib/xapi-fd-test/generate.ml b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/generate.ml
similarity index 100%
rename from lib/xapi-fd-test/generate.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/generate.ml
diff --git a/lib/xapi-fd-test/generate.mli b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/generate.mli
similarity index 100%
rename from lib/xapi-fd-test/generate.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/generate.mli
diff --git a/lib/xapi-fd-test/observations.ml b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/observations.ml
similarity index 100%
rename from lib/xapi-fd-test/observations.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/observations.ml
diff --git a/lib/xapi-fd-test/observations.mli b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/observations.mli
similarity index 100%
rename from lib/xapi-fd-test/observations.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/observations.mli
diff --git a/lib/xapi-fd-test/test/dune b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune
similarity index 100%
rename from lib/xapi-fd-test/test/dune
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/dune
diff --git a/lib/xapi-fd-test/test/test_xapi_fd_test.ml b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/test_xapi_fd_test.ml
similarity index 100%
rename from lib/xapi-fd-test/test/test_xapi_fd_test.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/test_xapi_fd_test.ml
diff --git a/lib/xapi-fd-test/test/test_xapi_fd_test.mli b/ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/test_xapi_fd_test.mli
similarity index 100%
rename from lib/xapi-fd-test/test/test_xapi_fd_test.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fd-test/test/test_xapi_fd_test.mli
diff --git a/lib/xapi-fdcaps/dune b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/dune
similarity index 100%
rename from lib/xapi-fdcaps/dune
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/dune
diff --git a/lib/xapi-fdcaps/operations.ml b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/operations.ml
similarity index 100%
rename from lib/xapi-fdcaps/operations.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/operations.ml
diff --git a/lib/xapi-fdcaps/operations.mli b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/operations.mli
similarity index 100%
rename from lib/xapi-fdcaps/operations.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/operations.mli
diff --git a/lib/xapi-fdcaps/properties.ml b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/properties.ml
similarity index 100%
rename from lib/xapi-fdcaps/properties.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/properties.ml
diff --git a/lib/xapi-fdcaps/properties.mli b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/properties.mli
similarity index 100%
rename from lib/xapi-fdcaps/properties.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/properties.mli
diff --git a/lib/xapi-fdcaps/safefd.ml b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/safefd.ml
similarity index 100%
rename from lib/xapi-fdcaps/safefd.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/safefd.ml
diff --git a/lib/xapi-fdcaps/safefd.mli b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/safefd.mli
similarity index 100%
rename from lib/xapi-fdcaps/safefd.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/safefd.mli
diff --git a/lib/xapi-fdcaps/test/dune b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune
similarity index 100%
rename from lib/xapi-fdcaps/test/dune
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/dune
diff --git a/lib/xapi-fdcaps/test/properties.t b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t
similarity index 100%
rename from lib/xapi-fdcaps/test/properties.t
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/properties.t
diff --git a/lib/xapi-fdcaps/test/test_operations.ml b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_operations.ml
similarity index 100%
rename from lib/xapi-fdcaps/test/test_operations.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_operations.ml
diff --git a/lib/xapi-fdcaps/test/test_operations.mli b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_operations.mli
similarity index 100%
rename from lib/xapi-fdcaps/test/test_operations.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_operations.mli
diff --git a/lib/xapi-fdcaps/test/test_properties.ml b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_properties.ml
similarity index 100%
rename from lib/xapi-fdcaps/test/test_properties.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_properties.ml
diff --git a/lib/xapi-fdcaps/test/test_properties.mli b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_properties.mli
similarity index 100%
rename from lib/xapi-fdcaps/test/test_properties.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_properties.mli
diff --git a/lib/xapi-fdcaps/test/test_safefd.ml b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_safefd.ml
similarity index 100%
rename from lib/xapi-fdcaps/test/test_safefd.ml
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_safefd.ml
diff --git a/lib/xapi-fdcaps/test/test_safefd.mli b/ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_safefd.mli
similarity index 100%
rename from lib/xapi-fdcaps/test/test_safefd.mli
rename to ocaml/libs/xapi-stdext/lib/xapi-fdcaps/test/test_safefd.mli