diff --git a/.gitignore b/vendors/ligo-utils/.gitignore
similarity index 100%
rename from .gitignore
rename to vendors/ligo-utils/.gitignore
diff --git a/proto-alpha-utils/cast.ml b/vendors/ligo-utils/proto-alpha-utils/cast.ml
similarity index 100%
rename from proto-alpha-utils/cast.ml
rename to vendors/ligo-utils/proto-alpha-utils/cast.ml
diff --git a/proto-alpha-utils/dune b/vendors/ligo-utils/proto-alpha-utils/dune
similarity index 100%
rename from proto-alpha-utils/dune
rename to vendors/ligo-utils/proto-alpha-utils/dune
diff --git a/proto-alpha-utils/dune-project b/vendors/ligo-utils/proto-alpha-utils/dune-project
similarity index 100%
rename from proto-alpha-utils/dune-project
rename to vendors/ligo-utils/proto-alpha-utils/dune-project
diff --git a/proto-alpha-utils/init_proto_alpha.ml b/vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml
similarity index 100%
rename from proto-alpha-utils/init_proto_alpha.ml
rename to vendors/ligo-utils/proto-alpha-utils/init_proto_alpha.ml
diff --git a/proto-alpha-utils/proto-alpha-utils.opam b/vendors/ligo-utils/proto-alpha-utils/proto-alpha-utils.opam
similarity index 100%
rename from proto-alpha-utils/proto-alpha-utils.opam
rename to vendors/ligo-utils/proto-alpha-utils/proto-alpha-utils.opam
diff --git a/proto-alpha-utils/proto_alpha_utils.ml b/vendors/ligo-utils/proto-alpha-utils/proto_alpha_utils.ml
similarity index 100%
rename from proto-alpha-utils/proto_alpha_utils.ml
rename to vendors/ligo-utils/proto-alpha-utils/proto_alpha_utils.ml
diff --git a/proto-alpha-utils/trace.ml b/vendors/ligo-utils/proto-alpha-utils/trace.ml
similarity index 100%
rename from proto-alpha-utils/trace.ml
rename to vendors/ligo-utils/proto-alpha-utils/trace.ml
diff --git a/proto-alpha-utils/x_error_monad.ml b/vendors/ligo-utils/proto-alpha-utils/x_error_monad.ml
similarity index 100%
rename from proto-alpha-utils/x_error_monad.ml
rename to vendors/ligo-utils/proto-alpha-utils/x_error_monad.ml
diff --git a/proto-alpha-utils/x_memory_proto_alpha.ml b/vendors/ligo-utils/proto-alpha-utils/x_memory_proto_alpha.ml
similarity index 100%
rename from proto-alpha-utils/x_memory_proto_alpha.ml
rename to vendors/ligo-utils/proto-alpha-utils/x_memory_proto_alpha.ml
diff --git a/simple-utils/PP_helpers.ml b/vendors/ligo-utils/simple-utils/PP_helpers.ml
similarity index 100%
rename from simple-utils/PP_helpers.ml
rename to vendors/ligo-utils/simple-utils/PP_helpers.ml
diff --git a/simple-utils/dictionary.ml b/vendors/ligo-utils/simple-utils/dictionary.ml
similarity index 100%
rename from simple-utils/dictionary.ml
rename to vendors/ligo-utils/simple-utils/dictionary.ml
diff --git a/simple-utils/dune b/vendors/ligo-utils/simple-utils/dune
similarity index 100%
rename from simple-utils/dune
rename to vendors/ligo-utils/simple-utils/dune
diff --git a/simple-utils/dune-project b/vendors/ligo-utils/simple-utils/dune-project
similarity index 100%
rename from simple-utils/dune-project
rename to vendors/ligo-utils/simple-utils/dune-project
diff --git a/simple-utils/function.ml b/vendors/ligo-utils/simple-utils/function.ml
similarity index 100%
rename from simple-utils/function.ml
rename to vendors/ligo-utils/simple-utils/function.ml
diff --git a/simple-utils/location.ml b/vendors/ligo-utils/simple-utils/location.ml
similarity index 100%
rename from simple-utils/location.ml
rename to vendors/ligo-utils/simple-utils/location.ml
diff --git a/simple-utils/logger.ml b/vendors/ligo-utils/simple-utils/logger.ml
similarity index 100%
rename from simple-utils/logger.ml
rename to vendors/ligo-utils/simple-utils/logger.ml
diff --git a/simple-utils/ne_list.ml b/vendors/ligo-utils/simple-utils/ne_list.ml
similarity index 100%
rename from simple-utils/ne_list.ml
rename to vendors/ligo-utils/simple-utils/ne_list.ml
diff --git a/simple-utils/pos.ml b/vendors/ligo-utils/simple-utils/pos.ml
similarity index 100%
rename from simple-utils/pos.ml
rename to vendors/ligo-utils/simple-utils/pos.ml
diff --git a/simple-utils/pos.mli b/vendors/ligo-utils/simple-utils/pos.mli
similarity index 100%
rename from simple-utils/pos.mli
rename to vendors/ligo-utils/simple-utils/pos.mli
diff --git a/simple-utils/ppx_let_generalized/.gitignore b/vendors/ligo-utils/simple-utils/ppx_let_generalized/.gitignore
similarity index 100%
rename from simple-utils/ppx_let_generalized/.gitignore
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/.gitignore
diff --git a/simple-utils/ppx_let_generalized/CHANGES.md b/vendors/ligo-utils/simple-utils/ppx_let_generalized/CHANGES.md
similarity index 100%
rename from simple-utils/ppx_let_generalized/CHANGES.md
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/CHANGES.md
diff --git a/simple-utils/ppx_let_generalized/CONTRIBUTING.md b/vendors/ligo-utils/simple-utils/ppx_let_generalized/CONTRIBUTING.md
similarity index 100%
rename from simple-utils/ppx_let_generalized/CONTRIBUTING.md
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/CONTRIBUTING.md
diff --git a/simple-utils/ppx_let_generalized/CREDITS b/vendors/ligo-utils/simple-utils/ppx_let_generalized/CREDITS
similarity index 100%
rename from simple-utils/ppx_let_generalized/CREDITS
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/CREDITS
diff --git a/simple-utils/ppx_let_generalized/LICENSE.md b/vendors/ligo-utils/simple-utils/ppx_let_generalized/LICENSE.md
similarity index 100%
rename from simple-utils/ppx_let_generalized/LICENSE.md
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/LICENSE.md
diff --git a/simple-utils/ppx_let_generalized/Makefile b/vendors/ligo-utils/simple-utils/ppx_let_generalized/Makefile
similarity index 100%
rename from simple-utils/ppx_let_generalized/Makefile
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/Makefile
diff --git a/simple-utils/ppx_let_generalized/README.md b/vendors/ligo-utils/simple-utils/ppx_let_generalized/README.md
similarity index 100%
rename from simple-utils/ppx_let_generalized/README.md
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/README.md
diff --git a/simple-utils/ppx_let_generalized/dune b/vendors/ligo-utils/simple-utils/ppx_let_generalized/dune
similarity index 100%
rename from simple-utils/ppx_let_generalized/dune
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/dune
diff --git a/simple-utils/ppx_let_generalized/expander/dune b/vendors/ligo-utils/simple-utils/ppx_let_generalized/expander/dune
similarity index 100%
rename from simple-utils/ppx_let_generalized/expander/dune
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/expander/dune
diff --git a/simple-utils/ppx_let_generalized/expander/ppx_let_expander.ml b/vendors/ligo-utils/simple-utils/ppx_let_generalized/expander/ppx_let_expander.ml
similarity index 100%
rename from simple-utils/ppx_let_generalized/expander/ppx_let_expander.ml
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/expander/ppx_let_expander.ml
diff --git a/simple-utils/ppx_let_generalized/expander/ppx_let_expander.mli b/vendors/ligo-utils/simple-utils/ppx_let_generalized/expander/ppx_let_expander.mli
similarity index 100%
rename from simple-utils/ppx_let_generalized/expander/ppx_let_expander.mli
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/expander/ppx_let_expander.mli
diff --git a/simple-utils/ppx_let_generalized/src/dune b/vendors/ligo-utils/simple-utils/ppx_let_generalized/src/dune
similarity index 100%
rename from simple-utils/ppx_let_generalized/src/dune
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/src/dune
diff --git a/simple-utils/ppx_let_generalized/src/ppx_let.ml b/vendors/ligo-utils/simple-utils/ppx_let_generalized/src/ppx_let.ml
similarity index 100%
rename from simple-utils/ppx_let_generalized/src/ppx_let.ml
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/src/ppx_let.ml
diff --git a/simple-utils/ppx_let_generalized/src/ppx_let.mli b/vendors/ligo-utils/simple-utils/ppx_let_generalized/src/ppx_let.mli
similarity index 100%
rename from simple-utils/ppx_let_generalized/src/ppx_let.mli
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/src/ppx_let.mli
diff --git a/simple-utils/ppx_let_generalized/test/dune b/vendors/ligo-utils/simple-utils/ppx_let_generalized/test/dune
similarity index 100%
rename from simple-utils/ppx_let_generalized/test/dune
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/test/dune
diff --git a/simple-utils/ppx_let_generalized/test/test-locations.mlt b/vendors/ligo-utils/simple-utils/ppx_let_generalized/test/test-locations.mlt
similarity index 100%
rename from simple-utils/ppx_let_generalized/test/test-locations.mlt
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/test/test-locations.mlt
diff --git a/simple-utils/ppx_let_generalized/test/test.ml b/vendors/ligo-utils/simple-utils/ppx_let_generalized/test/test.ml
similarity index 100%
rename from simple-utils/ppx_let_generalized/test/test.ml
rename to vendors/ligo-utils/simple-utils/ppx_let_generalized/test/test.ml
diff --git a/simple-utils/region.ml b/vendors/ligo-utils/simple-utils/region.ml
similarity index 100%
rename from simple-utils/region.ml
rename to vendors/ligo-utils/simple-utils/region.ml
diff --git a/simple-utils/region.mli b/vendors/ligo-utils/simple-utils/region.mli
similarity index 100%
rename from simple-utils/region.mli
rename to vendors/ligo-utils/simple-utils/region.mli
diff --git a/simple-utils/simple-utils.opam b/vendors/ligo-utils/simple-utils/simple-utils.opam
similarity index 100%
rename from simple-utils/simple-utils.opam
rename to vendors/ligo-utils/simple-utils/simple-utils.opam
diff --git a/simple-utils/simple_utils.ml b/vendors/ligo-utils/simple-utils/simple_utils.ml
similarity index 100%
rename from simple-utils/simple_utils.ml
rename to vendors/ligo-utils/simple-utils/simple_utils.ml
diff --git a/simple-utils/trace.ml b/vendors/ligo-utils/simple-utils/trace.ml
similarity index 100%
rename from simple-utils/trace.ml
rename to vendors/ligo-utils/simple-utils/trace.ml
diff --git a/simple-utils/tree.ml b/vendors/ligo-utils/simple-utils/tree.ml
similarity index 100%
rename from simple-utils/tree.ml
rename to vendors/ligo-utils/simple-utils/tree.ml
diff --git a/simple-utils/tuple.ml b/vendors/ligo-utils/simple-utils/tuple.ml
similarity index 100%
rename from simple-utils/tuple.ml
rename to vendors/ligo-utils/simple-utils/tuple.ml
diff --git a/simple-utils/wrap.ml b/vendors/ligo-utils/simple-utils/wrap.ml
similarity index 100%
rename from simple-utils/wrap.ml
rename to vendors/ligo-utils/simple-utils/wrap.ml
diff --git a/simple-utils/x_list.ml b/vendors/ligo-utils/simple-utils/x_list.ml
similarity index 100%
rename from simple-utils/x_list.ml
rename to vendors/ligo-utils/simple-utils/x_list.ml
diff --git a/simple-utils/x_map.ml b/vendors/ligo-utils/simple-utils/x_map.ml
similarity index 100%
rename from simple-utils/x_map.ml
rename to vendors/ligo-utils/simple-utils/x_map.ml
diff --git a/simple-utils/x_option.ml b/vendors/ligo-utils/simple-utils/x_option.ml
similarity index 100%
rename from simple-utils/x_option.ml
rename to vendors/ligo-utils/simple-utils/x_option.ml
diff --git a/tezos-utils/dune b/vendors/ligo-utils/tezos-utils/dune
similarity index 100%
rename from tezos-utils/dune
rename to vendors/ligo-utils/tezos-utils/dune
diff --git a/tezos-utils/dune-project b/vendors/ligo-utils/tezos-utils/dune-project
similarity index 100%
rename from tezos-utils/dune-project
rename to vendors/ligo-utils/tezos-utils/dune-project
diff --git a/tezos-utils/michelson-parser/dune b/vendors/ligo-utils/tezos-utils/michelson-parser/dune
similarity index 100%
rename from tezos-utils/michelson-parser/dune
rename to vendors/ligo-utils/tezos-utils/michelson-parser/dune
diff --git a/tezos-utils/michelson-parser/dune-project b/vendors/ligo-utils/tezos-utils/michelson-parser/dune-project
similarity index 100%
rename from tezos-utils/michelson-parser/dune-project
rename to vendors/ligo-utils/tezos-utils/michelson-parser/dune-project
diff --git a/tezos-utils/michelson-parser/michelson-parser.opam b/vendors/ligo-utils/tezos-utils/michelson-parser/michelson-parser.opam
similarity index 100%
rename from tezos-utils/michelson-parser/michelson-parser.opam
rename to vendors/ligo-utils/tezos-utils/michelson-parser/michelson-parser.opam
diff --git a/tezos-utils/michelson-parser/michelson_v1_macros.ml b/vendors/ligo-utils/tezos-utils/michelson-parser/michelson_v1_macros.ml
similarity index 100%
rename from tezos-utils/michelson-parser/michelson_v1_macros.ml
rename to vendors/ligo-utils/tezos-utils/michelson-parser/michelson_v1_macros.ml
diff --git a/tezos-utils/michelson-parser/michelson_v1_macros.mli b/vendors/ligo-utils/tezos-utils/michelson-parser/michelson_v1_macros.mli
similarity index 100%
rename from tezos-utils/michelson-parser/michelson_v1_macros.mli
rename to vendors/ligo-utils/tezos-utils/michelson-parser/michelson_v1_macros.mli
diff --git a/tezos-utils/michelson-parser/v1.ml b/vendors/ligo-utils/tezos-utils/michelson-parser/v1.ml
similarity index 100%
rename from tezos-utils/michelson-parser/v1.ml
rename to vendors/ligo-utils/tezos-utils/michelson-parser/v1.ml
diff --git a/tezos-utils/michelson-parser/v1.mli b/vendors/ligo-utils/tezos-utils/michelson-parser/v1.mli
similarity index 100%
rename from tezos-utils/michelson-parser/v1.mli
rename to vendors/ligo-utils/tezos-utils/michelson-parser/v1.mli
diff --git a/tezos-utils/tezos-utils.opam b/vendors/ligo-utils/tezos-utils/tezos-utils.opam
similarity index 100%
rename from tezos-utils/tezos-utils.opam
rename to vendors/ligo-utils/tezos-utils/tezos-utils.opam
diff --git a/tezos-utils/tezos_utils.ml b/vendors/ligo-utils/tezos-utils/tezos_utils.ml
similarity index 100%
rename from tezos-utils/tezos_utils.ml
rename to vendors/ligo-utils/tezos-utils/tezos_utils.ml
diff --git a/tezos-utils/x_error_monad.ml b/vendors/ligo-utils/tezos-utils/x_error_monad.ml
similarity index 100%
rename from tezos-utils/x_error_monad.ml
rename to vendors/ligo-utils/tezos-utils/x_error_monad.ml
diff --git a/tezos-utils/x_michelson.ml b/vendors/ligo-utils/tezos-utils/x_michelson.ml
similarity index 100%
rename from tezos-utils/x_michelson.ml
rename to vendors/ligo-utils/tezos-utils/x_michelson.ml