diff --git a/src/rescript-editor-support/BasicServer.re b/src/BasicServer.re
similarity index 100%
rename from src/rescript-editor-support/BasicServer.re
rename to src/BasicServer.re
diff --git a/src/rescript-editor-support/BuildSystem.re b/src/BuildSystem.re
similarity index 100%
rename from src/rescript-editor-support/BuildSystem.re
rename to src/BuildSystem.re
diff --git a/src/rescript-editor-support/CodeLens.re b/src/CodeLens.re
similarity index 100%
rename from src/rescript-editor-support/CodeLens.re
rename to src/CodeLens.re
diff --git a/src/rescript-editor-support/EditorSupportCommands.re b/src/EditorSupportCommands.re
similarity index 100%
rename from src/rescript-editor-support/EditorSupportCommands.re
rename to src/EditorSupportCommands.re
diff --git a/src/rescript-editor-support/Files.re b/src/Files.re
similarity index 100%
rename from src/rescript-editor-support/Files.re
rename to src/Files.re
diff --git a/src/rescript-editor-support/FindFiles.re b/src/FindFiles.re
similarity index 100%
rename from src/rescript-editor-support/FindFiles.re
rename to src/FindFiles.re
diff --git a/src/rescript-editor-support/Hover.re b/src/Hover.re
similarity index 100%
rename from src/rescript-editor-support/Hover.re
rename to src/Hover.re
diff --git a/src/rescript-editor-support/Infix.re b/src/Infix.re
similarity index 100%
rename from src/rescript-editor-support/Infix.re
rename to src/Infix.re
diff --git a/src/rescript-editor-support/JsonShort.re b/src/JsonShort.re
similarity index 100%
rename from src/rescript-editor-support/JsonShort.re
rename to src/JsonShort.re
diff --git a/src/rescript-editor-support/Log.re b/src/Log.re
similarity index 100%
rename from src/rescript-editor-support/Log.re
rename to src/Log.re
diff --git a/src/rescript-editor-support/MarkdownOfOCamldoc.re b/src/MarkdownOfOCamldoc.re
similarity index 100%
rename from src/rescript-editor-support/MarkdownOfOCamldoc.re
rename to src/MarkdownOfOCamldoc.re
diff --git a/src/rescript-editor-support/MerlinFile.re b/src/MerlinFile.re
similarity index 100%
rename from src/rescript-editor-support/MerlinFile.re
rename to src/MerlinFile.re
diff --git a/src/rescript-editor-support/MerlinFile.rei b/src/MerlinFile.rei
similarity index 100%
rename from src/rescript-editor-support/MerlinFile.rei
rename to src/MerlinFile.rei
diff --git a/src/rescript-editor-support/MessageHandlers.re b/src/MessageHandlers.re
similarity index 100%
rename from src/rescript-editor-support/MessageHandlers.re
rename to src/MessageHandlers.re
diff --git a/src/rescript-editor-support/ModuleResolution.re b/src/ModuleResolution.re
similarity index 100%
rename from src/rescript-editor-support/ModuleResolution.re
rename to src/ModuleResolution.re
diff --git a/src/rescript-editor-support/Monads.re b/src/Monads.re
similarity index 100%
rename from src/rescript-editor-support/Monads.re
rename to src/Monads.re
diff --git a/src/rescript-editor-support/NewCompletions.re b/src/NewCompletions.re
similarity index 100%
rename from src/rescript-editor-support/NewCompletions.re
rename to src/NewCompletions.re
diff --git a/src/rescript-editor-support/NotificationHandlers.re b/src/NotificationHandlers.re
similarity index 100%
rename from src/rescript-editor-support/NotificationHandlers.re
rename to src/NotificationHandlers.re
diff --git a/src/rescript-editor-support/Packages.re b/src/Packages.re
similarity index 100%
rename from src/rescript-editor-support/Packages.re
rename to src/Packages.re
diff --git a/src/rescript-editor-support/PartialParser.re b/src/PartialParser.re
similarity index 100%
rename from src/rescript-editor-support/PartialParser.re
rename to src/PartialParser.re
diff --git a/src/rescript-editor-support/PrepareUtils.re b/src/PrepareUtils.re
similarity index 100%
rename from src/rescript-editor-support/PrepareUtils.re
rename to src/PrepareUtils.re
diff --git a/src/rescript-editor-support/PrintType.re b/src/PrintType.re
similarity index 100%
rename from src/rescript-editor-support/PrintType.re
rename to src/PrintType.re
diff --git a/src/rescript-editor-support/ProcessAttributes.re b/src/ProcessAttributes.re
similarity index 100%
rename from src/rescript-editor-support/ProcessAttributes.re
rename to src/ProcessAttributes.re
diff --git a/src/rescript-editor-support/ProcessCmt.re b/src/ProcessCmt.re
similarity index 100%
rename from src/rescript-editor-support/ProcessCmt.re
rename to src/ProcessCmt.re
diff --git a/src/rescript-editor-support/ProcessExtra.re b/src/ProcessExtra.re
similarity index 100%
rename from src/rescript-editor-support/ProcessExtra.re
rename to src/ProcessExtra.re
diff --git a/src/rescript-editor-support/Process_406.re b/src/Process_406.re
similarity index 100%
rename from src/rescript-editor-support/Process_406.re
rename to src/Process_406.re
diff --git a/src/rescript-editor-support/Process_406.rei b/src/Process_406.rei
similarity index 100%
rename from src/rescript-editor-support/Process_406.rei
rename to src/Process_406.rei
diff --git a/src/rescript-editor-support/Protocol.re b/src/Protocol.re
similarity index 100%
rename from src/rescript-editor-support/Protocol.re
rename to src/Protocol.re
diff --git a/src/rescript-editor-support/Query.re b/src/Query.re
similarity index 100%
rename from src/rescript-editor-support/Query.re
rename to src/Query.re
diff --git a/src/rescript-editor-support/RJson.re b/src/RJson.re
similarity index 100%
rename from src/rescript-editor-support/RJson.re
rename to src/RJson.re
diff --git a/src/rescript-editor-support/RResult.re b/src/RResult.re
similarity index 100%
rename from src/rescript-editor-support/RResult.re
rename to src/RResult.re
diff --git a/src/rescript-editor-support/References.re b/src/References.re
similarity index 100%
rename from src/rescript-editor-support/References.re
rename to src/References.re
diff --git a/src/rescript-editor-support/RescriptEditorSupport.re b/src/RescriptEditorSupport.re
similarity index 100%
rename from src/rescript-editor-support/RescriptEditorSupport.re
rename to src/RescriptEditorSupport.re
diff --git a/src/rescript-editor-support/Rpc.re b/src/Rpc.re
similarity index 100%
rename from src/rescript-editor-support/Rpc.re
rename to src/Rpc.re
diff --git a/src/rescript-editor-support/Shared.re b/src/Shared.re
similarity index 100%
rename from src/rescript-editor-support/Shared.re
rename to src/Shared.re
diff --git a/src/rescript-editor-support/SharedTypes.re b/src/SharedTypes.re
similarity index 100%
rename from src/rescript-editor-support/SharedTypes.re
rename to src/SharedTypes.re
diff --git a/src/rescript-editor-support/State.re b/src/State.re
similarity index 100%
rename from src/rescript-editor-support/State.re
rename to src/State.re
diff --git a/src/rescript-editor-support/TopTypes.re b/src/TopTypes.re
similarity index 100%
rename from src/rescript-editor-support/TopTypes.re
rename to src/TopTypes.re
diff --git a/src/rescript-editor-support/Uri2.re b/src/Uri2.re
similarity index 100%
rename from src/rescript-editor-support/Uri2.re
rename to src/Uri2.re
diff --git a/src/rescript-editor-support/Utils.re b/src/Utils.re
similarity index 100%
rename from src/rescript-editor-support/Utils.re
rename to src/Utils.re
diff --git a/src/rescript-editor-support/dune b/src/dune
similarity index 100%
rename from src/rescript-editor-support/dune
rename to src/dune
diff --git a/src/rescript-editor-support/vendor/Json.re b/src/vendor/Json.re
similarity index 100%
rename from src/rescript-editor-support/vendor/Json.re
rename to src/vendor/Json.re
diff --git a/src/rescript-editor-support/vendor/odoc_parser/LICENSE.md b/src/vendor/odoc_parser/LICENSE.md
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/LICENSE.md
rename to src/vendor/odoc_parser/LICENSE.md
diff --git a/src/rescript-editor-support/vendor/odoc_parser/Readme.md b/src/vendor/odoc_parser/Readme.md
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/Readme.md
rename to src/vendor/odoc_parser/Readme.md
diff --git a/src/rescript-editor-support/vendor/odoc_parser/ast.ml b/src/vendor/odoc_parser/ast.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/ast.ml
rename to src/vendor/odoc_parser/ast.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/comment.ml b/src/vendor/odoc_parser/comment.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/comment.ml
rename to src/vendor/odoc_parser/comment.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/error.ml b/src/vendor/odoc_parser/error.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/error.ml
rename to src/vendor/odoc_parser/error.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/helpers.ml b/src/vendor/odoc_parser/helpers.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/helpers.ml
rename to src/vendor/odoc_parser/helpers.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/lang.ml b/src/vendor/odoc_parser/lang.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/lang.ml
rename to src/vendor/odoc_parser/lang.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/location_.ml b/src/vendor/odoc_parser/location_.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/location_.ml
rename to src/vendor/odoc_parser/location_.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/odoc_lexer.ml b/src/vendor/odoc_parser/odoc_lexer.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/odoc_lexer.ml
rename to src/vendor/odoc_parser/odoc_lexer.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/odoc_lexer.mli b/src/vendor/odoc_parser/odoc_lexer.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/odoc_lexer.mli
rename to src/vendor/odoc_parser/odoc_lexer.mli
diff --git a/src/rescript-editor-support/vendor/odoc_parser/odoc_lexer.mll b/src/vendor/odoc_parser/odoc_lexer.mll
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/odoc_lexer.mll
rename to src/vendor/odoc_parser/odoc_lexer.mll
diff --git a/src/rescript-editor-support/vendor/odoc_parser/parse_error.ml b/src/vendor/odoc_parser/parse_error.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/parse_error.ml
rename to src/vendor/odoc_parser/parse_error.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/parser_.ml b/src/vendor/odoc_parser/parser_.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/parser_.ml
rename to src/vendor/odoc_parser/parser_.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/parser_.mli b/src/vendor/odoc_parser/parser_.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/parser_.mli
rename to src/vendor/odoc_parser/parser_.mli
diff --git a/src/rescript-editor-support/vendor/odoc_parser/paths.ml b/src/vendor/odoc_parser/paths.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/paths.ml
rename to src/vendor/odoc_parser/paths.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/paths.mli b/src/vendor/odoc_parser/paths.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/paths.mli
rename to src/vendor/odoc_parser/paths.mli
diff --git a/src/rescript-editor-support/vendor/odoc_parser/paths_types.ml b/src/vendor/odoc_parser/paths_types.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/paths_types.ml
rename to src/vendor/odoc_parser/paths_types.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/root.ml b/src/vendor/odoc_parser/root.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/root.ml
rename to src/vendor/odoc_parser/root.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/root.mli b/src/vendor/odoc_parser/root.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/root.mli
rename to src/vendor/odoc_parser/root.mli
diff --git a/src/rescript-editor-support/vendor/odoc_parser/semantics.ml b/src/vendor/odoc_parser/semantics.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/semantics.ml
rename to src/vendor/odoc_parser/semantics.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/semantics.mli b/src/vendor/odoc_parser/semantics.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/semantics.mli
rename to src/vendor/odoc_parser/semantics.mli
diff --git a/src/rescript-editor-support/vendor/odoc_parser/syntax.ml b/src/vendor/odoc_parser/syntax.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/syntax.ml
rename to src/vendor/odoc_parser/syntax.ml
diff --git a/src/rescript-editor-support/vendor/odoc_parser/syntax.mli b/src/vendor/odoc_parser/syntax.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/syntax.mli
rename to src/vendor/odoc_parser/syntax.mli
diff --git a/src/rescript-editor-support/vendor/odoc_parser/token.ml b/src/vendor/odoc_parser/token.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/odoc_parser/token.ml
rename to src/vendor/odoc_parser/token.ml
diff --git a/src/rescript-editor-support/vendor/omd/Readme.md b/src/vendor/omd/Readme.md
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/Readme.md
rename to src/vendor/omd/Readme.md
diff --git a/src/rescript-editor-support/vendor/omd/html_characters.ml b/src/vendor/omd/html_characters.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/html_characters.ml
rename to src/vendor/omd/html_characters.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd.ml b/src/vendor/omd/omd.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd.ml
rename to src/vendor/omd/omd.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd.mli b/src/vendor/omd/omd.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd.mli
rename to src/vendor/omd/omd.mli
diff --git a/src/rescript-editor-support/vendor/omd/omd_backend.ml b/src/vendor/omd/omd_backend.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_backend.ml
rename to src/vendor/omd/omd_backend.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_backend.mli b/src/vendor/omd/omd_backend.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_backend.mli
rename to src/vendor/omd/omd_backend.mli
diff --git a/src/rescript-editor-support/vendor/omd/omd_html.ml b/src/vendor/omd/omd_html.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_html.ml
rename to src/vendor/omd/omd_html.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_lexer.ml b/src/vendor/omd/omd_lexer.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_lexer.ml
rename to src/vendor/omd/omd_lexer.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_lexer.mli b/src/vendor/omd/omd_lexer.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_lexer.mli
rename to src/vendor/omd/omd_lexer.mli
diff --git a/src/rescript-editor-support/vendor/omd/omd_parser.ml b/src/vendor/omd/omd_parser.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_parser.ml
rename to src/vendor/omd/omd_parser.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_parser.mli b/src/vendor/omd/omd_parser.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_parser.mli
rename to src/vendor/omd/omd_parser.mli
diff --git a/src/rescript-editor-support/vendor/omd/omd_representation.ml b/src/vendor/omd/omd_representation.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_representation.ml
rename to src/vendor/omd/omd_representation.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_representation.mli b/src/vendor/omd/omd_representation.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_representation.mli
rename to src/vendor/omd/omd_representation.mli
diff --git a/src/rescript-editor-support/vendor/omd/omd_types.ml b/src/vendor/omd/omd_types.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_types.ml
rename to src/vendor/omd/omd_types.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_utils.ml b/src/vendor/omd/omd_utils.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_utils.ml
rename to src/vendor/omd/omd_utils.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_utils.mli b/src/vendor/omd/omd_utils.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_utils.mli
rename to src/vendor/omd/omd_utils.mli
diff --git a/src/rescript-editor-support/vendor/omd/omd_xtxt.ml b/src/vendor/omd/omd_xtxt.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_xtxt.ml
rename to src/vendor/omd/omd_xtxt.ml
diff --git a/src/rescript-editor-support/vendor/omd/omd_xtxt.mli b/src/vendor/omd/omd_xtxt.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/omd/omd_xtxt.mli
rename to src/vendor/omd/omd_xtxt.mli
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_comment.ml b/src/vendor/res_outcome_printer/res_comment.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_comment.ml
rename to src/vendor/res_outcome_printer/res_comment.ml
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_comment.mli b/src/vendor/res_outcome_printer/res_comment.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_comment.mli
rename to src/vendor/res_outcome_printer/res_comment.mli
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_doc.ml b/src/vendor/res_outcome_printer/res_doc.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_doc.ml
rename to src/vendor/res_outcome_printer/res_doc.ml
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_doc.mli b/src/vendor/res_outcome_printer/res_doc.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_doc.mli
rename to src/vendor/res_outcome_printer/res_doc.mli
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_minibuffer.ml b/src/vendor/res_outcome_printer/res_minibuffer.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_minibuffer.ml
rename to src/vendor/res_outcome_printer/res_minibuffer.ml
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_minibuffer.mli b/src/vendor/res_outcome_printer/res_minibuffer.mli
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_minibuffer.mli
rename to src/vendor/res_outcome_printer/res_minibuffer.mli
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_outcome_printer.ml b/src/vendor/res_outcome_printer/res_outcome_printer.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_outcome_printer.ml
rename to src/vendor/res_outcome_printer/res_outcome_printer.ml
diff --git a/src/rescript-editor-support/vendor/res_outcome_printer/res_token.ml b/src/vendor/res_outcome_printer/res_token.ml
similarity index 100%
rename from src/rescript-editor-support/vendor/res_outcome_printer/res_token.ml
rename to src/vendor/res_outcome_printer/res_token.ml