diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ade0be36..6e8e635b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,7 @@ In addition to Prettier's formatting options, can contain the `errors` property The implementation of `runFormatTest` can be found in [`tests/config/run-format-test.js`](tests/config/run-format-test.js). -`tests/format/flow-repo/` contains the Flow test suite and is not supposed to be edited by hand. To update it, clone the Flow repo next to the Prettier repo and run: `node scripts/sync-flow-tests.cjs ../flow/tests/`. +`tests/format/flow/flow-repo/` contains the Flow test suite and is not supposed to be edited by hand. To update it, clone the Flow repo next to the Prettier repo and run: `node scripts/sync-flow-tests.cjs ../flow/tests/`. ## Debugging diff --git a/scripts/sync-flow-tests.cjs b/scripts/sync-flow-tests.cjs index af3a77447..22d466d93 100644 --- a/scripts/sync-flow-tests.cjs +++ b/scripts/sync-flow-tests.cjs @@ -7,7 +7,7 @@ const fastGlob = require("fast-glob"); const DEFAULT_SPEC_CONTENT = "runFormatTest(import.meta);\n"; const SPEC_FILE_NAME = "format.test.js"; -const FLOW_TESTS_DIR = path.join(__dirname, "../tests/format/flow-repo"); +const FLOW_TESTS_DIR = path.join(__dirname, "../tests/format/flow/flow-repo"); function tryParse(file, content) { // Keep this sync with `/src/language-js/parse/flow.js` diff --git a/tests/config/failed-format-tests.js b/tests/config/failed-format-tests.js index 32083026a..89e625830 100644 --- a/tests/config/failed-format-tests.js +++ b/tests/config/failed-format-tests.js @@ -90,7 +90,7 @@ const disabledTests = new Map( // Not supported "flow/comments/", - "flow-repo/union_new/", + "flow/flow-repo/union_new/", // Different result "flow/hook/comments-before-arrow.js", diff --git a/tests/config/utilities/check-parsers.js b/tests/config/utilities/check-parsers.js index 3a8dbb27c..e6a6f806e 100644 --- a/tests/config/utilities/check-parsers.js +++ b/tests/config/utilities/check-parsers.js @@ -30,14 +30,6 @@ const categoryParsers = new Map([ extensions: [".js", ".cjs", ".mjs"], }, ], - [ - "flow-repo", - { - parsers: ["flow", "babel-flow"], - verifyParsers: ["flow", "babel-flow", "typescript", "babel-ts"], - extensions: [".js", ".cjs", ".mjs"], - }, - ], [ "graphql", { parsers: ["graphql"], verifyParsers: [], extensions: [".graphql"] }, @@ -140,10 +132,6 @@ const categoryParsers = new Map([ extensions: [".scss"], }, ], - [ - "stylefmt-repo", - { parsers: ["css", "scss"], verifyParsers: [], extensions: [".css"] }, - ], [ "typescript", { diff --git a/tests/format/stylefmt-repo/at-apply/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/at-apply/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/at-apply/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/at-apply/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/at-apply/at-apply.css b/tests/format/css/stylefmt-repo/at-apply/at-apply.css similarity index 100% rename from tests/format/stylefmt-repo/at-apply/at-apply.css rename to tests/format/css/stylefmt-repo/at-apply/at-apply.css diff --git a/tests/format/stylefmt-repo/at-apply/format.test.js b/tests/format/css/stylefmt-repo/at-apply/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/at-apply/format.test.js rename to tests/format/css/stylefmt-repo/at-apply/format.test.js diff --git a/tests/format/stylefmt-repo/at-media/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/at-media/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/at-media/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/at-media/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/at-media/at-media.css b/tests/format/css/stylefmt-repo/at-media/at-media.css similarity index 100% rename from tests/format/stylefmt-repo/at-media/at-media.css rename to tests/format/css/stylefmt-repo/at-media/at-media.css diff --git a/tests/format/stylefmt-repo/at-media/format.test.js b/tests/format/css/stylefmt-repo/at-media/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/at-media/format.test.js rename to tests/format/css/stylefmt-repo/at-media/format.test.js diff --git a/tests/format/stylefmt-repo/attr-selector/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/attr-selector/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/attr-selector/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/attr-selector/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/attr-selector/attr-selector.css b/tests/format/css/stylefmt-repo/attr-selector/attr-selector.css similarity index 100% rename from tests/format/stylefmt-repo/attr-selector/attr-selector.css rename to tests/format/css/stylefmt-repo/attr-selector/attr-selector.css diff --git a/tests/format/stylefmt-repo/attr-selector/format.test.js b/tests/format/css/stylefmt-repo/attr-selector/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/attr-selector/format.test.js rename to tests/format/css/stylefmt-repo/attr-selector/format.test.js diff --git a/tests/format/stylefmt-repo/charset-2/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/charset-2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/charset-2/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/charset-2/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/charset-2/charset-2.css b/tests/format/css/stylefmt-repo/charset-2/charset-2.css similarity index 100% rename from tests/format/stylefmt-repo/charset-2/charset-2.css rename to tests/format/css/stylefmt-repo/charset-2/charset-2.css diff --git a/tests/format/stylefmt-repo/charset-2/format.test.js b/tests/format/css/stylefmt-repo/charset-2/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/charset-2/format.test.js rename to tests/format/css/stylefmt-repo/charset-2/format.test.js diff --git a/tests/format/stylefmt-repo/charset/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/charset/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/charset/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/charset/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/charset/charset.css b/tests/format/css/stylefmt-repo/charset/charset.css similarity index 100% rename from tests/format/stylefmt-repo/charset/charset.css rename to tests/format/css/stylefmt-repo/charset/charset.css diff --git a/tests/format/stylefmt-repo/charset/format.test.js b/tests/format/css/stylefmt-repo/charset/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/charset/format.test.js rename to tests/format/css/stylefmt-repo/charset/format.test.js diff --git a/tests/format/stylefmt-repo/color-hex-lowercase/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/color-hex-lowercase/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/color-hex-lowercase/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/color-hex-lowercase/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/color-hex-lowercase/color-hex-lowercase.css b/tests/format/css/stylefmt-repo/color-hex-lowercase/color-hex-lowercase.css similarity index 100% rename from tests/format/stylefmt-repo/color-hex-lowercase/color-hex-lowercase.css rename to tests/format/css/stylefmt-repo/color-hex-lowercase/color-hex-lowercase.css diff --git a/tests/format/stylefmt-repo/color-hex-lowercase/format.test.js b/tests/format/css/stylefmt-repo/color-hex-lowercase/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/color-hex-lowercase/format.test.js rename to tests/format/css/stylefmt-repo/color-hex-lowercase/format.test.js diff --git a/tests/format/stylefmt-repo/comment-in-rules/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/comment-in-rules/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/comment-in-rules/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/comment-in-rules/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/comment-in-rules/comment-in-rules.css b/tests/format/css/stylefmt-repo/comment-in-rules/comment-in-rules.css similarity index 100% rename from tests/format/stylefmt-repo/comment-in-rules/comment-in-rules.css rename to tests/format/css/stylefmt-repo/comment-in-rules/comment-in-rules.css diff --git a/tests/format/stylefmt-repo/comment-in-rules/format.test.js b/tests/format/css/stylefmt-repo/comment-in-rules/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/comment-in-rules/format.test.js rename to tests/format/css/stylefmt-repo/comment-in-rules/format.test.js diff --git a/tests/format/stylefmt-repo/comment/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/comment/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/comment/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/comment/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/comment/comment.css b/tests/format/css/stylefmt-repo/comment/comment.css similarity index 100% rename from tests/format/stylefmt-repo/comment/comment.css rename to tests/format/css/stylefmt-repo/comment/comment.css diff --git a/tests/format/stylefmt-repo/comment/format.test.js b/tests/format/css/stylefmt-repo/comment/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/comment/format.test.js rename to tests/format/css/stylefmt-repo/comment/format.test.js diff --git a/tests/format/stylefmt-repo/content/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/content/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/content/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/content/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/content/content.css b/tests/format/css/stylefmt-repo/content/content.css similarity index 100% rename from tests/format/stylefmt-repo/content/content.css rename to tests/format/css/stylefmt-repo/content/content.css diff --git a/tests/format/stylefmt-repo/content/format.test.js b/tests/format/css/stylefmt-repo/content/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/content/format.test.js rename to tests/format/css/stylefmt-repo/content/format.test.js diff --git a/tests/format/stylefmt-repo/cssnext-example/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/cssnext-example/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/cssnext-example/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/cssnext-example/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/cssnext-example/cssnext-example.css b/tests/format/css/stylefmt-repo/cssnext-example/cssnext-example.css similarity index 100% rename from tests/format/stylefmt-repo/cssnext-example/cssnext-example.css rename to tests/format/css/stylefmt-repo/cssnext-example/cssnext-example.css diff --git a/tests/format/stylefmt-repo/cssnext-example/format.test.js b/tests/format/css/stylefmt-repo/cssnext-example/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/cssnext-example/format.test.js rename to tests/format/css/stylefmt-repo/cssnext-example/format.test.js diff --git a/tests/format/stylefmt-repo/custom-media-queries/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/custom-media-queries/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/custom-media-queries/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/custom-media-queries/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/custom-media-queries/custom-media-queries.css b/tests/format/css/stylefmt-repo/custom-media-queries/custom-media-queries.css similarity index 100% rename from tests/format/stylefmt-repo/custom-media-queries/custom-media-queries.css rename to tests/format/css/stylefmt-repo/custom-media-queries/custom-media-queries.css diff --git a/tests/format/stylefmt-repo/custom-media-queries/format.test.js b/tests/format/css/stylefmt-repo/custom-media-queries/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/custom-media-queries/format.test.js rename to tests/format/css/stylefmt-repo/custom-media-queries/format.test.js diff --git a/tests/format/stylefmt-repo/custom-properties/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/custom-properties/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/custom-properties/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/custom-properties/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/custom-properties/custom-properties.css b/tests/format/css/stylefmt-repo/custom-properties/custom-properties.css similarity index 100% rename from tests/format/stylefmt-repo/custom-properties/custom-properties.css rename to tests/format/css/stylefmt-repo/custom-properties/custom-properties.css diff --git a/tests/format/stylefmt-repo/custom-properties/format.test.js b/tests/format/css/stylefmt-repo/custom-properties/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/custom-properties/format.test.js rename to tests/format/css/stylefmt-repo/custom-properties/format.test.js diff --git a/tests/format/stylefmt-repo/custom-selectors/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/custom-selectors/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/custom-selectors/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/custom-selectors/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/custom-selectors/custom-selectors.css b/tests/format/css/stylefmt-repo/custom-selectors/custom-selectors.css similarity index 100% rename from tests/format/stylefmt-repo/custom-selectors/custom-selectors.css rename to tests/format/css/stylefmt-repo/custom-selectors/custom-selectors.css diff --git a/tests/format/stylefmt-repo/custom-selectors/format.test.js b/tests/format/css/stylefmt-repo/custom-selectors/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/custom-selectors/format.test.js rename to tests/format/css/stylefmt-repo/custom-selectors/format.test.js diff --git a/tests/format/stylefmt-repo/data-url/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/data-url/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/data-url/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/data-url/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/data-url/data-url.css b/tests/format/css/stylefmt-repo/data-url/data-url.css similarity index 100% rename from tests/format/stylefmt-repo/data-url/data-url.css rename to tests/format/css/stylefmt-repo/data-url/data-url.css diff --git a/tests/format/stylefmt-repo/data-url/format.test.js b/tests/format/css/stylefmt-repo/data-url/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/data-url/format.test.js rename to tests/format/css/stylefmt-repo/data-url/format.test.js diff --git a/tests/format/stylefmt-repo/font-face/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/font-face/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/font-face/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/font-face/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/font-face/font-face.css b/tests/format/css/stylefmt-repo/font-face/font-face.css similarity index 100% rename from tests/format/stylefmt-repo/font-face/font-face.css rename to tests/format/css/stylefmt-repo/font-face/font-face.css diff --git a/tests/format/stylefmt-repo/font-face/format.test.js b/tests/format/css/stylefmt-repo/font-face/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/font-face/format.test.js rename to tests/format/css/stylefmt-repo/font-face/format.test.js diff --git a/tests/format/stylefmt-repo/font-shorthand/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/font-shorthand/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/font-shorthand/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/font-shorthand/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/font-shorthand/font-shorthand.css b/tests/format/css/stylefmt-repo/font-shorthand/font-shorthand.css similarity index 100% rename from tests/format/stylefmt-repo/font-shorthand/font-shorthand.css rename to tests/format/css/stylefmt-repo/font-shorthand/font-shorthand.css diff --git a/tests/format/stylefmt-repo/font-shorthand/format.test.js b/tests/format/css/stylefmt-repo/font-shorthand/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/font-shorthand/format.test.js rename to tests/format/css/stylefmt-repo/font-shorthand/format.test.js diff --git a/tests/format/stylefmt-repo/ie-hacks/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/ie-hacks/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/ie-hacks/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/ie-hacks/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/ie-hacks/format.test.js b/tests/format/css/stylefmt-repo/ie-hacks/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/ie-hacks/format.test.js rename to tests/format/css/stylefmt-repo/ie-hacks/format.test.js diff --git a/tests/format/stylefmt-repo/ie-hacks/ie-hacks.css b/tests/format/css/stylefmt-repo/ie-hacks/ie-hacks.css similarity index 100% rename from tests/format/stylefmt-repo/ie-hacks/ie-hacks.css rename to tests/format/css/stylefmt-repo/ie-hacks/ie-hacks.css diff --git a/tests/format/stylefmt-repo/import/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/import/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/import/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/import/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/import/format.test.js b/tests/format/css/stylefmt-repo/import/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/import/format.test.js rename to tests/format/css/stylefmt-repo/import/format.test.js diff --git a/tests/format/stylefmt-repo/import/import.css b/tests/format/css/stylefmt-repo/import/import.css similarity index 100% rename from tests/format/stylefmt-repo/import/import.css rename to tests/format/css/stylefmt-repo/import/import.css diff --git a/tests/format/stylefmt-repo/important/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/important/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/important/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/important/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/important/format.test.js b/tests/format/css/stylefmt-repo/important/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/important/format.test.js rename to tests/format/css/stylefmt-repo/important/format.test.js diff --git a/tests/format/stylefmt-repo/important/important.css b/tests/format/css/stylefmt-repo/important/important.css similarity index 100% rename from tests/format/stylefmt-repo/important/important.css rename to tests/format/css/stylefmt-repo/important/important.css diff --git a/tests/format/stylefmt-repo/inline-comment/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/inline-comment/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/inline-comment/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/inline-comment/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/inline-comment/format.test.js b/tests/format/css/stylefmt-repo/inline-comment/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/inline-comment/format.test.js rename to tests/format/css/stylefmt-repo/inline-comment/format.test.js diff --git a/tests/format/stylefmt-repo/inline-comment/inline-comment.css b/tests/format/css/stylefmt-repo/inline-comment/inline-comment.css similarity index 100% rename from tests/format/stylefmt-repo/inline-comment/inline-comment.css rename to tests/format/css/stylefmt-repo/inline-comment/inline-comment.css diff --git a/tests/format/stylefmt-repo/lowercase/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/lowercase/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/lowercase/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/lowercase/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/lowercase/format.test.js b/tests/format/css/stylefmt-repo/lowercase/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/lowercase/format.test.js rename to tests/format/css/stylefmt-repo/lowercase/format.test.js diff --git a/tests/format/stylefmt-repo/lowercase/lowercase.css b/tests/format/css/stylefmt-repo/lowercase/lowercase.css similarity index 100% rename from tests/format/stylefmt-repo/lowercase/lowercase.css rename to tests/format/css/stylefmt-repo/lowercase/lowercase.css diff --git a/tests/format/stylefmt-repo/media-indent-with-import/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/media-indent-with-import/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/media-indent-with-import/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/media-indent-with-import/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/media-indent-with-import/format.test.js b/tests/format/css/stylefmt-repo/media-indent-with-import/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/media-indent-with-import/format.test.js rename to tests/format/css/stylefmt-repo/media-indent-with-import/format.test.js diff --git a/tests/format/stylefmt-repo/media-indent-with-import/media-indent-with-import.css b/tests/format/css/stylefmt-repo/media-indent-with-import/media-indent-with-import.css similarity index 100% rename from tests/format/stylefmt-repo/media-indent-with-import/media-indent-with-import.css rename to tests/format/css/stylefmt-repo/media-indent-with-import/media-indent-with-import.css diff --git a/tests/format/stylefmt-repo/media-indent/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/media-indent/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/media-indent/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/media-indent/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/media-indent/format.test.js b/tests/format/css/stylefmt-repo/media-indent/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/media-indent/format.test.js rename to tests/format/css/stylefmt-repo/media-indent/format.test.js diff --git a/tests/format/stylefmt-repo/media-indent/media-indent.css b/tests/format/css/stylefmt-repo/media-indent/media-indent.css similarity index 100% rename from tests/format/stylefmt-repo/media-indent/media-indent.css rename to tests/format/css/stylefmt-repo/media-indent/media-indent.css diff --git a/tests/format/stylefmt-repo/media-queries-ranges/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/media-queries-ranges/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/media-queries-ranges/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/media-queries-ranges/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/media-queries-ranges/format.test.js b/tests/format/css/stylefmt-repo/media-queries-ranges/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/media-queries-ranges/format.test.js rename to tests/format/css/stylefmt-repo/media-queries-ranges/format.test.js diff --git a/tests/format/stylefmt-repo/media-queries-ranges/media-queries-ranges.css b/tests/format/css/stylefmt-repo/media-queries-ranges/media-queries-ranges.css similarity index 100% rename from tests/format/stylefmt-repo/media-queries-ranges/media-queries-ranges.css rename to tests/format/css/stylefmt-repo/media-queries-ranges/media-queries-ranges.css diff --git a/tests/format/stylefmt-repo/nested-2/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested-2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested-2/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested-2/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested-2/format.test.js b/tests/format/css/stylefmt-repo/nested-2/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested-2/format.test.js rename to tests/format/css/stylefmt-repo/nested-2/format.test.js diff --git a/tests/format/stylefmt-repo/nested-2/nested-2.css b/tests/format/css/stylefmt-repo/nested-2/nested-2.css similarity index 100% rename from tests/format/stylefmt-repo/nested-2/nested-2.css rename to tests/format/css/stylefmt-repo/nested-2/nested-2.css diff --git a/tests/format/stylefmt-repo/nested-atrule/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested-atrule/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested-atrule/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested-atrule/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested-atrule/format.test.js b/tests/format/css/stylefmt-repo/nested-atrule/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested-atrule/format.test.js rename to tests/format/css/stylefmt-repo/nested-atrule/format.test.js diff --git a/tests/format/stylefmt-repo/nested-atrule/nested-atrule.css b/tests/format/css/stylefmt-repo/nested-atrule/nested-atrule.css similarity index 100% rename from tests/format/stylefmt-repo/nested-atrule/nested-atrule.css rename to tests/format/css/stylefmt-repo/nested-atrule/nested-atrule.css diff --git a/tests/format/stylefmt-repo/nested-indention-2/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested-indention-2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested-indention-2/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested-indention-2/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested-indention-2/format.test.js b/tests/format/css/stylefmt-repo/nested-indention-2/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested-indention-2/format.test.js rename to tests/format/css/stylefmt-repo/nested-indention-2/format.test.js diff --git a/tests/format/stylefmt-repo/nested-indention-2/nested-indention-2.css b/tests/format/css/stylefmt-repo/nested-indention-2/nested-indention-2.css similarity index 100% rename from tests/format/stylefmt-repo/nested-indention-2/nested-indention-2.css rename to tests/format/css/stylefmt-repo/nested-indention-2/nested-indention-2.css diff --git a/tests/format/stylefmt-repo/nested-indention/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested-indention/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested-indention/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested-indention/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested-indention/format.test.js b/tests/format/css/stylefmt-repo/nested-indention/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested-indention/format.test.js rename to tests/format/css/stylefmt-repo/nested-indention/format.test.js diff --git a/tests/format/stylefmt-repo/nested-indention/nested-indention.css b/tests/format/css/stylefmt-repo/nested-indention/nested-indention.css similarity index 100% rename from tests/format/stylefmt-repo/nested-indention/nested-indention.css rename to tests/format/css/stylefmt-repo/nested-indention/nested-indention.css diff --git a/tests/format/stylefmt-repo/nested-mixin-2/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested-mixin-2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested-mixin-2/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested-mixin-2/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested-mixin-2/format.test.js b/tests/format/css/stylefmt-repo/nested-mixin-2/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested-mixin-2/format.test.js rename to tests/format/css/stylefmt-repo/nested-mixin-2/format.test.js diff --git a/tests/format/stylefmt-repo/nested-mixin-2/nested-mixin-2.css b/tests/format/css/stylefmt-repo/nested-mixin-2/nested-mixin-2.css similarity index 100% rename from tests/format/stylefmt-repo/nested-mixin-2/nested-mixin-2.css rename to tests/format/css/stylefmt-repo/nested-mixin-2/nested-mixin-2.css diff --git a/tests/format/stylefmt-repo/nested-mixin/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested-mixin/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested-mixin/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested-mixin/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested-mixin/format.test.js b/tests/format/css/stylefmt-repo/nested-mixin/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested-mixin/format.test.js rename to tests/format/css/stylefmt-repo/nested-mixin/format.test.js diff --git a/tests/format/stylefmt-repo/nested-mixin/nested-mixin.css b/tests/format/css/stylefmt-repo/nested-mixin/nested-mixin.css similarity index 100% rename from tests/format/stylefmt-repo/nested-mixin/nested-mixin.css rename to tests/format/css/stylefmt-repo/nested-mixin/nested-mixin.css diff --git a/tests/format/stylefmt-repo/nested/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/nested/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/nested/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/nested/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/nested/format.test.js b/tests/format/css/stylefmt-repo/nested/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/nested/format.test.js rename to tests/format/css/stylefmt-repo/nested/format.test.js diff --git a/tests/format/stylefmt-repo/nested/nested.css b/tests/format/css/stylefmt-repo/nested/nested.css similarity index 100% rename from tests/format/stylefmt-repo/nested/nested.css rename to tests/format/css/stylefmt-repo/nested/nested.css diff --git a/tests/format/stylefmt-repo/non-nested-combinator/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/non-nested-combinator/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/non-nested-combinator/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/non-nested-combinator/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/non-nested-combinator/format.test.js b/tests/format/css/stylefmt-repo/non-nested-combinator/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/non-nested-combinator/format.test.js rename to tests/format/css/stylefmt-repo/non-nested-combinator/format.test.js diff --git a/tests/format/stylefmt-repo/non-nested-combinator/non-nested-combinator.css b/tests/format/css/stylefmt-repo/non-nested-combinator/non-nested-combinator.css similarity index 100% rename from tests/format/stylefmt-repo/non-nested-combinator/non-nested-combinator.css rename to tests/format/css/stylefmt-repo/non-nested-combinator/non-nested-combinator.css diff --git a/tests/format/stylefmt-repo/pseudo-element/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/pseudo-element/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/pseudo-element/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/pseudo-element/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/pseudo-element/format.test.js b/tests/format/css/stylefmt-repo/pseudo-element/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/pseudo-element/format.test.js rename to tests/format/css/stylefmt-repo/pseudo-element/format.test.js diff --git a/tests/format/stylefmt-repo/pseudo-element/pseudo-element.css b/tests/format/css/stylefmt-repo/pseudo-element/pseudo-element.css similarity index 100% rename from tests/format/stylefmt-repo/pseudo-element/pseudo-element.css rename to tests/format/css/stylefmt-repo/pseudo-element/pseudo-element.css diff --git a/tests/format/stylefmt-repo/readme/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/readme/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/readme/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/readme/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/readme/format.test.js b/tests/format/css/stylefmt-repo/readme/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/readme/format.test.js rename to tests/format/css/stylefmt-repo/readme/format.test.js diff --git a/tests/format/stylefmt-repo/readme/readme.css b/tests/format/css/stylefmt-repo/readme/readme.css similarity index 100% rename from tests/format/stylefmt-repo/readme/readme.css rename to tests/format/css/stylefmt-repo/readme/readme.css diff --git a/tests/format/stylefmt-repo/shorthand-with-sass-variables/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/shorthand-with-sass-variables/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/shorthand-with-sass-variables/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/shorthand-with-sass-variables/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/shorthand-with-sass-variables/format.test.js b/tests/format/css/stylefmt-repo/shorthand-with-sass-variables/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/shorthand-with-sass-variables/format.test.js rename to tests/format/css/stylefmt-repo/shorthand-with-sass-variables/format.test.js diff --git a/tests/format/stylefmt-repo/shorthand-with-sass-variables/shorthand-with-sass-variables.css b/tests/format/css/stylefmt-repo/shorthand-with-sass-variables/shorthand-with-sass-variables.css similarity index 100% rename from tests/format/stylefmt-repo/shorthand-with-sass-variables/shorthand-with-sass-variables.css rename to tests/format/css/stylefmt-repo/shorthand-with-sass-variables/shorthand-with-sass-variables.css diff --git a/tests/format/stylefmt-repo/values/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/values/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/values/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/values/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/values/format.test.js b/tests/format/css/stylefmt-repo/values/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/values/format.test.js rename to tests/format/css/stylefmt-repo/values/format.test.js diff --git a/tests/format/stylefmt-repo/values/values.css b/tests/format/css/stylefmt-repo/values/values.css similarity index 100% rename from tests/format/stylefmt-repo/values/values.css rename to tests/format/css/stylefmt-repo/values/values.css diff --git a/tests/format/stylefmt-repo/var-notation/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/var-notation/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/var-notation/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/var-notation/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/var-notation/format.test.js b/tests/format/css/stylefmt-repo/var-notation/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/var-notation/format.test.js rename to tests/format/css/stylefmt-repo/var-notation/format.test.js diff --git a/tests/format/stylefmt-repo/var-notation/var-notation.css b/tests/format/css/stylefmt-repo/var-notation/var-notation.css similarity index 100% rename from tests/format/stylefmt-repo/var-notation/var-notation.css rename to tests/format/css/stylefmt-repo/var-notation/var-notation.css diff --git a/tests/format/stylefmt-repo/vendor-prefix/__snapshots__/format.test.js.snap b/tests/format/css/stylefmt-repo/vendor-prefix/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/stylefmt-repo/vendor-prefix/__snapshots__/format.test.js.snap rename to tests/format/css/stylefmt-repo/vendor-prefix/__snapshots__/format.test.js.snap diff --git a/tests/format/stylefmt-repo/vendor-prefix/format.test.js b/tests/format/css/stylefmt-repo/vendor-prefix/format.test.js similarity index 100% rename from tests/format/stylefmt-repo/vendor-prefix/format.test.js rename to tests/format/css/stylefmt-repo/vendor-prefix/format.test.js diff --git a/tests/format/stylefmt-repo/vendor-prefix/vendor-prefix.css b/tests/format/css/stylefmt-repo/vendor-prefix/vendor-prefix.css similarity index 100% rename from tests/format/stylefmt-repo/vendor-prefix/vendor-prefix.css rename to tests/format/css/stylefmt-repo/vendor-prefix/vendor-prefix.css diff --git a/tests/format/flow-repo/abnormal/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/abnormal/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/abnormal/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/abnormal/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/abnormal/break-continue.js b/tests/format/flow/flow-repo/abnormal/break-continue.js similarity index 100% rename from tests/format/flow-repo/abnormal/break-continue.js rename to tests/format/flow/flow-repo/abnormal/break-continue.js diff --git a/tests/format/flow-repo/abnormal/format.test.js b/tests/format/flow/flow-repo/abnormal/format.test.js similarity index 100% rename from tests/format/flow-repo/abnormal/format.test.js rename to tests/format/flow/flow-repo/abnormal/format.test.js diff --git a/tests/format/flow-repo/abnormal/return.js b/tests/format/flow/flow-repo/abnormal/return.js similarity index 100% rename from tests/format/flow-repo/abnormal/return.js rename to tests/format/flow/flow-repo/abnormal/return.js diff --git a/tests/format/flow-repo/abnormal/toplevel_throw.js b/tests/format/flow/flow-repo/abnormal/toplevel_throw.js similarity index 100% rename from tests/format/flow-repo/abnormal/toplevel_throw.js rename to tests/format/flow/flow-repo/abnormal/toplevel_throw.js diff --git a/tests/format/flow-repo/annot/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/annot/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/annot/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/annot/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/annot/annot.js b/tests/format/flow/flow-repo/annot/annot.js similarity index 100% rename from tests/format/flow-repo/annot/annot.js rename to tests/format/flow/flow-repo/annot/annot.js diff --git a/tests/format/flow-repo/annot/any/A.js b/tests/format/flow/flow-repo/annot/any/A.js similarity index 100% rename from tests/format/flow-repo/annot/any/A.js rename to tests/format/flow/flow-repo/annot/any/A.js diff --git a/tests/format/flow-repo/annot/any/B.js b/tests/format/flow/flow-repo/annot/any/B.js similarity index 100% rename from tests/format/flow-repo/annot/any/B.js rename to tests/format/flow/flow-repo/annot/any/B.js diff --git a/tests/format/flow-repo/annot/any/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/annot/any/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/annot/any/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/annot/any/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/annot/any/format.test.js b/tests/format/flow/flow-repo/annot/any/format.test.js similarity index 100% rename from tests/format/flow-repo/annot/any/format.test.js rename to tests/format/flow/flow-repo/annot/any/format.test.js diff --git a/tests/format/flow-repo/annot/format.test.js b/tests/format/flow/flow-repo/annot/format.test.js similarity index 100% rename from tests/format/flow-repo/annot/format.test.js rename to tests/format/flow/flow-repo/annot/format.test.js diff --git a/tests/format/flow-repo/annot/forward_ref.js b/tests/format/flow/flow-repo/annot/forward_ref.js similarity index 100% rename from tests/format/flow-repo/annot/forward_ref.js rename to tests/format/flow/flow-repo/annot/forward_ref.js diff --git a/tests/format/flow-repo/annot/issue-530.js b/tests/format/flow/flow-repo/annot/issue-530.js similarity index 100% rename from tests/format/flow-repo/annot/issue-530.js rename to tests/format/flow/flow-repo/annot/issue-530.js diff --git a/tests/format/flow-repo/annot/leak.js b/tests/format/flow/flow-repo/annot/leak.js similarity index 100% rename from tests/format/flow-repo/annot/leak.js rename to tests/format/flow/flow-repo/annot/leak.js diff --git a/tests/format/flow-repo/annot/other.js b/tests/format/flow/flow-repo/annot/other.js similarity index 100% rename from tests/format/flow-repo/annot/other.js rename to tests/format/flow/flow-repo/annot/other.js diff --git a/tests/format/flow-repo/annot/scope.js b/tests/format/flow/flow-repo/annot/scope.js similarity index 100% rename from tests/format/flow-repo/annot/scope.js rename to tests/format/flow/flow-repo/annot/scope.js diff --git a/tests/format/flow-repo/annot/test.js b/tests/format/flow/flow-repo/annot/test.js similarity index 100% rename from tests/format/flow-repo/annot/test.js rename to tests/format/flow/flow-repo/annot/test.js diff --git a/tests/format/flow-repo/annot2/A.js b/tests/format/flow/flow-repo/annot2/A.js similarity index 100% rename from tests/format/flow-repo/annot2/A.js rename to tests/format/flow/flow-repo/annot2/A.js diff --git a/tests/format/flow-repo/annot2/B.js b/tests/format/flow/flow-repo/annot2/B.js similarity index 100% rename from tests/format/flow-repo/annot2/B.js rename to tests/format/flow/flow-repo/annot2/B.js diff --git a/tests/format/flow-repo/annot2/T.js b/tests/format/flow/flow-repo/annot2/T.js similarity index 100% rename from tests/format/flow-repo/annot2/T.js rename to tests/format/flow/flow-repo/annot2/T.js diff --git a/tests/format/flow-repo/annot2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/annot2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/annot2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/annot2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/annot2/format.test.js b/tests/format/flow/flow-repo/annot2/format.test.js similarity index 100% rename from tests/format/flow-repo/annot2/format.test.js rename to tests/format/flow/flow-repo/annot2/format.test.js diff --git a/tests/format/flow-repo/any/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/any/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/any/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/any/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/any/any.js b/tests/format/flow/flow-repo/any/any.js similarity index 100% rename from tests/format/flow-repo/any/any.js rename to tests/format/flow/flow-repo/any/any.js diff --git a/tests/format/flow-repo/any/anyexportflowfile.js b/tests/format/flow/flow-repo/any/anyexportflowfile.js similarity index 100% rename from tests/format/flow-repo/any/anyexportflowfile.js rename to tests/format/flow/flow-repo/any/anyexportflowfile.js diff --git a/tests/format/flow-repo/any/flowfixme.js b/tests/format/flow/flow-repo/any/flowfixme.js similarity index 100% rename from tests/format/flow-repo/any/flowfixme.js rename to tests/format/flow/flow-repo/any/flowfixme.js diff --git a/tests/format/flow-repo/any/flowissue.js b/tests/format/flow/flow-repo/any/flowissue.js similarity index 100% rename from tests/format/flow-repo/any/flowissue.js rename to tests/format/flow/flow-repo/any/flowissue.js diff --git a/tests/format/flow-repo/any/format.test.js b/tests/format/flow/flow-repo/any/format.test.js similarity index 100% rename from tests/format/flow-repo/any/format.test.js rename to tests/format/flow/flow-repo/any/format.test.js diff --git a/tests/format/flow-repo/any/nonflowfile.js b/tests/format/flow/flow-repo/any/nonflowfile.js similarity index 100% rename from tests/format/flow-repo/any/nonflowfile.js rename to tests/format/flow/flow-repo/any/nonflowfile.js diff --git a/tests/format/flow-repo/any/propagate.js b/tests/format/flow/flow-repo/any/propagate.js similarity index 100% rename from tests/format/flow-repo/any/propagate.js rename to tests/format/flow/flow-repo/any/propagate.js diff --git a/tests/format/flow-repo/any/reach.js b/tests/format/flow/flow-repo/any/reach.js similarity index 100% rename from tests/format/flow-repo/any/reach.js rename to tests/format/flow/flow-repo/any/reach.js diff --git a/tests/format/flow-repo/arith/Arith.js b/tests/format/flow/flow-repo/arith/Arith.js similarity index 100% rename from tests/format/flow-repo/arith/Arith.js rename to tests/format/flow/flow-repo/arith/Arith.js diff --git a/tests/format/flow-repo/arith/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/arith/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/arith/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/arith/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/arith/exponent.js b/tests/format/flow/flow-repo/arith/exponent.js similarity index 100% rename from tests/format/flow-repo/arith/exponent.js rename to tests/format/flow/flow-repo/arith/exponent.js diff --git a/tests/format/flow-repo/arith/format.test.js b/tests/format/flow/flow-repo/arith/format.test.js similarity index 100% rename from tests/format/flow-repo/arith/format.test.js rename to tests/format/flow/flow-repo/arith/format.test.js diff --git a/tests/format/flow-repo/arith/generic.js b/tests/format/flow/flow-repo/arith/generic.js similarity index 100% rename from tests/format/flow-repo/arith/generic.js rename to tests/format/flow/flow-repo/arith/generic.js diff --git a/tests/format/flow-repo/arith/mult.js b/tests/format/flow/flow-repo/arith/mult.js similarity index 100% rename from tests/format/flow-repo/arith/mult.js rename to tests/format/flow/flow-repo/arith/mult.js diff --git a/tests/format/flow-repo/arith/relational.js b/tests/format/flow/flow-repo/arith/relational.js similarity index 100% rename from tests/format/flow-repo/arith/relational.js rename to tests/format/flow/flow-repo/arith/relational.js diff --git a/tests/format/flow-repo/array-filter/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/array-filter/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/array-filter/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/array-filter/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/array-filter/format.test.js b/tests/format/flow/flow-repo/array-filter/format.test.js similarity index 100% rename from tests/format/flow-repo/array-filter/format.test.js rename to tests/format/flow/flow-repo/array-filter/format.test.js diff --git a/tests/format/flow-repo/array-filter/test.js b/tests/format/flow/flow-repo/array-filter/test.js similarity index 100% rename from tests/format/flow-repo/array-filter/test.js rename to tests/format/flow/flow-repo/array-filter/test.js diff --git a/tests/format/flow-repo/array-filter/test2.js b/tests/format/flow/flow-repo/array-filter/test2.js similarity index 100% rename from tests/format/flow-repo/array-filter/test2.js rename to tests/format/flow/flow-repo/array-filter/test2.js diff --git a/tests/format/flow-repo/array_spread/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/array_spread/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/array_spread/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/array_spread/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/array_spread/format.test.js b/tests/format/flow/flow-repo/array_spread/format.test.js similarity index 100% rename from tests/format/flow-repo/array_spread/format.test.js rename to tests/format/flow/flow-repo/array_spread/format.test.js diff --git a/tests/format/flow-repo/array_spread/test.js b/tests/format/flow/flow-repo/array_spread/test.js similarity index 100% rename from tests/format/flow-repo/array_spread/test.js rename to tests/format/flow/flow-repo/array_spread/test.js diff --git a/tests/format/flow-repo/arraylib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/arraylib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/arraylib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/arraylib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/arraylib/array_lib.js b/tests/format/flow/flow-repo/arraylib/array_lib.js similarity index 100% rename from tests/format/flow-repo/arraylib/array_lib.js rename to tests/format/flow/flow-repo/arraylib/array_lib.js diff --git a/tests/format/flow-repo/arraylib/format.test.js b/tests/format/flow/flow-repo/arraylib/format.test.js similarity index 100% rename from tests/format/flow-repo/arraylib/format.test.js rename to tests/format/flow/flow-repo/arraylib/format.test.js diff --git a/tests/format/flow-repo/arrays/Arrays.js b/tests/format/flow/flow-repo/arrays/Arrays.js similarity index 100% rename from tests/format/flow-repo/arrays/Arrays.js rename to tests/format/flow/flow-repo/arrays/Arrays.js diff --git a/tests/format/flow-repo/arrays/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/arrays/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/arrays/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/arrays/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/arrays/format.test.js b/tests/format/flow/flow-repo/arrays/format.test.js similarity index 100% rename from tests/format/flow-repo/arrays/format.test.js rename to tests/format/flow/flow-repo/arrays/format.test.js diff --git a/tests/format/flow-repo/arrays/numeric_elem.js b/tests/format/flow/flow-repo/arrays/numeric_elem.js similarity index 100% rename from tests/format/flow-repo/arrays/numeric_elem.js rename to tests/format/flow/flow-repo/arrays/numeric_elem.js diff --git a/tests/format/flow-repo/arrows/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/arrows/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/arrows/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/arrows/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/arrows/advanced_arrows.js b/tests/format/flow/flow-repo/arrows/advanced_arrows.js similarity index 100% rename from tests/format/flow-repo/arrows/advanced_arrows.js rename to tests/format/flow/flow-repo/arrows/advanced_arrows.js diff --git a/tests/format/flow-repo/arrows/arrows.js b/tests/format/flow/flow-repo/arrows/arrows.js similarity index 100% rename from tests/format/flow-repo/arrows/arrows.js rename to tests/format/flow/flow-repo/arrows/arrows.js diff --git a/tests/format/flow-repo/arrows/format.test.js b/tests/format/flow/flow-repo/arrows/format.test.js similarity index 100% rename from tests/format/flow-repo/arrows/format.test.js rename to tests/format/flow/flow-repo/arrows/format.test.js diff --git a/tests/format/flow-repo/async/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/async/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/async/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/async/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/async/async.js b/tests/format/flow/flow-repo/async/async.js similarity index 100% rename from tests/format/flow-repo/async/async.js rename to tests/format/flow/flow-repo/async/async.js diff --git a/tests/format/flow-repo/async/async2.js b/tests/format/flow/flow-repo/async/async2.js similarity index 100% rename from tests/format/flow-repo/async/async2.js rename to tests/format/flow/flow-repo/async/async2.js diff --git a/tests/format/flow-repo/async/async3.js b/tests/format/flow/flow-repo/async/async3.js similarity index 100% rename from tests/format/flow-repo/async/async3.js rename to tests/format/flow/flow-repo/async/async3.js diff --git a/tests/format/flow-repo/async/async_base_class.js b/tests/format/flow/flow-repo/async/async_base_class.js similarity index 100% rename from tests/format/flow-repo/async/async_base_class.js rename to tests/format/flow/flow-repo/async/async_base_class.js diff --git a/tests/format/flow-repo/async/async_parse.js b/tests/format/flow/flow-repo/async/async_parse.js similarity index 100% rename from tests/format/flow-repo/async/async_parse.js rename to tests/format/flow/flow-repo/async/async_parse.js diff --git a/tests/format/flow-repo/async/async_promise.js b/tests/format/flow/flow-repo/async/async_promise.js similarity index 100% rename from tests/format/flow-repo/async/async_promise.js rename to tests/format/flow/flow-repo/async/async_promise.js diff --git a/tests/format/flow-repo/async/async_return_void.js b/tests/format/flow/flow-repo/async/async_return_void.js similarity index 100% rename from tests/format/flow-repo/async/async_return_void.js rename to tests/format/flow/flow-repo/async/async_return_void.js diff --git a/tests/format/flow-repo/async/await_parse.js b/tests/format/flow/flow-repo/async/await_parse.js similarity index 100% rename from tests/format/flow-repo/async/await_parse.js rename to tests/format/flow/flow-repo/async/await_parse.js diff --git a/tests/format/flow-repo/async/format.test.js b/tests/format/flow/flow-repo/async/format.test.js similarity index 100% rename from tests/format/flow-repo/async/format.test.js rename to tests/format/flow/flow-repo/async/format.test.js diff --git a/tests/format/flow-repo/async_iteration/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/async_iteration/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/async_iteration/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/async_iteration/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/async_iteration/delegate_yield.js b/tests/format/flow/flow-repo/async_iteration/delegate_yield.js similarity index 100% rename from tests/format/flow-repo/async_iteration/delegate_yield.js rename to tests/format/flow/flow-repo/async_iteration/delegate_yield.js diff --git a/tests/format/flow-repo/async_iteration/format.test.js b/tests/format/flow/flow-repo/async_iteration/format.test.js similarity index 100% rename from tests/format/flow-repo/async_iteration/format.test.js rename to tests/format/flow/flow-repo/async_iteration/format.test.js diff --git a/tests/format/flow-repo/async_iteration/generator.js b/tests/format/flow/flow-repo/async_iteration/generator.js similarity index 100% rename from tests/format/flow-repo/async_iteration/generator.js rename to tests/format/flow/flow-repo/async_iteration/generator.js diff --git a/tests/format/flow-repo/async_iteration/return.js b/tests/format/flow/flow-repo/async_iteration/return.js similarity index 100% rename from tests/format/flow-repo/async_iteration/return.js rename to tests/format/flow/flow-repo/async_iteration/return.js diff --git a/tests/format/flow-repo/async_iteration/throw.js b/tests/format/flow/flow-repo/async_iteration/throw.js similarity index 100% rename from tests/format/flow-repo/async_iteration/throw.js rename to tests/format/flow/flow-repo/async_iteration/throw.js diff --git a/tests/format/flow-repo/autocomplete/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/autocomplete/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/autocomplete/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/autocomplete/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/autocomplete/customfun.js b/tests/format/flow/flow-repo/autocomplete/customfun.js similarity index 100% rename from tests/format/flow-repo/autocomplete/customfun.js rename to tests/format/flow/flow-repo/autocomplete/customfun.js diff --git a/tests/format/flow-repo/autocomplete/format.test.js b/tests/format/flow/flow-repo/autocomplete/format.test.js similarity index 100% rename from tests/format/flow-repo/autocomplete/format.test.js rename to tests/format/flow/flow-repo/autocomplete/format.test.js diff --git a/tests/format/flow-repo/autocomplete/unknown.js b/tests/format/flow/flow-repo/autocomplete/unknown.js similarity index 100% rename from tests/format/flow-repo/autocomplete/unknown.js rename to tests/format/flow/flow-repo/autocomplete/unknown.js diff --git a/tests/format/flow-repo/auxiliary/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/auxiliary/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/auxiliary/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/auxiliary/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/auxiliary/client.js b/tests/format/flow/flow-repo/auxiliary/client.js similarity index 100% rename from tests/format/flow-repo/auxiliary/client.js rename to tests/format/flow/flow-repo/auxiliary/client.js diff --git a/tests/format/flow-repo/auxiliary/format.test.js b/tests/format/flow/flow-repo/auxiliary/format.test.js similarity index 100% rename from tests/format/flow-repo/auxiliary/format.test.js rename to tests/format/flow/flow-repo/auxiliary/format.test.js diff --git a/tests/format/flow-repo/auxiliary/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/auxiliary/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/auxiliary/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/auxiliary/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/auxiliary/lib/format.test.js b/tests/format/flow/flow-repo/auxiliary/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/auxiliary/lib/format.test.js rename to tests/format/flow/flow-repo/auxiliary/lib/format.test.js diff --git a/tests/format/flow-repo/auxiliary/lib/lib.js b/tests/format/flow/flow-repo/auxiliary/lib/lib.js similarity index 100% rename from tests/format/flow-repo/auxiliary/lib/lib.js rename to tests/format/flow/flow-repo/auxiliary/lib/lib.js diff --git a/tests/format/flow-repo/binary/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/binary/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/binary/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/binary/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/binary/format.test.js b/tests/format/flow/flow-repo/binary/format.test.js similarity index 100% rename from tests/format/flow-repo/binary/format.test.js rename to tests/format/flow/flow-repo/binary/format.test.js diff --git a/tests/format/flow-repo/binary/in.js b/tests/format/flow/flow-repo/binary/in.js similarity index 100% rename from tests/format/flow-repo/binary/in.js rename to tests/format/flow/flow-repo/binary/in.js diff --git a/tests/format/flow-repo/binding/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/binding/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/binding/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/binding/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/binding/const.js b/tests/format/flow/flow-repo/binding/const.js similarity index 100% rename from tests/format/flow-repo/binding/const.js rename to tests/format/flow/flow-repo/binding/const.js diff --git a/tests/format/flow-repo/binding/format.test.js b/tests/format/flow/flow-repo/binding/format.test.js similarity index 100% rename from tests/format/flow-repo/binding/format.test.js rename to tests/format/flow/flow-repo/binding/format.test.js diff --git a/tests/format/flow-repo/binding/rebinding.js b/tests/format/flow/flow-repo/binding/rebinding.js similarity index 100% rename from tests/format/flow-repo/binding/rebinding.js rename to tests/format/flow/flow-repo/binding/rebinding.js diff --git a/tests/format/flow-repo/binding/scope.js b/tests/format/flow/flow-repo/binding/scope.js similarity index 100% rename from tests/format/flow-repo/binding/scope.js rename to tests/format/flow/flow-repo/binding/scope.js diff --git a/tests/format/flow-repo/binding/tdz.js b/tests/format/flow/flow-repo/binding/tdz.js similarity index 100% rename from tests/format/flow-repo/binding/tdz.js rename to tests/format/flow/flow-repo/binding/tdz.js diff --git a/tests/format/flow-repo/bom/FormData.js b/tests/format/flow/flow-repo/bom/FormData.js similarity index 100% rename from tests/format/flow-repo/bom/FormData.js rename to tests/format/flow/flow-repo/bom/FormData.js diff --git a/tests/format/flow-repo/bom/MutationObserver.js b/tests/format/flow/flow-repo/bom/MutationObserver.js similarity index 100% rename from tests/format/flow-repo/bom/MutationObserver.js rename to tests/format/flow/flow-repo/bom/MutationObserver.js diff --git a/tests/format/flow-repo/bom/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/bom/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/bom/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/bom/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/bom/format.test.js b/tests/format/flow/flow-repo/bom/format.test.js similarity index 100% rename from tests/format/flow-repo/bom/format.test.js rename to tests/format/flow/flow-repo/bom/format.test.js diff --git a/tests/format/flow-repo/bounded_poly/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/bounded_poly/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/bounded_poly/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/bounded_poly/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/bounded_poly/format.test.js b/tests/format/flow/flow-repo/bounded_poly/format.test.js similarity index 100% rename from tests/format/flow-repo/bounded_poly/format.test.js rename to tests/format/flow/flow-repo/bounded_poly/format.test.js diff --git a/tests/format/flow-repo/bounded_poly/scope.js b/tests/format/flow/flow-repo/bounded_poly/scope.js similarity index 100% rename from tests/format/flow-repo/bounded_poly/scope.js rename to tests/format/flow/flow-repo/bounded_poly/scope.js diff --git a/tests/format/flow-repo/bounded_poly/test.js b/tests/format/flow/flow-repo/bounded_poly/test.js similarity index 100% rename from tests/format/flow-repo/bounded_poly/test.js rename to tests/format/flow/flow-repo/bounded_poly/test.js diff --git a/tests/format/flow-repo/break/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/break/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/break/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/break/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/break/break.js b/tests/format/flow/flow-repo/break/break.js similarity index 100% rename from tests/format/flow-repo/break/break.js rename to tests/format/flow/flow-repo/break/break.js diff --git a/tests/format/flow-repo/break/format.test.js b/tests/format/flow/flow-repo/break/format.test.js similarity index 100% rename from tests/format/flow-repo/break/format.test.js rename to tests/format/flow/flow-repo/break/format.test.js diff --git a/tests/format/flow-repo/builtin_uses/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/builtin_uses/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/builtin_uses/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/builtin_uses/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/builtin_uses/format.test.js b/tests/format/flow/flow-repo/builtin_uses/format.test.js similarity index 100% rename from tests/format/flow-repo/builtin_uses/format.test.js rename to tests/format/flow/flow-repo/builtin_uses/format.test.js diff --git a/tests/format/flow-repo/builtin_uses/test.js b/tests/format/flow/flow-repo/builtin_uses/test.js similarity index 100% rename from tests/format/flow-repo/builtin_uses/test.js rename to tests/format/flow/flow-repo/builtin_uses/test.js diff --git a/tests/format/flow-repo/builtin_uses/test2.js b/tests/format/flow/flow-repo/builtin_uses/test2.js similarity index 100% rename from tests/format/flow-repo/builtin_uses/test2.js rename to tests/format/flow/flow-repo/builtin_uses/test2.js diff --git a/tests/format/flow-repo/builtins/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/builtins/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/builtins/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/builtins/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/builtins/array.js b/tests/format/flow/flow-repo/builtins/array.js similarity index 100% rename from tests/format/flow-repo/builtins/array.js rename to tests/format/flow/flow-repo/builtins/array.js diff --git a/tests/format/flow-repo/builtins/format.test.js b/tests/format/flow/flow-repo/builtins/format.test.js similarity index 100% rename from tests/format/flow-repo/builtins/format.test.js rename to tests/format/flow/flow-repo/builtins/format.test.js diff --git a/tests/format/flow-repo/builtins/genericfoo.js b/tests/format/flow/flow-repo/builtins/genericfoo.js similarity index 100% rename from tests/format/flow-repo/builtins/genericfoo.js rename to tests/format/flow/flow-repo/builtins/genericfoo.js diff --git a/tests/format/flow-repo/call_caching1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/call_caching1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/call_caching1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/call_caching1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/call_caching1/format.test.js b/tests/format/flow/flow-repo/call_caching1/format.test.js similarity index 100% rename from tests/format/flow-repo/call_caching1/format.test.js rename to tests/format/flow/flow-repo/call_caching1/format.test.js diff --git a/tests/format/flow-repo/call_caching1/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/call_caching1/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/call_caching1/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/call_caching1/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/call_caching1/lib/core.js b/tests/format/flow/flow-repo/call_caching1/lib/core.js similarity index 100% rename from tests/format/flow-repo/call_caching1/lib/core.js rename to tests/format/flow/flow-repo/call_caching1/lib/core.js diff --git a/tests/format/flow-repo/call_caching1/lib/format.test.js b/tests/format/flow/flow-repo/call_caching1/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/call_caching1/lib/format.test.js rename to tests/format/flow/flow-repo/call_caching1/lib/format.test.js diff --git a/tests/format/flow-repo/call_caching1/lib/immutable.js b/tests/format/flow/flow-repo/call_caching1/lib/immutable.js similarity index 100% rename from tests/format/flow-repo/call_caching1/lib/immutable.js rename to tests/format/flow/flow-repo/call_caching1/lib/immutable.js diff --git a/tests/format/flow-repo/call_caching1/test.js b/tests/format/flow/flow-repo/call_caching1/test.js similarity index 100% rename from tests/format/flow-repo/call_caching1/test.js rename to tests/format/flow/flow-repo/call_caching1/test.js diff --git a/tests/format/flow-repo/call_caching1/test2.js b/tests/format/flow/flow-repo/call_caching1/test2.js similarity index 100% rename from tests/format/flow-repo/call_caching1/test2.js rename to tests/format/flow/flow-repo/call_caching1/test2.js diff --git a/tests/format/flow-repo/call_caching1/test3.js b/tests/format/flow/flow-repo/call_caching1/test3.js similarity index 100% rename from tests/format/flow-repo/call_caching1/test3.js rename to tests/format/flow/flow-repo/call_caching1/test3.js diff --git a/tests/format/flow-repo/call_caching2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/call_caching2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/call_caching2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/call_caching2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/call_caching2/format.test.js b/tests/format/flow/flow-repo/call_caching2/format.test.js similarity index 100% rename from tests/format/flow-repo/call_caching2/format.test.js rename to tests/format/flow/flow-repo/call_caching2/format.test.js diff --git a/tests/format/flow-repo/call_caching2/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/call_caching2/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/call_caching2/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/call_caching2/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/call_caching2/lib/format.test.js b/tests/format/flow/flow-repo/call_caching2/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/call_caching2/lib/format.test.js rename to tests/format/flow/flow-repo/call_caching2/lib/format.test.js diff --git a/tests/format/flow-repo/call_caching2/lib/immutable.js b/tests/format/flow/flow-repo/call_caching2/lib/immutable.js similarity index 100% rename from tests/format/flow-repo/call_caching2/lib/immutable.js rename to tests/format/flow/flow-repo/call_caching2/lib/immutable.js diff --git a/tests/format/flow-repo/call_caching2/test.js b/tests/format/flow/flow-repo/call_caching2/test.js similarity index 100% rename from tests/format/flow-repo/call_caching2/test.js rename to tests/format/flow/flow-repo/call_caching2/test.js diff --git a/tests/format/flow-repo/call_properties/A.js b/tests/format/flow/flow-repo/call_properties/A.js similarity index 100% rename from tests/format/flow-repo/call_properties/A.js rename to tests/format/flow/flow-repo/call_properties/A.js diff --git a/tests/format/flow-repo/call_properties/B.js b/tests/format/flow/flow-repo/call_properties/B.js similarity index 100% rename from tests/format/flow-repo/call_properties/B.js rename to tests/format/flow/flow-repo/call_properties/B.js diff --git a/tests/format/flow-repo/call_properties/C.js b/tests/format/flow/flow-repo/call_properties/C.js similarity index 100% rename from tests/format/flow-repo/call_properties/C.js rename to tests/format/flow/flow-repo/call_properties/C.js diff --git a/tests/format/flow-repo/call_properties/D.js b/tests/format/flow/flow-repo/call_properties/D.js similarity index 100% rename from tests/format/flow-repo/call_properties/D.js rename to tests/format/flow/flow-repo/call_properties/D.js diff --git a/tests/format/flow-repo/call_properties/E.js b/tests/format/flow/flow-repo/call_properties/E.js similarity index 100% rename from tests/format/flow-repo/call_properties/E.js rename to tests/format/flow/flow-repo/call_properties/E.js diff --git a/tests/format/flow-repo/call_properties/F.js b/tests/format/flow/flow-repo/call_properties/F.js similarity index 100% rename from tests/format/flow-repo/call_properties/F.js rename to tests/format/flow/flow-repo/call_properties/F.js diff --git a/tests/format/flow-repo/call_properties/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/call_properties/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/call_properties/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/call_properties/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/call_properties/format.test.js b/tests/format/flow/flow-repo/call_properties/format.test.js similarity index 100% rename from tests/format/flow-repo/call_properties/format.test.js rename to tests/format/flow/flow-repo/call_properties/format.test.js diff --git a/tests/format/flow-repo/callable/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/callable/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/callable/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/callable/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/callable/format.test.js b/tests/format/flow/flow-repo/callable/format.test.js similarity index 100% rename from tests/format/flow-repo/callable/format.test.js rename to tests/format/flow/flow-repo/callable/format.test.js diff --git a/tests/format/flow-repo/callable/optional.js b/tests/format/flow/flow-repo/callable/optional.js similarity index 100% rename from tests/format/flow-repo/callable/optional.js rename to tests/format/flow/flow-repo/callable/optional.js diff --git a/tests/format/flow-repo/callable/primitives.js b/tests/format/flow/flow-repo/callable/primitives.js similarity index 100% rename from tests/format/flow-repo/callable/primitives.js rename to tests/format/flow/flow-repo/callable/primitives.js diff --git a/tests/format/flow-repo/check-contents/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/check-contents/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/check-contents/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/check-contents/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/check-contents/format.test.js b/tests/format/flow/flow-repo/check-contents/format.test.js similarity index 100% rename from tests/format/flow-repo/check-contents/format.test.js rename to tests/format/flow/flow-repo/check-contents/format.test.js diff --git a/tests/format/flow-repo/check-contents/not_flow.js b/tests/format/flow/flow-repo/check-contents/not_flow.js similarity index 100% rename from tests/format/flow-repo/check-contents/not_flow.js rename to tests/format/flow/flow-repo/check-contents/not_flow.js diff --git a/tests/format/flow-repo/class_fields/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/class_fields/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/class_fields/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/class_fields/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/class_fields/base_class.js b/tests/format/flow/flow-repo/class_fields/base_class.js similarity index 100% rename from tests/format/flow-repo/class_fields/base_class.js rename to tests/format/flow/flow-repo/class_fields/base_class.js diff --git a/tests/format/flow-repo/class_fields/derived_class.js b/tests/format/flow/flow-repo/class_fields/derived_class.js similarity index 100% rename from tests/format/flow-repo/class_fields/derived_class.js rename to tests/format/flow/flow-repo/class_fields/derived_class.js diff --git a/tests/format/flow-repo/class_fields/format.test.js b/tests/format/flow/flow-repo/class_fields/format.test.js similarity index 100% rename from tests/format/flow-repo/class_fields/format.test.js rename to tests/format/flow/flow-repo/class_fields/format.test.js diff --git a/tests/format/flow-repo/class_fields/generic_class.js b/tests/format/flow/flow-repo/class_fields/generic_class.js similarity index 100% rename from tests/format/flow-repo/class_fields/generic_class.js rename to tests/format/flow/flow-repo/class_fields/generic_class.js diff --git a/tests/format/flow-repo/class_fields/scoping.js b/tests/format/flow/flow-repo/class_fields/scoping.js similarity index 100% rename from tests/format/flow-repo/class_fields/scoping.js rename to tests/format/flow/flow-repo/class_fields/scoping.js diff --git a/tests/format/flow-repo/class_method_default_parameters/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/class_method_default_parameters/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/class_method_default_parameters/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/class_method_default_parameters/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/class_method_default_parameters/class_method_default_parameters.js b/tests/format/flow/flow-repo/class_method_default_parameters/class_method_default_parameters.js similarity index 100% rename from tests/format/flow-repo/class_method_default_parameters/class_method_default_parameters.js rename to tests/format/flow/flow-repo/class_method_default_parameters/class_method_default_parameters.js diff --git a/tests/format/flow-repo/class_method_default_parameters/format.test.js b/tests/format/flow/flow-repo/class_method_default_parameters/format.test.js similarity index 100% rename from tests/format/flow-repo/class_method_default_parameters/format.test.js rename to tests/format/flow/flow-repo/class_method_default_parameters/format.test.js diff --git a/tests/format/flow-repo/class_munging/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/class_munging/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/class_munging/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/class_munging/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/class_munging/format.test.js b/tests/format/flow/flow-repo/class_munging/format.test.js similarity index 100% rename from tests/format/flow-repo/class_munging/format.test.js rename to tests/format/flow/flow-repo/class_munging/format.test.js diff --git a/tests/format/flow-repo/class_munging/with_munging.js b/tests/format/flow/flow-repo/class_munging/with_munging.js similarity index 100% rename from tests/format/flow-repo/class_munging/with_munging.js rename to tests/format/flow/flow-repo/class_munging/with_munging.js diff --git a/tests/format/flow-repo/class_munging/without_munging.js b/tests/format/flow/flow-repo/class_munging/without_munging.js similarity index 100% rename from tests/format/flow-repo/class_munging/without_munging.js rename to tests/format/flow/flow-repo/class_munging/without_munging.js diff --git a/tests/format/flow-repo/class_statics/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/class_statics/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/class_statics/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/class_statics/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/class_statics/format.test.js b/tests/format/flow/flow-repo/class_statics/format.test.js similarity index 100% rename from tests/format/flow-repo/class_statics/format.test.js rename to tests/format/flow/flow-repo/class_statics/format.test.js diff --git a/tests/format/flow-repo/class_statics/test.js b/tests/format/flow/flow-repo/class_statics/test.js similarity index 100% rename from tests/format/flow-repo/class_statics/test.js rename to tests/format/flow/flow-repo/class_statics/test.js diff --git a/tests/format/flow-repo/class_subtyping/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/class_subtyping/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/class_subtyping/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/class_subtyping/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/class_subtyping/format.test.js b/tests/format/flow/flow-repo/class_subtyping/format.test.js similarity index 100% rename from tests/format/flow-repo/class_subtyping/format.test.js rename to tests/format/flow/flow-repo/class_subtyping/format.test.js diff --git a/tests/format/flow-repo/class_subtyping/test.js b/tests/format/flow/flow-repo/class_subtyping/test.js similarity index 100% rename from tests/format/flow-repo/class_subtyping/test.js rename to tests/format/flow/flow-repo/class_subtyping/test.js diff --git a/tests/format/flow-repo/class_subtyping/test2.js b/tests/format/flow/flow-repo/class_subtyping/test2.js similarity index 100% rename from tests/format/flow-repo/class_subtyping/test2.js rename to tests/format/flow/flow-repo/class_subtyping/test2.js diff --git a/tests/format/flow-repo/class_subtyping/test3.js b/tests/format/flow/flow-repo/class_subtyping/test3.js similarity index 100% rename from tests/format/flow-repo/class_subtyping/test3.js rename to tests/format/flow/flow-repo/class_subtyping/test3.js diff --git a/tests/format/flow-repo/class_subtyping/test4.js b/tests/format/flow/flow-repo/class_subtyping/test4.js similarity index 100% rename from tests/format/flow-repo/class_subtyping/test4.js rename to tests/format/flow/flow-repo/class_subtyping/test4.js diff --git a/tests/format/flow-repo/class_type/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/class_type/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/class_type/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/class_type/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/class_type/format.test.js b/tests/format/flow/flow-repo/class_type/format.test.js similarity index 100% rename from tests/format/flow-repo/class_type/format.test.js rename to tests/format/flow/flow-repo/class_type/format.test.js diff --git a/tests/format/flow-repo/class_type/test.js b/tests/format/flow/flow-repo/class_type/test.js similarity index 100% rename from tests/format/flow-repo/class_type/test.js rename to tests/format/flow/flow-repo/class_type/test.js diff --git a/tests/format/flow-repo/class_type/test2.js b/tests/format/flow/flow-repo/class_type/test2.js similarity index 100% rename from tests/format/flow-repo/class_type/test2.js rename to tests/format/flow/flow-repo/class_type/test2.js diff --git a/tests/format/flow-repo/classes/A.js b/tests/format/flow/flow-repo/classes/A.js similarity index 100% rename from tests/format/flow-repo/classes/A.js rename to tests/format/flow/flow-repo/classes/A.js diff --git a/tests/format/flow-repo/classes/B.js b/tests/format/flow/flow-repo/classes/B.js similarity index 100% rename from tests/format/flow-repo/classes/B.js rename to tests/format/flow/flow-repo/classes/B.js diff --git a/tests/format/flow-repo/classes/C.js b/tests/format/flow/flow-repo/classes/C.js similarity index 100% rename from tests/format/flow-repo/classes/C.js rename to tests/format/flow/flow-repo/classes/C.js diff --git a/tests/format/flow-repo/classes/D.js b/tests/format/flow/flow-repo/classes/D.js similarity index 100% rename from tests/format/flow-repo/classes/D.js rename to tests/format/flow/flow-repo/classes/D.js diff --git a/tests/format/flow-repo/classes/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/classes/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/classes/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/classes/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/classes/class_shapes.js b/tests/format/flow/flow-repo/classes/class_shapes.js similarity index 100% rename from tests/format/flow-repo/classes/class_shapes.js rename to tests/format/flow/flow-repo/classes/class_shapes.js diff --git a/tests/format/flow-repo/classes/expr.js b/tests/format/flow/flow-repo/classes/expr.js similarity index 100% rename from tests/format/flow-repo/classes/expr.js rename to tests/format/flow/flow-repo/classes/expr.js diff --git a/tests/format/flow-repo/classes/extends_any.js b/tests/format/flow/flow-repo/classes/extends_any.js similarity index 100% rename from tests/format/flow-repo/classes/extends_any.js rename to tests/format/flow/flow-repo/classes/extends_any.js diff --git a/tests/format/flow-repo/classes/format.test.js b/tests/format/flow/flow-repo/classes/format.test.js similarity index 100% rename from tests/format/flow-repo/classes/format.test.js rename to tests/format/flow/flow-repo/classes/format.test.js diff --git a/tests/format/flow-repo/classes/loc.js b/tests/format/flow/flow-repo/classes/loc.js similarity index 100% rename from tests/format/flow-repo/classes/loc.js rename to tests/format/flow/flow-repo/classes/loc.js diff --git a/tests/format/flow-repo/classes/statics.js b/tests/format/flow/flow-repo/classes/statics.js similarity index 100% rename from tests/format/flow-repo/classes/statics.js rename to tests/format/flow/flow-repo/classes/statics.js diff --git a/tests/format/flow-repo/closure/Closure.js b/tests/format/flow/flow-repo/closure/Closure.js similarity index 100% rename from tests/format/flow-repo/closure/Closure.js rename to tests/format/flow/flow-repo/closure/Closure.js diff --git a/tests/format/flow-repo/closure/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/closure/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/closure/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/closure/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/closure/cond_havoc.js b/tests/format/flow/flow-repo/closure/cond_havoc.js similarity index 100% rename from tests/format/flow-repo/closure/cond_havoc.js rename to tests/format/flow/flow-repo/closure/cond_havoc.js diff --git a/tests/format/flow-repo/closure/const.js b/tests/format/flow/flow-repo/closure/const.js similarity index 100% rename from tests/format/flow-repo/closure/const.js rename to tests/format/flow/flow-repo/closure/const.js diff --git a/tests/format/flow-repo/closure/format.test.js b/tests/format/flow/flow-repo/closure/format.test.js similarity index 100% rename from tests/format/flow-repo/closure/format.test.js rename to tests/format/flow/flow-repo/closure/format.test.js diff --git a/tests/format/flow-repo/commonjs/Abs.js b/tests/format/flow/flow-repo/commonjs/Abs.js similarity index 100% rename from tests/format/flow-repo/commonjs/Abs.js rename to tests/format/flow/flow-repo/commonjs/Abs.js diff --git a/tests/format/flow-repo/commonjs/Rel.js b/tests/format/flow/flow-repo/commonjs/Rel.js similarity index 100% rename from tests/format/flow-repo/commonjs/Rel.js rename to tests/format/flow/flow-repo/commonjs/Rel.js diff --git a/tests/format/flow-repo/commonjs/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/commonjs/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/commonjs/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/commonjs/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/commonjs/format.test.js b/tests/format/flow/flow-repo/commonjs/format.test.js similarity index 100% rename from tests/format/flow-repo/commonjs/format.test.js rename to tests/format/flow/flow-repo/commonjs/format.test.js diff --git a/tests/format/flow-repo/computed_props/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/computed_props/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/computed_props/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/computed_props/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/computed_props/format.test.js b/tests/format/flow/flow-repo/computed_props/format.test.js similarity index 100% rename from tests/format/flow-repo/computed_props/format.test.js rename to tests/format/flow/flow-repo/computed_props/format.test.js diff --git a/tests/format/flow-repo/computed_props/test.js b/tests/format/flow/flow-repo/computed_props/test.js similarity index 100% rename from tests/format/flow-repo/computed_props/test.js rename to tests/format/flow/flow-repo/computed_props/test.js diff --git a/tests/format/flow-repo/computed_props/test2.js b/tests/format/flow/flow-repo/computed_props/test2.js similarity index 100% rename from tests/format/flow-repo/computed_props/test2.js rename to tests/format/flow/flow-repo/computed_props/test2.js diff --git a/tests/format/flow-repo/computed_props/test3.js b/tests/format/flow/flow-repo/computed_props/test3.js similarity index 100% rename from tests/format/flow-repo/computed_props/test3.js rename to tests/format/flow/flow-repo/computed_props/test3.js diff --git a/tests/format/flow-repo/computed_props/test4.js b/tests/format/flow/flow-repo/computed_props/test4.js similarity index 100% rename from tests/format/flow-repo/computed_props/test4.js rename to tests/format/flow/flow-repo/computed_props/test4.js diff --git a/tests/format/flow-repo/computed_props/test5.js b/tests/format/flow/flow-repo/computed_props/test5.js similarity index 100% rename from tests/format/flow-repo/computed_props/test5.js rename to tests/format/flow/flow-repo/computed_props/test5.js diff --git a/tests/format/flow-repo/computed_props/test6.js b/tests/format/flow/flow-repo/computed_props/test6.js similarity index 100% rename from tests/format/flow-repo/computed_props/test6.js rename to tests/format/flow/flow-repo/computed_props/test6.js diff --git a/tests/format/flow-repo/computed_props/test7.js b/tests/format/flow/flow-repo/computed_props/test7.js similarity index 100% rename from tests/format/flow-repo/computed_props/test7.js rename to tests/format/flow/flow-repo/computed_props/test7.js diff --git a/tests/format/flow-repo/conditional/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/conditional/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/conditional/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/conditional/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/conditional/conditional.js b/tests/format/flow/flow-repo/conditional/conditional.js similarity index 100% rename from tests/format/flow-repo/conditional/conditional.js rename to tests/format/flow/flow-repo/conditional/conditional.js diff --git a/tests/format/flow-repo/conditional/format.test.js b/tests/format/flow/flow-repo/conditional/format.test.js similarity index 100% rename from tests/format/flow-repo/conditional/format.test.js rename to tests/format/flow/flow-repo/conditional/format.test.js diff --git a/tests/format/flow-repo/config_all/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_all/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_all/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_all/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_all/format.test.js b/tests/format/flow/flow-repo/config_all/format.test.js similarity index 100% rename from tests/format/flow-repo/config_all/format.test.js rename to tests/format/flow/flow-repo/config_all/format.test.js diff --git a/tests/format/flow-repo/config_all/no_at_flow.js b/tests/format/flow/flow-repo/config_all/no_at_flow.js similarity index 100% rename from tests/format/flow-repo/config_all/no_at_flow.js rename to tests/format/flow/flow-repo/config_all/no_at_flow.js diff --git a/tests/format/flow-repo/config_all_false/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_all_false/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_all_false/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_all_false/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_all_false/format.test.js b/tests/format/flow/flow-repo/config_all_false/format.test.js similarity index 100% rename from tests/format/flow-repo/config_all_false/format.test.js rename to tests/format/flow/flow-repo/config_all_false/format.test.js diff --git a/tests/format/flow-repo/config_all_false/no_at_flow.js b/tests/format/flow/flow-repo/config_all_false/no_at_flow.js similarity index 100% rename from tests/format/flow-repo/config_all_false/no_at_flow.js rename to tests/format/flow/flow-repo/config_all_false/no_at_flow.js diff --git a/tests/format/flow-repo/config_all_weak/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_all_weak/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_all_weak/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_all_weak/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_all_weak/format.test.js b/tests/format/flow/flow-repo/config_all_weak/format.test.js similarity index 100% rename from tests/format/flow-repo/config_all_weak/format.test.js rename to tests/format/flow/flow-repo/config_all_weak/format.test.js diff --git a/tests/format/flow-repo/config_all_weak/no_at_flow.js b/tests/format/flow/flow-repo/config_all_weak/no_at_flow.js similarity index 100% rename from tests/format/flow-repo/config_all_weak/no_at_flow.js rename to tests/format/flow/flow-repo/config_all_weak/no_at_flow.js diff --git a/tests/format/flow-repo/config_file_extensions/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_file_extensions/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_file_extensions/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_file_extensions/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_file_extensions/format.test.js b/tests/format/flow/flow-repo/config_file_extensions/format.test.js similarity index 100% rename from tests/format/flow-repo/config_file_extensions/format.test.js rename to tests/format/flow/flow-repo/config_file_extensions/format.test.js diff --git a/tests/format/flow-repo/config_file_extensions/test.js b/tests/format/flow/flow-repo/config_file_extensions/test.js similarity index 100% rename from tests/format/flow-repo/config_file_extensions/test.js rename to tests/format/flow/flow-repo/config_file_extensions/test.js diff --git a/tests/format/flow-repo/config_ignore/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_ignore/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_ignore/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_ignore/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_ignore/dir/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_ignore/dir/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_ignore/dir/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_ignore/dir/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_ignore/dir/foo.js b/tests/format/flow/flow-repo/config_ignore/dir/foo.js similarity index 100% rename from tests/format/flow-repo/config_ignore/dir/foo.js rename to tests/format/flow/flow-repo/config_ignore/dir/foo.js diff --git a/tests/format/flow-repo/config_ignore/dir/format.test.js b/tests/format/flow/flow-repo/config_ignore/dir/format.test.js similarity index 100% rename from tests/format/flow-repo/config_ignore/dir/format.test.js rename to tests/format/flow/flow-repo/config_ignore/dir/format.test.js diff --git a/tests/format/flow-repo/config_ignore/foo.js b/tests/format/flow/flow-repo/config_ignore/foo.js similarity index 100% rename from tests/format/flow-repo/config_ignore/foo.js rename to tests/format/flow/flow-repo/config_ignore/foo.js diff --git a/tests/format/flow-repo/config_ignore/format.test.js b/tests/format/flow/flow-repo/config_ignore/format.test.js similarity index 100% rename from tests/format/flow-repo/config_ignore/format.test.js rename to tests/format/flow/flow-repo/config_ignore/format.test.js diff --git a/tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/format.test.js b/tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/format.test.js rename to tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/format.test.js diff --git a/tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/main.js b/tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/main.js similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/main.js rename to tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/main.js diff --git a/tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/format.test.js b/tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/format.test.js rename to tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/format.test.js diff --git a/tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/testmodule.js b/tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/testmodule.js similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/testmodule.js rename to tests/format/flow/flow-repo/config_module_name_mapper_PROJECT_ROOT-1.0/src/testmodule.js diff --git a/tests/format/flow-repo/config_module_name_mapper_filetype/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_name_mapper_filetype/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_filetype/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_name_mapper_filetype/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_name_mapper_filetype/format.test.js b/tests/format/flow/flow-repo/config_module_name_mapper_filetype/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_filetype/format.test.js rename to tests/format/flow/flow-repo/config_module_name_mapper_filetype/format.test.js diff --git a/tests/format/flow-repo/config_module_name_mapper_filetype/test.js b/tests/format/flow/flow-repo/config_module_name_mapper_filetype/test.js similarity index 100% rename from tests/format/flow-repo/config_module_name_mapper_filetype/test.js rename to tests/format/flow/flow-repo/config_module_name_mapper_filetype/test.js diff --git a/tests/format/flow-repo/config_module_name_rewrite_haste/A.js b/tests/format/flow/flow-repo/config_module_name_rewrite_haste/A.js similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_haste/A.js rename to tests/format/flow/flow-repo/config_module_name_rewrite_haste/A.js diff --git a/tests/format/flow-repo/config_module_name_rewrite_haste/Exists.js b/tests/format/flow/flow-repo/config_module_name_rewrite_haste/Exists.js similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_haste/Exists.js rename to tests/format/flow/flow-repo/config_module_name_rewrite_haste/Exists.js diff --git a/tests/format/flow-repo/config_module_name_rewrite_haste/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_name_rewrite_haste/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_haste/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_name_rewrite_haste/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_name_rewrite_haste/format.test.js b/tests/format/flow/flow-repo/config_module_name_rewrite_haste/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_haste/format.test.js rename to tests/format/flow/flow-repo/config_module_name_rewrite_haste/format.test.js diff --git a/tests/format/flow-repo/config_module_name_rewrite_node/A.js b/tests/format/flow/flow-repo/config_module_name_rewrite_node/A.js similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_node/A.js rename to tests/format/flow/flow-repo/config_module_name_rewrite_node/A.js diff --git a/tests/format/flow-repo/config_module_name_rewrite_node/Exists.js b/tests/format/flow/flow-repo/config_module_name_rewrite_node/Exists.js similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_node/Exists.js rename to tests/format/flow/flow-repo/config_module_name_rewrite_node/Exists.js diff --git a/tests/format/flow-repo/config_module_name_rewrite_node/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_name_rewrite_node/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_node/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_name_rewrite_node/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_name_rewrite_node/format.test.js b/tests/format/flow/flow-repo/config_module_name_rewrite_node/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_name_rewrite_node/format.test.js rename to tests/format/flow/flow-repo/config_module_name_rewrite_node/format.test.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/format.test.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/format.test.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/format.test.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/index.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/index.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/index.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj/index.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/format.test.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/format.test.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/format.test.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/index.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/index.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/index.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/custom_resolve_dir/testproj2/index.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/format.test.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/format.test.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/format.test.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/format.test.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/format.test.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/format.test.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/index.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/index.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/index.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/custom_resolve_dir/testproj2/index.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/format.test.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/format.test.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/format.test.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/format.test.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/sublevel.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/sublevel.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/subdir/sublevel.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/subdir/sublevel.js diff --git a/tests/format/flow-repo/config_module_system_node_resolve_dirname/toplevel.js b/tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/toplevel.js similarity index 100% rename from tests/format/flow-repo/config_module_system_node_resolve_dirname/toplevel.js rename to tests/format/flow/flow-repo/config_module_system_node_resolve_dirname/toplevel.js diff --git a/tests/format/flow-repo/config_munging_underscores/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_munging_underscores/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_munging_underscores/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_munging_underscores/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_munging_underscores/chain.js b/tests/format/flow/flow-repo/config_munging_underscores/chain.js similarity index 100% rename from tests/format/flow-repo/config_munging_underscores/chain.js rename to tests/format/flow/flow-repo/config_munging_underscores/chain.js diff --git a/tests/format/flow-repo/config_munging_underscores/commonjs_export.js b/tests/format/flow/flow-repo/config_munging_underscores/commonjs_export.js similarity index 100% rename from tests/format/flow-repo/config_munging_underscores/commonjs_export.js rename to tests/format/flow/flow-repo/config_munging_underscores/commonjs_export.js diff --git a/tests/format/flow-repo/config_munging_underscores/commonjs_import.js b/tests/format/flow/flow-repo/config_munging_underscores/commonjs_import.js similarity index 100% rename from tests/format/flow-repo/config_munging_underscores/commonjs_import.js rename to tests/format/flow/flow-repo/config_munging_underscores/commonjs_import.js diff --git a/tests/format/flow-repo/config_munging_underscores/format.test.js b/tests/format/flow/flow-repo/config_munging_underscores/format.test.js similarity index 100% rename from tests/format/flow-repo/config_munging_underscores/format.test.js rename to tests/format/flow/flow-repo/config_munging_underscores/format.test.js diff --git a/tests/format/flow-repo/config_munging_underscores2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/config_munging_underscores2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/config_munging_underscores2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/config_munging_underscores2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/config_munging_underscores2/chain.js b/tests/format/flow/flow-repo/config_munging_underscores2/chain.js similarity index 100% rename from tests/format/flow-repo/config_munging_underscores2/chain.js rename to tests/format/flow/flow-repo/config_munging_underscores2/chain.js diff --git a/tests/format/flow-repo/config_munging_underscores2/format.test.js b/tests/format/flow/flow-repo/config_munging_underscores2/format.test.js similarity index 100% rename from tests/format/flow-repo/config_munging_underscores2/format.test.js rename to tests/format/flow/flow-repo/config_munging_underscores2/format.test.js diff --git a/tests/format/flow-repo/const_params/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/const_params/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/const_params/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/const_params/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/const_params/format.test.js b/tests/format/flow/flow-repo/const_params/format.test.js similarity index 100% rename from tests/format/flow-repo/const_params/format.test.js rename to tests/format/flow/flow-repo/const_params/format.test.js diff --git a/tests/format/flow-repo/const_params/test.js b/tests/format/flow/flow-repo/const_params/test.js similarity index 100% rename from tests/format/flow-repo/const_params/test.js rename to tests/format/flow/flow-repo/const_params/test.js diff --git a/tests/format/flow-repo/constructor/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/constructor/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/constructor/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/constructor/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/constructor/constructor.js b/tests/format/flow/flow-repo/constructor/constructor.js similarity index 100% rename from tests/format/flow-repo/constructor/constructor.js rename to tests/format/flow/flow-repo/constructor/constructor.js diff --git a/tests/format/flow-repo/constructor/format.test.js b/tests/format/flow/flow-repo/constructor/format.test.js similarity index 100% rename from tests/format/flow-repo/constructor/format.test.js rename to tests/format/flow/flow-repo/constructor/format.test.js diff --git a/tests/format/flow-repo/constructor_annots/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/constructor_annots/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/constructor_annots/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/constructor_annots/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/constructor_annots/constructors.js b/tests/format/flow/flow-repo/constructor_annots/constructors.js similarity index 100% rename from tests/format/flow-repo/constructor_annots/constructors.js rename to tests/format/flow/flow-repo/constructor_annots/constructors.js diff --git a/tests/format/flow-repo/constructor_annots/format.test.js b/tests/format/flow/flow-repo/constructor_annots/format.test.js similarity index 100% rename from tests/format/flow-repo/constructor_annots/format.test.js rename to tests/format/flow/flow-repo/constructor_annots/format.test.js diff --git a/tests/format/flow-repo/constructor_annots/test.js b/tests/format/flow/flow-repo/constructor_annots/test.js similarity index 100% rename from tests/format/flow-repo/constructor_annots/test.js rename to tests/format/flow/flow-repo/constructor_annots/test.js diff --git a/tests/format/flow-repo/contents/ignore/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/contents/ignore/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/contents/ignore/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/contents/ignore/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/contents/ignore/dummy.js b/tests/format/flow/flow-repo/contents/ignore/dummy.js similarity index 100% rename from tests/format/flow-repo/contents/ignore/dummy.js rename to tests/format/flow/flow-repo/contents/ignore/dummy.js diff --git a/tests/format/flow-repo/contents/ignore/format.test.js b/tests/format/flow/flow-repo/contents/ignore/format.test.js similarity index 100% rename from tests/format/flow-repo/contents/ignore/format.test.js rename to tests/format/flow/flow-repo/contents/ignore/format.test.js diff --git a/tests/format/flow-repo/contents/ignore/test.js b/tests/format/flow/flow-repo/contents/ignore/test.js similarity index 100% rename from tests/format/flow-repo/contents/ignore/test.js rename to tests/format/flow/flow-repo/contents/ignore/test.js diff --git a/tests/format/flow-repo/contents/no_flow/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/contents/no_flow/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/contents/no_flow/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/contents/no_flow/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/contents/no_flow/dummy.js b/tests/format/flow/flow-repo/contents/no_flow/dummy.js similarity index 100% rename from tests/format/flow-repo/contents/no_flow/dummy.js rename to tests/format/flow/flow-repo/contents/no_flow/dummy.js diff --git a/tests/format/flow-repo/contents/no_flow/format.test.js b/tests/format/flow/flow-repo/contents/no_flow/format.test.js similarity index 100% rename from tests/format/flow-repo/contents/no_flow/format.test.js rename to tests/format/flow/flow-repo/contents/no_flow/format.test.js diff --git a/tests/format/flow-repo/contents/no_flow/test.js b/tests/format/flow/flow-repo/contents/no_flow/test.js similarity index 100% rename from tests/format/flow-repo/contents/no_flow/test.js rename to tests/format/flow/flow-repo/contents/no_flow/test.js diff --git a/tests/format/flow-repo/core_tests/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/core_tests/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/core_tests/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/core_tests/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/core_tests/boolean.js b/tests/format/flow/flow-repo/core_tests/boolean.js similarity index 100% rename from tests/format/flow-repo/core_tests/boolean.js rename to tests/format/flow/flow-repo/core_tests/boolean.js diff --git a/tests/format/flow-repo/core_tests/format.test.js b/tests/format/flow/flow-repo/core_tests/format.test.js similarity index 100% rename from tests/format/flow-repo/core_tests/format.test.js rename to tests/format/flow/flow-repo/core_tests/format.test.js diff --git a/tests/format/flow-repo/core_tests/map.js b/tests/format/flow/flow-repo/core_tests/map.js similarity index 100% rename from tests/format/flow-repo/core_tests/map.js rename to tests/format/flow/flow-repo/core_tests/map.js diff --git a/tests/format/flow-repo/core_tests/regexp.js b/tests/format/flow/flow-repo/core_tests/regexp.js similarity index 100% rename from tests/format/flow-repo/core_tests/regexp.js rename to tests/format/flow/flow-repo/core_tests/regexp.js diff --git a/tests/format/flow-repo/core_tests/weakset.js b/tests/format/flow/flow-repo/core_tests/weakset.js similarity index 100% rename from tests/format/flow-repo/core_tests/weakset.js rename to tests/format/flow/flow-repo/core_tests/weakset.js diff --git a/tests/format/flow-repo/covariance/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/covariance/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/covariance/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/covariance/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/covariance/format.test.js b/tests/format/flow/flow-repo/covariance/format.test.js similarity index 100% rename from tests/format/flow-repo/covariance/format.test.js rename to tests/format/flow/flow-repo/covariance/format.test.js diff --git a/tests/format/flow-repo/covariance/test.js b/tests/format/flow/flow-repo/covariance/test.js similarity index 100% rename from tests/format/flow-repo/covariance/test.js rename to tests/format/flow/flow-repo/covariance/test.js diff --git a/tests/format/flow-repo/coverage/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/coverage/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/coverage/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/coverage/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/coverage/crash.js b/tests/format/flow/flow-repo/coverage/crash.js similarity index 100% rename from tests/format/flow-repo/coverage/crash.js rename to tests/format/flow/flow-repo/coverage/crash.js diff --git a/tests/format/flow-repo/coverage/declare_module.js b/tests/format/flow/flow-repo/coverage/declare_module.js similarity index 100% rename from tests/format/flow-repo/coverage/declare_module.js rename to tests/format/flow/flow-repo/coverage/declare_module.js diff --git a/tests/format/flow-repo/coverage/format.test.js b/tests/format/flow/flow-repo/coverage/format.test.js similarity index 100% rename from tests/format/flow-repo/coverage/format.test.js rename to tests/format/flow/flow-repo/coverage/format.test.js diff --git a/tests/format/flow-repo/coverage/no_pragma.js b/tests/format/flow/flow-repo/coverage/no_pragma.js similarity index 100% rename from tests/format/flow-repo/coverage/no_pragma.js rename to tests/format/flow/flow-repo/coverage/no_pragma.js diff --git a/tests/format/flow-repo/coverage/non-termination.js b/tests/format/flow/flow-repo/coverage/non-termination.js similarity index 100% rename from tests/format/flow-repo/coverage/non-termination.js rename to tests/format/flow/flow-repo/coverage/non-termination.js diff --git a/tests/format/flow-repo/cycle/A.js b/tests/format/flow/flow-repo/cycle/A.js similarity index 100% rename from tests/format/flow-repo/cycle/A.js rename to tests/format/flow/flow-repo/cycle/A.js diff --git a/tests/format/flow-repo/cycle/B.js b/tests/format/flow/flow-repo/cycle/B.js similarity index 100% rename from tests/format/flow-repo/cycle/B.js rename to tests/format/flow/flow-repo/cycle/B.js diff --git a/tests/format/flow-repo/cycle/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/cycle/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/cycle/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/cycle/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/cycle/format.test.js b/tests/format/flow/flow-repo/cycle/format.test.js similarity index 100% rename from tests/format/flow-repo/cycle/format.test.js rename to tests/format/flow/flow-repo/cycle/format.test.js diff --git a/tests/format/flow-repo/date/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/date/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/date/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/date/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/date/date.js b/tests/format/flow/flow-repo/date/date.js similarity index 100% rename from tests/format/flow-repo/date/date.js rename to tests/format/flow/flow-repo/date/date.js diff --git a/tests/format/flow-repo/date/format.test.js b/tests/format/flow/flow-repo/date/format.test.js similarity index 100% rename from tests/format/flow-repo/date/format.test.js rename to tests/format/flow/flow-repo/date/format.test.js diff --git a/tests/format/flow-repo/declaration_files_haste/ExplicitProvidesModuleDifferentName.js b/tests/format/flow/flow-repo/declaration_files_haste/ExplicitProvidesModuleDifferentName.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ExplicitProvidesModuleDifferentName.js rename to tests/format/flow/flow-repo/declaration_files_haste/ExplicitProvidesModuleDifferentName.js diff --git a/tests/format/flow-repo/declaration_files_haste/ExplicitProvidesModuleSameName.js b/tests/format/flow/flow-repo/declaration_files_haste/ExplicitProvidesModuleSameName.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ExplicitProvidesModuleSameName.js rename to tests/format/flow/flow-repo/declaration_files_haste/ExplicitProvidesModuleSameName.js diff --git a/tests/format/flow-repo/declaration_files_haste/ImplicitProvidesModule.js b/tests/format/flow/flow-repo/declaration_files_haste/ImplicitProvidesModule.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ImplicitProvidesModule.js rename to tests/format/flow/flow-repo/declaration_files_haste/ImplicitProvidesModule.js diff --git a/tests/format/flow-repo/declaration_files_haste/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_haste/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_haste/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_haste/external/_d3/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_haste/external/_d3/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/external/_d3/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_haste/external/_d3/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_haste/external/_d3/format.test.js b/tests/format/flow/flow-repo/declaration_files_haste/external/_d3/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/external/_d3/format.test.js rename to tests/format/flow/flow-repo/declaration_files_haste/external/_d3/format.test.js diff --git a/tests/format/flow-repo/declaration_files_haste/external/_d3/min.js b/tests/format/flow/flow-repo/declaration_files_haste/external/_d3/min.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/external/_d3/min.js rename to tests/format/flow/flow-repo/declaration_files_haste/external/_d3/min.js diff --git a/tests/format/flow-repo/declaration_files_haste/foo/bar/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_haste/foo/bar/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/foo/bar/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_haste/foo/bar/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_haste/foo/bar/format.test.js b/tests/format/flow/flow-repo/declaration_files_haste/foo/bar/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/foo/bar/format.test.js rename to tests/format/flow/flow-repo/declaration_files_haste/foo/bar/format.test.js diff --git a/tests/format/flow-repo/declaration_files_haste/foo/bar/nested_test.js b/tests/format/flow/flow-repo/declaration_files_haste/foo/bar/nested_test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/foo/bar/nested_test.js rename to tests/format/flow/flow-repo/declaration_files_haste/foo/bar/nested_test.js diff --git a/tests/format/flow-repo/declaration_files_haste/format.test.js b/tests/format/flow/flow-repo/declaration_files_haste/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/format.test.js rename to tests/format/flow/flow-repo/declaration_files_haste/format.test.js diff --git a/tests/format/flow-repo/declaration_files_haste/md5.js b/tests/format/flow/flow-repo/declaration_files_haste/md5.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/md5.js rename to tests/format/flow/flow-repo/declaration_files_haste/md5.js diff --git a/tests/format/flow-repo/declaration_files_haste/test.js b/tests/format/flow/flow-repo/declaration_files_haste/test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/test.js rename to tests/format/flow/flow-repo/declaration_files_haste/test.js diff --git a/tests/format/flow-repo/declaration_files_haste/ws/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_haste/ws/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ws/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_haste/ws/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_haste/ws/format.test.js b/tests/format/flow/flow-repo/declaration_files_haste/ws/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ws/format.test.js rename to tests/format/flow/flow-repo/declaration_files_haste/ws/format.test.js diff --git a/tests/format/flow-repo/declaration_files_haste/ws/index.js b/tests/format/flow/flow-repo/declaration_files_haste/ws/index.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ws/index.js rename to tests/format/flow/flow-repo/declaration_files_haste/ws/index.js diff --git a/tests/format/flow-repo/declaration_files_haste/ws/test/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_haste/ws/test/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ws/test/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_haste/ws/test/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_haste/ws/test/client.js b/tests/format/flow/flow-repo/declaration_files_haste/ws/test/client.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ws/test/client.js rename to tests/format/flow/flow-repo/declaration_files_haste/ws/test/client.js diff --git a/tests/format/flow-repo/declaration_files_haste/ws/test/format.test.js b/tests/format/flow/flow-repo/declaration_files_haste/ws/test/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_haste/ws/test/format.test.js rename to tests/format/flow/flow-repo/declaration_files_haste/ws/test/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/A.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/A.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/A.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/A.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleDifferentName.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleDifferentName.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleDifferentName.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleDifferentName.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleSameName.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleSameName.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleSameName.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ExplicitProvidesModuleSameName.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ImplicitProvidesModule.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ImplicitProvidesModule.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ImplicitProvidesModule.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ImplicitProvidesModule.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_haste/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/external/_d3/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_haste/external/_d3/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/external/_d3/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/external/_d3/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/external/_d3/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/external/_d3/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/external/_d3/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/external/_d3/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/external/_d3/min.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/external/_d3/min.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/external/_d3/min.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/external/_d3/min.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/foo/bar/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_haste/foo/bar/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/foo/bar/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/foo/bar/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/foo/bar/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/foo/bar/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/foo/bar/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/foo/bar/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/foo/bar/nested_test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/foo/bar/nested_test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/foo/bar/nested_test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/foo/bar/nested_test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/md5.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/md5.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/md5.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/md5.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ws/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ws/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ws/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ws/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ws/index.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/index.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ws/index.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/index.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ws/test/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/test/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ws/test/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/test/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ws/test/client.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/test/client.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ws/test/client.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/test/client.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste/ws/test/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/test/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste/ws/test/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste/ws/test/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/A.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/A.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/A.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/A.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/index.js b/tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/index.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_haste_name_reducers/index.js rename to tests/format/flow/flow-repo/declaration_files_incremental_haste_name_reducers/index.js diff --git a/tests/format/flow-repo/declaration_files_incremental_node/A.js b/tests/format/flow/flow-repo/declaration_files_incremental_node/A.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_node/A.js rename to tests/format/flow/flow-repo/declaration_files_incremental_node/A.js diff --git a/tests/format/flow-repo/declaration_files_incremental_node/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_incremental_node/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_node/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_incremental_node/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_incremental_node/format.test.js b/tests/format/flow/flow-repo/declaration_files_incremental_node/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_node/format.test.js rename to tests/format/flow/flow-repo/declaration_files_incremental_node/format.test.js diff --git a/tests/format/flow-repo/declaration_files_incremental_node/test_absolute.js b/tests/format/flow/flow-repo/declaration_files_incremental_node/test_absolute.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_node/test_absolute.js rename to tests/format/flow/flow-repo/declaration_files_incremental_node/test_absolute.js diff --git a/tests/format/flow-repo/declaration_files_incremental_node/test_relative.js b/tests/format/flow/flow-repo/declaration_files_incremental_node/test_relative.js similarity index 100% rename from tests/format/flow-repo/declaration_files_incremental_node/test_relative.js rename to tests/format/flow/flow-repo/declaration_files_incremental_node/test_relative.js diff --git a/tests/format/flow-repo/declaration_files_node/A.js b/tests/format/flow/flow-repo/declaration_files_node/A.js similarity index 100% rename from tests/format/flow-repo/declaration_files_node/A.js rename to tests/format/flow/flow-repo/declaration_files_node/A.js diff --git a/tests/format/flow-repo/declaration_files_node/CJS.js b/tests/format/flow/flow-repo/declaration_files_node/CJS.js similarity index 100% rename from tests/format/flow-repo/declaration_files_node/CJS.js rename to tests/format/flow/flow-repo/declaration_files_node/CJS.js diff --git a/tests/format/flow-repo/declaration_files_node/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declaration_files_node/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declaration_files_node/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declaration_files_node/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declaration_files_node/format.test.js b/tests/format/flow/flow-repo/declaration_files_node/format.test.js similarity index 100% rename from tests/format/flow-repo/declaration_files_node/format.test.js rename to tests/format/flow/flow-repo/declaration_files_node/format.test.js diff --git a/tests/format/flow-repo/declaration_files_node/test_absolute.js b/tests/format/flow/flow-repo/declaration_files_node/test_absolute.js similarity index 100% rename from tests/format/flow-repo/declaration_files_node/test_absolute.js rename to tests/format/flow/flow-repo/declaration_files_node/test_absolute.js diff --git a/tests/format/flow-repo/declaration_files_node/test_relative.js b/tests/format/flow/flow-repo/declaration_files_node/test_relative.js similarity index 100% rename from tests/format/flow-repo/declaration_files_node/test_relative.js rename to tests/format/flow/flow-repo/declaration_files_node/test_relative.js diff --git a/tests/format/flow-repo/declare_class/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_class/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_class/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_class/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_class/declare_class.js b/tests/format/flow/flow-repo/declare_class/declare_class.js similarity index 100% rename from tests/format/flow-repo/declare_class/declare_class.js rename to tests/format/flow/flow-repo/declare_class/declare_class.js diff --git a/tests/format/flow-repo/declare_class/format.test.js b/tests/format/flow/flow-repo/declare_class/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_class/format.test.js rename to tests/format/flow/flow-repo/declare_class/format.test.js diff --git a/tests/format/flow-repo/declare_class/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_class/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_class/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_class/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_class/lib/format.test.js b/tests/format/flow/flow-repo/declare_class/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_class/lib/format.test.js rename to tests/format/flow/flow-repo/declare_class/lib/format.test.js diff --git a/tests/format/flow-repo/declare_class/lib/test.js b/tests/format/flow/flow-repo/declare_class/lib/test.js similarity index 100% rename from tests/format/flow-repo/declare_class/lib/test.js rename to tests/format/flow/flow-repo/declare_class/lib/test.js diff --git a/tests/format/flow-repo/declare_export/B.js b/tests/format/flow/flow-repo/declare_export/B.js similarity index 100% rename from tests/format/flow-repo/declare_export/B.js rename to tests/format/flow/flow-repo/declare_export/B.js diff --git a/tests/format/flow-repo/declare_export/C.js b/tests/format/flow/flow-repo/declare_export/C.js similarity index 100% rename from tests/format/flow-repo/declare_export/C.js rename to tests/format/flow/flow-repo/declare_export/C.js diff --git a/tests/format/flow-repo/declare_export/CommonJS_Clobbering_Class.js b/tests/format/flow/flow-repo/declare_export/CommonJS_Clobbering_Class.js similarity index 100% rename from tests/format/flow-repo/declare_export/CommonJS_Clobbering_Class.js rename to tests/format/flow/flow-repo/declare_export/CommonJS_Clobbering_Class.js diff --git a/tests/format/flow-repo/declare_export/CommonJS_Clobbering_Lit.js b/tests/format/flow/flow-repo/declare_export/CommonJS_Clobbering_Lit.js similarity index 100% rename from tests/format/flow-repo/declare_export/CommonJS_Clobbering_Lit.js rename to tests/format/flow/flow-repo/declare_export/CommonJS_Clobbering_Lit.js diff --git a/tests/format/flow-repo/declare_export/CommonJS_Named.js b/tests/format/flow/flow-repo/declare_export/CommonJS_Named.js similarity index 100% rename from tests/format/flow-repo/declare_export/CommonJS_Named.js rename to tests/format/flow/flow-repo/declare_export/CommonJS_Named.js diff --git a/tests/format/flow-repo/declare_export/ES6_DefaultAndNamed.js b/tests/format/flow/flow-repo/declare_export/ES6_DefaultAndNamed.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_DefaultAndNamed.js rename to tests/format/flow/flow-repo/declare_export/ES6_DefaultAndNamed.js diff --git a/tests/format/flow-repo/declare_export/ES6_Default_AnonFunction1.js b/tests/format/flow/flow-repo/declare_export/ES6_Default_AnonFunction1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Default_AnonFunction1.js rename to tests/format/flow/flow-repo/declare_export/ES6_Default_AnonFunction1.js diff --git a/tests/format/flow-repo/declare_export/ES6_Default_AnonFunction2.js b/tests/format/flow/flow-repo/declare_export/ES6_Default_AnonFunction2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Default_AnonFunction2.js rename to tests/format/flow/flow-repo/declare_export/ES6_Default_AnonFunction2.js diff --git a/tests/format/flow-repo/declare_export/ES6_Default_NamedClass1.js b/tests/format/flow/flow-repo/declare_export/ES6_Default_NamedClass1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Default_NamedClass1.js rename to tests/format/flow/flow-repo/declare_export/ES6_Default_NamedClass1.js diff --git a/tests/format/flow-repo/declare_export/ES6_Default_NamedClass2.js b/tests/format/flow/flow-repo/declare_export/ES6_Default_NamedClass2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Default_NamedClass2.js rename to tests/format/flow/flow-repo/declare_export/ES6_Default_NamedClass2.js diff --git a/tests/format/flow-repo/declare_export/ES6_Default_NamedFunction1.js b/tests/format/flow/flow-repo/declare_export/ES6_Default_NamedFunction1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Default_NamedFunction1.js rename to tests/format/flow/flow-repo/declare_export/ES6_Default_NamedFunction1.js diff --git a/tests/format/flow-repo/declare_export/ES6_Default_NamedFunction2.js b/tests/format/flow/flow-repo/declare_export/ES6_Default_NamedFunction2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Default_NamedFunction2.js rename to tests/format/flow/flow-repo/declare_export/ES6_Default_NamedFunction2.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportAllFromMulti.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportAllFromMulti.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportAllFromMulti.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportAllFromMulti.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary1.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary1.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary1.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary2.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary2.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Intermediary2.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Source1.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Source1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Source1.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Source1.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Source2.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Source2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportAllFrom_Source2.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportAllFrom_Source2.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportFrom_Intermediary1.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Intermediary1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportFrom_Intermediary1.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Intermediary1.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportFrom_Intermediary2.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Intermediary2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportFrom_Intermediary2.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Intermediary2.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportFrom_Source1.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Source1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportFrom_Source1.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Source1.js diff --git a/tests/format/flow-repo/declare_export/ES6_ExportFrom_Source2.js b/tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Source2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_ExportFrom_Source2.js rename to tests/format/flow/flow-repo/declare_export/ES6_ExportFrom_Source2.js diff --git a/tests/format/flow-repo/declare_export/ES6_Named1.js b/tests/format/flow/flow-repo/declare_export/ES6_Named1.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Named1.js rename to tests/format/flow/flow-repo/declare_export/ES6_Named1.js diff --git a/tests/format/flow-repo/declare_export/ES6_Named2.js b/tests/format/flow/flow-repo/declare_export/ES6_Named2.js similarity index 100% rename from tests/format/flow-repo/declare_export/ES6_Named2.js rename to tests/format/flow/flow-repo/declare_export/ES6_Named2.js diff --git a/tests/format/flow-repo/declare_export/ProvidesModuleA.js b/tests/format/flow/flow-repo/declare_export/ProvidesModuleA.js similarity index 100% rename from tests/format/flow-repo/declare_export/ProvidesModuleA.js rename to tests/format/flow/flow-repo/declare_export/ProvidesModuleA.js diff --git a/tests/format/flow-repo/declare_export/ProvidesModuleCJSDefault.js b/tests/format/flow/flow-repo/declare_export/ProvidesModuleCJSDefault.js similarity index 100% rename from tests/format/flow-repo/declare_export/ProvidesModuleCJSDefault.js rename to tests/format/flow/flow-repo/declare_export/ProvidesModuleCJSDefault.js diff --git a/tests/format/flow-repo/declare_export/ProvidesModuleD.js b/tests/format/flow/flow-repo/declare_export/ProvidesModuleD.js similarity index 100% rename from tests/format/flow-repo/declare_export/ProvidesModuleD.js rename to tests/format/flow/flow-repo/declare_export/ProvidesModuleD.js diff --git a/tests/format/flow-repo/declare_export/ProvidesModuleES6Default.js b/tests/format/flow/flow-repo/declare_export/ProvidesModuleES6Default.js similarity index 100% rename from tests/format/flow-repo/declare_export/ProvidesModuleES6Default.js rename to tests/format/flow/flow-repo/declare_export/ProvidesModuleES6Default.js diff --git a/tests/format/flow-repo/declare_export/SideEffects.js b/tests/format/flow/flow-repo/declare_export/SideEffects.js similarity index 100% rename from tests/format/flow-repo/declare_export/SideEffects.js rename to tests/format/flow/flow-repo/declare_export/SideEffects.js diff --git a/tests/format/flow-repo/declare_export/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_export/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_export/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_export/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_export/es6modules.js b/tests/format/flow/flow-repo/declare_export/es6modules.js similarity index 100% rename from tests/format/flow-repo/declare_export/es6modules.js rename to tests/format/flow/flow-repo/declare_export/es6modules.js diff --git a/tests/format/flow-repo/declare_export/format.test.js b/tests/format/flow/flow-repo/declare_export/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_export/format.test.js rename to tests/format/flow/flow-repo/declare_export/format.test.js diff --git a/tests/format/flow-repo/declare_fun/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_fun/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_fun/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_fun/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_fun/format.test.js b/tests/format/flow/flow-repo/declare_fun/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_fun/format.test.js rename to tests/format/flow/flow-repo/declare_fun/format.test.js diff --git a/tests/format/flow-repo/declare_fun/test.js b/tests/format/flow/flow-repo/declare_fun/test.js similarity index 100% rename from tests/format/flow-repo/declare_fun/test.js rename to tests/format/flow/flow-repo/declare_fun/test.js diff --git a/tests/format/flow-repo/declare_module_exports/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_module_exports/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_module_exports/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_module_exports/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_module_exports/flow-typed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_module_exports/flow-typed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_module_exports/flow-typed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_module_exports/flow-typed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_module_exports/flow-typed/format.test.js b/tests/format/flow/flow-repo/declare_module_exports/flow-typed/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_module_exports/flow-typed/format.test.js rename to tests/format/flow/flow-repo/declare_module_exports/flow-typed/format.test.js diff --git a/tests/format/flow-repo/declare_module_exports/flow-typed/libs.js b/tests/format/flow/flow-repo/declare_module_exports/flow-typed/libs.js similarity index 100% rename from tests/format/flow-repo/declare_module_exports/flow-typed/libs.js rename to tests/format/flow/flow-repo/declare_module_exports/flow-typed/libs.js diff --git a/tests/format/flow-repo/declare_module_exports/format.test.js b/tests/format/flow/flow-repo/declare_module_exports/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_module_exports/format.test.js rename to tests/format/flow/flow-repo/declare_module_exports/format.test.js diff --git a/tests/format/flow-repo/declare_module_exports/main.js b/tests/format/flow/flow-repo/declare_module_exports/main.js similarity index 100% rename from tests/format/flow-repo/declare_module_exports/main.js rename to tests/format/flow/flow-repo/declare_module_exports/main.js diff --git a/tests/format/flow-repo/declare_type/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_type/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_type/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_type/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_type/format.test.js b/tests/format/flow/flow-repo/declare_type/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_type/format.test.js rename to tests/format/flow/flow-repo/declare_type/format.test.js diff --git a/tests/format/flow-repo/declare_type/import_declare_type.js b/tests/format/flow/flow-repo/declare_type/import_declare_type.js similarity index 100% rename from tests/format/flow-repo/declare_type/import_declare_type.js rename to tests/format/flow/flow-repo/declare_type/import_declare_type.js diff --git a/tests/format/flow-repo/declare_type/lib/DeclareModule_TypeAlias.js b/tests/format/flow/flow-repo/declare_type/lib/DeclareModule_TypeAlias.js similarity index 100% rename from tests/format/flow-repo/declare_type/lib/DeclareModule_TypeAlias.js rename to tests/format/flow/flow-repo/declare_type/lib/DeclareModule_TypeAlias.js diff --git a/tests/format/flow-repo/declare_type/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/declare_type/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/declare_type/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/declare_type/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/declare_type/lib/declare_type_exports.js b/tests/format/flow/flow-repo/declare_type/lib/declare_type_exports.js similarity index 100% rename from tests/format/flow-repo/declare_type/lib/declare_type_exports.js rename to tests/format/flow/flow-repo/declare_type/lib/declare_type_exports.js diff --git a/tests/format/flow-repo/declare_type/lib/format.test.js b/tests/format/flow/flow-repo/declare_type/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/declare_type/lib/format.test.js rename to tests/format/flow/flow-repo/declare_type/lib/format.test.js diff --git a/tests/format/flow-repo/def_site_variance/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/def_site_variance/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/def_site_variance/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/def_site_variance/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/def_site_variance/format.test.js b/tests/format/flow/flow-repo/def_site_variance/format.test.js similarity index 100% rename from tests/format/flow-repo/def_site_variance/format.test.js rename to tests/format/flow/flow-repo/def_site_variance/format.test.js diff --git a/tests/format/flow-repo/def_site_variance/test.js b/tests/format/flow/flow-repo/def_site_variance/test.js similarity index 100% rename from tests/format/flow-repo/def_site_variance/test.js rename to tests/format/flow/flow-repo/def_site_variance/test.js diff --git a/tests/format/flow-repo/demo/1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/demo/1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/demo/1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/demo/1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/demo/1/f.js b/tests/format/flow/flow-repo/demo/1/f.js similarity index 100% rename from tests/format/flow-repo/demo/1/f.js rename to tests/format/flow/flow-repo/demo/1/f.js diff --git a/tests/format/flow-repo/demo/1/format.test.js b/tests/format/flow/flow-repo/demo/1/format.test.js similarity index 100% rename from tests/format/flow-repo/demo/1/format.test.js rename to tests/format/flow/flow-repo/demo/1/format.test.js diff --git a/tests/format/flow-repo/demo/2/A.js b/tests/format/flow/flow-repo/demo/2/A.js similarity index 100% rename from tests/format/flow-repo/demo/2/A.js rename to tests/format/flow/flow-repo/demo/2/A.js diff --git a/tests/format/flow-repo/demo/2/B.js b/tests/format/flow/flow-repo/demo/2/B.js similarity index 100% rename from tests/format/flow-repo/demo/2/B.js rename to tests/format/flow/flow-repo/demo/2/B.js diff --git a/tests/format/flow-repo/demo/2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/demo/2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/demo/2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/demo/2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/demo/2/format.test.js b/tests/format/flow/flow-repo/demo/2/format.test.js similarity index 100% rename from tests/format/flow-repo/demo/2/format.test.js rename to tests/format/flow/flow-repo/demo/2/format.test.js diff --git a/tests/format/flow-repo/deps/A.js b/tests/format/flow/flow-repo/deps/A.js similarity index 100% rename from tests/format/flow-repo/deps/A.js rename to tests/format/flow/flow-repo/deps/A.js diff --git a/tests/format/flow-repo/deps/B.js b/tests/format/flow/flow-repo/deps/B.js similarity index 100% rename from tests/format/flow-repo/deps/B.js rename to tests/format/flow/flow-repo/deps/B.js diff --git a/tests/format/flow-repo/deps/C.js b/tests/format/flow/flow-repo/deps/C.js similarity index 100% rename from tests/format/flow-repo/deps/C.js rename to tests/format/flow/flow-repo/deps/C.js diff --git a/tests/format/flow-repo/deps/D.js b/tests/format/flow/flow-repo/deps/D.js similarity index 100% rename from tests/format/flow-repo/deps/D.js rename to tests/format/flow/flow-repo/deps/D.js diff --git a/tests/format/flow-repo/deps/E.js b/tests/format/flow/flow-repo/deps/E.js similarity index 100% rename from tests/format/flow-repo/deps/E.js rename to tests/format/flow/flow-repo/deps/E.js diff --git a/tests/format/flow-repo/deps/F.js b/tests/format/flow/flow-repo/deps/F.js similarity index 100% rename from tests/format/flow-repo/deps/F.js rename to tests/format/flow/flow-repo/deps/F.js diff --git a/tests/format/flow-repo/deps/G.js b/tests/format/flow/flow-repo/deps/G.js similarity index 100% rename from tests/format/flow-repo/deps/G.js rename to tests/format/flow/flow-repo/deps/G.js diff --git a/tests/format/flow-repo/deps/H.js b/tests/format/flow/flow-repo/deps/H.js similarity index 100% rename from tests/format/flow-repo/deps/H.js rename to tests/format/flow/flow-repo/deps/H.js diff --git a/tests/format/flow-repo/deps/I.js b/tests/format/flow/flow-repo/deps/I.js similarity index 100% rename from tests/format/flow-repo/deps/I.js rename to tests/format/flow/flow-repo/deps/I.js diff --git a/tests/format/flow-repo/deps/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/deps/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/deps/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/deps/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/deps/format.test.js b/tests/format/flow/flow-repo/deps/format.test.js similarity index 100% rename from tests/format/flow-repo/deps/format.test.js rename to tests/format/flow/flow-repo/deps/format.test.js diff --git a/tests/format/flow-repo/destructuring/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/destructuring/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/destructuring/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/destructuring/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/destructuring/array_rest.js b/tests/format/flow/flow-repo/destructuring/array_rest.js similarity index 100% rename from tests/format/flow-repo/destructuring/array_rest.js rename to tests/format/flow/flow-repo/destructuring/array_rest.js diff --git a/tests/format/flow-repo/destructuring/computed.js b/tests/format/flow/flow-repo/destructuring/computed.js similarity index 100% rename from tests/format/flow-repo/destructuring/computed.js rename to tests/format/flow/flow-repo/destructuring/computed.js diff --git a/tests/format/flow-repo/destructuring/defaults.js b/tests/format/flow/flow-repo/destructuring/defaults.js similarity index 100% rename from tests/format/flow-repo/destructuring/defaults.js rename to tests/format/flow/flow-repo/destructuring/defaults.js diff --git a/tests/format/flow-repo/destructuring/destructuring.js b/tests/format/flow/flow-repo/destructuring/destructuring.js similarity index 100% rename from tests/format/flow-repo/destructuring/destructuring.js rename to tests/format/flow/flow-repo/destructuring/destructuring.js diff --git a/tests/format/flow-repo/destructuring/eager.js b/tests/format/flow/flow-repo/destructuring/eager.js similarity index 100% rename from tests/format/flow-repo/destructuring/eager.js rename to tests/format/flow/flow-repo/destructuring/eager.js diff --git a/tests/format/flow-repo/destructuring/format.test.js b/tests/format/flow/flow-repo/destructuring/format.test.js similarity index 100% rename from tests/format/flow-repo/destructuring/format.test.js rename to tests/format/flow/flow-repo/destructuring/format.test.js diff --git a/tests/format/flow-repo/destructuring/poly.js b/tests/format/flow/flow-repo/destructuring/poly.js similarity index 100% rename from tests/format/flow-repo/destructuring/poly.js rename to tests/format/flow/flow-repo/destructuring/poly.js diff --git a/tests/format/flow-repo/destructuring/rec.js b/tests/format/flow/flow-repo/destructuring/rec.js similarity index 100% rename from tests/format/flow-repo/destructuring/rec.js rename to tests/format/flow/flow-repo/destructuring/rec.js diff --git a/tests/format/flow-repo/destructuring/refinement_non_termination.js b/tests/format/flow/flow-repo/destructuring/refinement_non_termination.js similarity index 100% rename from tests/format/flow-repo/destructuring/refinement_non_termination.js rename to tests/format/flow/flow-repo/destructuring/refinement_non_termination.js diff --git a/tests/format/flow-repo/destructuring/string_lit.js b/tests/format/flow/flow-repo/destructuring/string_lit.js similarity index 100% rename from tests/format/flow-repo/destructuring/string_lit.js rename to tests/format/flow/flow-repo/destructuring/string_lit.js diff --git a/tests/format/flow-repo/destructuring/unannotated.js b/tests/format/flow/flow-repo/destructuring/unannotated.js similarity index 100% rename from tests/format/flow-repo/destructuring/unannotated.js rename to tests/format/flow/flow-repo/destructuring/unannotated.js diff --git a/tests/format/flow-repo/dictionary/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/dictionary/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/dictionary/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/dictionary/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/dictionary/any.js b/tests/format/flow/flow-repo/dictionary/any.js similarity index 100% rename from tests/format/flow-repo/dictionary/any.js rename to tests/format/flow/flow-repo/dictionary/any.js diff --git a/tests/format/flow-repo/dictionary/compatible.js b/tests/format/flow/flow-repo/dictionary/compatible.js similarity index 100% rename from tests/format/flow-repo/dictionary/compatible.js rename to tests/format/flow/flow-repo/dictionary/compatible.js diff --git a/tests/format/flow-repo/dictionary/dictionary.js b/tests/format/flow/flow-repo/dictionary/dictionary.js similarity index 100% rename from tests/format/flow-repo/dictionary/dictionary.js rename to tests/format/flow/flow-repo/dictionary/dictionary.js diff --git a/tests/format/flow-repo/dictionary/format.test.js b/tests/format/flow/flow-repo/dictionary/format.test.js similarity index 100% rename from tests/format/flow-repo/dictionary/format.test.js rename to tests/format/flow/flow-repo/dictionary/format.test.js diff --git a/tests/format/flow-repo/dictionary/incompatible.js b/tests/format/flow/flow-repo/dictionary/incompatible.js similarity index 100% rename from tests/format/flow-repo/dictionary/incompatible.js rename to tests/format/flow/flow-repo/dictionary/incompatible.js diff --git a/tests/format/flow-repo/dictionary/issue-1745.js b/tests/format/flow/flow-repo/dictionary/issue-1745.js similarity index 100% rename from tests/format/flow-repo/dictionary/issue-1745.js rename to tests/format/flow/flow-repo/dictionary/issue-1745.js diff --git a/tests/format/flow-repo/dictionary/test.js b/tests/format/flow/flow-repo/dictionary/test.js similarity index 100% rename from tests/format/flow-repo/dictionary/test.js rename to tests/format/flow/flow-repo/dictionary/test.js diff --git a/tests/format/flow-repo/dictionary/test_client.js b/tests/format/flow/flow-repo/dictionary/test_client.js similarity index 100% rename from tests/format/flow-repo/dictionary/test_client.js rename to tests/format/flow/flow-repo/dictionary/test_client.js diff --git a/tests/format/flow-repo/disjoint-union-perf/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/disjoint-union-perf/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/disjoint-union-perf/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/disjoint-union-perf/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/disjoint-union-perf/ast.js b/tests/format/flow/flow-repo/disjoint-union-perf/ast.js similarity index 100% rename from tests/format/flow-repo/disjoint-union-perf/ast.js rename to tests/format/flow/flow-repo/disjoint-union-perf/ast.js diff --git a/tests/format/flow-repo/disjoint-union-perf/emit.js b/tests/format/flow/flow-repo/disjoint-union-perf/emit.js similarity index 100% rename from tests/format/flow-repo/disjoint-union-perf/emit.js rename to tests/format/flow/flow-repo/disjoint-union-perf/emit.js diff --git a/tests/format/flow-repo/disjoint-union-perf/format.test.js b/tests/format/flow/flow-repo/disjoint-union-perf/format.test.js similarity index 100% rename from tests/format/flow-repo/disjoint-union-perf/format.test.js rename to tests/format/flow/flow-repo/disjoint-union-perf/format.test.js diff --git a/tests/format/flow-repo/disjoint-union-perf/jsAst.js b/tests/format/flow/flow-repo/disjoint-union-perf/jsAst.js similarity index 100% rename from tests/format/flow-repo/disjoint-union-perf/jsAst.js rename to tests/format/flow/flow-repo/disjoint-union-perf/jsAst.js diff --git a/tests/format/flow-repo/docblock_flow/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/docblock_flow/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/docblock_flow/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/docblock_flow/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/docblock_flow/format.test.js b/tests/format/flow/flow-repo/docblock_flow/format.test.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/format.test.js rename to tests/format/flow/flow-repo/docblock_flow/format.test.js diff --git a/tests/format/flow-repo/docblock_flow/license_with_flow.js b/tests/format/flow/flow-repo/docblock_flow/license_with_flow.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/license_with_flow.js rename to tests/format/flow/flow-repo/docblock_flow/license_with_flow.js diff --git a/tests/format/flow-repo/docblock_flow/max_header_tokens.js b/tests/format/flow/flow-repo/docblock_flow/max_header_tokens.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/max_header_tokens.js rename to tests/format/flow/flow-repo/docblock_flow/max_header_tokens.js diff --git a/tests/format/flow-repo/docblock_flow/multiple_flows_1.js b/tests/format/flow/flow-repo/docblock_flow/multiple_flows_1.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/multiple_flows_1.js rename to tests/format/flow/flow-repo/docblock_flow/multiple_flows_1.js diff --git a/tests/format/flow-repo/docblock_flow/multiple_flows_2.js b/tests/format/flow/flow-repo/docblock_flow/multiple_flows_2.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/multiple_flows_2.js rename to tests/format/flow/flow-repo/docblock_flow/multiple_flows_2.js diff --git a/tests/format/flow-repo/docblock_flow/multiple_providesModule_1.js b/tests/format/flow/flow-repo/docblock_flow/multiple_providesModule_1.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/multiple_providesModule_1.js rename to tests/format/flow/flow-repo/docblock_flow/multiple_providesModule_1.js diff --git a/tests/format/flow-repo/docblock_flow/multiple_providesModule_2.js b/tests/format/flow/flow-repo/docblock_flow/multiple_providesModule_2.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/multiple_providesModule_2.js rename to tests/format/flow/flow-repo/docblock_flow/multiple_providesModule_2.js diff --git a/tests/format/flow-repo/docblock_flow/use_strict_with_flow.js b/tests/format/flow/flow-repo/docblock_flow/use_strict_with_flow.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/use_strict_with_flow.js rename to tests/format/flow/flow-repo/docblock_flow/use_strict_with_flow.js diff --git a/tests/format/flow-repo/docblock_flow/with_flow.js b/tests/format/flow/flow-repo/docblock_flow/with_flow.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/with_flow.js rename to tests/format/flow/flow-repo/docblock_flow/with_flow.js diff --git a/tests/format/flow-repo/docblock_flow/without_flow.js b/tests/format/flow/flow-repo/docblock_flow/without_flow.js similarity index 100% rename from tests/format/flow-repo/docblock_flow/without_flow.js rename to tests/format/flow/flow-repo/docblock_flow/without_flow.js diff --git a/tests/format/flow-repo/dom/CanvasRenderingContext2D.js b/tests/format/flow/flow-repo/dom/CanvasRenderingContext2D.js similarity index 100% rename from tests/format/flow-repo/dom/CanvasRenderingContext2D.js rename to tests/format/flow/flow-repo/dom/CanvasRenderingContext2D.js diff --git a/tests/format/flow-repo/dom/CustomEvent.js b/tests/format/flow/flow-repo/dom/CustomEvent.js similarity index 100% rename from tests/format/flow-repo/dom/CustomEvent.js rename to tests/format/flow/flow-repo/dom/CustomEvent.js diff --git a/tests/format/flow-repo/dom/Document.js b/tests/format/flow/flow-repo/dom/Document.js similarity index 100% rename from tests/format/flow-repo/dom/Document.js rename to tests/format/flow/flow-repo/dom/Document.js diff --git a/tests/format/flow-repo/dom/Element.js b/tests/format/flow/flow-repo/dom/Element.js similarity index 100% rename from tests/format/flow-repo/dom/Element.js rename to tests/format/flow/flow-repo/dom/Element.js diff --git a/tests/format/flow-repo/dom/HTMLCanvasElement.js b/tests/format/flow/flow-repo/dom/HTMLCanvasElement.js similarity index 100% rename from tests/format/flow-repo/dom/HTMLCanvasElement.js rename to tests/format/flow/flow-repo/dom/HTMLCanvasElement.js diff --git a/tests/format/flow-repo/dom/HTMLElement.js b/tests/format/flow/flow-repo/dom/HTMLElement.js similarity index 100% rename from tests/format/flow-repo/dom/HTMLElement.js rename to tests/format/flow/flow-repo/dom/HTMLElement.js diff --git a/tests/format/flow-repo/dom/HTMLInputElement.js b/tests/format/flow/flow-repo/dom/HTMLInputElement.js similarity index 100% rename from tests/format/flow-repo/dom/HTMLInputElement.js rename to tests/format/flow/flow-repo/dom/HTMLInputElement.js diff --git a/tests/format/flow-repo/dom/URL.js b/tests/format/flow/flow-repo/dom/URL.js similarity index 100% rename from tests/format/flow-repo/dom/URL.js rename to tests/format/flow/flow-repo/dom/URL.js diff --git a/tests/format/flow-repo/dom/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/dom/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/dom/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/dom/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/dom/eventtarget.js b/tests/format/flow/flow-repo/dom/eventtarget.js similarity index 100% rename from tests/format/flow-repo/dom/eventtarget.js rename to tests/format/flow/flow-repo/dom/eventtarget.js diff --git a/tests/format/flow-repo/dom/format.test.js b/tests/format/flow/flow-repo/dom/format.test.js similarity index 100% rename from tests/format/flow-repo/dom/format.test.js rename to tests/format/flow/flow-repo/dom/format.test.js diff --git a/tests/format/flow-repo/dom/path2d.js b/tests/format/flow/flow-repo/dom/path2d.js similarity index 100% rename from tests/format/flow-repo/dom/path2d.js rename to tests/format/flow/flow-repo/dom/path2d.js diff --git a/tests/format/flow-repo/dom/registerElement.js b/tests/format/flow/flow-repo/dom/registerElement.js similarity index 100% rename from tests/format/flow-repo/dom/registerElement.js rename to tests/format/flow/flow-repo/dom/registerElement.js diff --git a/tests/format/flow-repo/dom/traversal.js b/tests/format/flow/flow-repo/dom/traversal.js similarity index 100% rename from tests/format/flow-repo/dom/traversal.js rename to tests/format/flow/flow-repo/dom/traversal.js diff --git a/tests/format/flow-repo/dump-types/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/dump-types/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/dump-types/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/dump-types/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/dump-types/format.test.js b/tests/format/flow/flow-repo/dump-types/format.test.js similarity index 100% rename from tests/format/flow-repo/dump-types/format.test.js rename to tests/format/flow/flow-repo/dump-types/format.test.js diff --git a/tests/format/flow-repo/dump-types/import.js b/tests/format/flow/flow-repo/dump-types/import.js similarity index 100% rename from tests/format/flow-repo/dump-types/import.js rename to tests/format/flow/flow-repo/dump-types/import.js diff --git a/tests/format/flow-repo/dump-types/test.js b/tests/format/flow/flow-repo/dump-types/test.js similarity index 100% rename from tests/format/flow-repo/dump-types/test.js rename to tests/format/flow/flow-repo/dump-types/test.js diff --git a/tests/format/flow-repo/duplicate_methods/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/duplicate_methods/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/duplicate_methods/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/duplicate_methods/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/duplicate_methods/format.test.js b/tests/format/flow/flow-repo/duplicate_methods/format.test.js similarity index 100% rename from tests/format/flow-repo/duplicate_methods/format.test.js rename to tests/format/flow/flow-repo/duplicate_methods/format.test.js diff --git a/tests/format/flow-repo/duplicate_methods/test.js b/tests/format/flow/flow-repo/duplicate_methods/test.js similarity index 100% rename from tests/format/flow-repo/duplicate_methods/test.js rename to tests/format/flow/flow-repo/duplicate_methods/test.js diff --git a/tests/format/flow-repo/encaps/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/encaps/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/encaps/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/encaps/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/encaps/encaps.js b/tests/format/flow/flow-repo/encaps/encaps.js similarity index 100% rename from tests/format/flow-repo/encaps/encaps.js rename to tests/format/flow/flow-repo/encaps/encaps.js diff --git a/tests/format/flow-repo/encaps/format.test.js b/tests/format/flow/flow-repo/encaps/format.test.js similarity index 100% rename from tests/format/flow-repo/encaps/format.test.js rename to tests/format/flow/flow-repo/encaps/format.test.js diff --git a/tests/format/flow-repo/enumerror/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/enumerror/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/enumerror/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/enumerror/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/enumerror/enumerror.js b/tests/format/flow/flow-repo/enumerror/enumerror.js similarity index 100% rename from tests/format/flow-repo/enumerror/enumerror.js rename to tests/format/flow/flow-repo/enumerror/enumerror.js diff --git a/tests/format/flow-repo/enumerror/format.test.js b/tests/format/flow/flow-repo/enumerror/format.test.js similarity index 100% rename from tests/format/flow-repo/enumerror/format.test.js rename to tests/format/flow/flow-repo/enumerror/format.test.js diff --git a/tests/format/flow-repo/enums/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/enums/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/enums/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/enums/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/enums/declared.js b/tests/format/flow/flow-repo/enums/declared.js similarity index 100% rename from tests/format/flow-repo/enums/declared.js rename to tests/format/flow/flow-repo/enums/declared.js diff --git a/tests/format/flow-repo/enums/format.test.js b/tests/format/flow/flow-repo/enums/format.test.js similarity index 100% rename from tests/format/flow-repo/enums/format.test.js rename to tests/format/flow/flow-repo/enums/format.test.js diff --git a/tests/format/flow-repo/enums/lib.js b/tests/format/flow/flow-repo/enums/lib.js similarity index 100% rename from tests/format/flow-repo/enums/lib.js rename to tests/format/flow/flow-repo/enums/lib.js diff --git a/tests/format/flow-repo/equals/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/equals/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/equals/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/equals/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/equals/equals.js b/tests/format/flow/flow-repo/equals/equals.js similarity index 100% rename from tests/format/flow-repo/equals/equals.js rename to tests/format/flow/flow-repo/equals/equals.js diff --git a/tests/format/flow-repo/equals/format.test.js b/tests/format/flow/flow-repo/equals/format.test.js similarity index 100% rename from tests/format/flow-repo/equals/format.test.js rename to tests/format/flow/flow-repo/equals/format.test.js diff --git a/tests/format/flow-repo/error_messages/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/error_messages/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/error_messages/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/error_messages/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/error_messages/errors.js b/tests/format/flow/flow-repo/error_messages/errors.js similarity index 100% rename from tests/format/flow-repo/error_messages/errors.js rename to tests/format/flow/flow-repo/error_messages/errors.js diff --git a/tests/format/flow-repo/error_messages/format.test.js b/tests/format/flow/flow-repo/error_messages/format.test.js similarity index 100% rename from tests/format/flow-repo/error_messages/format.test.js rename to tests/format/flow/flow-repo/error_messages/format.test.js diff --git a/tests/format/flow-repo/es6modules/B.js b/tests/format/flow/flow-repo/es6modules/B.js similarity index 100% rename from tests/format/flow-repo/es6modules/B.js rename to tests/format/flow/flow-repo/es6modules/B.js diff --git a/tests/format/flow-repo/es6modules/C.js b/tests/format/flow/flow-repo/es6modules/C.js similarity index 100% rename from tests/format/flow-repo/es6modules/C.js rename to tests/format/flow/flow-repo/es6modules/C.js diff --git a/tests/format/flow-repo/es6modules/CommonJS_Clobbering_Class.js b/tests/format/flow/flow-repo/es6modules/CommonJS_Clobbering_Class.js similarity index 100% rename from tests/format/flow-repo/es6modules/CommonJS_Clobbering_Class.js rename to tests/format/flow/flow-repo/es6modules/CommonJS_Clobbering_Class.js diff --git a/tests/format/flow-repo/es6modules/CommonJS_Clobbering_Frozen.js b/tests/format/flow/flow-repo/es6modules/CommonJS_Clobbering_Frozen.js similarity index 100% rename from tests/format/flow-repo/es6modules/CommonJS_Clobbering_Frozen.js rename to tests/format/flow/flow-repo/es6modules/CommonJS_Clobbering_Frozen.js diff --git a/tests/format/flow-repo/es6modules/CommonJS_Clobbering_Lit.js b/tests/format/flow/flow-repo/es6modules/CommonJS_Clobbering_Lit.js similarity index 100% rename from tests/format/flow-repo/es6modules/CommonJS_Clobbering_Lit.js rename to tests/format/flow/flow-repo/es6modules/CommonJS_Clobbering_Lit.js diff --git a/tests/format/flow-repo/es6modules/CommonJS_Named.js b/tests/format/flow/flow-repo/es6modules/CommonJS_Named.js similarity index 100% rename from tests/format/flow-repo/es6modules/CommonJS_Named.js rename to tests/format/flow/flow-repo/es6modules/CommonJS_Named.js diff --git a/tests/format/flow-repo/es6modules/ES6_DefaultAndNamed.js b/tests/format/flow/flow-repo/es6modules/ES6_DefaultAndNamed.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_DefaultAndNamed.js rename to tests/format/flow/flow-repo/es6modules/ES6_DefaultAndNamed.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_AnonClass1.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_AnonClass1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_AnonClass1.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_AnonClass1.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_AnonClass2.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_AnonClass2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_AnonClass2.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_AnonClass2.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_AnonFunction1.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_AnonFunction1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_AnonFunction1.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_AnonFunction1.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_AnonFunction2.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_AnonFunction2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_AnonFunction2.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_AnonFunction2.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_NamedClass1.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_NamedClass1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_NamedClass1.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_NamedClass1.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_NamedClass2.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_NamedClass2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_NamedClass2.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_NamedClass2.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_NamedFunction1.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_NamedFunction1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_NamedFunction1.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_NamedFunction1.js diff --git a/tests/format/flow-repo/es6modules/ES6_Default_NamedFunction2.js b/tests/format/flow/flow-repo/es6modules/ES6_Default_NamedFunction2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Default_NamedFunction2.js rename to tests/format/flow/flow-repo/es6modules/ES6_Default_NamedFunction2.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportAllFromMulti.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportAllFromMulti.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportAllFromMulti.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportAllFromMulti.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary1.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary1.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary1.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary2.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary2.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Intermediary2.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Source1.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Source1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Source1.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Source1.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Source2.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Source2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportAllFrom_Source2.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportAllFrom_Source2.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportFrom_Intermediary1.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Intermediary1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportFrom_Intermediary1.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Intermediary1.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportFrom_Intermediary2.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Intermediary2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportFrom_Intermediary2.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Intermediary2.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportFrom_Source1.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Source1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportFrom_Source1.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Source1.js diff --git a/tests/format/flow-repo/es6modules/ES6_ExportFrom_Source2.js b/tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Source2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_ExportFrom_Source2.js rename to tests/format/flow/flow-repo/es6modules/ES6_ExportFrom_Source2.js diff --git a/tests/format/flow-repo/es6modules/ES6_Named1.js b/tests/format/flow/flow-repo/es6modules/ES6_Named1.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Named1.js rename to tests/format/flow/flow-repo/es6modules/ES6_Named1.js diff --git a/tests/format/flow-repo/es6modules/ES6_Named2.js b/tests/format/flow/flow-repo/es6modules/ES6_Named2.js similarity index 100% rename from tests/format/flow-repo/es6modules/ES6_Named2.js rename to tests/format/flow/flow-repo/es6modules/ES6_Named2.js diff --git a/tests/format/flow-repo/es6modules/ExportType.js b/tests/format/flow/flow-repo/es6modules/ExportType.js similarity index 100% rename from tests/format/flow-repo/es6modules/ExportType.js rename to tests/format/flow/flow-repo/es6modules/ExportType.js diff --git a/tests/format/flow-repo/es6modules/ProvidesModuleA.js b/tests/format/flow/flow-repo/es6modules/ProvidesModuleA.js similarity index 100% rename from tests/format/flow-repo/es6modules/ProvidesModuleA.js rename to tests/format/flow/flow-repo/es6modules/ProvidesModuleA.js diff --git a/tests/format/flow-repo/es6modules/ProvidesModuleCJSDefault.js b/tests/format/flow/flow-repo/es6modules/ProvidesModuleCJSDefault.js similarity index 100% rename from tests/format/flow-repo/es6modules/ProvidesModuleCJSDefault.js rename to tests/format/flow/flow-repo/es6modules/ProvidesModuleCJSDefault.js diff --git a/tests/format/flow-repo/es6modules/ProvidesModuleD.js b/tests/format/flow/flow-repo/es6modules/ProvidesModuleD.js similarity index 100% rename from tests/format/flow-repo/es6modules/ProvidesModuleD.js rename to tests/format/flow/flow-repo/es6modules/ProvidesModuleD.js diff --git a/tests/format/flow-repo/es6modules/ProvidesModuleES6Default.js b/tests/format/flow/flow-repo/es6modules/ProvidesModuleES6Default.js similarity index 100% rename from tests/format/flow-repo/es6modules/ProvidesModuleES6Default.js rename to tests/format/flow/flow-repo/es6modules/ProvidesModuleES6Default.js diff --git a/tests/format/flow-repo/es6modules/SideEffects.js b/tests/format/flow/flow-repo/es6modules/SideEffects.js similarity index 100% rename from tests/format/flow-repo/es6modules/SideEffects.js rename to tests/format/flow/flow-repo/es6modules/SideEffects.js diff --git a/tests/format/flow-repo/es6modules/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/es6modules/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/es6modules/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/es6modules/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/es6modules/es6modules.js b/tests/format/flow/flow-repo/es6modules/es6modules.js similarity index 100% rename from tests/format/flow-repo/es6modules/es6modules.js rename to tests/format/flow/flow-repo/es6modules/es6modules.js diff --git a/tests/format/flow-repo/es6modules/format.test.js b/tests/format/flow/flow-repo/es6modules/format.test.js similarity index 100% rename from tests/format/flow-repo/es6modules/format.test.js rename to tests/format/flow/flow-repo/es6modules/format.test.js diff --git a/tests/format/flow-repo/es6modules/test_imports_are_frozen.js b/tests/format/flow/flow-repo/es6modules/test_imports_are_frozen.js similarity index 100% rename from tests/format/flow-repo/es6modules/test_imports_are_frozen.js rename to tests/format/flow/flow-repo/es6modules/test_imports_are_frozen.js diff --git a/tests/format/flow-repo/es_declare_module/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/es_declare_module/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/es_declare_module/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/es_declare_module/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/es_declare_module/es_declare_module.js b/tests/format/flow/flow-repo/es_declare_module/es_declare_module.js similarity index 100% rename from tests/format/flow-repo/es_declare_module/es_declare_module.js rename to tests/format/flow/flow-repo/es_declare_module/es_declare_module.js diff --git a/tests/format/flow-repo/es_declare_module/flow-typed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/es_declare_module/flow-typed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/es_declare_module/flow-typed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/es_declare_module/flow-typed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/es_declare_module/flow-typed/declares.js b/tests/format/flow/flow-repo/es_declare_module/flow-typed/declares.js similarity index 100% rename from tests/format/flow-repo/es_declare_module/flow-typed/declares.js rename to tests/format/flow/flow-repo/es_declare_module/flow-typed/declares.js diff --git a/tests/format/flow-repo/es_declare_module/flow-typed/format.test.js b/tests/format/flow/flow-repo/es_declare_module/flow-typed/format.test.js similarity index 100% rename from tests/format/flow-repo/es_declare_module/flow-typed/format.test.js rename to tests/format/flow/flow-repo/es_declare_module/flow-typed/format.test.js diff --git a/tests/format/flow-repo/es_declare_module/format.test.js b/tests/format/flow/flow-repo/es_declare_module/format.test.js similarity index 100% rename from tests/format/flow-repo/es_declare_module/format.test.js rename to tests/format/flow/flow-repo/es_declare_module/format.test.js diff --git a/tests/format/flow-repo/esproposal_class_instance_fields.ignore/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_class_instance_fields.ignore/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_class_instance_fields.ignore/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_class_instance_fields.ignore/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_class_instance_fields.ignore/format.test.js b/tests/format/flow/flow-repo/esproposal_class_instance_fields.ignore/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_instance_fields.ignore/format.test.js rename to tests/format/flow/flow-repo/esproposal_class_instance_fields.ignore/format.test.js diff --git a/tests/format/flow-repo/esproposal_class_instance_fields.ignore/test.js b/tests/format/flow/flow-repo/esproposal_class_instance_fields.ignore/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_instance_fields.ignore/test.js rename to tests/format/flow/flow-repo/esproposal_class_instance_fields.ignore/test.js diff --git a/tests/format/flow-repo/esproposal_class_instance_fields.warn/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_class_instance_fields.warn/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_class_instance_fields.warn/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_class_instance_fields.warn/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_class_instance_fields.warn/format.test.js b/tests/format/flow/flow-repo/esproposal_class_instance_fields.warn/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_instance_fields.warn/format.test.js rename to tests/format/flow/flow-repo/esproposal_class_instance_fields.warn/format.test.js diff --git a/tests/format/flow-repo/esproposal_class_instance_fields.warn/test.js b/tests/format/flow/flow-repo/esproposal_class_instance_fields.warn/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_instance_fields.warn/test.js rename to tests/format/flow/flow-repo/esproposal_class_instance_fields.warn/test.js diff --git a/tests/format/flow-repo/esproposal_class_static_fields.ignore/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_class_static_fields.ignore/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_class_static_fields.ignore/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_class_static_fields.ignore/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_class_static_fields.ignore/format.test.js b/tests/format/flow/flow-repo/esproposal_class_static_fields.ignore/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_static_fields.ignore/format.test.js rename to tests/format/flow/flow-repo/esproposal_class_static_fields.ignore/format.test.js diff --git a/tests/format/flow-repo/esproposal_class_static_fields.ignore/test.js b/tests/format/flow/flow-repo/esproposal_class_static_fields.ignore/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_static_fields.ignore/test.js rename to tests/format/flow/flow-repo/esproposal_class_static_fields.ignore/test.js diff --git a/tests/format/flow-repo/esproposal_class_static_fields.warn/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_class_static_fields.warn/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_class_static_fields.warn/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_class_static_fields.warn/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_class_static_fields.warn/format.test.js b/tests/format/flow/flow-repo/esproposal_class_static_fields.warn/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_static_fields.warn/format.test.js rename to tests/format/flow/flow-repo/esproposal_class_static_fields.warn/format.test.js diff --git a/tests/format/flow-repo/esproposal_class_static_fields.warn/test.js b/tests/format/flow/flow-repo/esproposal_class_static_fields.warn/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_class_static_fields.warn/test.js rename to tests/format/flow/flow-repo/esproposal_class_static_fields.warn/test.js diff --git a/tests/format/flow-repo/esproposal_decorators.ignore/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_decorators.ignore/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_decorators.ignore/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_decorators.ignore/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_decorators.ignore/format.test.js b/tests/format/flow/flow-repo/esproposal_decorators.ignore/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_decorators.ignore/format.test.js rename to tests/format/flow/flow-repo/esproposal_decorators.ignore/format.test.js diff --git a/tests/format/flow-repo/esproposal_decorators.ignore/test.js b/tests/format/flow/flow-repo/esproposal_decorators.ignore/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_decorators.ignore/test.js rename to tests/format/flow/flow-repo/esproposal_decorators.ignore/test.js diff --git a/tests/format/flow-repo/esproposal_decorators.warn/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_decorators.warn/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_decorators.warn/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_decorators.warn/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_decorators.warn/format.test.js b/tests/format/flow/flow-repo/esproposal_decorators.warn/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_decorators.warn/format.test.js rename to tests/format/flow/flow-repo/esproposal_decorators.warn/format.test.js diff --git a/tests/format/flow-repo/esproposal_decorators.warn/test.js b/tests/format/flow/flow-repo/esproposal_decorators.warn/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_decorators.warn/test.js rename to tests/format/flow/flow-repo/esproposal_decorators.warn/test.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.enable/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_export_star_as.enable/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.enable/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_export_star_as.enable/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_export_star_as.enable/dest.js b/tests/format/flow/flow-repo/esproposal_export_star_as.enable/dest.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.enable/dest.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.enable/dest.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.enable/format.test.js b/tests/format/flow/flow-repo/esproposal_export_star_as.enable/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.enable/format.test.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.enable/format.test.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.enable/source.js b/tests/format/flow/flow-repo/esproposal_export_star_as.enable/source.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.enable/source.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.enable/source.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.enable/test.js b/tests/format/flow/flow-repo/esproposal_export_star_as.enable/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.enable/test.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.enable/test.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.ignore/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_export_star_as.ignore/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.ignore/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_export_star_as.ignore/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_export_star_as.ignore/dest.js b/tests/format/flow/flow-repo/esproposal_export_star_as.ignore/dest.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.ignore/dest.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.ignore/dest.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.ignore/format.test.js b/tests/format/flow/flow-repo/esproposal_export_star_as.ignore/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.ignore/format.test.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.ignore/format.test.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.ignore/source.js b/tests/format/flow/flow-repo/esproposal_export_star_as.ignore/source.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.ignore/source.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.ignore/source.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.ignore/test.js b/tests/format/flow/flow-repo/esproposal_export_star_as.ignore/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.ignore/test.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.ignore/test.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.warn/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/esproposal_export_star_as.warn/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.warn/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/esproposal_export_star_as.warn/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/esproposal_export_star_as.warn/format.test.js b/tests/format/flow/flow-repo/esproposal_export_star_as.warn/format.test.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.warn/format.test.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.warn/format.test.js diff --git a/tests/format/flow-repo/esproposal_export_star_as.warn/test.js b/tests/format/flow/flow-repo/esproposal_export_star_as.warn/test.js similarity index 100% rename from tests/format/flow-repo/esproposal_export_star_as.warn/test.js rename to tests/format/flow/flow-repo/esproposal_export_star_as.warn/test.js diff --git a/tests/format/flow-repo/export_default/P.js b/tests/format/flow/flow-repo/export_default/P.js similarity index 100% rename from tests/format/flow-repo/export_default/P.js rename to tests/format/flow/flow-repo/export_default/P.js diff --git a/tests/format/flow-repo/export_default/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/export_default/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/export_default/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/export_default/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/export_default/format.test.js b/tests/format/flow/flow-repo/export_default/format.test.js similarity index 100% rename from tests/format/flow-repo/export_default/format.test.js rename to tests/format/flow/flow-repo/export_default/format.test.js diff --git a/tests/format/flow-repo/export_default/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/export_default/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/export_default/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/export_default/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/export_default/lib/format.test.js b/tests/format/flow/flow-repo/export_default/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/export_default/lib/format.test.js rename to tests/format/flow/flow-repo/export_default/lib/format.test.js diff --git a/tests/format/flow-repo/export_default/lib/lib.js b/tests/format/flow/flow-repo/export_default/lib/lib.js similarity index 100% rename from tests/format/flow-repo/export_default/lib/lib.js rename to tests/format/flow/flow-repo/export_default/lib/lib.js diff --git a/tests/format/flow-repo/export_default/test.js b/tests/format/flow/flow-repo/export_default/test.js similarity index 100% rename from tests/format/flow-repo/export_default/test.js rename to tests/format/flow/flow-repo/export_default/test.js diff --git a/tests/format/flow-repo/export_type/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/export_type/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/export_type/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/export_type/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/export_type/cjs_with_types.js b/tests/format/flow/flow-repo/export_type/cjs_with_types.js similarity index 100% rename from tests/format/flow-repo/export_type/cjs_with_types.js rename to tests/format/flow/flow-repo/export_type/cjs_with_types.js diff --git a/tests/format/flow-repo/export_type/format.test.js b/tests/format/flow/flow-repo/export_type/format.test.js similarity index 100% rename from tests/format/flow-repo/export_type/format.test.js rename to tests/format/flow/flow-repo/export_type/format.test.js diff --git a/tests/format/flow-repo/export_type/importer.js b/tests/format/flow/flow-repo/export_type/importer.js similarity index 100% rename from tests/format/flow-repo/export_type/importer.js rename to tests/format/flow/flow-repo/export_type/importer.js diff --git a/tests/format/flow-repo/export_type/types_only.js b/tests/format/flow/flow-repo/export_type/types_only.js similarity index 100% rename from tests/format/flow-repo/export_type/types_only.js rename to tests/format/flow/flow-repo/export_type/types_only.js diff --git a/tests/format/flow-repo/export_type/types_only2.js b/tests/format/flow/flow-repo/export_type/types_only2.js similarity index 100% rename from tests/format/flow-repo/export_type/types_only2.js rename to tests/format/flow/flow-repo/export_type/types_only2.js diff --git a/tests/format/flow-repo/extensions/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/extensions/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/extensions/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/extensions/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/extensions/foo.js b/tests/format/flow/flow-repo/extensions/foo.js similarity index 100% rename from tests/format/flow-repo/extensions/foo.js rename to tests/format/flow/flow-repo/extensions/foo.js diff --git a/tests/format/flow-repo/extensions/format.test.js b/tests/format/flow/flow-repo/extensions/format.test.js similarity index 100% rename from tests/format/flow-repo/extensions/format.test.js rename to tests/format/flow/flow-repo/extensions/format.test.js diff --git a/tests/format/flow-repo/facebook_fbt_none/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/facebook_fbt_none/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/facebook_fbt_none/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/facebook_fbt_none/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/facebook_fbt_none/format.test.js b/tests/format/flow/flow-repo/facebook_fbt_none/format.test.js similarity index 100% rename from tests/format/flow-repo/facebook_fbt_none/format.test.js rename to tests/format/flow/flow-repo/facebook_fbt_none/format.test.js diff --git a/tests/format/flow-repo/facebook_fbt_none/main.js b/tests/format/flow/flow-repo/facebook_fbt_none/main.js similarity index 100% rename from tests/format/flow-repo/facebook_fbt_none/main.js rename to tests/format/flow/flow-repo/facebook_fbt_none/main.js diff --git a/tests/format/flow-repo/facebook_fbt_some/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/facebook_fbt_some/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/facebook_fbt_some/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/facebook_fbt_some/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/facebook_fbt_some/flow-typed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/facebook_fbt_some/flow-typed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/facebook_fbt_some/flow-typed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/facebook_fbt_some/flow-typed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/facebook_fbt_some/flow-typed/fbt.js b/tests/format/flow/flow-repo/facebook_fbt_some/flow-typed/fbt.js similarity index 100% rename from tests/format/flow-repo/facebook_fbt_some/flow-typed/fbt.js rename to tests/format/flow/flow-repo/facebook_fbt_some/flow-typed/fbt.js diff --git a/tests/format/flow-repo/facebook_fbt_some/flow-typed/format.test.js b/tests/format/flow/flow-repo/facebook_fbt_some/flow-typed/format.test.js similarity index 100% rename from tests/format/flow-repo/facebook_fbt_some/flow-typed/format.test.js rename to tests/format/flow/flow-repo/facebook_fbt_some/flow-typed/format.test.js diff --git a/tests/format/flow-repo/facebook_fbt_some/format.test.js b/tests/format/flow/flow-repo/facebook_fbt_some/format.test.js similarity index 100% rename from tests/format/flow-repo/facebook_fbt_some/format.test.js rename to tests/format/flow/flow-repo/facebook_fbt_some/format.test.js diff --git a/tests/format/flow-repo/facebook_fbt_some/main.js b/tests/format/flow/flow-repo/facebook_fbt_some/main.js similarity index 100% rename from tests/format/flow-repo/facebook_fbt_some/main.js rename to tests/format/flow/flow-repo/facebook_fbt_some/main.js diff --git a/tests/format/flow-repo/facebookisms/Bar.js b/tests/format/flow/flow-repo/facebookisms/Bar.js similarity index 100% rename from tests/format/flow-repo/facebookisms/Bar.js rename to tests/format/flow/flow-repo/facebookisms/Bar.js diff --git a/tests/format/flow-repo/facebookisms/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/facebookisms/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/facebookisms/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/facebookisms/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/facebookisms/copyProperties.js b/tests/format/flow/flow-repo/facebookisms/copyProperties.js similarity index 100% rename from tests/format/flow-repo/facebookisms/copyProperties.js rename to tests/format/flow/flow-repo/facebookisms/copyProperties.js diff --git a/tests/format/flow-repo/facebookisms/format.test.js b/tests/format/flow/flow-repo/facebookisms/format.test.js similarity index 100% rename from tests/format/flow-repo/facebookisms/format.test.js rename to tests/format/flow/flow-repo/facebookisms/format.test.js diff --git a/tests/format/flow-repo/facebookisms/invariant.js b/tests/format/flow/flow-repo/facebookisms/invariant.js similarity index 100% rename from tests/format/flow-repo/facebookisms/invariant.js rename to tests/format/flow/flow-repo/facebookisms/invariant.js diff --git a/tests/format/flow-repo/facebookisms/lib.js b/tests/format/flow/flow-repo/facebookisms/lib.js similarity index 100% rename from tests/format/flow-repo/facebookisms/lib.js rename to tests/format/flow/flow-repo/facebookisms/lib.js diff --git a/tests/format/flow-repo/facebookisms/mergeInto.js b/tests/format/flow/flow-repo/facebookisms/mergeInto.js similarity index 100% rename from tests/format/flow-repo/facebookisms/mergeInto.js rename to tests/format/flow/flow-repo/facebookisms/mergeInto.js diff --git a/tests/format/flow-repo/facebookisms/test.js b/tests/format/flow/flow-repo/facebookisms/test.js similarity index 100% rename from tests/format/flow-repo/facebookisms/test.js rename to tests/format/flow/flow-repo/facebookisms/test.js diff --git a/tests/format/flow-repo/fetch/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/fetch/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/fetch/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/fetch/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/fetch/fetch.js b/tests/format/flow/flow-repo/fetch/fetch.js similarity index 100% rename from tests/format/flow-repo/fetch/fetch.js rename to tests/format/flow/flow-repo/fetch/fetch.js diff --git a/tests/format/flow-repo/fetch/format.test.js b/tests/format/flow/flow-repo/fetch/format.test.js similarity index 100% rename from tests/format/flow-repo/fetch/format.test.js rename to tests/format/flow/flow-repo/fetch/format.test.js diff --git a/tests/format/flow-repo/fetch/headers.js b/tests/format/flow/flow-repo/fetch/headers.js similarity index 100% rename from tests/format/flow-repo/fetch/headers.js rename to tests/format/flow/flow-repo/fetch/headers.js diff --git a/tests/format/flow-repo/fetch/request.js b/tests/format/flow/flow-repo/fetch/request.js similarity index 100% rename from tests/format/flow-repo/fetch/request.js rename to tests/format/flow/flow-repo/fetch/request.js diff --git a/tests/format/flow-repo/fetch/response.js b/tests/format/flow/flow-repo/fetch/response.js similarity index 100% rename from tests/format/flow-repo/fetch/response.js rename to tests/format/flow/flow-repo/fetch/response.js diff --git a/tests/format/flow-repo/fetch/urlsearchparams.js b/tests/format/flow/flow-repo/fetch/urlsearchparams.js similarity index 100% rename from tests/format/flow-repo/fetch/urlsearchparams.js rename to tests/format/flow/flow-repo/fetch/urlsearchparams.js diff --git a/tests/format/flow-repo/find-module/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/find-module/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/find-module/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/find-module/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/find-module/format.test.js b/tests/format/flow/flow-repo/find-module/format.test.js similarity index 100% rename from tests/format/flow-repo/find-module/format.test.js rename to tests/format/flow/flow-repo/find-module/format.test.js diff --git a/tests/format/flow-repo/find-module/req.js b/tests/format/flow/flow-repo/find-module/req.js similarity index 100% rename from tests/format/flow-repo/find-module/req.js rename to tests/format/flow/flow-repo/find-module/req.js diff --git a/tests/format/flow-repo/find-module/test.js b/tests/format/flow/flow-repo/find-module/test.js similarity index 100% rename from tests/format/flow-repo/find-module/test.js rename to tests/format/flow/flow-repo/find-module/test.js diff --git a/tests/format/flow-repo/fixpoint/Fun.js b/tests/format/flow/flow-repo/fixpoint/Fun.js similarity index 100% rename from tests/format/flow-repo/fixpoint/Fun.js rename to tests/format/flow/flow-repo/fixpoint/Fun.js diff --git a/tests/format/flow-repo/fixpoint/Ycombinator.js b/tests/format/flow/flow-repo/fixpoint/Ycombinator.js similarity index 100% rename from tests/format/flow-repo/fixpoint/Ycombinator.js rename to tests/format/flow/flow-repo/fixpoint/Ycombinator.js diff --git a/tests/format/flow-repo/fixpoint/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/fixpoint/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/fixpoint/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/fixpoint/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/fixpoint/format.test.js b/tests/format/flow/flow-repo/fixpoint/format.test.js similarity index 100% rename from tests/format/flow-repo/fixpoint/format.test.js rename to tests/format/flow/flow-repo/fixpoint/format.test.js diff --git a/tests/format/flow-repo/flow_ast.template_strings/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/flow_ast.template_strings/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/flow_ast.template_strings/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/flow_ast.template_strings/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/flow_ast.template_strings/foo.js b/tests/format/flow/flow-repo/flow_ast.template_strings/foo.js similarity index 100% rename from tests/format/flow-repo/flow_ast.template_strings/foo.js rename to tests/format/flow/flow-repo/flow_ast.template_strings/foo.js diff --git a/tests/format/flow-repo/flow_ast.template_strings/format.test.js b/tests/format/flow/flow-repo/flow_ast.template_strings/format.test.js similarity index 100% rename from tests/format/flow-repo/flow_ast.template_strings/format.test.js rename to tests/format/flow/flow-repo/flow_ast.template_strings/format.test.js diff --git a/tests/format/flow-repo/focus-check/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/focus-check/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/focus-check/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/focus-check/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/focus-check/a.js b/tests/format/flow/flow-repo/focus-check/a.js similarity index 100% rename from tests/format/flow-repo/focus-check/a.js rename to tests/format/flow/flow-repo/focus-check/a.js diff --git a/tests/format/flow-repo/focus-check/b.js b/tests/format/flow/flow-repo/focus-check/b.js similarity index 100% rename from tests/format/flow-repo/focus-check/b.js rename to tests/format/flow/flow-repo/focus-check/b.js diff --git a/tests/format/flow-repo/focus-check/format.test.js b/tests/format/flow/flow-repo/focus-check/format.test.js similarity index 100% rename from tests/format/flow-repo/focus-check/format.test.js rename to tests/format/flow/flow-repo/focus-check/format.test.js diff --git a/tests/format/flow-repo/focus-check/test.js b/tests/format/flow/flow-repo/focus-check/test.js similarity index 100% rename from tests/format/flow-repo/focus-check/test.js rename to tests/format/flow/flow-repo/focus-check/test.js diff --git a/tests/format/flow-repo/for/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/for/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/for/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/for/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/for/abnormal.js b/tests/format/flow/flow-repo/for/abnormal.js similarity index 100% rename from tests/format/flow-repo/for/abnormal.js rename to tests/format/flow/flow-repo/for/abnormal.js diff --git a/tests/format/flow-repo/for/abnormal_for_in.js b/tests/format/flow/flow-repo/for/abnormal_for_in.js similarity index 100% rename from tests/format/flow-repo/for/abnormal_for_in.js rename to tests/format/flow/flow-repo/for/abnormal_for_in.js diff --git a/tests/format/flow-repo/for/abnormal_for_of.js b/tests/format/flow/flow-repo/for/abnormal_for_of.js similarity index 100% rename from tests/format/flow-repo/for/abnormal_for_of.js rename to tests/format/flow/flow-repo/for/abnormal_for_of.js diff --git a/tests/format/flow-repo/for/format.test.js b/tests/format/flow/flow-repo/for/format.test.js similarity index 100% rename from tests/format/flow-repo/for/format.test.js rename to tests/format/flow/flow-repo/for/format.test.js diff --git a/tests/format/flow-repo/forof/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/forof/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/forof/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/forof/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/forof/format.test.js b/tests/format/flow/flow-repo/forof/format.test.js similarity index 100% rename from tests/format/flow-repo/forof/format.test.js rename to tests/format/flow/flow-repo/forof/format.test.js diff --git a/tests/format/flow-repo/forof/forof.js b/tests/format/flow/flow-repo/forof/forof.js similarity index 100% rename from tests/format/flow-repo/forof/forof.js rename to tests/format/flow/flow-repo/forof/forof.js diff --git a/tests/format/flow-repo/function/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/function/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/function/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/function/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/function/apply.js b/tests/format/flow/flow-repo/function/apply.js similarity index 100% rename from tests/format/flow-repo/function/apply.js rename to tests/format/flow/flow-repo/function/apply.js diff --git a/tests/format/flow-repo/function/bind.js b/tests/format/flow/flow-repo/function/bind.js similarity index 100% rename from tests/format/flow-repo/function/bind.js rename to tests/format/flow/flow-repo/function/bind.js diff --git a/tests/format/flow-repo/function/call.js b/tests/format/flow/flow-repo/function/call.js similarity index 100% rename from tests/format/flow-repo/function/call.js rename to tests/format/flow/flow-repo/function/call.js diff --git a/tests/format/flow-repo/function/format.test.js b/tests/format/flow/flow-repo/function/format.test.js similarity index 100% rename from tests/format/flow-repo/function/format.test.js rename to tests/format/flow/flow-repo/function/format.test.js diff --git a/tests/format/flow-repo/function/function.js b/tests/format/flow/flow-repo/function/function.js similarity index 100% rename from tests/format/flow-repo/function/function.js rename to tests/format/flow/flow-repo/function/function.js diff --git a/tests/format/flow-repo/function/rest.js b/tests/format/flow/flow-repo/function/rest.js similarity index 100% rename from tests/format/flow-repo/function/rest.js rename to tests/format/flow/flow-repo/function/rest.js diff --git a/tests/format/flow-repo/function/rest_type.js b/tests/format/flow/flow-repo/function/rest_type.js similarity index 100% rename from tests/format/flow-repo/function/rest_type.js rename to tests/format/flow/flow-repo/function/rest_type.js diff --git a/tests/format/flow-repo/funrec/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/funrec/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/funrec/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/funrec/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/funrec/format.test.js b/tests/format/flow/flow-repo/funrec/format.test.js similarity index 100% rename from tests/format/flow-repo/funrec/format.test.js rename to tests/format/flow/flow-repo/funrec/format.test.js diff --git a/tests/format/flow-repo/funrec/funrec.js b/tests/format/flow/flow-repo/funrec/funrec.js similarity index 100% rename from tests/format/flow-repo/funrec/funrec.js rename to tests/format/flow/flow-repo/funrec/funrec.js diff --git a/tests/format/flow-repo/generators/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/generators/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/generators/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/generators/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/generators/class.js b/tests/format/flow/flow-repo/generators/class.js similarity index 100% rename from tests/format/flow-repo/generators/class.js rename to tests/format/flow/flow-repo/generators/class.js diff --git a/tests/format/flow-repo/generators/class_failure.js b/tests/format/flow/flow-repo/generators/class_failure.js similarity index 100% rename from tests/format/flow-repo/generators/class_failure.js rename to tests/format/flow/flow-repo/generators/class_failure.js diff --git a/tests/format/flow-repo/generators/format.test.js b/tests/format/flow/flow-repo/generators/format.test.js similarity index 100% rename from tests/format/flow-repo/generators/format.test.js rename to tests/format/flow/flow-repo/generators/format.test.js diff --git a/tests/format/flow-repo/generators/generators.js b/tests/format/flow/flow-repo/generators/generators.js similarity index 100% rename from tests/format/flow-repo/generators/generators.js rename to tests/format/flow/flow-repo/generators/generators.js diff --git a/tests/format/flow-repo/generators/refi.js b/tests/format/flow/flow-repo/generators/refi.js similarity index 100% rename from tests/format/flow-repo/generators/refi.js rename to tests/format/flow/flow-repo/generators/refi.js diff --git a/tests/format/flow-repo/generators/return.js b/tests/format/flow/flow-repo/generators/return.js similarity index 100% rename from tests/format/flow-repo/generators/return.js rename to tests/format/flow/flow-repo/generators/return.js diff --git a/tests/format/flow-repo/generators/throw.js b/tests/format/flow/flow-repo/generators/throw.js similarity index 100% rename from tests/format/flow-repo/generators/throw.js rename to tests/format/flow/flow-repo/generators/throw.js diff --git a/tests/format/flow-repo/generators/variance.js b/tests/format/flow/flow-repo/generators/variance.js similarity index 100% rename from tests/format/flow-repo/generators/variance.js rename to tests/format/flow/flow-repo/generators/variance.js diff --git a/tests/format/flow-repo/generics/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/generics/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/generics/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/generics/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/generics/format.test.js b/tests/format/flow/flow-repo/generics/format.test.js similarity index 100% rename from tests/format/flow-repo/generics/format.test.js rename to tests/format/flow/flow-repo/generics/format.test.js diff --git a/tests/format/flow-repo/generics/generics.js b/tests/format/flow/flow-repo/generics/generics.js similarity index 100% rename from tests/format/flow-repo/generics/generics.js rename to tests/format/flow/flow-repo/generics/generics.js diff --git a/tests/format/flow-repo/geolocation/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/geolocation/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/geolocation/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/geolocation/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/geolocation/a.js b/tests/format/flow/flow-repo/geolocation/a.js similarity index 100% rename from tests/format/flow-repo/geolocation/a.js rename to tests/format/flow/flow-repo/geolocation/a.js diff --git a/tests/format/flow-repo/geolocation/format.test.js b/tests/format/flow/flow-repo/geolocation/format.test.js similarity index 100% rename from tests/format/flow-repo/geolocation/format.test.js rename to tests/format/flow/flow-repo/geolocation/format.test.js diff --git a/tests/format/flow-repo/get-def/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/get-def/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/get-def/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/get-def/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/get-def/class.js b/tests/format/flow/flow-repo/get-def/class.js similarity index 100% rename from tests/format/flow-repo/get-def/class.js rename to tests/format/flow/flow-repo/get-def/class.js diff --git a/tests/format/flow-repo/get-def/example.js b/tests/format/flow/flow-repo/get-def/example.js similarity index 100% rename from tests/format/flow-repo/get-def/example.js rename to tests/format/flow/flow-repo/get-def/example.js diff --git a/tests/format/flow-repo/get-def/format.test.js b/tests/format/flow/flow-repo/get-def/format.test.js similarity index 100% rename from tests/format/flow-repo/get-def/format.test.js rename to tests/format/flow/flow-repo/get-def/format.test.js diff --git a/tests/format/flow-repo/get-def/helpers/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/get-def/helpers/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/get-def/helpers/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/get-def/helpers/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/get-def/helpers/exports_default.js b/tests/format/flow/flow-repo/get-def/helpers/exports_default.js similarity index 100% rename from tests/format/flow-repo/get-def/helpers/exports_default.js rename to tests/format/flow/flow-repo/get-def/helpers/exports_default.js diff --git a/tests/format/flow-repo/get-def/helpers/exports_named.js b/tests/format/flow/flow-repo/get-def/helpers/exports_named.js similarity index 100% rename from tests/format/flow-repo/get-def/helpers/exports_named.js rename to tests/format/flow/flow-repo/get-def/helpers/exports_named.js diff --git a/tests/format/flow-repo/get-def/helpers/format.test.js b/tests/format/flow/flow-repo/get-def/helpers/format.test.js similarity index 100% rename from tests/format/flow-repo/get-def/helpers/format.test.js rename to tests/format/flow/flow-repo/get-def/helpers/format.test.js diff --git a/tests/format/flow-repo/get-def/imports.js b/tests/format/flow/flow-repo/get-def/imports.js similarity index 100% rename from tests/format/flow-repo/get-def/imports.js rename to tests/format/flow/flow-repo/get-def/imports.js diff --git a/tests/format/flow-repo/get-def/library.js b/tests/format/flow/flow-repo/get-def/library.js similarity index 100% rename from tests/format/flow-repo/get-def/library.js rename to tests/format/flow/flow-repo/get-def/library.js diff --git a/tests/format/flow-repo/get-def2/Parent.js b/tests/format/flow/flow-repo/get-def2/Parent.js similarity index 100% rename from tests/format/flow-repo/get-def2/Parent.js rename to tests/format/flow/flow-repo/get-def2/Parent.js diff --git a/tests/format/flow-repo/get-def2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/get-def2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/get-def2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/get-def2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/get-def2/format.test.js b/tests/format/flow/flow-repo/get-def2/format.test.js similarity index 100% rename from tests/format/flow-repo/get-def2/format.test.js rename to tests/format/flow/flow-repo/get-def2/format.test.js diff --git a/tests/format/flow-repo/get-def2/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/get-def2/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/get-def2/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/get-def2/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/get-def2/lib/format.test.js b/tests/format/flow/flow-repo/get-def2/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/get-def2/lib/format.test.js rename to tests/format/flow/flow-repo/get-def2/lib/format.test.js diff --git a/tests/format/flow-repo/get-def2/lib/jsx.js b/tests/format/flow/flow-repo/get-def2/lib/jsx.js similarity index 100% rename from tests/format/flow-repo/get-def2/lib/jsx.js rename to tests/format/flow/flow-repo/get-def2/lib/jsx.js diff --git a/tests/format/flow-repo/get-def2/main.js b/tests/format/flow/flow-repo/get-def2/main.js similarity index 100% rename from tests/format/flow-repo/get-def2/main.js rename to tests/format/flow/flow-repo/get-def2/main.js diff --git a/tests/format/flow-repo/get-def2/override.js b/tests/format/flow/flow-repo/get-def2/override.js similarity index 100% rename from tests/format/flow-repo/get-def2/override.js rename to tests/format/flow/flow-repo/get-def2/override.js diff --git a/tests/format/flow-repo/get-def2/react.js b/tests/format/flow/flow-repo/get-def2/react.js similarity index 100% rename from tests/format/flow-repo/get-def2/react.js rename to tests/format/flow/flow-repo/get-def2/react.js diff --git a/tests/format/flow-repo/get-def2/types.js b/tests/format/flow/flow-repo/get-def2/types.js similarity index 100% rename from tests/format/flow-repo/get-def2/types.js rename to tests/format/flow/flow-repo/get-def2/types.js diff --git a/tests/format/flow-repo/get-imports/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/get-imports/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/get-imports/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/get-imports/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/get-imports/a.js b/tests/format/flow/flow-repo/get-imports/a.js similarity index 100% rename from tests/format/flow-repo/get-imports/a.js rename to tests/format/flow/flow-repo/get-imports/a.js diff --git a/tests/format/flow-repo/get-imports/b.js b/tests/format/flow/flow-repo/get-imports/b.js similarity index 100% rename from tests/format/flow-repo/get-imports/b.js rename to tests/format/flow/flow-repo/get-imports/b.js diff --git a/tests/format/flow-repo/get-imports/c.js b/tests/format/flow/flow-repo/get-imports/c.js similarity index 100% rename from tests/format/flow-repo/get-imports/c.js rename to tests/format/flow/flow-repo/get-imports/c.js diff --git a/tests/format/flow-repo/get-imports/format.test.js b/tests/format/flow/flow-repo/get-imports/format.test.js similarity index 100% rename from tests/format/flow-repo/get-imports/format.test.js rename to tests/format/flow/flow-repo/get-imports/format.test.js diff --git a/tests/format/flow-repo/getters_and_setters_disabled/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/getters_and_setters_disabled/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/getters_and_setters_disabled/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/getters_and_setters_disabled/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/getters_and_setters_disabled/format.test.js b/tests/format/flow/flow-repo/getters_and_setters_disabled/format.test.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_disabled/format.test.js rename to tests/format/flow/flow-repo/getters_and_setters_disabled/format.test.js diff --git a/tests/format/flow-repo/getters_and_setters_disabled/getters_and_setters.js b/tests/format/flow/flow-repo/getters_and_setters_disabled/getters_and_setters.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_disabled/getters_and_setters.js rename to tests/format/flow/flow-repo/getters_and_setters_disabled/getters_and_setters.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/getters_and_setters_enabled/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/getters_and_setters_enabled/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/getters_and_setters_enabled/class.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/class.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/class.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/class.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/declare_class.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/declare_class.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/declare_class.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/declare_class.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/format.test.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/format.test.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/format.test.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/format.test.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/object.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/object.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/object.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/object.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/object_type.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/object_type.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/object_type.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/object_type.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/react.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/react.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/react.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/react.js diff --git a/tests/format/flow-repo/getters_and_setters_enabled/variance.js b/tests/format/flow/flow-repo/getters_and_setters_enabled/variance.js similarity index 100% rename from tests/format/flow-repo/getters_and_setters_enabled/variance.js rename to tests/format/flow/flow-repo/getters_and_setters_enabled/variance.js diff --git a/tests/format/flow-repo/haste_cycle/API.js b/tests/format/flow/flow-repo/haste_cycle/API.js similarity index 100% rename from tests/format/flow-repo/haste_cycle/API.js rename to tests/format/flow/flow-repo/haste_cycle/API.js diff --git a/tests/format/flow-repo/haste_cycle/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_cycle/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_cycle/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_cycle/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_cycle/format.test.js b/tests/format/flow/flow-repo/haste_cycle/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_cycle/format.test.js rename to tests/format/flow/flow-repo/haste_cycle/format.test.js diff --git a/tests/format/flow-repo/haste_cycle/models/OpenGraphAction.js b/tests/format/flow/flow-repo/haste_cycle/models/OpenGraphAction.js similarity index 100% rename from tests/format/flow-repo/haste_cycle/models/OpenGraphAction.js rename to tests/format/flow/flow-repo/haste_cycle/models/OpenGraphAction.js diff --git a/tests/format/flow-repo/haste_cycle/models/OpenGraphObject.js b/tests/format/flow/flow-repo/haste_cycle/models/OpenGraphObject.js similarity index 100% rename from tests/format/flow-repo/haste_cycle/models/OpenGraphObject.js rename to tests/format/flow/flow-repo/haste_cycle/models/OpenGraphObject.js diff --git a/tests/format/flow-repo/haste_cycle/models/OpenGraphValueContainer.js b/tests/format/flow/flow-repo/haste_cycle/models/OpenGraphValueContainer.js similarity index 100% rename from tests/format/flow-repo/haste_cycle/models/OpenGraphValueContainer.js rename to tests/format/flow/flow-repo/haste_cycle/models/OpenGraphValueContainer.js diff --git a/tests/format/flow-repo/haste_cycle/models/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_cycle/models/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_cycle/models/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_cycle/models/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_cycle/models/format.test.js b/tests/format/flow/flow-repo/haste_cycle/models/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_cycle/models/format.test.js rename to tests/format/flow/flow-repo/haste_cycle/models/format.test.js diff --git a/tests/format/flow-repo/haste_dupe/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_dupe/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_dupe/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_dupe/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_dupe/dupe1.js b/tests/format/flow/flow-repo/haste_dupe/dupe1.js similarity index 100% rename from tests/format/flow-repo/haste_dupe/dupe1.js rename to tests/format/flow/flow-repo/haste_dupe/dupe1.js diff --git a/tests/format/flow-repo/haste_dupe/dupe2.js b/tests/format/flow/flow-repo/haste_dupe/dupe2.js similarity index 100% rename from tests/format/flow-repo/haste_dupe/dupe2.js rename to tests/format/flow/flow-repo/haste_dupe/dupe2.js diff --git a/tests/format/flow-repo/haste_dupe/format.test.js b/tests/format/flow/flow-repo/haste_dupe/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_dupe/format.test.js rename to tests/format/flow/flow-repo/haste_dupe/format.test.js diff --git a/tests/format/flow-repo/haste_dupe/requires_dupe.js b/tests/format/flow/flow-repo/haste_dupe/requires_dupe.js similarity index 100% rename from tests/format/flow-repo/haste_dupe/requires_dupe.js rename to tests/format/flow/flow-repo/haste_dupe/requires_dupe.js diff --git a/tests/format/flow-repo/haste_name_reducers_defaults/Module1.js b/tests/format/flow/flow-repo/haste_name_reducers_defaults/Module1.js similarity index 100% rename from tests/format/flow-repo/haste_name_reducers_defaults/Module1.js rename to tests/format/flow/flow-repo/haste_name_reducers_defaults/Module1.js diff --git a/tests/format/flow-repo/haste_name_reducers_defaults/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_name_reducers_defaults/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_name_reducers_defaults/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_name_reducers_defaults/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_name_reducers_defaults/format.test.js b/tests/format/flow/flow-repo/haste_name_reducers_defaults/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_name_reducers_defaults/format.test.js rename to tests/format/flow/flow-repo/haste_name_reducers_defaults/format.test.js diff --git a/tests/format/flow-repo/haste_name_reducers_defaults/index.js b/tests/format/flow/flow-repo/haste_name_reducers_defaults/index.js similarity index 100% rename from tests/format/flow-repo/haste_name_reducers_defaults/index.js rename to tests/format/flow/flow-repo/haste_name_reducers_defaults/index.js diff --git a/tests/format/flow-repo/haste_use_name_reducers/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_use_name_reducers/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_use_name_reducers/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_use_name_reducers/dir1/Module1.js b/tests/format/flow/flow-repo/haste_use_name_reducers/dir1/Module1.js similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/dir1/Module1.js rename to tests/format/flow/flow-repo/haste_use_name_reducers/dir1/Module1.js diff --git a/tests/format/flow-repo/haste_use_name_reducers/dir1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_use_name_reducers/dir1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/dir1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_use_name_reducers/dir1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_use_name_reducers/dir1/format.test.js b/tests/format/flow/flow-repo/haste_use_name_reducers/dir1/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/dir1/format.test.js rename to tests/format/flow/flow-repo/haste_use_name_reducers/dir1/format.test.js diff --git a/tests/format/flow-repo/haste_use_name_reducers/dir2/Module2.ios.js b/tests/format/flow/flow-repo/haste_use_name_reducers/dir2/Module2.ios.js similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/dir2/Module2.ios.js rename to tests/format/flow/flow-repo/haste_use_name_reducers/dir2/Module2.ios.js diff --git a/tests/format/flow-repo/haste_use_name_reducers/dir2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/haste_use_name_reducers/dir2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/dir2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/haste_use_name_reducers/dir2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/haste_use_name_reducers/dir2/format.test.js b/tests/format/flow/flow-repo/haste_use_name_reducers/dir2/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/dir2/format.test.js rename to tests/format/flow/flow-repo/haste_use_name_reducers/dir2/format.test.js diff --git a/tests/format/flow-repo/haste_use_name_reducers/format.test.js b/tests/format/flow/flow-repo/haste_use_name_reducers/format.test.js similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/format.test.js rename to tests/format/flow/flow-repo/haste_use_name_reducers/format.test.js diff --git a/tests/format/flow-repo/haste_use_name_reducers/index.js b/tests/format/flow/flow-repo/haste_use_name_reducers/index.js similarity index 100% rename from tests/format/flow-repo/haste_use_name_reducers/index.js rename to tests/format/flow/flow-repo/haste_use_name_reducers/index.js diff --git a/tests/format/flow-repo/ignore_package/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/ignore_package/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/ignore_package/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/ignore_package/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/ignore_package/foo.js b/tests/format/flow/flow-repo/ignore_package/foo.js similarity index 100% rename from tests/format/flow-repo/ignore_package/foo.js rename to tests/format/flow/flow-repo/ignore_package/foo.js diff --git a/tests/format/flow-repo/ignore_package/format.test.js b/tests/format/flow/flow-repo/ignore_package/format.test.js similarity index 100% rename from tests/format/flow-repo/ignore_package/format.test.js rename to tests/format/flow/flow-repo/ignore_package/format.test.js diff --git a/tests/format/flow-repo/immutable_methods/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/immutable_methods/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/immutable_methods/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/immutable_methods/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/immutable_methods/format.test.js b/tests/format/flow/flow-repo/immutable_methods/format.test.js similarity index 100% rename from tests/format/flow-repo/immutable_methods/format.test.js rename to tests/format/flow/flow-repo/immutable_methods/format.test.js diff --git a/tests/format/flow-repo/immutable_methods/test.js b/tests/format/flow/flow-repo/immutable_methods/test.js similarity index 100% rename from tests/format/flow-repo/immutable_methods/test.js rename to tests/format/flow/flow-repo/immutable_methods/test.js diff --git a/tests/format/flow-repo/implements/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/implements/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/implements/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/implements/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/implements/format.test.js b/tests/format/flow/flow-repo/implements/format.test.js similarity index 100% rename from tests/format/flow-repo/implements/format.test.js rename to tests/format/flow/flow-repo/implements/format.test.js diff --git a/tests/format/flow-repo/implements/test.js b/tests/format/flow/flow-repo/implements/test.js similarity index 100% rename from tests/format/flow-repo/implements/test.js rename to tests/format/flow/flow-repo/implements/test.js diff --git a/tests/format/flow-repo/import_type/ExportCJSDefault_Class.js b/tests/format/flow/flow-repo/import_type/ExportCJSDefault_Class.js similarity index 100% rename from tests/format/flow-repo/import_type/ExportCJSDefault_Class.js rename to tests/format/flow/flow-repo/import_type/ExportCJSDefault_Class.js diff --git a/tests/format/flow-repo/import_type/ExportCJSNamed_Class.js b/tests/format/flow/flow-repo/import_type/ExportCJSNamed_Class.js similarity index 100% rename from tests/format/flow-repo/import_type/ExportCJSNamed_Class.js rename to tests/format/flow/flow-repo/import_type/ExportCJSNamed_Class.js diff --git a/tests/format/flow-repo/import_type/ExportDefault_Class.js b/tests/format/flow/flow-repo/import_type/ExportDefault_Class.js similarity index 100% rename from tests/format/flow-repo/import_type/ExportDefault_Class.js rename to tests/format/flow/flow-repo/import_type/ExportDefault_Class.js diff --git a/tests/format/flow-repo/import_type/ExportNamed_Alias.js b/tests/format/flow/flow-repo/import_type/ExportNamed_Alias.js similarity index 100% rename from tests/format/flow-repo/import_type/ExportNamed_Alias.js rename to tests/format/flow/flow-repo/import_type/ExportNamed_Alias.js diff --git a/tests/format/flow-repo/import_type/ExportNamed_Class.js b/tests/format/flow/flow-repo/import_type/ExportNamed_Class.js similarity index 100% rename from tests/format/flow-repo/import_type/ExportNamed_Class.js rename to tests/format/flow/flow-repo/import_type/ExportNamed_Class.js diff --git a/tests/format/flow-repo/import_type/ExportsANumber.js b/tests/format/flow/flow-repo/import_type/ExportsANumber.js similarity index 100% rename from tests/format/flow-repo/import_type/ExportsANumber.js rename to tests/format/flow/flow-repo/import_type/ExportsANumber.js diff --git a/tests/format/flow-repo/import_type/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/import_type/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/import_type/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/import_type/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/import_type/format.test.js b/tests/format/flow/flow-repo/import_type/format.test.js similarity index 100% rename from tests/format/flow-repo/import_type/format.test.js rename to tests/format/flow/flow-repo/import_type/format.test.js diff --git a/tests/format/flow-repo/import_type/import_type.js b/tests/format/flow/flow-repo/import_type/import_type.js similarity index 100% rename from tests/format/flow-repo/import_type/import_type.js rename to tests/format/flow/flow-repo/import_type/import_type.js diff --git a/tests/format/flow-repo/import_type/issue-359.js b/tests/format/flow/flow-repo/import_type/issue-359.js similarity index 100% rename from tests/format/flow-repo/import_type/issue-359.js rename to tests/format/flow/flow-repo/import_type/issue-359.js diff --git a/tests/format/flow-repo/import_typeof/ExportCJSDefault_Class.js b/tests/format/flow/flow-repo/import_typeof/ExportCJSDefault_Class.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportCJSDefault_Class.js rename to tests/format/flow/flow-repo/import_typeof/ExportCJSDefault_Class.js diff --git a/tests/format/flow-repo/import_typeof/ExportCJSDefault_Number.js b/tests/format/flow/flow-repo/import_typeof/ExportCJSDefault_Number.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportCJSDefault_Number.js rename to tests/format/flow/flow-repo/import_typeof/ExportCJSDefault_Number.js diff --git a/tests/format/flow-repo/import_typeof/ExportCJSNamed_Class.js b/tests/format/flow/flow-repo/import_typeof/ExportCJSNamed_Class.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportCJSNamed_Class.js rename to tests/format/flow/flow-repo/import_typeof/ExportCJSNamed_Class.js diff --git a/tests/format/flow-repo/import_typeof/ExportCJSNamed_Number.js b/tests/format/flow/flow-repo/import_typeof/ExportCJSNamed_Number.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportCJSNamed_Number.js rename to tests/format/flow/flow-repo/import_typeof/ExportCJSNamed_Number.js diff --git a/tests/format/flow-repo/import_typeof/ExportDefault_Class.js b/tests/format/flow/flow-repo/import_typeof/ExportDefault_Class.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportDefault_Class.js rename to tests/format/flow/flow-repo/import_typeof/ExportDefault_Class.js diff --git a/tests/format/flow-repo/import_typeof/ExportDefault_Number.js b/tests/format/flow/flow-repo/import_typeof/ExportDefault_Number.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportDefault_Number.js rename to tests/format/flow/flow-repo/import_typeof/ExportDefault_Number.js diff --git a/tests/format/flow-repo/import_typeof/ExportNamed_Alias.js b/tests/format/flow/flow-repo/import_typeof/ExportNamed_Alias.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportNamed_Alias.js rename to tests/format/flow/flow-repo/import_typeof/ExportNamed_Alias.js diff --git a/tests/format/flow-repo/import_typeof/ExportNamed_Class.js b/tests/format/flow/flow-repo/import_typeof/ExportNamed_Class.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportNamed_Class.js rename to tests/format/flow/flow-repo/import_typeof/ExportNamed_Class.js diff --git a/tests/format/flow-repo/import_typeof/ExportNamed_Multi.js b/tests/format/flow/flow-repo/import_typeof/ExportNamed_Multi.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportNamed_Multi.js rename to tests/format/flow/flow-repo/import_typeof/ExportNamed_Multi.js diff --git a/tests/format/flow-repo/import_typeof/ExportNamed_Number.js b/tests/format/flow/flow-repo/import_typeof/ExportNamed_Number.js similarity index 100% rename from tests/format/flow-repo/import_typeof/ExportNamed_Number.js rename to tests/format/flow/flow-repo/import_typeof/ExportNamed_Number.js diff --git a/tests/format/flow-repo/import_typeof/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/import_typeof/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/import_typeof/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/import_typeof/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/import_typeof/format.test.js b/tests/format/flow/flow-repo/import_typeof/format.test.js similarity index 100% rename from tests/format/flow-repo/import_typeof/format.test.js rename to tests/format/flow/flow-repo/import_typeof/format.test.js diff --git a/tests/format/flow-repo/import_typeof/import_typeof.js b/tests/format/flow/flow-repo/import_typeof/import_typeof.js similarity index 100% rename from tests/format/flow-repo/import_typeof/import_typeof.js rename to tests/format/flow/flow-repo/import_typeof/import_typeof.js diff --git a/tests/format/flow-repo/include/foo/batman/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/include/foo/batman/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/include/foo/batman/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/include/foo/batman/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/include/foo/batman/baz.js b/tests/format/flow/flow-repo/include/foo/batman/baz.js similarity index 100% rename from tests/format/flow-repo/include/foo/batman/baz.js rename to tests/format/flow/flow-repo/include/foo/batman/baz.js diff --git a/tests/format/flow-repo/include/foo/batman/format.test.js b/tests/format/flow/flow-repo/include/foo/batman/format.test.js similarity index 100% rename from tests/format/flow-repo/include/foo/batman/format.test.js rename to tests/format/flow/flow-repo/include/foo/batman/format.test.js diff --git a/tests/format/flow-repo/include/included/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/include/included/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/include/included/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/include/included/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/include/included/format.test.js b/tests/format/flow/flow-repo/include/included/format.test.js similarity index 100% rename from tests/format/flow-repo/include/included/format.test.js rename to tests/format/flow/flow-repo/include/included/format.test.js diff --git a/tests/format/flow-repo/include/included/test.js b/tests/format/flow/flow-repo/include/included/test.js similarity index 100% rename from tests/format/flow-repo/include/included/test.js rename to tests/format/flow/flow-repo/include/included/test.js diff --git a/tests/format/flow-repo/include_suppressed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/include_suppressed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/include_suppressed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/include_suppressed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/include_suppressed/format.test.js b/tests/format/flow/flow-repo/include_suppressed/format.test.js similarity index 100% rename from tests/format/flow-repo/include_suppressed/format.test.js rename to tests/format/flow/flow-repo/include_suppressed/format.test.js diff --git a/tests/format/flow-repo/include_suppressed/test.js b/tests/format/flow/flow-repo/include_suppressed/test.js similarity index 100% rename from tests/format/flow-repo/include_suppressed/test.js rename to tests/format/flow/flow-repo/include_suppressed/test.js diff --git a/tests/format/flow-repo/incremental/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental/a.js b/tests/format/flow/flow-repo/incremental/a.js similarity index 100% rename from tests/format/flow-repo/incremental/a.js rename to tests/format/flow/flow-repo/incremental/a.js diff --git a/tests/format/flow-repo/incremental/b.js b/tests/format/flow/flow-repo/incremental/b.js similarity index 100% rename from tests/format/flow-repo/incremental/b.js rename to tests/format/flow/flow-repo/incremental/b.js diff --git a/tests/format/flow-repo/incremental/dup_a.js b/tests/format/flow/flow-repo/incremental/dup_a.js similarity index 100% rename from tests/format/flow-repo/incremental/dup_a.js rename to tests/format/flow/flow-repo/incremental/dup_a.js diff --git a/tests/format/flow-repo/incremental/format.test.js b/tests/format/flow/flow-repo/incremental/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental/format.test.js rename to tests/format/flow/flow-repo/incremental/format.test.js diff --git a/tests/format/flow-repo/incremental_basic/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_basic/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_basic/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_basic/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_basic/a.js b/tests/format/flow/flow-repo/incremental_basic/a.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/a.js rename to tests/format/flow/flow-repo/incremental_basic/a.js diff --git a/tests/format/flow-repo/incremental_basic/b.js b/tests/format/flow/flow-repo/incremental_basic/b.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/b.js rename to tests/format/flow/flow-repo/incremental_basic/b.js diff --git a/tests/format/flow-repo/incremental_basic/c.js b/tests/format/flow/flow-repo/incremental_basic/c.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/c.js rename to tests/format/flow/flow-repo/incremental_basic/c.js diff --git a/tests/format/flow-repo/incremental_basic/format.test.js b/tests/format/flow/flow-repo/incremental_basic/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/format.test.js rename to tests/format/flow/flow-repo/incremental_basic/format.test.js diff --git a/tests/format/flow-repo/incremental_basic/tmp1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_basic/tmp1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_basic/tmp1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_basic/tmp1/b.js b/tests/format/flow/flow-repo/incremental_basic/tmp1/b.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp1/b.js rename to tests/format/flow/flow-repo/incremental_basic/tmp1/b.js diff --git a/tests/format/flow-repo/incremental_basic/tmp1/format.test.js b/tests/format/flow/flow-repo/incremental_basic/tmp1/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp1/format.test.js rename to tests/format/flow/flow-repo/incremental_basic/tmp1/format.test.js diff --git a/tests/format/flow-repo/incremental_basic/tmp2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_basic/tmp2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_basic/tmp2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_basic/tmp2/a.js b/tests/format/flow/flow-repo/incremental_basic/tmp2/a.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp2/a.js rename to tests/format/flow/flow-repo/incremental_basic/tmp2/a.js diff --git a/tests/format/flow-repo/incremental_basic/tmp2/format.test.js b/tests/format/flow/flow-repo/incremental_basic/tmp2/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp2/format.test.js rename to tests/format/flow/flow-repo/incremental_basic/tmp2/format.test.js diff --git a/tests/format/flow-repo/incremental_basic/tmp3/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_basic/tmp3/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp3/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_basic/tmp3/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_basic/tmp3/b.js b/tests/format/flow/flow-repo/incremental_basic/tmp3/b.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp3/b.js rename to tests/format/flow/flow-repo/incremental_basic/tmp3/b.js diff --git a/tests/format/flow-repo/incremental_basic/tmp3/format.test.js b/tests/format/flow/flow-repo/incremental_basic/tmp3/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_basic/tmp3/format.test.js rename to tests/format/flow/flow-repo/incremental_basic/tmp3/format.test.js diff --git a/tests/format/flow-repo/incremental_cycle/A.js b/tests/format/flow/flow-repo/incremental_cycle/A.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/A.js rename to tests/format/flow/flow-repo/incremental_cycle/A.js diff --git a/tests/format/flow-repo/incremental_cycle/B.js b/tests/format/flow/flow-repo/incremental_cycle/B.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/B.js rename to tests/format/flow/flow-repo/incremental_cycle/B.js diff --git a/tests/format/flow-repo/incremental_cycle/C.js b/tests/format/flow/flow-repo/incremental_cycle/C.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/C.js rename to tests/format/flow/flow-repo/incremental_cycle/C.js diff --git a/tests/format/flow-repo/incremental_cycle/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_cycle/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_cycle/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_cycle/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_cycle/format.test.js b/tests/format/flow/flow-repo/incremental_cycle/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/format.test.js rename to tests/format/flow/flow-repo/incremental_cycle/format.test.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp1/B.js b/tests/format/flow/flow-repo/incremental_cycle/tmp1/B.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp1/B.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp1/B.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp1/C.js b/tests/format/flow/flow-repo/incremental_cycle/tmp1/C.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp1/C.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp1/C.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_cycle/tmp1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_cycle/tmp1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_cycle/tmp1/format.test.js b/tests/format/flow/flow-repo/incremental_cycle/tmp1/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp1/format.test.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp1/format.test.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp2/B.js b/tests/format/flow/flow-repo/incremental_cycle/tmp2/B.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp2/B.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp2/B.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_cycle/tmp2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_cycle/tmp2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_cycle/tmp2/format.test.js b/tests/format/flow/flow-repo/incremental_cycle/tmp2/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp2/format.test.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp2/format.test.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp3/B.js b/tests/format/flow/flow-repo/incremental_cycle/tmp3/B.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp3/B.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp3/B.js diff --git a/tests/format/flow-repo/incremental_cycle/tmp3/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_cycle/tmp3/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp3/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_cycle/tmp3/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_cycle/tmp3/format.test.js b/tests/format/flow/flow-repo/incremental_cycle/tmp3/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle/tmp3/format.test.js rename to tests/format/flow/flow-repo/incremental_cycle/tmp3/format.test.js diff --git a/tests/format/flow-repo/incremental_cycle_break/A.js b/tests/format/flow/flow-repo/incremental_cycle_break/A.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/A.js rename to tests/format/flow/flow-repo/incremental_cycle_break/A.js diff --git a/tests/format/flow-repo/incremental_cycle_break/B.js b/tests/format/flow/flow-repo/incremental_cycle_break/B.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/B.js rename to tests/format/flow/flow-repo/incremental_cycle_break/B.js diff --git a/tests/format/flow-repo/incremental_cycle_break/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_cycle_break/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_cycle_break/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_cycle_break/format.test.js b/tests/format/flow/flow-repo/incremental_cycle_break/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/format.test.js rename to tests/format/flow/flow-repo/incremental_cycle_break/format.test.js diff --git a/tests/format/flow-repo/incremental_cycle_break/tmp1/A.js b/tests/format/flow/flow-repo/incremental_cycle_break/tmp1/A.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/tmp1/A.js rename to tests/format/flow/flow-repo/incremental_cycle_break/tmp1/A.js diff --git a/tests/format/flow-repo/incremental_cycle_break/tmp1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_cycle_break/tmp1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/tmp1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_cycle_break/tmp1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_cycle_break/tmp1/format.test.js b/tests/format/flow/flow-repo/incremental_cycle_break/tmp1/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_cycle_break/tmp1/format.test.js rename to tests/format/flow/flow-repo/incremental_cycle_break/tmp1/format.test.js diff --git a/tests/format/flow-repo/incremental_delete/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_delete/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_delete/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_delete/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_delete/a.js b/tests/format/flow/flow-repo/incremental_delete/a.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/a.js rename to tests/format/flow/flow-repo/incremental_delete/a.js diff --git a/tests/format/flow-repo/incremental_delete/b.js b/tests/format/flow/flow-repo/incremental_delete/b.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/b.js rename to tests/format/flow/flow-repo/incremental_delete/b.js diff --git a/tests/format/flow-repo/incremental_delete/c.js b/tests/format/flow/flow-repo/incremental_delete/c.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/c.js rename to tests/format/flow/flow-repo/incremental_delete/c.js diff --git a/tests/format/flow-repo/incremental_delete/dupe1.js b/tests/format/flow/flow-repo/incremental_delete/dupe1.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/dupe1.js rename to tests/format/flow/flow-repo/incremental_delete/dupe1.js diff --git a/tests/format/flow-repo/incremental_delete/dupe2.js b/tests/format/flow/flow-repo/incremental_delete/dupe2.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/dupe2.js rename to tests/format/flow/flow-repo/incremental_delete/dupe2.js diff --git a/tests/format/flow-repo/incremental_delete/format.test.js b/tests/format/flow/flow-repo/incremental_delete/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/format.test.js rename to tests/format/flow/flow-repo/incremental_delete/format.test.js diff --git a/tests/format/flow-repo/incremental_delete/requires_dupe.js b/tests/format/flow/flow-repo/incremental_delete/requires_dupe.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/requires_dupe.js rename to tests/format/flow/flow-repo/incremental_delete/requires_dupe.js diff --git a/tests/format/flow-repo/incremental_delete/requires_unchecked.js b/tests/format/flow/flow-repo/incremental_delete/requires_unchecked.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/requires_unchecked.js rename to tests/format/flow/flow-repo/incremental_delete/requires_unchecked.js diff --git a/tests/format/flow-repo/incremental_delete/unchecked.js b/tests/format/flow/flow-repo/incremental_delete/unchecked.js similarity index 100% rename from tests/format/flow-repo/incremental_delete/unchecked.js rename to tests/format/flow/flow-repo/incremental_delete/unchecked.js diff --git a/tests/format/flow-repo/incremental_duplicate_delete/A.js b/tests/format/flow/flow-repo/incremental_duplicate_delete/A.js similarity index 100% rename from tests/format/flow-repo/incremental_duplicate_delete/A.js rename to tests/format/flow/flow-repo/incremental_duplicate_delete/A.js diff --git a/tests/format/flow-repo/incremental_duplicate_delete/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_duplicate_delete/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_duplicate_delete/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_duplicate_delete/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_duplicate_delete/format.test.js b/tests/format/flow/flow-repo/incremental_duplicate_delete/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_duplicate_delete/format.test.js rename to tests/format/flow/flow-repo/incremental_duplicate_delete/format.test.js diff --git a/tests/format/flow-repo/incremental_haste_blacklist/A.js b/tests/format/flow/flow-repo/incremental_haste_blacklist/A.js similarity index 100% rename from tests/format/flow-repo/incremental_haste_blacklist/A.js rename to tests/format/flow/flow-repo/incremental_haste_blacklist/A.js diff --git a/tests/format/flow-repo/incremental_haste_blacklist/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_haste_blacklist/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_haste_blacklist/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_haste_blacklist/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_haste_blacklist/format.test.js b/tests/format/flow/flow-repo/incremental_haste_blacklist/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_haste_blacklist/format.test.js rename to tests/format/flow/flow-repo/incremental_haste_blacklist/format.test.js diff --git a/tests/format/flow-repo/incremental_haste_blacklist/index.js b/tests/format/flow/flow-repo/incremental_haste_blacklist/index.js similarity index 100% rename from tests/format/flow-repo/incremental_haste_blacklist/index.js rename to tests/format/flow/flow-repo/incremental_haste_blacklist/index.js diff --git a/tests/format/flow-repo/incremental_haste_name_reducers_duplicate/A.js b/tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/A.js similarity index 100% rename from tests/format/flow-repo/incremental_haste_name_reducers_duplicate/A.js rename to tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/A.js diff --git a/tests/format/flow-repo/incremental_haste_name_reducers_duplicate/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_haste_name_reducers_duplicate/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_haste_name_reducers_duplicate/format.test.js b/tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_haste_name_reducers_duplicate/format.test.js rename to tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/format.test.js diff --git a/tests/format/flow-repo/incremental_haste_name_reducers_duplicate/index.js b/tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/index.js similarity index 100% rename from tests/format/flow-repo/incremental_haste_name_reducers_duplicate/index.js rename to tests/format/flow/flow-repo/incremental_haste_name_reducers_duplicate/index.js diff --git a/tests/format/flow-repo/incremental_json/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_json/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_json/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_json/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_json/format.test.js b/tests/format/flow/flow-repo/incremental_json/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_json/format.test.js rename to tests/format/flow/flow-repo/incremental_json/format.test.js diff --git a/tests/format/flow-repo/incremental_json/test.js b/tests/format/flow/flow-repo/incremental_json/test.js similarity index 100% rename from tests/format/flow-repo/incremental_json/test.js rename to tests/format/flow/flow-repo/incremental_json/test.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/a.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/a.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/a.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/a.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/b.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/b.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/b.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/b.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/c.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/c.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/c.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/c.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/d.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/d.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/d.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/d.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/format.test.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/format.test.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/format.test.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/root.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/root.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/root.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/root.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/tmp1/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/tmp1/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/tmp1/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/tmp1/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/tmp1/format.test.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/tmp1/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/tmp1/format.test.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/tmp1/format.test.js diff --git a/tests/format/flow-repo/incremental_mixed_naming_cycle/tmp1/root.js b/tests/format/flow/flow-repo/incremental_mixed_naming_cycle/tmp1/root.js similarity index 100% rename from tests/format/flow-repo/incremental_mixed_naming_cycle/tmp1/root.js rename to tests/format/flow/flow-repo/incremental_mixed_naming_cycle/tmp1/root.js diff --git a/tests/format/flow-repo/incremental_non_flow_move/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_non_flow_move/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_non_flow_move/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_non_flow_move/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_non_flow_move/foo.js b/tests/format/flow/flow-repo/incremental_non_flow_move/foo.js similarity index 100% rename from tests/format/flow-repo/incremental_non_flow_move/foo.js rename to tests/format/flow/flow-repo/incremental_non_flow_move/foo.js diff --git a/tests/format/flow-repo/incremental_non_flow_move/format.test.js b/tests/format/flow/flow-repo/incremental_non_flow_move/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_non_flow_move/format.test.js rename to tests/format/flow/flow-repo/incremental_non_flow_move/format.test.js diff --git a/tests/format/flow-repo/incremental_non_flow_move/test.js b/tests/format/flow/flow-repo/incremental_non_flow_move/test.js similarity index 100% rename from tests/format/flow-repo/incremental_non_flow_move/test.js rename to tests/format/flow/flow-repo/incremental_non_flow_move/test.js diff --git a/tests/format/flow-repo/incremental_path/dir/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/incremental_path/dir/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/incremental_path/dir/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/incremental_path/dir/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/incremental_path/dir/a.js b/tests/format/flow/flow-repo/incremental_path/dir/a.js similarity index 100% rename from tests/format/flow-repo/incremental_path/dir/a.js rename to tests/format/flow/flow-repo/incremental_path/dir/a.js diff --git a/tests/format/flow-repo/incremental_path/dir/format.test.js b/tests/format/flow/flow-repo/incremental_path/dir/format.test.js similarity index 100% rename from tests/format/flow-repo/incremental_path/dir/format.test.js rename to tests/format/flow/flow-repo/incremental_path/dir/format.test.js diff --git a/tests/format/flow-repo/indexer/A.js b/tests/format/flow/flow-repo/indexer/A.js similarity index 100% rename from tests/format/flow-repo/indexer/A.js rename to tests/format/flow/flow-repo/indexer/A.js diff --git a/tests/format/flow-repo/indexer/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/indexer/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/indexer/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/indexer/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/indexer/format.test.js b/tests/format/flow/flow-repo/indexer/format.test.js similarity index 100% rename from tests/format/flow-repo/indexer/format.test.js rename to tests/format/flow/flow-repo/indexer/format.test.js diff --git a/tests/format/flow-repo/indexer/multiple.js b/tests/format/flow/flow-repo/indexer/multiple.js similarity index 100% rename from tests/format/flow-repo/indexer/multiple.js rename to tests/format/flow/flow-repo/indexer/multiple.js diff --git a/tests/format/flow-repo/init/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/init/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/init/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/init/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/init/format.test.js b/tests/format/flow/flow-repo/init/format.test.js similarity index 100% rename from tests/format/flow-repo/init/format.test.js rename to tests/format/flow/flow-repo/init/format.test.js diff --git a/tests/format/flow-repo/init/hoisted.js b/tests/format/flow/flow-repo/init/hoisted.js similarity index 100% rename from tests/format/flow-repo/init/hoisted.js rename to tests/format/flow/flow-repo/init/hoisted.js diff --git a/tests/format/flow-repo/init/hoisted2.js b/tests/format/flow/flow-repo/init/hoisted2.js similarity index 100% rename from tests/format/flow-repo/init/hoisted2.js rename to tests/format/flow/flow-repo/init/hoisted2.js diff --git a/tests/format/flow-repo/init/let.js b/tests/format/flow/flow-repo/init/let.js similarity index 100% rename from tests/format/flow-repo/init/let.js rename to tests/format/flow/flow-repo/init/let.js diff --git a/tests/format/flow-repo/init/nullable-init.js b/tests/format/flow/flow-repo/init/nullable-init.js similarity index 100% rename from tests/format/flow-repo/init/nullable-init.js rename to tests/format/flow/flow-repo/init/nullable-init.js diff --git a/tests/format/flow-repo/instanceof/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/instanceof/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/instanceof/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/instanceof/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/instanceof/format.test.js b/tests/format/flow/flow-repo/instanceof/format.test.js similarity index 100% rename from tests/format/flow-repo/instanceof/format.test.js rename to tests/format/flow/flow-repo/instanceof/format.test.js diff --git a/tests/format/flow-repo/instanceof/instanceof.js b/tests/format/flow/flow-repo/instanceof/instanceof.js similarity index 100% rename from tests/format/flow-repo/instanceof/instanceof.js rename to tests/format/flow/flow-repo/instanceof/instanceof.js diff --git a/tests/format/flow-repo/integration/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/integration/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/integration/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/integration/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/integration/bar.js b/tests/format/flow/flow-repo/integration/bar.js similarity index 100% rename from tests/format/flow-repo/integration/bar.js rename to tests/format/flow/flow-repo/integration/bar.js diff --git a/tests/format/flow-repo/integration/foo.js b/tests/format/flow/flow-repo/integration/foo.js similarity index 100% rename from tests/format/flow-repo/integration/foo.js rename to tests/format/flow/flow-repo/integration/foo.js diff --git a/tests/format/flow-repo/integration/format.test.js b/tests/format/flow/flow-repo/integration/format.test.js similarity index 100% rename from tests/format/flow-repo/integration/format.test.js rename to tests/format/flow/flow-repo/integration/format.test.js diff --git a/tests/format/flow-repo/interface/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/interface/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/interface/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/interface/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/interface/format.test.js b/tests/format/flow/flow-repo/interface/format.test.js similarity index 100% rename from tests/format/flow-repo/interface/format.test.js rename to tests/format/flow/flow-repo/interface/format.test.js diff --git a/tests/format/flow-repo/interface/import.js b/tests/format/flow/flow-repo/interface/import.js similarity index 100% rename from tests/format/flow-repo/interface/import.js rename to tests/format/flow/flow-repo/interface/import.js diff --git a/tests/format/flow-repo/interface/indexer.js b/tests/format/flow/flow-repo/interface/indexer.js similarity index 100% rename from tests/format/flow-repo/interface/indexer.js rename to tests/format/flow/flow-repo/interface/indexer.js diff --git a/tests/format/flow-repo/interface/interface.js b/tests/format/flow/flow-repo/interface/interface.js similarity index 100% rename from tests/format/flow-repo/interface/interface.js rename to tests/format/flow/flow-repo/interface/interface.js diff --git a/tests/format/flow-repo/interface/test.js b/tests/format/flow/flow-repo/interface/test.js similarity index 100% rename from tests/format/flow-repo/interface/test.js rename to tests/format/flow/flow-repo/interface/test.js diff --git a/tests/format/flow-repo/interface/test2.js b/tests/format/flow/flow-repo/interface/test2.js similarity index 100% rename from tests/format/flow-repo/interface/test2.js rename to tests/format/flow/flow-repo/interface/test2.js diff --git a/tests/format/flow-repo/interface/test3.js b/tests/format/flow/flow-repo/interface/test3.js similarity index 100% rename from tests/format/flow-repo/interface/test3.js rename to tests/format/flow/flow-repo/interface/test3.js diff --git a/tests/format/flow-repo/interface/test4.js b/tests/format/flow/flow-repo/interface/test4.js similarity index 100% rename from tests/format/flow-repo/interface/test4.js rename to tests/format/flow/flow-repo/interface/test4.js diff --git a/tests/format/flow-repo/intersection/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/intersection/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/intersection/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/intersection/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/intersection/format.test.js b/tests/format/flow/flow-repo/intersection/format.test.js similarity index 100% rename from tests/format/flow-repo/intersection/format.test.js rename to tests/format/flow/flow-repo/intersection/format.test.js diff --git a/tests/format/flow-repo/intersection/intersection.js b/tests/format/flow/flow-repo/intersection/intersection.js similarity index 100% rename from tests/format/flow-repo/intersection/intersection.js rename to tests/format/flow/flow-repo/intersection/intersection.js diff --git a/tests/format/flow-repo/intersection/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/intersection/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/intersection/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/intersection/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/intersection/lib/format.test.js b/tests/format/flow/flow-repo/intersection/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/intersection/lib/format.test.js rename to tests/format/flow/flow-repo/intersection/lib/format.test.js diff --git a/tests/format/flow-repo/intersection/lib/lib.js b/tests/format/flow/flow-repo/intersection/lib/lib.js similarity index 100% rename from tests/format/flow-repo/intersection/lib/lib.js rename to tests/format/flow/flow-repo/intersection/lib/lib.js diff --git a/tests/format/flow-repo/intersection/objassign.js b/tests/format/flow/flow-repo/intersection/objassign.js similarity index 100% rename from tests/format/flow-repo/intersection/objassign.js rename to tests/format/flow/flow-repo/intersection/objassign.js diff --git a/tests/format/flow-repo/intersection/pred.js b/tests/format/flow/flow-repo/intersection/pred.js similarity index 100% rename from tests/format/flow-repo/intersection/pred.js rename to tests/format/flow/flow-repo/intersection/pred.js diff --git a/tests/format/flow-repo/intersection/test_fun.js b/tests/format/flow/flow-repo/intersection/test_fun.js similarity index 100% rename from tests/format/flow-repo/intersection/test_fun.js rename to tests/format/flow/flow-repo/intersection/test_fun.js diff --git a/tests/format/flow-repo/intersection/test_obj.js b/tests/format/flow/flow-repo/intersection/test_obj.js similarity index 100% rename from tests/format/flow-repo/intersection/test_obj.js rename to tests/format/flow/flow-repo/intersection/test_obj.js diff --git a/tests/format/flow-repo/issues-11/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/issues-11/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/issues-11/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/issues-11/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/issues-11/export.js b/tests/format/flow/flow-repo/issues-11/export.js similarity index 100% rename from tests/format/flow-repo/issues-11/export.js rename to tests/format/flow/flow-repo/issues-11/export.js diff --git a/tests/format/flow-repo/issues-11/format.test.js b/tests/format/flow/flow-repo/issues-11/format.test.js similarity index 100% rename from tests/format/flow-repo/issues-11/format.test.js rename to tests/format/flow/flow-repo/issues-11/format.test.js diff --git a/tests/format/flow-repo/issues-11/import.js b/tests/format/flow/flow-repo/issues-11/import.js similarity index 100% rename from tests/format/flow-repo/issues-11/import.js rename to tests/format/flow/flow-repo/issues-11/import.js diff --git a/tests/format/flow-repo/iter/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/iter/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/iter/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/iter/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/iter/format.test.js b/tests/format/flow/flow-repo/iter/format.test.js similarity index 100% rename from tests/format/flow-repo/iter/format.test.js rename to tests/format/flow/flow-repo/iter/format.test.js diff --git a/tests/format/flow-repo/iter/iter.js b/tests/format/flow/flow-repo/iter/iter.js similarity index 100% rename from tests/format/flow-repo/iter/iter.js rename to tests/format/flow/flow-repo/iter/iter.js diff --git a/tests/format/flow-repo/iterable/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/iterable/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/iterable/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/iterable/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/iterable/array.js b/tests/format/flow/flow-repo/iterable/array.js similarity index 100% rename from tests/format/flow-repo/iterable/array.js rename to tests/format/flow/flow-repo/iterable/array.js diff --git a/tests/format/flow-repo/iterable/caching_bug.js b/tests/format/flow/flow-repo/iterable/caching_bug.js similarity index 100% rename from tests/format/flow-repo/iterable/caching_bug.js rename to tests/format/flow/flow-repo/iterable/caching_bug.js diff --git a/tests/format/flow-repo/iterable/format.test.js b/tests/format/flow/flow-repo/iterable/format.test.js similarity index 100% rename from tests/format/flow-repo/iterable/format.test.js rename to tests/format/flow/flow-repo/iterable/format.test.js diff --git a/tests/format/flow-repo/iterable/iter.js b/tests/format/flow/flow-repo/iterable/iter.js similarity index 100% rename from tests/format/flow-repo/iterable/iter.js rename to tests/format/flow/flow-repo/iterable/iter.js diff --git a/tests/format/flow-repo/iterable/iterator_result.js b/tests/format/flow/flow-repo/iterable/iterator_result.js similarity index 100% rename from tests/format/flow-repo/iterable/iterator_result.js rename to tests/format/flow/flow-repo/iterable/iterator_result.js diff --git a/tests/format/flow-repo/iterable/map.js b/tests/format/flow/flow-repo/iterable/map.js similarity index 100% rename from tests/format/flow-repo/iterable/map.js rename to tests/format/flow/flow-repo/iterable/map.js diff --git a/tests/format/flow-repo/iterable/set.js b/tests/format/flow/flow-repo/iterable/set.js similarity index 100% rename from tests/format/flow-repo/iterable/set.js rename to tests/format/flow/flow-repo/iterable/set.js diff --git a/tests/format/flow-repo/iterable/string.js b/tests/format/flow/flow-repo/iterable/string.js similarity index 100% rename from tests/format/flow-repo/iterable/string.js rename to tests/format/flow/flow-repo/iterable/string.js diff --git a/tests/format/flow-repo/iterable/variance.js b/tests/format/flow/flow-repo/iterable/variance.js similarity index 100% rename from tests/format/flow-repo/iterable/variance.js rename to tests/format/flow/flow-repo/iterable/variance.js diff --git a/tests/format/flow-repo/jsx_intrinsics.builtin/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/jsx_intrinsics.builtin/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.builtin/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/jsx_intrinsics.builtin/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/jsx_intrinsics.builtin/format.test.js b/tests/format/flow/flow-repo/jsx_intrinsics.builtin/format.test.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.builtin/format.test.js rename to tests/format/flow/flow-repo/jsx_intrinsics.builtin/format.test.js diff --git a/tests/format/flow-repo/jsx_intrinsics.builtin/main.js b/tests/format/flow/flow-repo/jsx_intrinsics.builtin/main.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.builtin/main.js rename to tests/format/flow/flow-repo/jsx_intrinsics.builtin/main.js diff --git a/tests/format/flow-repo/jsx_intrinsics.builtin/strings.js b/tests/format/flow/flow-repo/jsx_intrinsics.builtin/strings.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.builtin/strings.js rename to tests/format/flow/flow-repo/jsx_intrinsics.builtin/strings.js diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/jsx_intrinsics.custom/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/format.test.js b/tests/format/flow/flow-repo/jsx_intrinsics.custom/format.test.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/format.test.js rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/format.test.js diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/jsx_intrinsics.custom/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/lib/format.test.js b/tests/format/flow/flow-repo/jsx_intrinsics.custom/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/lib/format.test.js rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/lib/format.test.js diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/lib/jsx.js b/tests/format/flow/flow-repo/jsx_intrinsics.custom/lib/jsx.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/lib/jsx.js rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/lib/jsx.js diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/main.js b/tests/format/flow/flow-repo/jsx_intrinsics.custom/main.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/main.js rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/main.js diff --git a/tests/format/flow-repo/jsx_intrinsics.custom/strings.js b/tests/format/flow/flow-repo/jsx_intrinsics.custom/strings.js similarity index 100% rename from tests/format/flow-repo/jsx_intrinsics.custom/strings.js rename to tests/format/flow/flow-repo/jsx_intrinsics.custom/strings.js diff --git a/tests/format/flow-repo/keys/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/keys/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/keys/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/keys/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/keys/format.test.js b/tests/format/flow/flow-repo/keys/format.test.js similarity index 100% rename from tests/format/flow-repo/keys/format.test.js rename to tests/format/flow/flow-repo/keys/format.test.js diff --git a/tests/format/flow-repo/keys/keys.js b/tests/format/flow/flow-repo/keys/keys.js similarity index 100% rename from tests/format/flow-repo/keys/keys.js rename to tests/format/flow/flow-repo/keys/keys.js diff --git a/tests/format/flow-repo/keyvalue/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/keyvalue/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/keyvalue/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/keyvalue/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/keyvalue/format.test.js b/tests/format/flow/flow-repo/keyvalue/format.test.js similarity index 100% rename from tests/format/flow-repo/keyvalue/format.test.js rename to tests/format/flow/flow-repo/keyvalue/format.test.js diff --git a/tests/format/flow-repo/keyvalue/keyvalue.js b/tests/format/flow/flow-repo/keyvalue/keyvalue.js similarity index 100% rename from tests/format/flow-repo/keyvalue/keyvalue.js rename to tests/format/flow/flow-repo/keyvalue/keyvalue.js diff --git a/tests/format/flow-repo/last_duplicate_property_wins/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/last_duplicate_property_wins/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/last_duplicate_property_wins/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/last_duplicate_property_wins/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/last_duplicate_property_wins/format.test.js b/tests/format/flow/flow-repo/last_duplicate_property_wins/format.test.js similarity index 100% rename from tests/format/flow-repo/last_duplicate_property_wins/format.test.js rename to tests/format/flow/flow-repo/last_duplicate_property_wins/format.test.js diff --git a/tests/format/flow-repo/last_duplicate_property_wins/test.js b/tests/format/flow/flow-repo/last_duplicate_property_wins/test.js similarity index 100% rename from tests/format/flow-repo/last_duplicate_property_wins/test.js rename to tests/format/flow/flow-repo/last_duplicate_property_wins/test.js diff --git a/tests/format/flow-repo/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/lib/format.test.js b/tests/format/flow/flow-repo/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/lib/format.test.js rename to tests/format/flow/flow-repo/lib/format.test.js diff --git a/tests/format/flow-repo/lib/libtest.js b/tests/format/flow/flow-repo/lib/libtest.js similarity index 100% rename from tests/format/flow-repo/lib/libtest.js rename to tests/format/flow/flow-repo/lib/libtest.js diff --git a/tests/format/flow-repo/lib_interfaces/declarations/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/lib_interfaces/declarations/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/lib_interfaces/declarations/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/lib_interfaces/declarations/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/lib_interfaces/declarations/format.test.js b/tests/format/flow/flow-repo/lib_interfaces/declarations/format.test.js similarity index 100% rename from tests/format/flow-repo/lib_interfaces/declarations/format.test.js rename to tests/format/flow/flow-repo/lib_interfaces/declarations/format.test.js diff --git a/tests/format/flow-repo/lib_interfaces/declarations/underscore.js b/tests/format/flow/flow-repo/lib_interfaces/declarations/underscore.js similarity index 100% rename from tests/format/flow-repo/lib_interfaces/declarations/underscore.js rename to tests/format/flow/flow-repo/lib_interfaces/declarations/underscore.js diff --git a/tests/format/flow-repo/libconfig/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/libconfig/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/libconfig/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/libconfig/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/libconfig/format.test.js b/tests/format/flow/flow-repo/libconfig/format.test.js similarity index 100% rename from tests/format/flow-repo/libconfig/format.test.js rename to tests/format/flow/flow-repo/libconfig/format.test.js diff --git a/tests/format/flow-repo/libconfig/libA.js b/tests/format/flow/flow-repo/libconfig/libA.js similarity index 100% rename from tests/format/flow-repo/libconfig/libA.js rename to tests/format/flow/flow-repo/libconfig/libA.js diff --git a/tests/format/flow-repo/libconfig/libB.js b/tests/format/flow/flow-repo/libconfig/libB.js similarity index 100% rename from tests/format/flow-repo/libconfig/libB.js rename to tests/format/flow/flow-repo/libconfig/libB.js diff --git a/tests/format/flow-repo/libconfig/libtest.js b/tests/format/flow/flow-repo/libconfig/libtest.js similarity index 100% rename from tests/format/flow-repo/libconfig/libtest.js rename to tests/format/flow/flow-repo/libconfig/libtest.js diff --git a/tests/format/flow-repo/libdef_ignored_module/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/libdef_ignored_module/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/libdef_ignored_module/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/libdef_ignored_module/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/libdef_ignored_module/format.test.js b/tests/format/flow/flow-repo/libdef_ignored_module/format.test.js similarity index 100% rename from tests/format/flow-repo/libdef_ignored_module/format.test.js rename to tests/format/flow/flow-repo/libdef_ignored_module/format.test.js diff --git a/tests/format/flow-repo/libdef_ignored_module/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/libdef_ignored_module/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/libdef_ignored_module/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/libdef_ignored_module/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/libdef_ignored_module/lib/foo.js b/tests/format/flow/flow-repo/libdef_ignored_module/lib/foo.js similarity index 100% rename from tests/format/flow-repo/libdef_ignored_module/lib/foo.js rename to tests/format/flow/flow-repo/libdef_ignored_module/lib/foo.js diff --git a/tests/format/flow-repo/libdef_ignored_module/lib/format.test.js b/tests/format/flow/flow-repo/libdef_ignored_module/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/libdef_ignored_module/lib/format.test.js rename to tests/format/flow/flow-repo/libdef_ignored_module/lib/format.test.js diff --git a/tests/format/flow-repo/libdef_ignored_module/test.js b/tests/format/flow/flow-repo/libdef_ignored_module/test.js similarity index 100% rename from tests/format/flow-repo/libdef_ignored_module/test.js rename to tests/format/flow/flow-repo/libdef_ignored_module/test.js diff --git a/tests/format/flow-repo/liberr/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/liberr/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/liberr/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/liberr/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/liberr/a.js b/tests/format/flow/flow-repo/liberr/a.js similarity index 100% rename from tests/format/flow-repo/liberr/a.js rename to tests/format/flow/flow-repo/liberr/a.js diff --git a/tests/format/flow-repo/liberr/format.test.js b/tests/format/flow/flow-repo/liberr/format.test.js similarity index 100% rename from tests/format/flow-repo/liberr/format.test.js rename to tests/format/flow/flow-repo/liberr/format.test.js diff --git a/tests/format/flow-repo/liberr/libs/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/liberr/libs/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/liberr/libs/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/liberr/libs/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/liberr/libs/format.test.js b/tests/format/flow/flow-repo/liberr/libs/format.test.js similarity index 100% rename from tests/format/flow-repo/liberr/libs/format.test.js rename to tests/format/flow/flow-repo/liberr/libs/format.test.js diff --git a/tests/format/flow-repo/liberr/libs/type_error.js b/tests/format/flow/flow-repo/liberr/libs/type_error.js similarity index 100% rename from tests/format/flow-repo/liberr/libs/type_error.js rename to tests/format/flow/flow-repo/liberr/libs/type_error.js diff --git a/tests/format/flow-repo/libflow-typed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/libflow-typed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/libflow-typed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/libflow-typed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/libflow-typed/flow-typed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/libflow-typed/flow-typed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/libflow-typed/flow-typed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/libflow-typed/flow-typed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/libflow-typed/flow-typed/dino.js b/tests/format/flow/flow-repo/libflow-typed/flow-typed/dino.js similarity index 100% rename from tests/format/flow-repo/libflow-typed/flow-typed/dino.js rename to tests/format/flow/flow-repo/libflow-typed/flow-typed/dino.js diff --git a/tests/format/flow-repo/libflow-typed/flow-typed/format.test.js b/tests/format/flow/flow-repo/libflow-typed/flow-typed/format.test.js similarity index 100% rename from tests/format/flow-repo/libflow-typed/flow-typed/format.test.js rename to tests/format/flow/flow-repo/libflow-typed/flow-typed/format.test.js diff --git a/tests/format/flow-repo/libflow-typed/format.test.js b/tests/format/flow/flow-repo/libflow-typed/format.test.js similarity index 100% rename from tests/format/flow-repo/libflow-typed/format.test.js rename to tests/format/flow/flow-repo/libflow-typed/format.test.js diff --git a/tests/format/flow-repo/libflow-typed/libtest.js b/tests/format/flow/flow-repo/libflow-typed/libtest.js similarity index 100% rename from tests/format/flow-repo/libflow-typed/libtest.js rename to tests/format/flow/flow-repo/libflow-typed/libtest.js diff --git a/tests/format/flow-repo/librec/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/librec/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/librec/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/librec/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/librec/format.test.js b/tests/format/flow/flow-repo/librec/format.test.js similarity index 100% rename from tests/format/flow-repo/librec/format.test.js rename to tests/format/flow/flow-repo/librec/format.test.js diff --git a/tests/format/flow-repo/librec/lib/A/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/librec/lib/A/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/librec/lib/A/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/librec/lib/A/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/librec/lib/A/format.test.js b/tests/format/flow/flow-repo/librec/lib/A/format.test.js similarity index 100% rename from tests/format/flow-repo/librec/lib/A/format.test.js rename to tests/format/flow/flow-repo/librec/lib/A/format.test.js diff --git a/tests/format/flow-repo/librec/lib/A/libA.js b/tests/format/flow/flow-repo/librec/lib/A/libA.js similarity index 100% rename from tests/format/flow-repo/librec/lib/A/libA.js rename to tests/format/flow/flow-repo/librec/lib/A/libA.js diff --git a/tests/format/flow-repo/librec/lib/B/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/librec/lib/B/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/librec/lib/B/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/librec/lib/B/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/librec/lib/B/format.test.js b/tests/format/flow/flow-repo/librec/lib/B/format.test.js similarity index 100% rename from tests/format/flow-repo/librec/lib/B/format.test.js rename to tests/format/flow/flow-repo/librec/lib/B/format.test.js diff --git a/tests/format/flow-repo/librec/lib/B/libB.js b/tests/format/flow/flow-repo/librec/lib/B/libB.js similarity index 100% rename from tests/format/flow-repo/librec/lib/B/libB.js rename to tests/format/flow/flow-repo/librec/lib/B/libB.js diff --git a/tests/format/flow-repo/librec/libtest.js b/tests/format/flow/flow-repo/librec/libtest.js similarity index 100% rename from tests/format/flow-repo/librec/libtest.js rename to tests/format/flow/flow-repo/librec/libtest.js diff --git a/tests/format/flow-repo/literal/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/literal/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/literal/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/literal/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/literal/enum.js b/tests/format/flow/flow-repo/literal/enum.js similarity index 100% rename from tests/format/flow-repo/literal/enum.js rename to tests/format/flow/flow-repo/literal/enum.js diff --git a/tests/format/flow-repo/literal/enum_client.js b/tests/format/flow/flow-repo/literal/enum_client.js similarity index 100% rename from tests/format/flow-repo/literal/enum_client.js rename to tests/format/flow/flow-repo/literal/enum_client.js diff --git a/tests/format/flow-repo/literal/format.test.js b/tests/format/flow/flow-repo/literal/format.test.js similarity index 100% rename from tests/format/flow-repo/literal/format.test.js rename to tests/format/flow/flow-repo/literal/format.test.js diff --git a/tests/format/flow-repo/literal/number.js b/tests/format/flow/flow-repo/literal/number.js similarity index 100% rename from tests/format/flow-repo/literal/number.js rename to tests/format/flow/flow-repo/literal/number.js diff --git a/tests/format/flow-repo/locals/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/locals/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/locals/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/locals/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/locals/format.test.js b/tests/format/flow/flow-repo/locals/format.test.js similarity index 100% rename from tests/format/flow-repo/locals/format.test.js rename to tests/format/flow/flow-repo/locals/format.test.js diff --git a/tests/format/flow-repo/locals/lex.js b/tests/format/flow/flow-repo/locals/lex.js similarity index 100% rename from tests/format/flow-repo/locals/lex.js rename to tests/format/flow/flow-repo/locals/lex.js diff --git a/tests/format/flow-repo/locals/locals.js b/tests/format/flow/flow-repo/locals/locals.js similarity index 100% rename from tests/format/flow-repo/locals/locals.js rename to tests/format/flow/flow-repo/locals/locals.js diff --git a/tests/format/flow-repo/logical/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/logical/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/logical/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/logical/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/logical/format.test.js b/tests/format/flow/flow-repo/logical/format.test.js similarity index 100% rename from tests/format/flow-repo/logical/format.test.js rename to tests/format/flow/flow-repo/logical/format.test.js diff --git a/tests/format/flow-repo/logical/logical.js b/tests/format/flow/flow-repo/logical/logical.js similarity index 100% rename from tests/format/flow-repo/logical/logical.js rename to tests/format/flow/flow-repo/logical/logical.js diff --git a/tests/format/flow-repo/loners/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/loners/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/loners/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/loners/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/loners/format.test.js b/tests/format/flow/flow-repo/loners/format.test.js similarity index 100% rename from tests/format/flow-repo/loners/format.test.js rename to tests/format/flow/flow-repo/loners/format.test.js diff --git a/tests/format/flow-repo/loners/loners.js b/tests/format/flow/flow-repo/loners/loners.js similarity index 100% rename from tests/format/flow-repo/loners/loners.js rename to tests/format/flow/flow-repo/loners/loners.js diff --git a/tests/format/flow-repo/malformed_code/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/malformed_code/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/malformed_code/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/malformed_code/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/malformed_code/format.test.js b/tests/format/flow/flow-repo/malformed_code/format.test.js similarity index 100% rename from tests/format/flow-repo/malformed_code/format.test.js rename to tests/format/flow/flow-repo/malformed_code/format.test.js diff --git a/tests/format/flow-repo/malformed_code/text.js b/tests/format/flow/flow-repo/malformed_code/text.js similarity index 100% rename from tests/format/flow-repo/malformed_code/text.js rename to tests/format/flow/flow-repo/malformed_code/text.js diff --git a/tests/format/flow-repo/match/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/match/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/match/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/match/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/match/expression.js b/tests/format/flow/flow-repo/match/expression.js similarity index 100% rename from tests/format/flow-repo/match/expression.js rename to tests/format/flow/flow-repo/match/expression.js diff --git a/tests/format/flow-repo/match/format.test.js b/tests/format/flow/flow-repo/match/format.test.js similarity index 100% rename from tests/format/flow-repo/match/format.test.js rename to tests/format/flow/flow-repo/match/format.test.js diff --git a/tests/format/flow-repo/match/hints.js b/tests/format/flow/flow-repo/match/hints.js similarity index 100% rename from tests/format/flow-repo/match/hints.js rename to tests/format/flow/flow-repo/match/hints.js diff --git a/tests/format/flow-repo/match/matching.js b/tests/format/flow/flow-repo/match/matching.js similarity index 100% rename from tests/format/flow-repo/match/matching.js rename to tests/format/flow/flow-repo/match/matching.js diff --git a/tests/format/flow-repo/match/pattern-errors.js b/tests/format/flow/flow-repo/match/pattern-errors.js similarity index 100% rename from tests/format/flow-repo/match/pattern-errors.js rename to tests/format/flow/flow-repo/match/pattern-errors.js diff --git a/tests/format/flow-repo/match/patterns.js b/tests/format/flow/flow-repo/match/patterns.js similarity index 100% rename from tests/format/flow-repo/match/patterns.js rename to tests/format/flow/flow-repo/match/patterns.js diff --git a/tests/format/flow-repo/match/rules-of-hooks.js b/tests/format/flow/flow-repo/match/rules-of-hooks.js similarity index 100% rename from tests/format/flow-repo/match/rules-of-hooks.js rename to tests/format/flow/flow-repo/match/rules-of-hooks.js diff --git a/tests/format/flow-repo/match/statement.js b/tests/format/flow/flow-repo/match/statement.js similarity index 100% rename from tests/format/flow-repo/match/statement.js rename to tests/format/flow/flow-repo/match/statement.js diff --git a/tests/format/flow-repo/match_failure/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/match_failure/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/match_failure/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/match_failure/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/match_failure/disjoint_union.js b/tests/format/flow/flow-repo/match_failure/disjoint_union.js similarity index 100% rename from tests/format/flow-repo/match_failure/disjoint_union.js rename to tests/format/flow/flow-repo/match_failure/disjoint_union.js diff --git a/tests/format/flow-repo/match_failure/enum.js b/tests/format/flow/flow-repo/match_failure/enum.js similarity index 100% rename from tests/format/flow-repo/match_failure/enum.js rename to tests/format/flow/flow-repo/match_failure/enum.js diff --git a/tests/format/flow-repo/match_failure/format.test.js b/tests/format/flow/flow-repo/match_failure/format.test.js similarity index 100% rename from tests/format/flow-repo/match_failure/format.test.js rename to tests/format/flow/flow-repo/match_failure/format.test.js diff --git a/tests/format/flow-repo/method_properties/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/method_properties/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/method_properties/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/method_properties/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/method_properties/exports_optional_prop.js b/tests/format/flow/flow-repo/method_properties/exports_optional_prop.js similarity index 100% rename from tests/format/flow-repo/method_properties/exports_optional_prop.js rename to tests/format/flow/flow-repo/method_properties/exports_optional_prop.js diff --git a/tests/format/flow-repo/method_properties/format.test.js b/tests/format/flow/flow-repo/method_properties/format.test.js similarity index 100% rename from tests/format/flow-repo/method_properties/format.test.js rename to tests/format/flow/flow-repo/method_properties/format.test.js diff --git a/tests/format/flow-repo/method_properties/test.js b/tests/format/flow/flow-repo/method_properties/test.js similarity index 100% rename from tests/format/flow-repo/method_properties/test.js rename to tests/format/flow/flow-repo/method_properties/test.js diff --git a/tests/format/flow-repo/misc/A.js b/tests/format/flow/flow-repo/misc/A.js similarity index 100% rename from tests/format/flow-repo/misc/A.js rename to tests/format/flow/flow-repo/misc/A.js diff --git a/tests/format/flow-repo/misc/B.js b/tests/format/flow/flow-repo/misc/B.js similarity index 100% rename from tests/format/flow-repo/misc/B.js rename to tests/format/flow/flow-repo/misc/B.js diff --git a/tests/format/flow-repo/misc/C.js b/tests/format/flow/flow-repo/misc/C.js similarity index 100% rename from tests/format/flow-repo/misc/C.js rename to tests/format/flow/flow-repo/misc/C.js diff --git a/tests/format/flow-repo/misc/D.js b/tests/format/flow/flow-repo/misc/D.js similarity index 100% rename from tests/format/flow-repo/misc/D.js rename to tests/format/flow/flow-repo/misc/D.js diff --git a/tests/format/flow-repo/misc/E.js b/tests/format/flow/flow-repo/misc/E.js similarity index 100% rename from tests/format/flow-repo/misc/E.js rename to tests/format/flow/flow-repo/misc/E.js diff --git a/tests/format/flow-repo/misc/F.js b/tests/format/flow/flow-repo/misc/F.js similarity index 100% rename from tests/format/flow-repo/misc/F.js rename to tests/format/flow/flow-repo/misc/F.js diff --git a/tests/format/flow-repo/misc/G.js b/tests/format/flow/flow-repo/misc/G.js similarity index 100% rename from tests/format/flow-repo/misc/G.js rename to tests/format/flow/flow-repo/misc/G.js diff --git a/tests/format/flow-repo/misc/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/misc/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/misc/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/misc/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/misc/format.test.js b/tests/format/flow/flow-repo/misc/format.test.js similarity index 100% rename from tests/format/flow-repo/misc/format.test.js rename to tests/format/flow/flow-repo/misc/format.test.js diff --git a/tests/format/flow-repo/missing_annotation/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/missing_annotation/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/missing_annotation/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/missing_annotation/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/missing_annotation/array.js b/tests/format/flow/flow-repo/missing_annotation/array.js similarity index 100% rename from tests/format/flow-repo/missing_annotation/array.js rename to tests/format/flow/flow-repo/missing_annotation/array.js diff --git a/tests/format/flow-repo/missing_annotation/async_return.js b/tests/format/flow/flow-repo/missing_annotation/async_return.js similarity index 100% rename from tests/format/flow-repo/missing_annotation/async_return.js rename to tests/format/flow/flow-repo/missing_annotation/async_return.js diff --git a/tests/format/flow-repo/missing_annotation/format.test.js b/tests/format/flow/flow-repo/missing_annotation/format.test.js similarity index 100% rename from tests/format/flow-repo/missing_annotation/format.test.js rename to tests/format/flow/flow-repo/missing_annotation/format.test.js diff --git a/tests/format/flow-repo/missing_annotation/infer.js b/tests/format/flow/flow-repo/missing_annotation/infer.js similarity index 100% rename from tests/format/flow-repo/missing_annotation/infer.js rename to tests/format/flow/flow-repo/missing_annotation/infer.js diff --git a/tests/format/flow-repo/modified_lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/modified_lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/modified_lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/modified_lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/modified_lib/format.test.js b/tests/format/flow/flow-repo/modified_lib/format.test.js similarity index 100% rename from tests/format/flow-repo/modified_lib/format.test.js rename to tests/format/flow/flow-repo/modified_lib/format.test.js diff --git a/tests/format/flow-repo/modified_lib/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/modified_lib/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/modified_lib/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/modified_lib/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/modified_lib/lib/format.test.js b/tests/format/flow/flow-repo/modified_lib/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/modified_lib/lib/format.test.js rename to tests/format/flow/flow-repo/modified_lib/lib/format.test.js diff --git a/tests/format/flow-repo/modified_lib/lib/lib.js b/tests/format/flow/flow-repo/modified_lib/lib/lib.js similarity index 100% rename from tests/format/flow-repo/modified_lib/lib/lib.js rename to tests/format/flow/flow-repo/modified_lib/lib/lib.js diff --git a/tests/format/flow-repo/modified_lib/test.js b/tests/format/flow/flow-repo/modified_lib/test.js similarity index 100% rename from tests/format/flow-repo/modified_lib/test.js rename to tests/format/flow/flow-repo/modified_lib/test.js diff --git a/tests/format/flow-repo/module_not_found_errors/src/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/module_not_found_errors/src/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/module_not_found_errors/src/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/module_not_found_errors/src/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/module_not_found_errors/src/format.test.js b/tests/format/flow/flow-repo/module_not_found_errors/src/format.test.js similarity index 100% rename from tests/format/flow-repo/module_not_found_errors/src/format.test.js rename to tests/format/flow/flow-repo/module_not_found_errors/src/format.test.js diff --git a/tests/format/flow-repo/module_not_found_errors/src/index.js b/tests/format/flow/flow-repo/module_not_found_errors/src/index.js similarity index 100% rename from tests/format/flow-repo/module_not_found_errors/src/index.js rename to tests/format/flow/flow-repo/module_not_found_errors/src/index.js diff --git a/tests/format/flow-repo/module_redirect/A.js b/tests/format/flow/flow-repo/module_redirect/A.js similarity index 100% rename from tests/format/flow-repo/module_redirect/A.js rename to tests/format/flow/flow-repo/module_redirect/A.js diff --git a/tests/format/flow-repo/module_redirect/B.js b/tests/format/flow/flow-repo/module_redirect/B.js similarity index 100% rename from tests/format/flow-repo/module_redirect/B.js rename to tests/format/flow/flow-repo/module_redirect/B.js diff --git a/tests/format/flow-repo/module_redirect/C.js b/tests/format/flow/flow-repo/module_redirect/C.js similarity index 100% rename from tests/format/flow-repo/module_redirect/C.js rename to tests/format/flow/flow-repo/module_redirect/C.js diff --git a/tests/format/flow-repo/module_redirect/D.js b/tests/format/flow/flow-repo/module_redirect/D.js similarity index 100% rename from tests/format/flow-repo/module_redirect/D.js rename to tests/format/flow/flow-repo/module_redirect/D.js diff --git a/tests/format/flow-repo/module_redirect/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/module_redirect/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/module_redirect/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/module_redirect/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/module_redirect/format.test.js b/tests/format/flow/flow-repo/module_redirect/format.test.js similarity index 100% rename from tests/format/flow-repo/module_redirect/format.test.js rename to tests/format/flow/flow-repo/module_redirect/format.test.js diff --git a/tests/format/flow-repo/module_use_strict/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/module_use_strict/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/module_use_strict/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/module_use_strict/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/module_use_strict/format.test.js b/tests/format/flow/flow-repo/module_use_strict/format.test.js similarity index 100% rename from tests/format/flow-repo/module_use_strict/format.test.js rename to tests/format/flow/flow-repo/module_use_strict/format.test.js diff --git a/tests/format/flow-repo/module_use_strict/test.js b/tests/format/flow/flow-repo/module_use_strict/test.js similarity index 100% rename from tests/format/flow-repo/module_use_strict/test.js rename to tests/format/flow/flow-repo/module_use_strict/test.js diff --git a/tests/format/flow-repo/modules/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/modules/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/modules/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/modules/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/modules/cli.js b/tests/format/flow/flow-repo/modules/cli.js similarity index 100% rename from tests/format/flow-repo/modules/cli.js rename to tests/format/flow/flow-repo/modules/cli.js diff --git a/tests/format/flow-repo/modules/cli2.js b/tests/format/flow/flow-repo/modules/cli2.js similarity index 100% rename from tests/format/flow-repo/modules/cli2.js rename to tests/format/flow/flow-repo/modules/cli2.js diff --git a/tests/format/flow-repo/modules/format.test.js b/tests/format/flow/flow-repo/modules/format.test.js similarity index 100% rename from tests/format/flow-repo/modules/format.test.js rename to tests/format/flow/flow-repo/modules/format.test.js diff --git a/tests/format/flow-repo/modules/lib.js b/tests/format/flow/flow-repo/modules/lib.js similarity index 100% rename from tests/format/flow-repo/modules/lib.js rename to tests/format/flow/flow-repo/modules/lib.js diff --git a/tests/format/flow-repo/more_annot/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/more_annot/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/more_annot/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/more_annot/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/more_annot/client_object.js b/tests/format/flow/flow-repo/more_annot/client_object.js similarity index 100% rename from tests/format/flow-repo/more_annot/client_object.js rename to tests/format/flow/flow-repo/more_annot/client_object.js diff --git a/tests/format/flow-repo/more_annot/format.test.js b/tests/format/flow/flow-repo/more_annot/format.test.js similarity index 100% rename from tests/format/flow-repo/more_annot/format.test.js rename to tests/format/flow/flow-repo/more_annot/format.test.js diff --git a/tests/format/flow-repo/more_annot/object.js b/tests/format/flow/flow-repo/more_annot/object.js similarity index 100% rename from tests/format/flow-repo/more_annot/object.js rename to tests/format/flow/flow-repo/more_annot/object.js diff --git a/tests/format/flow-repo/more_annot/proto.js b/tests/format/flow/flow-repo/more_annot/proto.js similarity index 100% rename from tests/format/flow-repo/more_annot/proto.js rename to tests/format/flow/flow-repo/more_annot/proto.js diff --git a/tests/format/flow-repo/more_annot/super.js b/tests/format/flow/flow-repo/more_annot/super.js similarity index 100% rename from tests/format/flow-repo/more_annot/super.js rename to tests/format/flow/flow-repo/more_annot/super.js diff --git a/tests/format/flow-repo/more_classes/Bar.js b/tests/format/flow/flow-repo/more_classes/Bar.js similarity index 100% rename from tests/format/flow-repo/more_classes/Bar.js rename to tests/format/flow/flow-repo/more_classes/Bar.js diff --git a/tests/format/flow-repo/more_classes/Foo.js b/tests/format/flow/flow-repo/more_classes/Foo.js similarity index 100% rename from tests/format/flow-repo/more_classes/Foo.js rename to tests/format/flow/flow-repo/more_classes/Foo.js diff --git a/tests/format/flow-repo/more_classes/Qux.js b/tests/format/flow/flow-repo/more_classes/Qux.js similarity index 100% rename from tests/format/flow-repo/more_classes/Qux.js rename to tests/format/flow/flow-repo/more_classes/Qux.js diff --git a/tests/format/flow-repo/more_classes/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/more_classes/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/more_classes/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/more_classes/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/more_classes/format.test.js b/tests/format/flow/flow-repo/more_classes/format.test.js similarity index 100% rename from tests/format/flow-repo/more_classes/format.test.js rename to tests/format/flow/flow-repo/more_classes/format.test.js diff --git a/tests/format/flow-repo/more_generics/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/more_generics/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/more_generics/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/more_generics/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/more_generics/format.test.js b/tests/format/flow/flow-repo/more_generics/format.test.js similarity index 100% rename from tests/format/flow-repo/more_generics/format.test.js rename to tests/format/flow/flow-repo/more_generics/format.test.js diff --git a/tests/format/flow-repo/more_generics/poly.js b/tests/format/flow/flow-repo/more_generics/poly.js similarity index 100% rename from tests/format/flow-repo/more_generics/poly.js rename to tests/format/flow/flow-repo/more_generics/poly.js diff --git a/tests/format/flow-repo/more_path/Condition.js b/tests/format/flow/flow-repo/more_path/Condition.js similarity index 100% rename from tests/format/flow-repo/more_path/Condition.js rename to tests/format/flow/flow-repo/more_path/Condition.js diff --git a/tests/format/flow-repo/more_path/FlowSA.js b/tests/format/flow/flow-repo/more_path/FlowSA.js similarity index 100% rename from tests/format/flow-repo/more_path/FlowSA.js rename to tests/format/flow/flow-repo/more_path/FlowSA.js diff --git a/tests/format/flow-repo/more_path/Sigma.js b/tests/format/flow/flow-repo/more_path/Sigma.js similarity index 100% rename from tests/format/flow-repo/more_path/Sigma.js rename to tests/format/flow/flow-repo/more_path/Sigma.js diff --git a/tests/format/flow-repo/more_path/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/more_path/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/more_path/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/more_path/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/more_path/format.test.js b/tests/format/flow/flow-repo/more_path/format.test.js similarity index 100% rename from tests/format/flow-repo/more_path/format.test.js rename to tests/format/flow/flow-repo/more_path/format.test.js diff --git a/tests/format/flow-repo/more_path/test.js b/tests/format/flow/flow-repo/more_path/test.js similarity index 100% rename from tests/format/flow-repo/more_path/test.js rename to tests/format/flow/flow-repo/more_path/test.js diff --git a/tests/format/flow-repo/more_react/API.react.js b/tests/format/flow/flow-repo/more_react/API.react.js similarity index 100% rename from tests/format/flow-repo/more_react/API.react.js rename to tests/format/flow/flow-repo/more_react/API.react.js diff --git a/tests/format/flow-repo/more_react/App.react.js b/tests/format/flow/flow-repo/more_react/App.react.js similarity index 100% rename from tests/format/flow-repo/more_react/App.react.js rename to tests/format/flow/flow-repo/more_react/App.react.js diff --git a/tests/format/flow-repo/more_react/InitializedFields.js b/tests/format/flow/flow-repo/more_react/InitializedFields.js similarity index 100% rename from tests/format/flow-repo/more_react/InitializedFields.js rename to tests/format/flow/flow-repo/more_react/InitializedFields.js diff --git a/tests/format/flow-repo/more_react/JSX.js b/tests/format/flow/flow-repo/more_react/JSX.js similarity index 100% rename from tests/format/flow-repo/more_react/JSX.js rename to tests/format/flow/flow-repo/more_react/JSX.js diff --git a/tests/format/flow-repo/more_react/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/more_react/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/more_react/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/more_react/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/more_react/checkPropTypes.js b/tests/format/flow/flow-repo/more_react/checkPropTypes.js similarity index 100% rename from tests/format/flow-repo/more_react/checkPropTypes.js rename to tests/format/flow/flow-repo/more_react/checkPropTypes.js diff --git a/tests/format/flow-repo/more_react/format.test.js b/tests/format/flow/flow-repo/more_react/format.test.js similarity index 100% rename from tests/format/flow-repo/more_react/format.test.js rename to tests/format/flow/flow-repo/more_react/format.test.js diff --git a/tests/format/flow-repo/more_react/propTypes.js b/tests/format/flow/flow-repo/more_react/propTypes.js similarity index 100% rename from tests/format/flow-repo/more_react/propTypes.js rename to tests/format/flow/flow-repo/more_react/propTypes.js diff --git a/tests/format/flow-repo/more_statics/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/more_statics/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/more_statics/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/more_statics/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/more_statics/class_static.js b/tests/format/flow/flow-repo/more_statics/class_static.js similarity index 100% rename from tests/format/flow-repo/more_statics/class_static.js rename to tests/format/flow/flow-repo/more_statics/class_static.js diff --git a/tests/format/flow-repo/more_statics/format.test.js b/tests/format/flow/flow-repo/more_statics/format.test.js similarity index 100% rename from tests/format/flow-repo/more_statics/format.test.js rename to tests/format/flow/flow-repo/more_statics/format.test.js diff --git a/tests/format/flow-repo/multiflow/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/multiflow/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/multiflow/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/multiflow/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/multiflow/apply.js b/tests/format/flow/flow-repo/multiflow/apply.js similarity index 100% rename from tests/format/flow-repo/multiflow/apply.js rename to tests/format/flow/flow-repo/multiflow/apply.js diff --git a/tests/format/flow-repo/multiflow/format.test.js b/tests/format/flow/flow-repo/multiflow/format.test.js similarity index 100% rename from tests/format/flow-repo/multiflow/format.test.js rename to tests/format/flow/flow-repo/multiflow/format.test.js diff --git a/tests/format/flow-repo/multiflow/issue3443.js b/tests/format/flow/flow-repo/multiflow/issue3443.js similarity index 100% rename from tests/format/flow-repo/multiflow/issue3443.js rename to tests/format/flow/flow-repo/multiflow/issue3443.js diff --git a/tests/format/flow-repo/multiflow/jsx.js b/tests/format/flow/flow-repo/multiflow/jsx.js similarity index 100% rename from tests/format/flow-repo/multiflow/jsx.js rename to tests/format/flow/flow-repo/multiflow/jsx.js diff --git a/tests/format/flow-repo/multiflow/spread.js b/tests/format/flow/flow-repo/multiflow/spread.js similarity index 100% rename from tests/format/flow-repo/multiflow/spread.js rename to tests/format/flow/flow-repo/multiflow/spread.js diff --git a/tests/format/flow-repo/multiflow_with_flowlib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/multiflow_with_flowlib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/multiflow_with_flowlib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/multiflow_with_flowlib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/multiflow_with_flowlib/format.test.js b/tests/format/flow/flow-repo/multiflow_with_flowlib/format.test.js similarity index 100% rename from tests/format/flow-repo/multiflow_with_flowlib/format.test.js rename to tests/format/flow/flow-repo/multiflow_with_flowlib/format.test.js diff --git a/tests/format/flow-repo/multiflow_with_flowlib/spread.js b/tests/format/flow/flow-repo/multiflow_with_flowlib/spread.js similarity index 100% rename from tests/format/flow-repo/multiflow_with_flowlib/spread.js rename to tests/format/flow/flow-repo/multiflow_with_flowlib/spread.js diff --git a/tests/format/flow-repo/name_prop/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/name_prop/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/name_prop/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/name_prop/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/name_prop/class.js b/tests/format/flow/flow-repo/name_prop/class.js similarity index 100% rename from tests/format/flow-repo/name_prop/class.js rename to tests/format/flow/flow-repo/name_prop/class.js diff --git a/tests/format/flow-repo/name_prop/format.test.js b/tests/format/flow/flow-repo/name_prop/format.test.js similarity index 100% rename from tests/format/flow-repo/name_prop/format.test.js rename to tests/format/flow/flow-repo/name_prop/format.test.js diff --git a/tests/format/flow-repo/name_prop/function.js b/tests/format/flow/flow-repo/name_prop/function.js similarity index 100% rename from tests/format/flow-repo/name_prop/function.js rename to tests/format/flow/flow-repo/name_prop/function.js diff --git a/tests/format/flow-repo/namespace/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/namespace/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/namespace/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/namespace/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/namespace/client.js b/tests/format/flow/flow-repo/namespace/client.js similarity index 100% rename from tests/format/flow-repo/namespace/client.js rename to tests/format/flow/flow-repo/namespace/client.js diff --git a/tests/format/flow-repo/namespace/format.test.js b/tests/format/flow/flow-repo/namespace/format.test.js similarity index 100% rename from tests/format/flow-repo/namespace/format.test.js rename to tests/format/flow/flow-repo/namespace/format.test.js diff --git a/tests/format/flow-repo/namespace/namespace.js b/tests/format/flow/flow-repo/namespace/namespace.js similarity index 100% rename from tests/format/flow-repo/namespace/namespace.js rename to tests/format/flow/flow-repo/namespace/namespace.js diff --git a/tests/format/flow-repo/new_react/FeedUFI.react.js b/tests/format/flow/flow-repo/new_react/FeedUFI.react.js similarity index 100% rename from tests/format/flow-repo/new_react/FeedUFI.react.js rename to tests/format/flow/flow-repo/new_react/FeedUFI.react.js diff --git a/tests/format/flow-repo/new_react/Mixin.js b/tests/format/flow/flow-repo/new_react/Mixin.js similarity index 100% rename from tests/format/flow-repo/new_react/Mixin.js rename to tests/format/flow/flow-repo/new_react/Mixin.js diff --git a/tests/format/flow-repo/new_react/UFILikeCount.react.js b/tests/format/flow/flow-repo/new_react/UFILikeCount.react.js similarity index 100% rename from tests/format/flow-repo/new_react/UFILikeCount.react.js rename to tests/format/flow/flow-repo/new_react/UFILikeCount.react.js diff --git a/tests/format/flow-repo/new_react/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/new_react/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/new_react/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/new_react/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/new_react/bad_default_props.js b/tests/format/flow/flow-repo/new_react/bad_default_props.js similarity index 100% rename from tests/format/flow-repo/new_react/bad_default_props.js rename to tests/format/flow/flow-repo/new_react/bad_default_props.js diff --git a/tests/format/flow-repo/new_react/classes.js b/tests/format/flow/flow-repo/new_react/classes.js similarity index 100% rename from tests/format/flow-repo/new_react/classes.js rename to tests/format/flow/flow-repo/new_react/classes.js diff --git a/tests/format/flow-repo/new_react/fakelib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/new_react/fakelib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/new_react/fakelib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/new_react/fakelib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/new_react/fakelib/format.test.js b/tests/format/flow/flow-repo/new_react/fakelib/format.test.js similarity index 100% rename from tests/format/flow-repo/new_react/fakelib/format.test.js rename to tests/format/flow/flow-repo/new_react/fakelib/format.test.js diff --git a/tests/format/flow-repo/new_react/fakelib/type_aliases.js b/tests/format/flow/flow-repo/new_react/fakelib/type_aliases.js similarity index 100% rename from tests/format/flow-repo/new_react/fakelib/type_aliases.js rename to tests/format/flow/flow-repo/new_react/fakelib/type_aliases.js diff --git a/tests/format/flow-repo/new_react/format.test.js b/tests/format/flow/flow-repo/new_react/format.test.js similarity index 100% rename from tests/format/flow-repo/new_react/format.test.js rename to tests/format/flow/flow-repo/new_react/format.test.js diff --git a/tests/format/flow-repo/new_react/import-react.js b/tests/format/flow/flow-repo/new_react/import-react.js similarity index 100% rename from tests/format/flow-repo/new_react/import-react.js rename to tests/format/flow/flow-repo/new_react/import-react.js diff --git a/tests/format/flow-repo/new_react/new_react.js b/tests/format/flow/flow-repo/new_react/new_react.js similarity index 100% rename from tests/format/flow-repo/new_react/new_react.js rename to tests/format/flow/flow-repo/new_react/new_react.js diff --git a/tests/format/flow-repo/new_react/propTypes.js b/tests/format/flow/flow-repo/new_react/propTypes.js similarity index 100% rename from tests/format/flow-repo/new_react/propTypes.js rename to tests/format/flow/flow-repo/new_react/propTypes.js diff --git a/tests/format/flow-repo/new_react/props.js b/tests/format/flow/flow-repo/new_react/props.js similarity index 100% rename from tests/format/flow-repo/new_react/props.js rename to tests/format/flow/flow-repo/new_react/props.js diff --git a/tests/format/flow-repo/new_react/props2.js b/tests/format/flow/flow-repo/new_react/props2.js similarity index 100% rename from tests/format/flow-repo/new_react/props2.js rename to tests/format/flow/flow-repo/new_react/props2.js diff --git a/tests/format/flow-repo/new_react/props3.js b/tests/format/flow/flow-repo/new_react/props3.js similarity index 100% rename from tests/format/flow-repo/new_react/props3.js rename to tests/format/flow/flow-repo/new_react/props3.js diff --git a/tests/format/flow-repo/new_react/props4.js b/tests/format/flow/flow-repo/new_react/props4.js similarity index 100% rename from tests/format/flow-repo/new_react/props4.js rename to tests/format/flow/flow-repo/new_react/props4.js diff --git a/tests/format/flow-repo/new_react/props5.js b/tests/format/flow/flow-repo/new_react/props5.js similarity index 100% rename from tests/format/flow-repo/new_react/props5.js rename to tests/format/flow/flow-repo/new_react/props5.js diff --git a/tests/format/flow-repo/new_react/state.js b/tests/format/flow/flow-repo/new_react/state.js similarity index 100% rename from tests/format/flow-repo/new_react/state.js rename to tests/format/flow/flow-repo/new_react/state.js diff --git a/tests/format/flow-repo/new_react/state2.js b/tests/format/flow/flow-repo/new_react/state2.js similarity index 100% rename from tests/format/flow-repo/new_react/state2.js rename to tests/format/flow/flow-repo/new_react/state2.js diff --git a/tests/format/flow-repo/new_react/state3.js b/tests/format/flow/flow-repo/new_react/state3.js similarity index 100% rename from tests/format/flow-repo/new_react/state3.js rename to tests/format/flow/flow-repo/new_react/state3.js diff --git a/tests/format/flow-repo/new_react/state4.js b/tests/format/flow/flow-repo/new_react/state4.js similarity index 100% rename from tests/format/flow-repo/new_react/state4.js rename to tests/format/flow/flow-repo/new_react/state4.js diff --git a/tests/format/flow-repo/new_react/state5.js b/tests/format/flow/flow-repo/new_react/state5.js similarity index 100% rename from tests/format/flow-repo/new_react/state5.js rename to tests/format/flow/flow-repo/new_react/state5.js diff --git a/tests/format/flow-repo/new_spread/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/new_spread/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/new_spread/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/new_spread/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/new_spread/format.test.js b/tests/format/flow/flow-repo/new_spread/format.test.js similarity index 100% rename from tests/format/flow-repo/new_spread/format.test.js rename to tests/format/flow/flow-repo/new_spread/format.test.js diff --git a/tests/format/flow-repo/new_spread/type.js b/tests/format/flow/flow-repo/new_spread/type.js similarity index 100% rename from tests/format/flow-repo/new_spread/type.js rename to tests/format/flow/flow-repo/new_spread/type.js diff --git a/tests/format/flow-repo/new_spread/type_any.js b/tests/format/flow/flow-repo/new_spread/type_any.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_any.js rename to tests/format/flow/flow-repo/new_spread/type_any.js diff --git a/tests/format/flow-repo/new_spread/type_contra.js b/tests/format/flow/flow-repo/new_spread/type_contra.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_contra.js rename to tests/format/flow/flow-repo/new_spread/type_contra.js diff --git a/tests/format/flow-repo/new_spread/type_dict.js b/tests/format/flow/flow-repo/new_spread/type_dict.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_dict.js rename to tests/format/flow/flow-repo/new_spread/type_dict.js diff --git a/tests/format/flow-repo/new_spread/type_generic.js b/tests/format/flow/flow-repo/new_spread/type_generic.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_generic.js rename to tests/format/flow/flow-repo/new_spread/type_generic.js diff --git a/tests/format/flow-repo/new_spread/type_instance.js b/tests/format/flow/flow-repo/new_spread/type_instance.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_instance.js rename to tests/format/flow/flow-repo/new_spread/type_instance.js diff --git a/tests/format/flow-repo/new_spread/type_intersection.js b/tests/format/flow/flow-repo/new_spread/type_intersection.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_intersection.js rename to tests/format/flow/flow-repo/new_spread/type_intersection.js diff --git a/tests/format/flow-repo/new_spread/type_intersection_optional.js b/tests/format/flow/flow-repo/new_spread/type_intersection_optional.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_intersection_optional.js rename to tests/format/flow/flow-repo/new_spread/type_intersection_optional.js diff --git a/tests/format/flow-repo/new_spread/type_optional.js b/tests/format/flow/flow-repo/new_spread/type_optional.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_optional.js rename to tests/format/flow/flow-repo/new_spread/type_optional.js diff --git a/tests/format/flow-repo/new_spread/type_union.js b/tests/format/flow/flow-repo/new_spread/type_union.js similarity index 100% rename from tests/format/flow-repo/new_spread/type_union.js rename to tests/format/flow/flow-repo/new_spread/type_union.js diff --git a/tests/format/flow-repo/node_haste/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_haste/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_haste/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_haste/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_haste/client.js b/tests/format/flow/flow-repo/node_haste/client.js similarity index 100% rename from tests/format/flow-repo/node_haste/client.js rename to tests/format/flow/flow-repo/node_haste/client.js diff --git a/tests/format/flow-repo/node_haste/external/_d3/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_haste/external/_d3/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_haste/external/_d3/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_haste/external/_d3/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_haste/external/_d3/format.test.js b/tests/format/flow/flow-repo/node_haste/external/_d3/format.test.js similarity index 100% rename from tests/format/flow-repo/node_haste/external/_d3/format.test.js rename to tests/format/flow/flow-repo/node_haste/external/_d3/format.test.js diff --git a/tests/format/flow-repo/node_haste/external/_d3/min.js b/tests/format/flow/flow-repo/node_haste/external/_d3/min.js similarity index 100% rename from tests/format/flow-repo/node_haste/external/_d3/min.js rename to tests/format/flow/flow-repo/node_haste/external/_d3/min.js diff --git a/tests/format/flow-repo/node_haste/foo/bar/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_haste/foo/bar/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_haste/foo/bar/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_haste/foo/bar/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_haste/foo/bar/client.js b/tests/format/flow/flow-repo/node_haste/foo/bar/client.js similarity index 100% rename from tests/format/flow-repo/node_haste/foo/bar/client.js rename to tests/format/flow/flow-repo/node_haste/foo/bar/client.js diff --git a/tests/format/flow-repo/node_haste/foo/bar/format.test.js b/tests/format/flow/flow-repo/node_haste/foo/bar/format.test.js similarity index 100% rename from tests/format/flow-repo/node_haste/foo/bar/format.test.js rename to tests/format/flow/flow-repo/node_haste/foo/bar/format.test.js diff --git a/tests/format/flow-repo/node_haste/format.test.js b/tests/format/flow/flow-repo/node_haste/format.test.js similarity index 100% rename from tests/format/flow-repo/node_haste/format.test.js rename to tests/format/flow/flow-repo/node_haste/format.test.js diff --git a/tests/format/flow-repo/node_haste/md5.js b/tests/format/flow/flow-repo/node_haste/md5.js similarity index 100% rename from tests/format/flow-repo/node_haste/md5.js rename to tests/format/flow/flow-repo/node_haste/md5.js diff --git a/tests/format/flow-repo/node_haste/ws/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_haste/ws/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_haste/ws/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_haste/ws/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_haste/ws/format.test.js b/tests/format/flow/flow-repo/node_haste/ws/format.test.js similarity index 100% rename from tests/format/flow-repo/node_haste/ws/format.test.js rename to tests/format/flow/flow-repo/node_haste/ws/format.test.js diff --git a/tests/format/flow-repo/node_haste/ws/index.js b/tests/format/flow/flow-repo/node_haste/ws/index.js similarity index 100% rename from tests/format/flow-repo/node_haste/ws/index.js rename to tests/format/flow/flow-repo/node_haste/ws/index.js diff --git a/tests/format/flow-repo/node_haste/ws/test/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_haste/ws/test/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_haste/ws/test/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_haste/ws/test/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_haste/ws/test/client.js b/tests/format/flow/flow-repo/node_haste/ws/test/client.js similarity index 100% rename from tests/format/flow-repo/node_haste/ws/test/client.js rename to tests/format/flow/flow-repo/node_haste/ws/test/client.js diff --git a/tests/format/flow-repo/node_haste/ws/test/format.test.js b/tests/format/flow/flow-repo/node_haste/ws/test/format.test.js similarity index 100% rename from tests/format/flow-repo/node_haste/ws/test/format.test.js rename to tests/format/flow/flow-repo/node_haste/ws/test/format.test.js diff --git a/tests/format/flow-repo/node_modules_with_symlinks/root/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_modules_with_symlinks/root/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/root/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_modules_with_symlinks/root/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_modules_with_symlinks/root/foo.js b/tests/format/flow/flow-repo/node_modules_with_symlinks/root/foo.js similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/root/foo.js rename to tests/format/flow/flow-repo/node_modules_with_symlinks/root/foo.js diff --git a/tests/format/flow-repo/node_modules_with_symlinks/root/format.test.js b/tests/format/flow/flow-repo/node_modules_with_symlinks/root/format.test.js similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/root/format.test.js rename to tests/format/flow/flow-repo/node_modules_with_symlinks/root/format.test.js diff --git a/tests/format/flow-repo/node_modules_with_symlinks/root/symlink_lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_modules_with_symlinks/root/symlink_lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/root/symlink_lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_modules_with_symlinks/root/symlink_lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_modules_with_symlinks/root/symlink_lib/format.test.js b/tests/format/flow/flow-repo/node_modules_with_symlinks/root/symlink_lib/format.test.js similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/root/symlink_lib/format.test.js rename to tests/format/flow/flow-repo/node_modules_with_symlinks/root/symlink_lib/format.test.js diff --git a/tests/format/flow-repo/node_modules_with_symlinks/root/symlink_lib/index.js b/tests/format/flow/flow-repo/node_modules_with_symlinks/root/symlink_lib/index.js similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/root/symlink_lib/index.js rename to tests/format/flow/flow-repo/node_modules_with_symlinks/root/symlink_lib/index.js diff --git a/tests/format/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/format.test.js b/tests/format/flow/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/format.test.js similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/format.test.js rename to tests/format/flow/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/format.test.js diff --git a/tests/format/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/index.js b/tests/format/flow/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/index.js similarity index 100% rename from tests/format/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/index.js rename to tests/format/flow/flow-repo/node_modules_with_symlinks/symlink_lib_outside_root/index.js diff --git a/tests/format/flow-repo/node_modules_without_json/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_modules_without_json/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_modules_without_json/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_modules_without_json/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_modules_without_json/format.test.js b/tests/format/flow/flow-repo/node_modules_without_json/format.test.js similarity index 100% rename from tests/format/flow-repo/node_modules_without_json/format.test.js rename to tests/format/flow/flow-repo/node_modules_without_json/format.test.js diff --git a/tests/format/flow-repo/node_modules_without_json/test.js b/tests/format/flow/flow-repo/node_modules_without_json/test.js similarity index 100% rename from tests/format/flow-repo/node_modules_without_json/test.js rename to tests/format/flow/flow-repo/node_modules_without_json/test.js diff --git a/tests/format/flow-repo/node_tests/assert/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/assert/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/assert/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/assert/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/assert/assert.js b/tests/format/flow/flow-repo/node_tests/assert/assert.js similarity index 100% rename from tests/format/flow-repo/node_tests/assert/assert.js rename to tests/format/flow/flow-repo/node_tests/assert/assert.js diff --git a/tests/format/flow-repo/node_tests/assert/format.test.js b/tests/format/flow/flow-repo/node_tests/assert/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/assert/format.test.js rename to tests/format/flow/flow-repo/node_tests/assert/format.test.js diff --git a/tests/format/flow-repo/node_tests/basic/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/basic/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/basic/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/basic/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/basic/bar.js b/tests/format/flow/flow-repo/node_tests/basic/bar.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic/bar.js rename to tests/format/flow/flow-repo/node_tests/basic/bar.js diff --git a/tests/format/flow-repo/node_tests/basic/foo.js b/tests/format/flow/flow-repo/node_tests/basic/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic/foo.js rename to tests/format/flow/flow-repo/node_tests/basic/foo.js diff --git a/tests/format/flow-repo/node_tests/basic/format.test.js b/tests/format/flow/flow-repo/node_tests/basic/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic/format.test.js rename to tests/format/flow/flow-repo/node_tests/basic/format.test.js diff --git a/tests/format/flow-repo/node_tests/basic_file/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/basic_file/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/basic_file/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/basic_file/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/basic_file/bar.js b/tests/format/flow/flow-repo/node_tests/basic_file/bar.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_file/bar.js rename to tests/format/flow/flow-repo/node_tests/basic_file/bar.js diff --git a/tests/format/flow-repo/node_tests/basic_file/foo.js b/tests/format/flow/flow-repo/node_tests/basic_file/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_file/foo.js rename to tests/format/flow/flow-repo/node_tests/basic_file/foo.js diff --git a/tests/format/flow-repo/node_tests/basic_file/format.test.js b/tests/format/flow/flow-repo/node_tests/basic_file/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_file/format.test.js rename to tests/format/flow/flow-repo/node_tests/basic_file/format.test.js diff --git a/tests/format/flow-repo/node_tests/basic_node__modules/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/basic_node__modules/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/basic_node__modules/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/basic_node__modules/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/basic_node__modules/foo.js b/tests/format/flow/flow-repo/node_tests/basic_node__modules/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_node__modules/foo.js rename to tests/format/flow/flow-repo/node_tests/basic_node__modules/foo.js diff --git a/tests/format/flow-repo/node_tests/basic_node__modules/format.test.js b/tests/format/flow/flow-repo/node_tests/basic_node__modules/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_node__modules/format.test.js rename to tests/format/flow/flow-repo/node_tests/basic_node__modules/format.test.js diff --git a/tests/format/flow-repo/node_tests/basic_node_modules_with_path/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/basic_node_modules_with_path/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/basic_node_modules_with_path/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/basic_node_modules_with_path/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/basic_node_modules_with_path/foo.js b/tests/format/flow/flow-repo/node_tests/basic_node_modules_with_path/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_node_modules_with_path/foo.js rename to tests/format/flow/flow-repo/node_tests/basic_node_modules_with_path/foo.js diff --git a/tests/format/flow-repo/node_tests/basic_node_modules_with_path/format.test.js b/tests/format/flow/flow-repo/node_tests/basic_node_modules_with_path/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_node_modules_with_path/format.test.js rename to tests/format/flow/flow-repo/node_tests/basic_node_modules_with_path/format.test.js diff --git a/tests/format/flow-repo/node_tests/basic_package/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/basic_package/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/basic_package/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/basic_package/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/basic_package/bar_lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/basic_package/bar_lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/basic_package/bar_lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/basic_package/bar_lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/basic_package/bar_lib/bar.js b/tests/format/flow/flow-repo/node_tests/basic_package/bar_lib/bar.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_package/bar_lib/bar.js rename to tests/format/flow/flow-repo/node_tests/basic_package/bar_lib/bar.js diff --git a/tests/format/flow-repo/node_tests/basic_package/bar_lib/format.test.js b/tests/format/flow/flow-repo/node_tests/basic_package/bar_lib/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_package/bar_lib/format.test.js rename to tests/format/flow/flow-repo/node_tests/basic_package/bar_lib/format.test.js diff --git a/tests/format/flow-repo/node_tests/basic_package/foo.js b/tests/format/flow/flow-repo/node_tests/basic_package/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_package/foo.js rename to tests/format/flow/flow-repo/node_tests/basic_package/foo.js diff --git a/tests/format/flow-repo/node_tests/basic_package/format.test.js b/tests/format/flow/flow-repo/node_tests/basic_package/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/basic_package/format.test.js rename to tests/format/flow/flow-repo/node_tests/basic_package/format.test.js diff --git a/tests/format/flow-repo/node_tests/buffer/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/buffer/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/buffer/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/buffer/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/buffer/buffer.js b/tests/format/flow/flow-repo/node_tests/buffer/buffer.js similarity index 100% rename from tests/format/flow-repo/node_tests/buffer/buffer.js rename to tests/format/flow/flow-repo/node_tests/buffer/buffer.js diff --git a/tests/format/flow-repo/node_tests/buffer/format.test.js b/tests/format/flow/flow-repo/node_tests/buffer/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/buffer/format.test.js rename to tests/format/flow/flow-repo/node_tests/buffer/format.test.js diff --git a/tests/format/flow-repo/node_tests/child_process/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/child_process/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/child_process/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/child_process/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/child_process/exec.js b/tests/format/flow/flow-repo/node_tests/child_process/exec.js similarity index 100% rename from tests/format/flow-repo/node_tests/child_process/exec.js rename to tests/format/flow/flow-repo/node_tests/child_process/exec.js diff --git a/tests/format/flow-repo/node_tests/child_process/execFile.js b/tests/format/flow/flow-repo/node_tests/child_process/execFile.js similarity index 100% rename from tests/format/flow-repo/node_tests/child_process/execFile.js rename to tests/format/flow/flow-repo/node_tests/child_process/execFile.js diff --git a/tests/format/flow-repo/node_tests/child_process/execSync.js b/tests/format/flow/flow-repo/node_tests/child_process/execSync.js similarity index 100% rename from tests/format/flow-repo/node_tests/child_process/execSync.js rename to tests/format/flow/flow-repo/node_tests/child_process/execSync.js diff --git a/tests/format/flow-repo/node_tests/child_process/format.test.js b/tests/format/flow/flow-repo/node_tests/child_process/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/child_process/format.test.js rename to tests/format/flow/flow-repo/node_tests/child_process/format.test.js diff --git a/tests/format/flow-repo/node_tests/child_process/spawn.js b/tests/format/flow/flow-repo/node_tests/child_process/spawn.js similarity index 100% rename from tests/format/flow-repo/node_tests/child_process/spawn.js rename to tests/format/flow/flow-repo/node_tests/child_process/spawn.js diff --git a/tests/format/flow-repo/node_tests/crypto/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/crypto/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/crypto/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/crypto/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/crypto/crypto.js b/tests/format/flow/flow-repo/node_tests/crypto/crypto.js similarity index 100% rename from tests/format/flow-repo/node_tests/crypto/crypto.js rename to tests/format/flow/flow-repo/node_tests/crypto/crypto.js diff --git a/tests/format/flow-repo/node_tests/crypto/format.test.js b/tests/format/flow/flow-repo/node_tests/crypto/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/crypto/format.test.js rename to tests/format/flow/flow-repo/node_tests/crypto/format.test.js diff --git a/tests/format/flow-repo/node_tests/fs/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/fs/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/fs/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/fs/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/fs/format.test.js b/tests/format/flow/flow-repo/node_tests/fs/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/fs/format.test.js rename to tests/format/flow/flow-repo/node_tests/fs/format.test.js diff --git a/tests/format/flow-repo/node_tests/fs/fs.js b/tests/format/flow/flow-repo/node_tests/fs/fs.js similarity index 100% rename from tests/format/flow-repo/node_tests/fs/fs.js rename to tests/format/flow/flow-repo/node_tests/fs/fs.js diff --git a/tests/format/flow-repo/node_tests/json_file/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/json_file/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/json_file/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/json_file/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/json_file/format.test.js b/tests/format/flow/flow-repo/node_tests/json_file/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/json_file/format.test.js rename to tests/format/flow/flow-repo/node_tests/json_file/format.test.js diff --git a/tests/format/flow-repo/node_tests/json_file/package2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/json_file/package2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/json_file/package2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/json_file/package2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/json_file/package2/format.test.js b/tests/format/flow/flow-repo/node_tests/json_file/package2/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/json_file/package2/format.test.js rename to tests/format/flow/flow-repo/node_tests/json_file/package2/format.test.js diff --git a/tests/format/flow-repo/node_tests/json_file/package2/index.js b/tests/format/flow/flow-repo/node_tests/json_file/package2/index.js similarity index 100% rename from tests/format/flow-repo/node_tests/json_file/package2/index.js rename to tests/format/flow/flow-repo/node_tests/json_file/package2/index.js diff --git a/tests/format/flow-repo/node_tests/json_file/test.js b/tests/format/flow/flow-repo/node_tests/json_file/test.js similarity index 100% rename from tests/format/flow-repo/node_tests/json_file/test.js rename to tests/format/flow/flow-repo/node_tests/json_file/test.js diff --git a/tests/format/flow-repo/node_tests/os/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/os/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/os/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/os/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/os/format.test.js b/tests/format/flow/flow-repo/node_tests/os/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/os/format.test.js rename to tests/format/flow/flow-repo/node_tests/os/format.test.js diff --git a/tests/format/flow-repo/node_tests/os/userInfo.js b/tests/format/flow/flow-repo/node_tests/os/userInfo.js similarity index 100% rename from tests/format/flow-repo/node_tests/os/userInfo.js rename to tests/format/flow/flow-repo/node_tests/os/userInfo.js diff --git a/tests/format/flow-repo/node_tests/package_file/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/package_file/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/package_file/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/package_file/bar_lib.js b/tests/format/flow/flow-repo/node_tests/package_file/bar_lib.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/bar_lib.js rename to tests/format/flow/flow-repo/node_tests/package_file/bar_lib.js diff --git a/tests/format/flow-repo/node_tests/package_file/bar_lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/package_file/bar_lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/bar_lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/package_file/bar_lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/package_file/bar_lib/bar.js b/tests/format/flow/flow-repo/node_tests/package_file/bar_lib/bar.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/bar_lib/bar.js rename to tests/format/flow/flow-repo/node_tests/package_file/bar_lib/bar.js diff --git a/tests/format/flow-repo/node_tests/package_file/bar_lib/format.test.js b/tests/format/flow/flow-repo/node_tests/package_file/bar_lib/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/bar_lib/format.test.js rename to tests/format/flow/flow-repo/node_tests/package_file/bar_lib/format.test.js diff --git a/tests/format/flow-repo/node_tests/package_file/foo.js b/tests/format/flow/flow-repo/node_tests/package_file/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/foo.js rename to tests/format/flow/flow-repo/node_tests/package_file/foo.js diff --git a/tests/format/flow-repo/node_tests/package_file/format.test.js b/tests/format/flow/flow-repo/node_tests/package_file/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file/format.test.js rename to tests/format/flow/flow-repo/node_tests/package_file/format.test.js diff --git a/tests/format/flow-repo/node_tests/package_file_node__modules/foo/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/package_file_node__modules/foo/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/package_file_node__modules/foo/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/package_file_node__modules/foo/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/package_file_node__modules/foo/foo.js b/tests/format/flow/flow-repo/node_tests/package_file_node__modules/foo/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file_node__modules/foo/foo.js rename to tests/format/flow/flow-repo/node_tests/package_file_node__modules/foo/foo.js diff --git a/tests/format/flow-repo/node_tests/package_file_node__modules/foo/format.test.js b/tests/format/flow/flow-repo/node_tests/package_file_node__modules/foo/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/package_file_node__modules/foo/format.test.js rename to tests/format/flow/flow-repo/node_tests/package_file_node__modules/foo/format.test.js diff --git a/tests/format/flow-repo/node_tests/path_node__modules/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/path_node__modules/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/path_node__modules/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/path_node__modules/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/path_node__modules/foo.js b/tests/format/flow/flow-repo/node_tests/path_node__modules/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_node__modules/foo.js rename to tests/format/flow/flow-repo/node_tests/path_node__modules/foo.js diff --git a/tests/format/flow-repo/node_tests/path_node__modules/format.test.js b/tests/format/flow/flow-repo/node_tests/path_node__modules/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_node__modules/format.test.js rename to tests/format/flow/flow-repo/node_tests/path_node__modules/format.test.js diff --git a/tests/format/flow-repo/node_tests/path_node_modules_with_short_main/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/path_node_modules_with_short_main/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/path_node_modules_with_short_main/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/path_node_modules_with_short_main/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/path_node_modules_with_short_main/foo.js b/tests/format/flow/flow-repo/node_tests/path_node_modules_with_short_main/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_node_modules_with_short_main/foo.js rename to tests/format/flow/flow-repo/node_tests/path_node_modules_with_short_main/foo.js diff --git a/tests/format/flow-repo/node_tests/path_node_modules_with_short_main/format.test.js b/tests/format/flow/flow-repo/node_tests/path_node_modules_with_short_main/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_node_modules_with_short_main/format.test.js rename to tests/format/flow/flow-repo/node_tests/path_node_modules_with_short_main/format.test.js diff --git a/tests/format/flow-repo/node_tests/path_node_modules_without_main/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/path_node_modules_without_main/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/path_node_modules_without_main/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/path_node_modules_without_main/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/path_node_modules_without_main/foo.js b/tests/format/flow/flow-repo/node_tests/path_node_modules_without_main/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_node_modules_without_main/foo.js rename to tests/format/flow/flow-repo/node_tests/path_node_modules_without_main/foo.js diff --git a/tests/format/flow-repo/node_tests/path_node_modules_without_main/format.test.js b/tests/format/flow/flow-repo/node_tests/path_node_modules_without_main/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_node_modules_without_main/format.test.js rename to tests/format/flow/flow-repo/node_tests/path_node_modules_without_main/format.test.js diff --git a/tests/format/flow-repo/node_tests/path_package/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/path_package/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/path_package/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/path_package/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/path_package/foo.js b/tests/format/flow/flow-repo/node_tests/path_package/foo.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_package/foo.js rename to tests/format/flow/flow-repo/node_tests/path_package/foo.js diff --git a/tests/format/flow-repo/node_tests/path_package/format.test.js b/tests/format/flow/flow-repo/node_tests/path_package/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/path_package/format.test.js rename to tests/format/flow/flow-repo/node_tests/path_package/format.test.js diff --git a/tests/format/flow-repo/node_tests/process/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/process/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/process/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/process/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/process/format.test.js b/tests/format/flow/flow-repo/node_tests/process/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/process/format.test.js rename to tests/format/flow/flow-repo/node_tests/process/format.test.js diff --git a/tests/format/flow-repo/node_tests/process/nextTick.js b/tests/format/flow/flow-repo/node_tests/process/nextTick.js similarity index 100% rename from tests/format/flow-repo/node_tests/process/nextTick.js rename to tests/format/flow/flow-repo/node_tests/process/nextTick.js diff --git a/tests/format/flow-repo/node_tests/stream/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/stream/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/stream/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/stream/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/stream/format.test.js b/tests/format/flow/flow-repo/node_tests/stream/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/stream/format.test.js rename to tests/format/flow/flow-repo/node_tests/stream/format.test.js diff --git a/tests/format/flow-repo/node_tests/stream/stream.js b/tests/format/flow/flow-repo/node_tests/stream/stream.js similarity index 100% rename from tests/format/flow-repo/node_tests/stream/stream.js rename to tests/format/flow/flow-repo/node_tests/stream/stream.js diff --git a/tests/format/flow-repo/node_tests/timers/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/timers/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/timers/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/timers/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/timers/format.test.js b/tests/format/flow/flow-repo/node_tests/timers/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/timers/format.test.js rename to tests/format/flow/flow-repo/node_tests/timers/format.test.js diff --git a/tests/format/flow-repo/node_tests/timers/timers.js b/tests/format/flow/flow-repo/node_tests/timers/timers.js similarity index 100% rename from tests/format/flow-repo/node_tests/timers/timers.js rename to tests/format/flow/flow-repo/node_tests/timers/timers.js diff --git a/tests/format/flow-repo/node_tests/url/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/node_tests/url/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/node_tests/url/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/node_tests/url/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/node_tests/url/format.test.js b/tests/format/flow/flow-repo/node_tests/url/format.test.js similarity index 100% rename from tests/format/flow-repo/node_tests/url/format.test.js rename to tests/format/flow/flow-repo/node_tests/url/format.test.js diff --git a/tests/format/flow-repo/node_tests/url/url.js b/tests/format/flow/flow-repo/node_tests/url/url.js similarity index 100% rename from tests/format/flow-repo/node_tests/url/url.js rename to tests/format/flow/flow-repo/node_tests/url/url.js diff --git a/tests/format/flow-repo/nullable/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/nullable/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/nullable/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/nullable/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/nullable/format.test.js b/tests/format/flow/flow-repo/nullable/format.test.js similarity index 100% rename from tests/format/flow-repo/nullable/format.test.js rename to tests/format/flow/flow-repo/nullable/format.test.js diff --git a/tests/format/flow-repo/nullable/maybe.js b/tests/format/flow/flow-repo/nullable/maybe.js similarity index 100% rename from tests/format/flow-repo/nullable/maybe.js rename to tests/format/flow/flow-repo/nullable/maybe.js diff --git a/tests/format/flow-repo/nullable/nullable.js b/tests/format/flow/flow-repo/nullable/nullable.js similarity index 100% rename from tests/format/flow-repo/nullable/nullable.js rename to tests/format/flow/flow-repo/nullable/nullable.js diff --git a/tests/format/flow-repo/nullable/simple_nullable.js b/tests/format/flow/flow-repo/nullable/simple_nullable.js similarity index 100% rename from tests/format/flow-repo/nullable/simple_nullable.js rename to tests/format/flow/flow-repo/nullable/simple_nullable.js diff --git a/tests/format/flow-repo/number_constants/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/number_constants/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/number_constants/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/number_constants/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/number_constants/format.test.js b/tests/format/flow/flow-repo/number_constants/format.test.js similarity index 100% rename from tests/format/flow-repo/number_constants/format.test.js rename to tests/format/flow/flow-repo/number_constants/format.test.js diff --git a/tests/format/flow-repo/number_constants/number_constants.js b/tests/format/flow/flow-repo/number_constants/number_constants.js similarity index 100% rename from tests/format/flow-repo/number_constants/number_constants.js rename to tests/format/flow/flow-repo/number_constants/number_constants.js diff --git a/tests/format/flow-repo/object-method/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/object-method/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/object-method/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/object-method/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/object-method/format.test.js b/tests/format/flow/flow-repo/object-method/format.test.js similarity index 100% rename from tests/format/flow-repo/object-method/format.test.js rename to tests/format/flow/flow-repo/object-method/format.test.js diff --git a/tests/format/flow-repo/object-method/id.js b/tests/format/flow/flow-repo/object-method/id.js similarity index 100% rename from tests/format/flow-repo/object-method/id.js rename to tests/format/flow/flow-repo/object-method/id.js diff --git a/tests/format/flow-repo/object-method/subtype.js b/tests/format/flow/flow-repo/object-method/subtype.js similarity index 100% rename from tests/format/flow-repo/object-method/subtype.js rename to tests/format/flow/flow-repo/object-method/subtype.js diff --git a/tests/format/flow-repo/object-method/test.js b/tests/format/flow/flow-repo/object-method/test.js similarity index 100% rename from tests/format/flow-repo/object-method/test.js rename to tests/format/flow/flow-repo/object-method/test.js diff --git a/tests/format/flow-repo/object-method/test2.js b/tests/format/flow/flow-repo/object-method/test2.js similarity index 100% rename from tests/format/flow-repo/object-method/test2.js rename to tests/format/flow/flow-repo/object-method/test2.js diff --git a/tests/format/flow-repo/object-method/test3.js b/tests/format/flow/flow-repo/object-method/test3.js similarity index 100% rename from tests/format/flow-repo/object-method/test3.js rename to tests/format/flow/flow-repo/object-method/test3.js diff --git a/tests/format/flow-repo/object_annot/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/object_annot/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/object_annot/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/object_annot/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/object_annot/format.test.js b/tests/format/flow/flow-repo/object_annot/format.test.js similarity index 100% rename from tests/format/flow-repo/object_annot/format.test.js rename to tests/format/flow/flow-repo/object_annot/format.test.js diff --git a/tests/format/flow-repo/object_annot/test.js b/tests/format/flow/flow-repo/object_annot/test.js similarity index 100% rename from tests/format/flow-repo/object_annot/test.js rename to tests/format/flow/flow-repo/object_annot/test.js diff --git a/tests/format/flow-repo/object_api/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/object_api/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/object_api/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/object_api/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/object_api/a.js b/tests/format/flow/flow-repo/object_api/a.js similarity index 100% rename from tests/format/flow-repo/object_api/a.js rename to tests/format/flow/flow-repo/object_api/a.js diff --git a/tests/format/flow-repo/object_api/b.js b/tests/format/flow/flow-repo/object_api/b.js similarity index 100% rename from tests/format/flow-repo/object_api/b.js rename to tests/format/flow/flow-repo/object_api/b.js diff --git a/tests/format/flow-repo/object_api/c.js b/tests/format/flow/flow-repo/object_api/c.js similarity index 100% rename from tests/format/flow-repo/object_api/c.js rename to tests/format/flow/flow-repo/object_api/c.js diff --git a/tests/format/flow-repo/object_api/format.test.js b/tests/format/flow/flow-repo/object_api/format.test.js similarity index 100% rename from tests/format/flow-repo/object_api/format.test.js rename to tests/format/flow/flow-repo/object_api/format.test.js diff --git a/tests/format/flow-repo/object_api/object_assign.js b/tests/format/flow/flow-repo/object_api/object_assign.js similarity index 100% rename from tests/format/flow-repo/object_api/object_assign.js rename to tests/format/flow/flow-repo/object_api/object_assign.js diff --git a/tests/format/flow-repo/object_api/object_create.js b/tests/format/flow/flow-repo/object_api/object_create.js similarity index 100% rename from tests/format/flow-repo/object_api/object_create.js rename to tests/format/flow/flow-repo/object_api/object_create.js diff --git a/tests/format/flow-repo/object_api/object_getprototypeof.js b/tests/format/flow/flow-repo/object_api/object_getprototypeof.js similarity index 100% rename from tests/format/flow-repo/object_api/object_getprototypeof.js rename to tests/format/flow/flow-repo/object_api/object_getprototypeof.js diff --git a/tests/format/flow-repo/object_api/object_keys.js b/tests/format/flow/flow-repo/object_api/object_keys.js similarity index 100% rename from tests/format/flow-repo/object_api/object_keys.js rename to tests/format/flow/flow-repo/object_api/object_keys.js diff --git a/tests/format/flow-repo/object_api/object_missing.js b/tests/format/flow/flow-repo/object_api/object_missing.js similarity index 100% rename from tests/format/flow-repo/object_api/object_missing.js rename to tests/format/flow/flow-repo/object_api/object_missing.js diff --git a/tests/format/flow-repo/object_api/object_prototype.js b/tests/format/flow/flow-repo/object_api/object_prototype.js similarity index 100% rename from tests/format/flow-repo/object_api/object_prototype.js rename to tests/format/flow/flow-repo/object_api/object_prototype.js diff --git a/tests/format/flow-repo/object_assign/A.js b/tests/format/flow/flow-repo/object_assign/A.js similarity index 100% rename from tests/format/flow-repo/object_assign/A.js rename to tests/format/flow/flow-repo/object_assign/A.js diff --git a/tests/format/flow-repo/object_assign/B.js b/tests/format/flow/flow-repo/object_assign/B.js similarity index 100% rename from tests/format/flow-repo/object_assign/B.js rename to tests/format/flow/flow-repo/object_assign/B.js diff --git a/tests/format/flow-repo/object_assign/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/object_assign/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/object_assign/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/object_assign/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/object_assign/apply.js b/tests/format/flow/flow-repo/object_assign/apply.js similarity index 100% rename from tests/format/flow-repo/object_assign/apply.js rename to tests/format/flow/flow-repo/object_assign/apply.js diff --git a/tests/format/flow-repo/object_assign/format.test.js b/tests/format/flow/flow-repo/object_assign/format.test.js similarity index 100% rename from tests/format/flow-repo/object_assign/format.test.js rename to tests/format/flow/flow-repo/object_assign/format.test.js diff --git a/tests/format/flow-repo/object_assign/non_objects.js b/tests/format/flow/flow-repo/object_assign/non_objects.js similarity index 100% rename from tests/format/flow-repo/object_assign/non_objects.js rename to tests/format/flow/flow-repo/object_assign/non_objects.js diff --git a/tests/format/flow-repo/object_assign/spread.js b/tests/format/flow/flow-repo/object_assign/spread.js similarity index 100% rename from tests/format/flow-repo/object_assign/spread.js rename to tests/format/flow/flow-repo/object_assign/spread.js diff --git a/tests/format/flow-repo/object_assign/undefined.js b/tests/format/flow/flow-repo/object_assign/undefined.js similarity index 100% rename from tests/format/flow-repo/object_assign/undefined.js rename to tests/format/flow/flow-repo/object_assign/undefined.js diff --git a/tests/format/flow-repo/object_freeze/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/object_freeze/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/object_freeze/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/object_freeze/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/object_freeze/format.test.js b/tests/format/flow/flow-repo/object_freeze/format.test.js similarity index 100% rename from tests/format/flow-repo/object_freeze/format.test.js rename to tests/format/flow/flow-repo/object_freeze/format.test.js diff --git a/tests/format/flow-repo/object_freeze/object_freeze.js b/tests/format/flow/flow-repo/object_freeze/object_freeze.js similarity index 100% rename from tests/format/flow-repo/object_freeze/object_freeze.js rename to tests/format/flow/flow-repo/object_freeze/object_freeze.js diff --git a/tests/format/flow-repo/object_is/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/object_is/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/object_is/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/object_is/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/object_is/format.test.js b/tests/format/flow/flow-repo/object_is/format.test.js similarity index 100% rename from tests/format/flow-repo/object_is/format.test.js rename to tests/format/flow/flow-repo/object_is/format.test.js diff --git a/tests/format/flow-repo/object_is/object_is.js b/tests/format/flow/flow-repo/object_is/object_is.js similarity index 100% rename from tests/format/flow-repo/object_is/object_is.js rename to tests/format/flow/flow-repo/object_is/object_is.js diff --git a/tests/format/flow-repo/objects/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/objects/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/objects/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/objects/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/objects/compatibility.js b/tests/format/flow/flow-repo/objects/compatibility.js similarity index 100% rename from tests/format/flow-repo/objects/compatibility.js rename to tests/format/flow/flow-repo/objects/compatibility.js diff --git a/tests/format/flow-repo/objects/conversion.js b/tests/format/flow/flow-repo/objects/conversion.js similarity index 100% rename from tests/format/flow-repo/objects/conversion.js rename to tests/format/flow/flow-repo/objects/conversion.js diff --git a/tests/format/flow-repo/objects/format.test.js b/tests/format/flow/flow-repo/objects/format.test.js similarity index 100% rename from tests/format/flow-repo/objects/format.test.js rename to tests/format/flow/flow-repo/objects/format.test.js diff --git a/tests/format/flow-repo/objects/objects.js b/tests/format/flow/flow-repo/objects/objects.js similarity index 100% rename from tests/format/flow-repo/objects/objects.js rename to tests/format/flow/flow-repo/objects/objects.js diff --git a/tests/format/flow-repo/objects/unaliased_assign.js b/tests/format/flow/flow-repo/objects/unaliased_assign.js similarity index 100% rename from tests/format/flow-repo/objects/unaliased_assign.js rename to tests/format/flow/flow-repo/objects/unaliased_assign.js diff --git a/tests/format/flow-repo/objmap/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/objmap/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/objmap/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/objmap/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/objmap/format.test.js b/tests/format/flow/flow-repo/objmap/format.test.js similarity index 100% rename from tests/format/flow-repo/objmap/format.test.js rename to tests/format/flow/flow-repo/objmap/format.test.js diff --git a/tests/format/flow-repo/objmap/objmap.js b/tests/format/flow/flow-repo/objmap/objmap.js similarity index 100% rename from tests/format/flow-repo/objmap/objmap.js rename to tests/format/flow/flow-repo/objmap/objmap.js diff --git a/tests/format/flow-repo/optional/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/optional/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/optional/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/optional/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/optional/client_optional.js b/tests/format/flow/flow-repo/optional/client_optional.js similarity index 100% rename from tests/format/flow-repo/optional/client_optional.js rename to tests/format/flow/flow-repo/optional/client_optional.js diff --git a/tests/format/flow-repo/optional/default.js b/tests/format/flow/flow-repo/optional/default.js similarity index 100% rename from tests/format/flow-repo/optional/default.js rename to tests/format/flow/flow-repo/optional/default.js diff --git a/tests/format/flow-repo/optional/format.test.js b/tests/format/flow/flow-repo/optional/format.test.js similarity index 100% rename from tests/format/flow-repo/optional/format.test.js rename to tests/format/flow/flow-repo/optional/format.test.js diff --git a/tests/format/flow-repo/optional/generic.js b/tests/format/flow/flow-repo/optional/generic.js similarity index 100% rename from tests/format/flow-repo/optional/generic.js rename to tests/format/flow/flow-repo/optional/generic.js diff --git a/tests/format/flow-repo/optional/loop.js b/tests/format/flow/flow-repo/optional/loop.js similarity index 100% rename from tests/format/flow-repo/optional/loop.js rename to tests/format/flow/flow-repo/optional/loop.js diff --git a/tests/format/flow-repo/optional/maybe.js b/tests/format/flow/flow-repo/optional/maybe.js similarity index 100% rename from tests/format/flow-repo/optional/maybe.js rename to tests/format/flow/flow-repo/optional/maybe.js diff --git a/tests/format/flow-repo/optional/nullable.js b/tests/format/flow/flow-repo/optional/nullable.js similarity index 100% rename from tests/format/flow-repo/optional/nullable.js rename to tests/format/flow/flow-repo/optional/nullable.js diff --git a/tests/format/flow-repo/optional/optional.js b/tests/format/flow/flow-repo/optional/optional.js similarity index 100% rename from tests/format/flow-repo/optional/optional.js rename to tests/format/flow/flow-repo/optional/optional.js diff --git a/tests/format/flow-repo/optional/optional_param.js b/tests/format/flow/flow-repo/optional/optional_param.js similarity index 100% rename from tests/format/flow-repo/optional/optional_param.js rename to tests/format/flow/flow-repo/optional/optional_param.js diff --git a/tests/format/flow-repo/optional/optional_param2.js b/tests/format/flow/flow-repo/optional/optional_param2.js similarity index 100% rename from tests/format/flow-repo/optional/optional_param2.js rename to tests/format/flow/flow-repo/optional/optional_param2.js diff --git a/tests/format/flow-repo/optional/optional_param3.js b/tests/format/flow/flow-repo/optional/optional_param3.js similarity index 100% rename from tests/format/flow-repo/optional/optional_param3.js rename to tests/format/flow/flow-repo/optional/optional_param3.js diff --git a/tests/format/flow-repo/optional/optional_param4.js b/tests/format/flow/flow-repo/optional/optional_param4.js similarity index 100% rename from tests/format/flow-repo/optional/optional_param4.js rename to tests/format/flow/flow-repo/optional/optional_param4.js diff --git a/tests/format/flow-repo/optional/undefined.js b/tests/format/flow/flow-repo/optional/undefined.js similarity index 100% rename from tests/format/flow-repo/optional/undefined.js rename to tests/format/flow/flow-repo/optional/undefined.js diff --git a/tests/format/flow-repo/optional/undefined2.js b/tests/format/flow/flow-repo/optional/undefined2.js similarity index 100% rename from tests/format/flow-repo/optional/undefined2.js rename to tests/format/flow/flow-repo/optional/undefined2.js diff --git a/tests/format/flow-repo/optional_chaining/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/optional_chaining/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/optional_chaining/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/optional_chaining/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/optional_chaining/format.test.js b/tests/format/flow/flow-repo/optional_chaining/format.test.js similarity index 100% rename from tests/format/flow-repo/optional_chaining/format.test.js rename to tests/format/flow/flow-repo/optional_chaining/format.test.js diff --git a/tests/format/flow-repo/optional_chaining/private_properties.js b/tests/format/flow/flow-repo/optional_chaining/private_properties.js similarity index 100% rename from tests/format/flow-repo/optional_chaining/private_properties.js rename to tests/format/flow/flow-repo/optional_chaining/private_properties.js diff --git a/tests/format/flow-repo/optional_props/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/optional_props/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/optional_props/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/optional_props/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/optional_props/format.test.js b/tests/format/flow/flow-repo/optional_props/format.test.js similarity index 100% rename from tests/format/flow-repo/optional_props/format.test.js rename to tests/format/flow/flow-repo/optional_props/format.test.js diff --git a/tests/format/flow-repo/optional_props/test.js b/tests/format/flow/flow-repo/optional_props/test.js similarity index 100% rename from tests/format/flow-repo/optional_props/test.js rename to tests/format/flow/flow-repo/optional_props/test.js diff --git a/tests/format/flow-repo/optional_props/test2.js b/tests/format/flow/flow-repo/optional_props/test2.js similarity index 100% rename from tests/format/flow-repo/optional_props/test2.js rename to tests/format/flow/flow-repo/optional_props/test2.js diff --git a/tests/format/flow-repo/optional_props/test3.js b/tests/format/flow/flow-repo/optional_props/test3.js similarity index 100% rename from tests/format/flow-repo/optional_props/test3.js rename to tests/format/flow/flow-repo/optional_props/test3.js diff --git a/tests/format/flow-repo/optional_props/test3_exact_annot.js b/tests/format/flow/flow-repo/optional_props/test3_exact_annot.js similarity index 100% rename from tests/format/flow-repo/optional_props/test3_exact_annot.js rename to tests/format/flow/flow-repo/optional_props/test3_exact_annot.js diff --git a/tests/format/flow-repo/optional_props/test3_failure.js b/tests/format/flow/flow-repo/optional_props/test3_failure.js similarity index 100% rename from tests/format/flow-repo/optional_props/test3_failure.js rename to tests/format/flow/flow-repo/optional_props/test3_failure.js diff --git a/tests/format/flow-repo/overload/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/overload/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/overload/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/overload/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/overload/format.test.js b/tests/format/flow/flow-repo/overload/format.test.js similarity index 100% rename from tests/format/flow-repo/overload/format.test.js rename to tests/format/flow/flow-repo/overload/format.test.js diff --git a/tests/format/flow-repo/overload/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/overload/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/overload/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/overload/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/overload/lib/format.test.js b/tests/format/flow/flow-repo/overload/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/overload/lib/format.test.js rename to tests/format/flow/flow-repo/overload/lib/format.test.js diff --git a/tests/format/flow-repo/overload/lib/lib.js b/tests/format/flow/flow-repo/overload/lib/lib.js similarity index 100% rename from tests/format/flow-repo/overload/lib/lib.js rename to tests/format/flow/flow-repo/overload/lib/lib.js diff --git a/tests/format/flow-repo/overload/overload.js b/tests/format/flow/flow-repo/overload/overload.js similarity index 100% rename from tests/format/flow-repo/overload/overload.js rename to tests/format/flow/flow-repo/overload/overload.js diff --git a/tests/format/flow-repo/overload/test.js b/tests/format/flow/flow-repo/overload/test.js similarity index 100% rename from tests/format/flow-repo/overload/test.js rename to tests/format/flow/flow-repo/overload/test.js diff --git a/tests/format/flow-repo/overload/test2.js b/tests/format/flow/flow-repo/overload/test2.js similarity index 100% rename from tests/format/flow-repo/overload/test2.js rename to tests/format/flow/flow-repo/overload/test2.js diff --git a/tests/format/flow-repo/overload/test3.js b/tests/format/flow/flow-repo/overload/test3.js similarity index 100% rename from tests/format/flow-repo/overload/test3.js rename to tests/format/flow/flow-repo/overload/test3.js diff --git a/tests/format/flow-repo/overload/union.js b/tests/format/flow/flow-repo/overload/union.js similarity index 100% rename from tests/format/flow-repo/overload/union.js rename to tests/format/flow/flow-repo/overload/union.js diff --git a/tests/format/flow-repo/parse/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/parse/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/parse/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/parse/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/parse/format.test.js b/tests/format/flow/flow-repo/parse/format.test.js similarity index 100% rename from tests/format/flow-repo/parse/format.test.js rename to tests/format/flow/flow-repo/parse/format.test.js diff --git a/tests/format/flow-repo/parse/no_parse_error.js b/tests/format/flow/flow-repo/parse/no_parse_error.js similarity index 100% rename from tests/format/flow-repo/parse/no_parse_error.js rename to tests/format/flow/flow-repo/parse/no_parse_error.js diff --git a/tests/format/flow-repo/parse_error_haste/Client.js b/tests/format/flow/flow-repo/parse_error_haste/Client.js similarity index 100% rename from tests/format/flow-repo/parse_error_haste/Client.js rename to tests/format/flow/flow-repo/parse_error_haste/Client.js diff --git a/tests/format/flow-repo/parse_error_haste/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/parse_error_haste/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/parse_error_haste/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/parse_error_haste/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/parse_error_haste/format.test.js b/tests/format/flow/flow-repo/parse_error_haste/format.test.js similarity index 100% rename from tests/format/flow-repo/parse_error_haste/format.test.js rename to tests/format/flow/flow-repo/parse_error_haste/format.test.js diff --git a/tests/format/flow-repo/parse_error_node/Client.js b/tests/format/flow/flow-repo/parse_error_node/Client.js similarity index 100% rename from tests/format/flow-repo/parse_error_node/Client.js rename to tests/format/flow/flow-repo/parse_error_node/Client.js diff --git a/tests/format/flow-repo/parse_error_node/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/parse_error_node/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/parse_error_node/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/parse_error_node/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/parse_error_node/format.test.js b/tests/format/flow/flow-repo/parse_error_node/format.test.js similarity index 100% rename from tests/format/flow-repo/parse_error_node/format.test.js rename to tests/format/flow/flow-repo/parse_error_node/format.test.js diff --git a/tests/format/flow-repo/path/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/path/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/path/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/path/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/path/format.test.js b/tests/format/flow/flow-repo/path/format.test.js similarity index 100% rename from tests/format/flow-repo/path/format.test.js rename to tests/format/flow/flow-repo/path/format.test.js diff --git a/tests/format/flow-repo/path/while.js b/tests/format/flow/flow-repo/path/while.js similarity index 100% rename from tests/format/flow-repo/path/while.js rename to tests/format/flow/flow-repo/path/while.js diff --git a/tests/format/flow-repo/plsummit/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/plsummit/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/plsummit/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/plsummit/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/plsummit/arrays.js b/tests/format/flow/flow-repo/plsummit/arrays.js similarity index 100% rename from tests/format/flow-repo/plsummit/arrays.js rename to tests/format/flow/flow-repo/plsummit/arrays.js diff --git a/tests/format/flow-repo/plsummit/export_class.js b/tests/format/flow/flow-repo/plsummit/export_class.js similarity index 100% rename from tests/format/flow-repo/plsummit/export_class.js rename to tests/format/flow/flow-repo/plsummit/export_class.js diff --git a/tests/format/flow-repo/plsummit/format.test.js b/tests/format/flow/flow-repo/plsummit/format.test.js similarity index 100% rename from tests/format/flow-repo/plsummit/format.test.js rename to tests/format/flow/flow-repo/plsummit/format.test.js diff --git a/tests/format/flow-repo/plsummit/generics.js b/tests/format/flow/flow-repo/plsummit/generics.js similarity index 100% rename from tests/format/flow-repo/plsummit/generics.js rename to tests/format/flow/flow-repo/plsummit/generics.js diff --git a/tests/format/flow-repo/plsummit/import_class.js b/tests/format/flow/flow-repo/plsummit/import_class.js similarity index 100% rename from tests/format/flow-repo/plsummit/import_class.js rename to tests/format/flow/flow-repo/plsummit/import_class.js diff --git a/tests/format/flow-repo/plsummit/locals.js b/tests/format/flow/flow-repo/plsummit/locals.js similarity index 100% rename from tests/format/flow-repo/plsummit/locals.js rename to tests/format/flow/flow-repo/plsummit/locals.js diff --git a/tests/format/flow-repo/plsummit/objects.js b/tests/format/flow/flow-repo/plsummit/objects.js similarity index 100% rename from tests/format/flow-repo/plsummit/objects.js rename to tests/format/flow/flow-repo/plsummit/objects.js diff --git a/tests/format/flow-repo/poly/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/poly/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/poly/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/poly/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/poly/annot.js b/tests/format/flow/flow-repo/poly/annot.js similarity index 100% rename from tests/format/flow-repo/poly/annot.js rename to tests/format/flow/flow-repo/poly/annot.js diff --git a/tests/format/flow-repo/poly/format.test.js b/tests/format/flow/flow-repo/poly/format.test.js similarity index 100% rename from tests/format/flow-repo/poly/format.test.js rename to tests/format/flow/flow-repo/poly/format.test.js diff --git a/tests/format/flow-repo/poly/implicit_bounded_instantiation.js b/tests/format/flow/flow-repo/poly/implicit_bounded_instantiation.js similarity index 100% rename from tests/format/flow-repo/poly/implicit_bounded_instantiation.js rename to tests/format/flow/flow-repo/poly/implicit_bounded_instantiation.js diff --git a/tests/format/flow-repo/poly/issue-1029.js b/tests/format/flow/flow-repo/poly/issue-1029.js similarity index 100% rename from tests/format/flow-repo/poly/issue-1029.js rename to tests/format/flow/flow-repo/poly/issue-1029.js diff --git a/tests/format/flow-repo/poly/poly.js b/tests/format/flow/flow-repo/poly/poly.js similarity index 100% rename from tests/format/flow-repo/poly/poly.js rename to tests/format/flow/flow-repo/poly/poly.js diff --git a/tests/format/flow-repo/poly/test.js b/tests/format/flow/flow-repo/poly/test.js similarity index 100% rename from tests/format/flow-repo/poly/test.js rename to tests/format/flow/flow-repo/poly/test.js diff --git a/tests/format/flow-repo/poly_class_export/A.js b/tests/format/flow/flow-repo/poly_class_export/A.js similarity index 100% rename from tests/format/flow-repo/poly_class_export/A.js rename to tests/format/flow/flow-repo/poly_class_export/A.js diff --git a/tests/format/flow-repo/poly_class_export/B.js b/tests/format/flow/flow-repo/poly_class_export/B.js similarity index 100% rename from tests/format/flow-repo/poly_class_export/B.js rename to tests/format/flow/flow-repo/poly_class_export/B.js diff --git a/tests/format/flow-repo/poly_class_export/C.js b/tests/format/flow/flow-repo/poly_class_export/C.js similarity index 100% rename from tests/format/flow-repo/poly_class_export/C.js rename to tests/format/flow/flow-repo/poly_class_export/C.js diff --git a/tests/format/flow-repo/poly_class_export/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/poly_class_export/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/poly_class_export/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/poly_class_export/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/poly_class_export/format.test.js b/tests/format/flow/flow-repo/poly_class_export/format.test.js similarity index 100% rename from tests/format/flow-repo/poly_class_export/format.test.js rename to tests/format/flow/flow-repo/poly_class_export/format.test.js diff --git a/tests/format/flow-repo/poly_overload/decls/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/poly_overload/decls/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/poly_overload/decls/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/poly_overload/decls/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/poly_overload/decls/format.test.js b/tests/format/flow/flow-repo/poly_overload/decls/format.test.js similarity index 100% rename from tests/format/flow-repo/poly_overload/decls/format.test.js rename to tests/format/flow/flow-repo/poly_overload/decls/format.test.js diff --git a/tests/format/flow-repo/poly_overload/decls/typescript-deferred.js b/tests/format/flow/flow-repo/poly_overload/decls/typescript-deferred.js similarity index 100% rename from tests/format/flow-repo/poly_overload/decls/typescript-deferred.js rename to tests/format/flow/flow-repo/poly_overload/decls/typescript-deferred.js diff --git a/tests/format/flow-repo/predicates-abstract/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/predicates-abstract/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/predicates-abstract/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/predicates-abstract/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/predicates-abstract/filter-union.js b/tests/format/flow/flow-repo/predicates-abstract/filter-union.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/filter-union.js rename to tests/format/flow/flow-repo/predicates-abstract/filter-union.js diff --git a/tests/format/flow-repo/predicates-abstract/filter.js b/tests/format/flow/flow-repo/predicates-abstract/filter.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/filter.js rename to tests/format/flow/flow-repo/predicates-abstract/filter.js diff --git a/tests/format/flow-repo/predicates-abstract/format.test.js b/tests/format/flow/flow-repo/predicates-abstract/format.test.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/format.test.js rename to tests/format/flow/flow-repo/predicates-abstract/format.test.js diff --git a/tests/format/flow-repo/predicates-abstract/refine.js b/tests/format/flow/flow-repo/predicates-abstract/refine.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/refine.js rename to tests/format/flow/flow-repo/predicates-abstract/refine.js diff --git a/tests/format/flow-repo/predicates-abstract/sanity-filter-union.js b/tests/format/flow/flow-repo/predicates-abstract/sanity-filter-union.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/sanity-filter-union.js rename to tests/format/flow/flow-repo/predicates-abstract/sanity-filter-union.js diff --git a/tests/format/flow-repo/predicates-abstract/sanity-filter.js b/tests/format/flow/flow-repo/predicates-abstract/sanity-filter.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/sanity-filter.js rename to tests/format/flow/flow-repo/predicates-abstract/sanity-filter.js diff --git a/tests/format/flow-repo/predicates-abstract/sanity-refine.js b/tests/format/flow/flow-repo/predicates-abstract/sanity-refine.js similarity index 100% rename from tests/format/flow-repo/predicates-abstract/sanity-refine.js rename to tests/format/flow/flow-repo/predicates-abstract/sanity-refine.js diff --git a/tests/format/flow-repo/predicates-declared/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/predicates-declared/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/predicates-declared/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/predicates-declared/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/predicates-declared/format.test.js b/tests/format/flow/flow-repo/predicates-declared/format.test.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/format.test.js rename to tests/format/flow/flow-repo/predicates-declared/format.test.js diff --git a/tests/format/flow-repo/predicates-declared/function-bind.js b/tests/format/flow/flow-repo/predicates-declared/function-bind.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/function-bind.js rename to tests/format/flow/flow-repo/predicates-declared/function-bind.js diff --git a/tests/format/flow-repo/predicates-declared/function-union.js b/tests/format/flow/flow-repo/predicates-declared/function-union.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/function-union.js rename to tests/format/flow/flow-repo/predicates-declared/function-union.js diff --git a/tests/format/flow-repo/predicates-declared/is-string-decl.js b/tests/format/flow/flow-repo/predicates-declared/is-string-decl.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/is-string-decl.js rename to tests/format/flow/flow-repo/predicates-declared/is-string-decl.js diff --git a/tests/format/flow-repo/predicates-declared/logical-or.js b/tests/format/flow/flow-repo/predicates-declared/logical-or.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/logical-or.js rename to tests/format/flow/flow-repo/predicates-declared/logical-or.js diff --git a/tests/format/flow-repo/predicates-declared/object-invariant.js b/tests/format/flow/flow-repo/predicates-declared/object-invariant.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/object-invariant.js rename to tests/format/flow/flow-repo/predicates-declared/object-invariant.js diff --git a/tests/format/flow-repo/predicates-declared/orig-string-tag-check.js b/tests/format/flow/flow-repo/predicates-declared/orig-string-tag-check.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/orig-string-tag-check.js rename to tests/format/flow/flow-repo/predicates-declared/orig-string-tag-check.js diff --git a/tests/format/flow-repo/predicates-declared/sanity-fall-through.js b/tests/format/flow/flow-repo/predicates-declared/sanity-fall-through.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/sanity-fall-through.js rename to tests/format/flow/flow-repo/predicates-declared/sanity-fall-through.js diff --git a/tests/format/flow-repo/predicates-declared/sanity-invalid-calls.js b/tests/format/flow/flow-repo/predicates-declared/sanity-invalid-calls.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/sanity-invalid-calls.js rename to tests/format/flow/flow-repo/predicates-declared/sanity-invalid-calls.js diff --git a/tests/format/flow-repo/predicates-declared/sanity-is-string-bug.js b/tests/format/flow/flow-repo/predicates-declared/sanity-is-string-bug.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/sanity-is-string-bug.js rename to tests/format/flow/flow-repo/predicates-declared/sanity-is-string-bug.js diff --git a/tests/format/flow-repo/predicates-declared/sanity-parameter-mismatch.js b/tests/format/flow/flow-repo/predicates-declared/sanity-parameter-mismatch.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/sanity-parameter-mismatch.js rename to tests/format/flow/flow-repo/predicates-declared/sanity-parameter-mismatch.js diff --git a/tests/format/flow-repo/predicates-declared/sanity-pred-with-body.js b/tests/format/flow/flow-repo/predicates-declared/sanity-pred-with-body.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/sanity-pred-with-body.js rename to tests/format/flow/flow-repo/predicates-declared/sanity-pred-with-body.js diff --git a/tests/format/flow-repo/predicates-declared/sanity-return-type.js b/tests/format/flow/flow-repo/predicates-declared/sanity-return-type.js similarity index 100% rename from tests/format/flow-repo/predicates-declared/sanity-return-type.js rename to tests/format/flow/flow-repo/predicates-declared/sanity-return-type.js diff --git a/tests/format/flow-repo/predicates-inferred/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/predicates-inferred/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/predicates-inferred/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/predicates-inferred/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/predicates-inferred/format.test.js b/tests/format/flow/flow-repo/predicates-inferred/format.test.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/format.test.js rename to tests/format/flow/flow-repo/predicates-inferred/format.test.js diff --git a/tests/format/flow-repo/predicates-inferred/sanity-multi-params.js b/tests/format/flow/flow-repo/predicates-inferred/sanity-multi-params.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/sanity-multi-params.js rename to tests/format/flow/flow-repo/predicates-inferred/sanity-multi-params.js diff --git a/tests/format/flow-repo/predicates-inferred/sanity-ordering.js b/tests/format/flow/flow-repo/predicates-inferred/sanity-ordering.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/sanity-ordering.js rename to tests/format/flow/flow-repo/predicates-inferred/sanity-ordering.js diff --git a/tests/format/flow-repo/predicates-inferred/sanity-unbound-var.js b/tests/format/flow/flow-repo/predicates-inferred/sanity-unbound-var.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/sanity-unbound-var.js rename to tests/format/flow/flow-repo/predicates-inferred/sanity-unbound-var.js diff --git a/tests/format/flow-repo/predicates-inferred/sanity.js b/tests/format/flow/flow-repo/predicates-inferred/sanity.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/sanity.js rename to tests/format/flow/flow-repo/predicates-inferred/sanity.js diff --git a/tests/format/flow-repo/predicates-inferred/simple-predicate-func-post.js b/tests/format/flow/flow-repo/predicates-inferred/simple-predicate-func-post.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/simple-predicate-func-post.js rename to tests/format/flow/flow-repo/predicates-inferred/simple-predicate-func-post.js diff --git a/tests/format/flow-repo/predicates-inferred/simple-predicate-func.js b/tests/format/flow/flow-repo/predicates-inferred/simple-predicate-func.js similarity index 100% rename from tests/format/flow-repo/predicates-inferred/simple-predicate-func.js rename to tests/format/flow/flow-repo/predicates-inferred/simple-predicate-func.js diff --git a/tests/format/flow-repo/predicates-parsing/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/predicates-parsing/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/predicates-parsing/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/predicates-parsing/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/predicates-parsing/fail-0.js b/tests/format/flow/flow-repo/predicates-parsing/fail-0.js similarity index 100% rename from tests/format/flow-repo/predicates-parsing/fail-0.js rename to tests/format/flow/flow-repo/predicates-parsing/fail-0.js diff --git a/tests/format/flow-repo/predicates-parsing/fail-1.js b/tests/format/flow/flow-repo/predicates-parsing/fail-1.js similarity index 100% rename from tests/format/flow-repo/predicates-parsing/fail-1.js rename to tests/format/flow/flow-repo/predicates-parsing/fail-1.js diff --git a/tests/format/flow-repo/predicates-parsing/fail-2.js b/tests/format/flow/flow-repo/predicates-parsing/fail-2.js similarity index 100% rename from tests/format/flow-repo/predicates-parsing/fail-2.js rename to tests/format/flow/flow-repo/predicates-parsing/fail-2.js diff --git a/tests/format/flow-repo/predicates-parsing/fail-3.js b/tests/format/flow/flow-repo/predicates-parsing/fail-3.js similarity index 100% rename from tests/format/flow-repo/predicates-parsing/fail-3.js rename to tests/format/flow/flow-repo/predicates-parsing/fail-3.js diff --git a/tests/format/flow-repo/predicates-parsing/format.test.js b/tests/format/flow/flow-repo/predicates-parsing/format.test.js similarity index 100% rename from tests/format/flow-repo/predicates-parsing/format.test.js rename to tests/format/flow/flow-repo/predicates-parsing/format.test.js diff --git a/tests/format/flow-repo/predicates-parsing/pass.js b/tests/format/flow/flow-repo/predicates-parsing/pass.js similarity index 100% rename from tests/format/flow-repo/predicates-parsing/pass.js rename to tests/format/flow/flow-repo/predicates-parsing/pass.js diff --git a/tests/format/flow-repo/private/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/private/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/private/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/private/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/private/format.test.js b/tests/format/flow/flow-repo/private/format.test.js similarity index 100% rename from tests/format/flow-repo/private/format.test.js rename to tests/format/flow/flow-repo/private/format.test.js diff --git a/tests/format/flow-repo/private/private.js b/tests/format/flow/flow-repo/private/private.js similarity index 100% rename from tests/format/flow-repo/private/private.js rename to tests/format/flow/flow-repo/private/private.js diff --git a/tests/format/flow-repo/private_class_fields/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/private_class_fields/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/private_class_fields/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/private_class_fields/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/private_class_fields/format.test.js b/tests/format/flow/flow-repo/private_class_fields/format.test.js similarity index 100% rename from tests/format/flow-repo/private_class_fields/format.test.js rename to tests/format/flow/flow-repo/private_class_fields/format.test.js diff --git a/tests/format/flow-repo/private_class_fields/test.js b/tests/format/flow/flow-repo/private_class_fields/test.js similarity index 100% rename from tests/format/flow-repo/private_class_fields/test.js rename to tests/format/flow/flow-repo/private_class_fields/test.js diff --git a/tests/format/flow-repo/promises/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/promises/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/promises/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/promises/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/promises/all.js b/tests/format/flow/flow-repo/promises/all.js similarity index 100% rename from tests/format/flow-repo/promises/all.js rename to tests/format/flow/flow-repo/promises/all.js diff --git a/tests/format/flow-repo/promises/covariance.js b/tests/format/flow/flow-repo/promises/covariance.js similarity index 100% rename from tests/format/flow-repo/promises/covariance.js rename to tests/format/flow/flow-repo/promises/covariance.js diff --git a/tests/format/flow-repo/promises/format.test.js b/tests/format/flow/flow-repo/promises/format.test.js similarity index 100% rename from tests/format/flow-repo/promises/format.test.js rename to tests/format/flow/flow-repo/promises/format.test.js diff --git a/tests/format/flow-repo/promises/promise.js b/tests/format/flow/flow-repo/promises/promise.js similarity index 100% rename from tests/format/flow-repo/promises/promise.js rename to tests/format/flow/flow-repo/promises/promise.js diff --git a/tests/format/flow-repo/promises/resolve_global.js b/tests/format/flow/flow-repo/promises/resolve_global.js similarity index 100% rename from tests/format/flow-repo/promises/resolve_global.js rename to tests/format/flow/flow-repo/promises/resolve_global.js diff --git a/tests/format/flow-repo/promises/resolve_void.js b/tests/format/flow/flow-repo/promises/resolve_void.js similarity index 100% rename from tests/format/flow-repo/promises/resolve_void.js rename to tests/format/flow/flow-repo/promises/resolve_void.js diff --git a/tests/format/flow-repo/pure_component/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/pure_component/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/pure_component/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/pure_component/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/pure_component/format.test.js b/tests/format/flow/flow-repo/pure_component/format.test.js similarity index 100% rename from tests/format/flow-repo/pure_component/format.test.js rename to tests/format/flow/flow-repo/pure_component/format.test.js diff --git a/tests/format/flow-repo/pure_component/test.js b/tests/format/flow/flow-repo/pure_component/test.js similarity index 100% rename from tests/format/flow-repo/pure_component/test.js rename to tests/format/flow/flow-repo/pure_component/test.js diff --git a/tests/format/flow-repo/qualified/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/qualified/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/qualified/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/qualified/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/qualified/format.test.js b/tests/format/flow/flow-repo/qualified/format.test.js similarity index 100% rename from tests/format/flow-repo/qualified/format.test.js rename to tests/format/flow/flow-repo/qualified/format.test.js diff --git a/tests/format/flow-repo/qualified/qualified.js b/tests/format/flow/flow-repo/qualified/qualified.js similarity index 100% rename from tests/format/flow-repo/qualified/qualified.js rename to tests/format/flow/flow-repo/qualified/qualified.js diff --git a/tests/format/flow-repo/react/ArityError.react.js b/tests/format/flow/flow-repo/react/ArityError.react.js similarity index 100% rename from tests/format/flow-repo/react/ArityError.react.js rename to tests/format/flow/flow-repo/react/ArityError.react.js diff --git a/tests/format/flow-repo/react/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/react/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/react/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/react/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/react/createElementRequiredProp_string.js b/tests/format/flow/flow-repo/react/createElementRequiredProp_string.js similarity index 100% rename from tests/format/flow-repo/react/createElementRequiredProp_string.js rename to tests/format/flow/flow-repo/react/createElementRequiredProp_string.js diff --git a/tests/format/flow-repo/react/createElement_string.js b/tests/format/flow/flow-repo/react/createElement_string.js similarity index 100% rename from tests/format/flow-repo/react/createElement_string.js rename to tests/format/flow/flow-repo/react/createElement_string.js diff --git a/tests/format/flow-repo/react/create_class.js b/tests/format/flow/flow-repo/react/create_class.js similarity index 100% rename from tests/format/flow-repo/react/create_class.js rename to tests/format/flow/flow-repo/react/create_class.js diff --git a/tests/format/flow-repo/react/create_class_initial_state_sealed.js b/tests/format/flow/flow-repo/react/create_class_initial_state_sealed.js similarity index 100% rename from tests/format/flow-repo/react/create_class_initial_state_sealed.js rename to tests/format/flow/flow-repo/react/create_class_initial_state_sealed.js diff --git a/tests/format/flow-repo/react/create_class_statics_sealed.js b/tests/format/flow/flow-repo/react/create_class_statics_sealed.js similarity index 100% rename from tests/format/flow-repo/react/create_class_statics_sealed.js rename to tests/format/flow/flow-repo/react/create_class_statics_sealed.js diff --git a/tests/format/flow-repo/react/format.test.js b/tests/format/flow/flow-repo/react/format.test.js similarity index 100% rename from tests/format/flow-repo/react/format.test.js rename to tests/format/flow/flow-repo/react/format.test.js diff --git a/tests/format/flow-repo/react/import_react.js b/tests/format/flow/flow-repo/react/import_react.js similarity index 100% rename from tests/format/flow-repo/react/import_react.js rename to tests/format/flow/flow-repo/react/import_react.js diff --git a/tests/format/flow-repo/react/jsx_spread.js b/tests/format/flow/flow-repo/react/jsx_spread.js similarity index 100% rename from tests/format/flow-repo/react/jsx_spread.js rename to tests/format/flow/flow-repo/react/jsx_spread.js diff --git a/tests/format/flow-repo/react/proptype_any.js b/tests/format/flow/flow-repo/react/proptype_any.js similarity index 100% rename from tests/format/flow-repo/react/proptype_any.js rename to tests/format/flow/flow-repo/react/proptype_any.js diff --git a/tests/format/flow-repo/react/proptype_arrayOf.js b/tests/format/flow/flow-repo/react/proptype_arrayOf.js similarity index 100% rename from tests/format/flow-repo/react/proptype_arrayOf.js rename to tests/format/flow/flow-repo/react/proptype_arrayOf.js diff --git a/tests/format/flow-repo/react/proptype_custom_validator.js b/tests/format/flow/flow-repo/react/proptype_custom_validator.js similarity index 100% rename from tests/format/flow-repo/react/proptype_custom_validator.js rename to tests/format/flow/flow-repo/react/proptype_custom_validator.js diff --git a/tests/format/flow-repo/react/proptype_func.js b/tests/format/flow/flow-repo/react/proptype_func.js similarity index 100% rename from tests/format/flow-repo/react/proptype_func.js rename to tests/format/flow/flow-repo/react/proptype_func.js diff --git a/tests/format/flow-repo/react/proptype_incompatible.js b/tests/format/flow/flow-repo/react/proptype_incompatible.js similarity index 100% rename from tests/format/flow-repo/react/proptype_incompatible.js rename to tests/format/flow/flow-repo/react/proptype_incompatible.js diff --git a/tests/format/flow-repo/react/proptype_instanceOf.js b/tests/format/flow/flow-repo/react/proptype_instanceOf.js similarity index 100% rename from tests/format/flow-repo/react/proptype_instanceOf.js rename to tests/format/flow/flow-repo/react/proptype_instanceOf.js diff --git a/tests/format/flow-repo/react/proptype_missing.js b/tests/format/flow/flow-repo/react/proptype_missing.js similarity index 100% rename from tests/format/flow-repo/react/proptype_missing.js rename to tests/format/flow/flow-repo/react/proptype_missing.js diff --git a/tests/format/flow-repo/react/proptype_object.js b/tests/format/flow/flow-repo/react/proptype_object.js similarity index 100% rename from tests/format/flow-repo/react/proptype_object.js rename to tests/format/flow/flow-repo/react/proptype_object.js diff --git a/tests/format/flow-repo/react/proptype_objectOf.js b/tests/format/flow/flow-repo/react/proptype_objectOf.js similarity index 100% rename from tests/format/flow-repo/react/proptype_objectOf.js rename to tests/format/flow/flow-repo/react/proptype_objectOf.js diff --git a/tests/format/flow-repo/react/proptype_oneOf.js b/tests/format/flow/flow-repo/react/proptype_oneOf.js similarity index 100% rename from tests/format/flow-repo/react/proptype_oneOf.js rename to tests/format/flow/flow-repo/react/proptype_oneOf.js diff --git a/tests/format/flow-repo/react/proptype_oneOfType.js b/tests/format/flow/flow-repo/react/proptype_oneOfType.js similarity index 100% rename from tests/format/flow-repo/react/proptype_oneOfType.js rename to tests/format/flow/flow-repo/react/proptype_oneOfType.js diff --git a/tests/format/flow-repo/react/proptype_shape.js b/tests/format/flow/flow-repo/react/proptype_shape.js similarity index 100% rename from tests/format/flow-repo/react/proptype_shape.js rename to tests/format/flow/flow-repo/react/proptype_shape.js diff --git a/tests/format/flow-repo/react/proptypes_builtins.js b/tests/format/flow/flow-repo/react/proptypes_builtins.js similarity index 100% rename from tests/format/flow-repo/react/proptypes_builtins.js rename to tests/format/flow/flow-repo/react/proptypes_builtins.js diff --git a/tests/format/flow-repo/react/proptypes_sealed.js b/tests/format/flow/flow-repo/react/proptypes_sealed.js similarity index 100% rename from tests/format/flow-repo/react/proptypes_sealed.js rename to tests/format/flow/flow-repo/react/proptypes_sealed.js diff --git a/tests/format/flow-repo/react_functional/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/react_functional/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/react_functional/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/react_functional/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/react_functional/format.test.js b/tests/format/flow/flow-repo/react_functional/format.test.js similarity index 100% rename from tests/format/flow-repo/react_functional/format.test.js rename to tests/format/flow/flow-repo/react_functional/format.test.js diff --git a/tests/format/flow-repo/react_functional/test.js b/tests/format/flow/flow-repo/react_functional/test.js similarity index 100% rename from tests/format/flow-repo/react_functional/test.js rename to tests/format/flow/flow-repo/react_functional/test.js diff --git a/tests/format/flow-repo/react_modules/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/react_modules/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/react_modules/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/react_modules/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/react_modules/createclass-callsite.js b/tests/format/flow/flow-repo/react_modules/createclass-callsite.js similarity index 100% rename from tests/format/flow-repo/react_modules/createclass-callsite.js rename to tests/format/flow/flow-repo/react_modules/createclass-callsite.js diff --git a/tests/format/flow-repo/react_modules/createclass-module.js b/tests/format/flow/flow-repo/react_modules/createclass-module.js similarity index 100% rename from tests/format/flow-repo/react_modules/createclass-module.js rename to tests/format/flow/flow-repo/react_modules/createclass-module.js diff --git a/tests/format/flow-repo/react_modules/es6class-proptypes-callsite.js b/tests/format/flow/flow-repo/react_modules/es6class-proptypes-callsite.js similarity index 100% rename from tests/format/flow-repo/react_modules/es6class-proptypes-callsite.js rename to tests/format/flow/flow-repo/react_modules/es6class-proptypes-callsite.js diff --git a/tests/format/flow-repo/react_modules/es6class-proptypes-module.js b/tests/format/flow/flow-repo/react_modules/es6class-proptypes-module.js similarity index 100% rename from tests/format/flow-repo/react_modules/es6class-proptypes-module.js rename to tests/format/flow/flow-repo/react_modules/es6class-proptypes-module.js diff --git a/tests/format/flow-repo/react_modules/es6class-types-callsite.js b/tests/format/flow/flow-repo/react_modules/es6class-types-callsite.js similarity index 100% rename from tests/format/flow-repo/react_modules/es6class-types-callsite.js rename to tests/format/flow/flow-repo/react_modules/es6class-types-callsite.js diff --git a/tests/format/flow-repo/react_modules/es6class-types-module.js b/tests/format/flow/flow-repo/react_modules/es6class-types-module.js similarity index 100% rename from tests/format/flow-repo/react_modules/es6class-types-module.js rename to tests/format/flow/flow-repo/react_modules/es6class-types-module.js diff --git a/tests/format/flow-repo/react_modules/format.test.js b/tests/format/flow/flow-repo/react_modules/format.test.js similarity index 100% rename from tests/format/flow-repo/react_modules/format.test.js rename to tests/format/flow/flow-repo/react_modules/format.test.js diff --git a/tests/format/flow-repo/rec/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/rec/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/rec/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/rec/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/rec/format.test.js b/tests/format/flow/flow-repo/rec/format.test.js similarity index 100% rename from tests/format/flow-repo/rec/format.test.js rename to tests/format/flow/flow-repo/rec/format.test.js diff --git a/tests/format/flow-repo/rec/issue-1228.js b/tests/format/flow/flow-repo/rec/issue-1228.js similarity index 100% rename from tests/format/flow-repo/rec/issue-1228.js rename to tests/format/flow/flow-repo/rec/issue-1228.js diff --git a/tests/format/flow-repo/rec/issue-598.js b/tests/format/flow/flow-repo/rec/issue-598.js similarity index 100% rename from tests/format/flow-repo/rec/issue-598.js rename to tests/format/flow/flow-repo/rec/issue-598.js diff --git a/tests/format/flow-repo/rec/test.js b/tests/format/flow/flow-repo/rec/test.js similarity index 100% rename from tests/format/flow-repo/rec/test.js rename to tests/format/flow/flow-repo/rec/test.js diff --git a/tests/format/flow-repo/rec/test2.js b/tests/format/flow/flow-repo/rec/test2.js similarity index 100% rename from tests/format/flow-repo/rec/test2.js rename to tests/format/flow/flow-repo/rec/test2.js diff --git a/tests/format/flow-repo/rec/test3.js b/tests/format/flow/flow-repo/rec/test3.js similarity index 100% rename from tests/format/flow-repo/rec/test3.js rename to tests/format/flow/flow-repo/rec/test3.js diff --git a/tests/format/flow-repo/rec/test4.js b/tests/format/flow/flow-repo/rec/test4.js similarity index 100% rename from tests/format/flow-repo/rec/test4.js rename to tests/format/flow/flow-repo/rec/test4.js diff --git a/tests/format/flow-repo/rec/test5.js b/tests/format/flow/flow-repo/rec/test5.js similarity index 100% rename from tests/format/flow-repo/rec/test5.js rename to tests/format/flow/flow-repo/rec/test5.js diff --git a/tests/format/flow-repo/recheck-haste/A1.js b/tests/format/flow/flow-repo/recheck-haste/A1.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/A1.js rename to tests/format/flow/flow-repo/recheck-haste/A1.js diff --git a/tests/format/flow-repo/recheck-haste/A3.js b/tests/format/flow/flow-repo/recheck-haste/A3.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/A3.js rename to tests/format/flow/flow-repo/recheck-haste/A3.js diff --git a/tests/format/flow-repo/recheck-haste/B1.js b/tests/format/flow/flow-repo/recheck-haste/B1.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/B1.js rename to tests/format/flow/flow-repo/recheck-haste/B1.js diff --git a/tests/format/flow-repo/recheck-haste/B3.js b/tests/format/flow/flow-repo/recheck-haste/B3.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/B3.js rename to tests/format/flow/flow-repo/recheck-haste/B3.js diff --git a/tests/format/flow-repo/recheck-haste/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck-haste/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck-haste/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck-haste/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck-haste/dir1B/B2.js b/tests/format/flow/flow-repo/recheck-haste/dir1B/B2.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/dir1B/B2.js rename to tests/format/flow/flow-repo/recheck-haste/dir1B/B2.js diff --git a/tests/format/flow-repo/recheck-haste/dir1B/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck-haste/dir1B/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck-haste/dir1B/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck-haste/dir1B/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck-haste/dir1B/format.test.js b/tests/format/flow/flow-repo/recheck-haste/dir1B/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/dir1B/format.test.js rename to tests/format/flow/flow-repo/recheck-haste/dir1B/format.test.js diff --git a/tests/format/flow-repo/recheck-haste/format.test.js b/tests/format/flow/flow-repo/recheck-haste/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/format.test.js rename to tests/format/flow/flow-repo/recheck-haste/format.test.js diff --git a/tests/format/flow-repo/recheck-haste/tmp1A/A2.js b/tests/format/flow/flow-repo/recheck-haste/tmp1A/A2.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/tmp1A/A2.js rename to tests/format/flow/flow-repo/recheck-haste/tmp1A/A2.js diff --git a/tests/format/flow-repo/recheck-haste/tmp1A/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck-haste/tmp1A/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck-haste/tmp1A/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck-haste/tmp1A/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck-haste/tmp1A/format.test.js b/tests/format/flow/flow-repo/recheck-haste/tmp1A/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/tmp1A/format.test.js rename to tests/format/flow/flow-repo/recheck-haste/tmp1A/format.test.js diff --git a/tests/format/flow-repo/recheck-haste/tmp2A/A3.js b/tests/format/flow/flow-repo/recheck-haste/tmp2A/A3.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/tmp2A/A3.js rename to tests/format/flow/flow-repo/recheck-haste/tmp2A/A3.js diff --git a/tests/format/flow-repo/recheck-haste/tmp2A/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck-haste/tmp2A/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck-haste/tmp2A/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck-haste/tmp2A/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck-haste/tmp2A/format.test.js b/tests/format/flow/flow-repo/recheck-haste/tmp2A/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck-haste/tmp2A/format.test.js rename to tests/format/flow/flow-repo/recheck-haste/tmp2A/format.test.js diff --git a/tests/format/flow-repo/recheck/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/a1.js b/tests/format/flow/flow-repo/recheck/a1.js similarity index 100% rename from tests/format/flow-repo/recheck/a1.js rename to tests/format/flow/flow-repo/recheck/a1.js diff --git a/tests/format/flow-repo/recheck/a2.js b/tests/format/flow/flow-repo/recheck/a2.js similarity index 100% rename from tests/format/flow-repo/recheck/a2.js rename to tests/format/flow/flow-repo/recheck/a2.js diff --git a/tests/format/flow-repo/recheck/a3.js b/tests/format/flow/flow-repo/recheck/a3.js similarity index 100% rename from tests/format/flow-repo/recheck/a3.js rename to tests/format/flow/flow-repo/recheck/a3.js diff --git a/tests/format/flow-repo/recheck/b0.js b/tests/format/flow/flow-repo/recheck/b0.js similarity index 100% rename from tests/format/flow-repo/recheck/b0.js rename to tests/format/flow/flow-repo/recheck/b0.js diff --git a/tests/format/flow-repo/recheck/b1.js b/tests/format/flow/flow-repo/recheck/b1.js similarity index 100% rename from tests/format/flow-repo/recheck/b1.js rename to tests/format/flow/flow-repo/recheck/b1.js diff --git a/tests/format/flow-repo/recheck/b2.js b/tests/format/flow/flow-repo/recheck/b2.js similarity index 100% rename from tests/format/flow-repo/recheck/b2.js rename to tests/format/flow/flow-repo/recheck/b2.js diff --git a/tests/format/flow-repo/recheck/b3.js b/tests/format/flow/flow-repo/recheck/b3.js similarity index 100% rename from tests/format/flow-repo/recheck/b3.js rename to tests/format/flow/flow-repo/recheck/b3.js diff --git a/tests/format/flow-repo/recheck/c1.js b/tests/format/flow/flow-repo/recheck/c1.js similarity index 100% rename from tests/format/flow-repo/recheck/c1.js rename to tests/format/flow/flow-repo/recheck/c1.js diff --git a/tests/format/flow-repo/recheck/c2.js b/tests/format/flow/flow-repo/recheck/c2.js similarity index 100% rename from tests/format/flow-repo/recheck/c2.js rename to tests/format/flow/flow-repo/recheck/c2.js diff --git a/tests/format/flow-repo/recheck/c3.js b/tests/format/flow/flow-repo/recheck/c3.js similarity index 100% rename from tests/format/flow-repo/recheck/c3.js rename to tests/format/flow/flow-repo/recheck/c3.js diff --git a/tests/format/flow-repo/recheck/d1.js b/tests/format/flow/flow-repo/recheck/d1.js similarity index 100% rename from tests/format/flow-repo/recheck/d1.js rename to tests/format/flow/flow-repo/recheck/d1.js diff --git a/tests/format/flow-repo/recheck/d2.js b/tests/format/flow/flow-repo/recheck/d2.js similarity index 100% rename from tests/format/flow-repo/recheck/d2.js rename to tests/format/flow/flow-repo/recheck/d2.js diff --git a/tests/format/flow-repo/recheck/e1.js b/tests/format/flow/flow-repo/recheck/e1.js similarity index 100% rename from tests/format/flow-repo/recheck/e1.js rename to tests/format/flow/flow-repo/recheck/e1.js diff --git a/tests/format/flow-repo/recheck/e2.js b/tests/format/flow/flow-repo/recheck/e2.js similarity index 100% rename from tests/format/flow-repo/recheck/e2.js rename to tests/format/flow/flow-repo/recheck/e2.js diff --git a/tests/format/flow-repo/recheck/f1.js b/tests/format/flow/flow-repo/recheck/f1.js similarity index 100% rename from tests/format/flow-repo/recheck/f1.js rename to tests/format/flow/flow-repo/recheck/f1.js diff --git a/tests/format/flow-repo/recheck/f2.js b/tests/format/flow/flow-repo/recheck/f2.js similarity index 100% rename from tests/format/flow-repo/recheck/f2.js rename to tests/format/flow/flow-repo/recheck/f2.js diff --git a/tests/format/flow-repo/recheck/format.test.js b/tests/format/flow/flow-repo/recheck/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/format.test.js rename to tests/format/flow/flow-repo/recheck/format.test.js diff --git a/tests/format/flow-repo/recheck/g1.js b/tests/format/flow/flow-repo/recheck/g1.js similarity index 100% rename from tests/format/flow-repo/recheck/g1.js rename to tests/format/flow/flow-repo/recheck/g1.js diff --git a/tests/format/flow-repo/recheck/g2.js b/tests/format/flow/flow-repo/recheck/g2.js similarity index 100% rename from tests/format/flow-repo/recheck/g2.js rename to tests/format/flow/flow-repo/recheck/g2.js diff --git a/tests/format/flow-repo/recheck/g3.js b/tests/format/flow/flow-repo/recheck/g3.js similarity index 100% rename from tests/format/flow-repo/recheck/g3.js rename to tests/format/flow/flow-repo/recheck/g3.js diff --git a/tests/format/flow-repo/recheck/h1.js b/tests/format/flow/flow-repo/recheck/h1.js similarity index 100% rename from tests/format/flow-repo/recheck/h1.js rename to tests/format/flow/flow-repo/recheck/h1.js diff --git a/tests/format/flow-repo/recheck/h2.js b/tests/format/flow/flow-repo/recheck/h2.js similarity index 100% rename from tests/format/flow-repo/recheck/h2.js rename to tests/format/flow/flow-repo/recheck/h2.js diff --git a/tests/format/flow-repo/recheck/i1.js b/tests/format/flow/flow-repo/recheck/i1.js similarity index 100% rename from tests/format/flow-repo/recheck/i1.js rename to tests/format/flow/flow-repo/recheck/i1.js diff --git a/tests/format/flow-repo/recheck/i2.js b/tests/format/flow/flow-repo/recheck/i2.js similarity index 100% rename from tests/format/flow-repo/recheck/i2.js rename to tests/format/flow/flow-repo/recheck/i2.js diff --git a/tests/format/flow-repo/recheck/j1.js b/tests/format/flow/flow-repo/recheck/j1.js similarity index 100% rename from tests/format/flow-repo/recheck/j1.js rename to tests/format/flow/flow-repo/recheck/j1.js diff --git a/tests/format/flow-repo/recheck/j2.js b/tests/format/flow/flow-repo/recheck/j2.js similarity index 100% rename from tests/format/flow-repo/recheck/j2.js rename to tests/format/flow/flow-repo/recheck/j2.js diff --git a/tests/format/flow-repo/recheck/k.js b/tests/format/flow/flow-repo/recheck/k.js similarity index 100% rename from tests/format/flow-repo/recheck/k.js rename to tests/format/flow/flow-repo/recheck/k.js diff --git a/tests/format/flow-repo/recheck/tmp1a/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1a/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1a/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1a/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1a/a1.js b/tests/format/flow/flow-repo/recheck/tmp1a/a1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1a/a1.js rename to tests/format/flow/flow-repo/recheck/tmp1a/a1.js diff --git a/tests/format/flow-repo/recheck/tmp1a/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1a/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1a/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1a/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1b/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1b/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1b/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1b/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1b/b1.js b/tests/format/flow/flow-repo/recheck/tmp1b/b1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1b/b1.js rename to tests/format/flow/flow-repo/recheck/tmp1b/b1.js diff --git a/tests/format/flow-repo/recheck/tmp1b/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1b/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1b/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1b/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1c/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1c/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1c/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1c/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1c/c2.js b/tests/format/flow/flow-repo/recheck/tmp1c/c2.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1c/c2.js rename to tests/format/flow/flow-repo/recheck/tmp1c/c2.js diff --git a/tests/format/flow-repo/recheck/tmp1c/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1c/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1c/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1c/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1d/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1d/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1d/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1d/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1d/d1.js b/tests/format/flow/flow-repo/recheck/tmp1d/d1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1d/d1.js rename to tests/format/flow/flow-repo/recheck/tmp1d/d1.js diff --git a/tests/format/flow-repo/recheck/tmp1d/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1d/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1d/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1d/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1e/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1e/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1e/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1e/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1e/e2.js b/tests/format/flow/flow-repo/recheck/tmp1e/e2.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1e/e2.js rename to tests/format/flow/flow-repo/recheck/tmp1e/e2.js diff --git a/tests/format/flow-repo/recheck/tmp1e/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1e/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1e/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1e/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1f/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1f/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1f/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1f/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1f/f1.js b/tests/format/flow/flow-repo/recheck/tmp1f/f1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1f/f1.js rename to tests/format/flow/flow-repo/recheck/tmp1f/f1.js diff --git a/tests/format/flow-repo/recheck/tmp1f/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1f/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1f/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1f/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1g/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1g/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1g/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1g/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1g/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1g/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1g/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1g/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1g/g1.js b/tests/format/flow/flow-repo/recheck/tmp1g/g1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1g/g1.js rename to tests/format/flow/flow-repo/recheck/tmp1g/g1.js diff --git a/tests/format/flow-repo/recheck/tmp1h/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1h/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1h/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1h/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1h/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1h/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1h/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1h/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1h/h1.js b/tests/format/flow/flow-repo/recheck/tmp1h/h1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1h/h1.js rename to tests/format/flow/flow-repo/recheck/tmp1h/h1.js diff --git a/tests/format/flow-repo/recheck/tmp1i/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1i/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1i/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1i/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1i/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1i/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1i/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1i/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1i/i1.js b/tests/format/flow/flow-repo/recheck/tmp1i/i1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1i/i1.js rename to tests/format/flow/flow-repo/recheck/tmp1i/i1.js diff --git a/tests/format/flow-repo/recheck/tmp1j/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp1j/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp1j/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp1j/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp1j/format.test.js b/tests/format/flow/flow-repo/recheck/tmp1j/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1j/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp1j/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp1j/j1.js b/tests/format/flow/flow-repo/recheck/tmp1j/j1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp1j/j1.js rename to tests/format/flow/flow-repo/recheck/tmp1j/j1.js diff --git a/tests/format/flow-repo/recheck/tmp2a/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp2a/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp2a/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp2a/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp2a/a1.js b/tests/format/flow/flow-repo/recheck/tmp2a/a1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2a/a1.js rename to tests/format/flow/flow-repo/recheck/tmp2a/a1.js diff --git a/tests/format/flow-repo/recheck/tmp2a/format.test.js b/tests/format/flow/flow-repo/recheck/tmp2a/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2a/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp2a/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp2b/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp2b/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp2b/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp2b/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp2b/b0.js b/tests/format/flow/flow-repo/recheck/tmp2b/b0.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2b/b0.js rename to tests/format/flow/flow-repo/recheck/tmp2b/b0.js diff --git a/tests/format/flow-repo/recheck/tmp2b/format.test.js b/tests/format/flow/flow-repo/recheck/tmp2b/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2b/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp2b/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp2c/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp2c/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp2c/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp2c/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp2c/c1.js b/tests/format/flow/flow-repo/recheck/tmp2c/c1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2c/c1.js rename to tests/format/flow/flow-repo/recheck/tmp2c/c1.js diff --git a/tests/format/flow-repo/recheck/tmp2c/format.test.js b/tests/format/flow/flow-repo/recheck/tmp2c/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2c/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp2c/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp2e/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp2e/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp2e/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp2e/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp2e/e1.js b/tests/format/flow/flow-repo/recheck/tmp2e/e1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2e/e1.js rename to tests/format/flow/flow-repo/recheck/tmp2e/e1.js diff --git a/tests/format/flow-repo/recheck/tmp2e/format.test.js b/tests/format/flow/flow-repo/recheck/tmp2e/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2e/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp2e/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp2f/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp2f/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp2f/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp2f/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp2f/f1.js b/tests/format/flow/flow-repo/recheck/tmp2f/f1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2f/f1.js rename to tests/format/flow/flow-repo/recheck/tmp2f/f1.js diff --git a/tests/format/flow-repo/recheck/tmp2f/format.test.js b/tests/format/flow/flow-repo/recheck/tmp2f/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp2f/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp2f/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp3e/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp3e/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp3e/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp3e/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp3e/e1.js b/tests/format/flow/flow-repo/recheck/tmp3e/e1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp3e/e1.js rename to tests/format/flow/flow-repo/recheck/tmp3e/e1.js diff --git a/tests/format/flow-repo/recheck/tmp3e/e2.js b/tests/format/flow/flow-repo/recheck/tmp3e/e2.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp3e/e2.js rename to tests/format/flow/flow-repo/recheck/tmp3e/e2.js diff --git a/tests/format/flow-repo/recheck/tmp3e/format.test.js b/tests/format/flow/flow-repo/recheck/tmp3e/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp3e/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp3e/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp3f/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp3f/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp3f/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp3f/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp3f/f1.js b/tests/format/flow/flow-repo/recheck/tmp3f/f1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp3f/f1.js rename to tests/format/flow/flow-repo/recheck/tmp3f/f1.js diff --git a/tests/format/flow-repo/recheck/tmp3f/format.test.js b/tests/format/flow/flow-repo/recheck/tmp3f/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp3f/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp3f/format.test.js diff --git a/tests/format/flow-repo/recheck/tmp4f/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmp4f/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmp4f/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmp4f/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmp4f/f1.js b/tests/format/flow/flow-repo/recheck/tmp4f/f1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp4f/f1.js rename to tests/format/flow/flow-repo/recheck/tmp4f/f1.js diff --git a/tests/format/flow-repo/recheck/tmp4f/format.test.js b/tests/format/flow/flow-repo/recheck/tmp4f/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmp4f/format.test.js rename to tests/format/flow/flow-repo/recheck/tmp4f/format.test.js diff --git a/tests/format/flow-repo/recheck/tmpk/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmpk/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmpk/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmpk/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmpk/format.test.js b/tests/format/flow/flow-repo/recheck/tmpk/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmpk/format.test.js rename to tests/format/flow/flow-repo/recheck/tmpk/format.test.js diff --git a/tests/format/flow-repo/recheck/tmpk/k.js b/tests/format/flow/flow-repo/recheck/tmpk/k.js similarity index 100% rename from tests/format/flow-repo/recheck/tmpk/k.js rename to tests/format/flow/flow-repo/recheck/tmpk/k.js diff --git a/tests/format/flow-repo/recheck/tmplibk/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/recheck/tmplibk/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/recheck/tmplibk/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/recheck/tmplibk/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/recheck/tmplibk/format.test.js b/tests/format/flow/flow-repo/recheck/tmplibk/format.test.js similarity index 100% rename from tests/format/flow-repo/recheck/tmplibk/format.test.js rename to tests/format/flow/flow-repo/recheck/tmplibk/format.test.js diff --git a/tests/format/flow-repo/recheck/tmplibk/libk1.js b/tests/format/flow/flow-repo/recheck/tmplibk/libk1.js similarity index 100% rename from tests/format/flow-repo/recheck/tmplibk/libk1.js rename to tests/format/flow/flow-repo/recheck/tmplibk/libk1.js diff --git a/tests/format/flow-repo/recheck/tmplibk/libk2.js b/tests/format/flow/flow-repo/recheck/tmplibk/libk2.js similarity index 100% rename from tests/format/flow-repo/recheck/tmplibk/libk2.js rename to tests/format/flow/flow-repo/recheck/tmplibk/libk2.js diff --git a/tests/format/flow-repo/record/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/record/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/record/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/record/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/record/format.test.js b/tests/format/flow/flow-repo/record/format.test.js similarity index 100% rename from tests/format/flow-repo/record/format.test.js rename to tests/format/flow/flow-repo/record/format.test.js diff --git a/tests/format/flow-repo/record/test.js b/tests/format/flow/flow-repo/record/test.js similarity index 100% rename from tests/format/flow-repo/record/test.js rename to tests/format/flow/flow-repo/record/test.js diff --git a/tests/format/flow-repo/refi/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/refi/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/refi/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/refi/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/refi/bound.js b/tests/format/flow/flow-repo/refi/bound.js similarity index 100% rename from tests/format/flow-repo/refi/bound.js rename to tests/format/flow/flow-repo/refi/bound.js diff --git a/tests/format/flow-repo/refi/format.test.js b/tests/format/flow/flow-repo/refi/format.test.js similarity index 100% rename from tests/format/flow-repo/refi/format.test.js rename to tests/format/flow/flow-repo/refi/format.test.js diff --git a/tests/format/flow-repo/refi/heap.js b/tests/format/flow/flow-repo/refi/heap.js similarity index 100% rename from tests/format/flow-repo/refi/heap.js rename to tests/format/flow/flow-repo/refi/heap.js diff --git a/tests/format/flow-repo/refi/lex.js b/tests/format/flow/flow-repo/refi/lex.js similarity index 100% rename from tests/format/flow-repo/refi/lex.js rename to tests/format/flow/flow-repo/refi/lex.js diff --git a/tests/format/flow-repo/refi/local.js b/tests/format/flow/flow-repo/refi/local.js similarity index 100% rename from tests/format/flow-repo/refi/local.js rename to tests/format/flow/flow-repo/refi/local.js diff --git a/tests/format/flow-repo/refi/null_tests.js b/tests/format/flow/flow-repo/refi/null_tests.js similarity index 100% rename from tests/format/flow-repo/refi/null_tests.js rename to tests/format/flow/flow-repo/refi/null_tests.js diff --git a/tests/format/flow-repo/refi/switch.js b/tests/format/flow/flow-repo/refi/switch.js similarity index 100% rename from tests/format/flow-repo/refi/switch.js rename to tests/format/flow/flow-repo/refi/switch.js diff --git a/tests/format/flow-repo/refi/typeof_tests.js b/tests/format/flow/flow-repo/refi/typeof_tests.js similarity index 100% rename from tests/format/flow-repo/refi/typeof_tests.js rename to tests/format/flow/flow-repo/refi/typeof_tests.js diff --git a/tests/format/flow-repo/refi/undef_tests.js b/tests/format/flow/flow-repo/refi/undef_tests.js similarity index 100% rename from tests/format/flow-repo/refi/undef_tests.js rename to tests/format/flow/flow-repo/refi/undef_tests.js diff --git a/tests/format/flow-repo/refi/void_tests.js b/tests/format/flow/flow-repo/refi/void_tests.js similarity index 100% rename from tests/format/flow-repo/refi/void_tests.js rename to tests/format/flow/flow-repo/refi/void_tests.js diff --git a/tests/format/flow-repo/refinements/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/refinements/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/refinements/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/refinements/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/refinements/assignment.js b/tests/format/flow/flow-repo/refinements/assignment.js similarity index 100% rename from tests/format/flow-repo/refinements/assignment.js rename to tests/format/flow/flow-repo/refinements/assignment.js diff --git a/tests/format/flow-repo/refinements/ast_node.js b/tests/format/flow/flow-repo/refinements/ast_node.js similarity index 100% rename from tests/format/flow-repo/refinements/ast_node.js rename to tests/format/flow/flow-repo/refinements/ast_node.js diff --git a/tests/format/flow-repo/refinements/bool.js b/tests/format/flow/flow-repo/refinements/bool.js similarity index 100% rename from tests/format/flow-repo/refinements/bool.js rename to tests/format/flow/flow-repo/refinements/bool.js diff --git a/tests/format/flow-repo/refinements/computed_string_literal.js b/tests/format/flow/flow-repo/refinements/computed_string_literal.js similarity index 100% rename from tests/format/flow-repo/refinements/computed_string_literal.js rename to tests/format/flow/flow-repo/refinements/computed_string_literal.js diff --git a/tests/format/flow-repo/refinements/cond_prop.js b/tests/format/flow/flow-repo/refinements/cond_prop.js similarity index 100% rename from tests/format/flow-repo/refinements/cond_prop.js rename to tests/format/flow/flow-repo/refinements/cond_prop.js diff --git a/tests/format/flow-repo/refinements/constants.js b/tests/format/flow/flow-repo/refinements/constants.js similarity index 100% rename from tests/format/flow-repo/refinements/constants.js rename to tests/format/flow/flow-repo/refinements/constants.js diff --git a/tests/format/flow-repo/refinements/eq.js b/tests/format/flow/flow-repo/refinements/eq.js similarity index 100% rename from tests/format/flow-repo/refinements/eq.js rename to tests/format/flow/flow-repo/refinements/eq.js diff --git a/tests/format/flow-repo/refinements/exists.js b/tests/format/flow/flow-repo/refinements/exists.js similarity index 100% rename from tests/format/flow-repo/refinements/exists.js rename to tests/format/flow/flow-repo/refinements/exists.js diff --git a/tests/format/flow-repo/refinements/format.test.js b/tests/format/flow/flow-repo/refinements/format.test.js similarity index 100% rename from tests/format/flow-repo/refinements/format.test.js rename to tests/format/flow/flow-repo/refinements/format.test.js diff --git a/tests/format/flow-repo/refinements/func_call.js b/tests/format/flow/flow-repo/refinements/func_call.js similarity index 100% rename from tests/format/flow-repo/refinements/func_call.js rename to tests/format/flow/flow-repo/refinements/func_call.js diff --git a/tests/format/flow-repo/refinements/hasOwnProperty.js b/tests/format/flow/flow-repo/refinements/hasOwnProperty.js similarity index 100% rename from tests/format/flow-repo/refinements/hasOwnProperty.js rename to tests/format/flow/flow-repo/refinements/hasOwnProperty.js diff --git a/tests/format/flow-repo/refinements/heap_defassign.js b/tests/format/flow/flow-repo/refinements/heap_defassign.js similarity index 100% rename from tests/format/flow-repo/refinements/heap_defassign.js rename to tests/format/flow/flow-repo/refinements/heap_defassign.js diff --git a/tests/format/flow-repo/refinements/lib.js b/tests/format/flow/flow-repo/refinements/lib.js similarity index 100% rename from tests/format/flow-repo/refinements/lib.js rename to tests/format/flow/flow-repo/refinements/lib.js diff --git a/tests/format/flow-repo/refinements/missing-property-cond.js b/tests/format/flow/flow-repo/refinements/missing-property-cond.js similarity index 100% rename from tests/format/flow-repo/refinements/missing-property-cond.js rename to tests/format/flow/flow-repo/refinements/missing-property-cond.js diff --git a/tests/format/flow-repo/refinements/mixed.js b/tests/format/flow/flow-repo/refinements/mixed.js similarity index 100% rename from tests/format/flow-repo/refinements/mixed.js rename to tests/format/flow/flow-repo/refinements/mixed.js diff --git a/tests/format/flow-repo/refinements/node1.js b/tests/format/flow/flow-repo/refinements/node1.js similarity index 100% rename from tests/format/flow-repo/refinements/node1.js rename to tests/format/flow/flow-repo/refinements/node1.js diff --git a/tests/format/flow-repo/refinements/not.js b/tests/format/flow/flow-repo/refinements/not.js similarity index 100% rename from tests/format/flow-repo/refinements/not.js rename to tests/format/flow/flow-repo/refinements/not.js diff --git a/tests/format/flow-repo/refinements/null.js b/tests/format/flow/flow-repo/refinements/null.js similarity index 100% rename from tests/format/flow-repo/refinements/null.js rename to tests/format/flow/flow-repo/refinements/null.js diff --git a/tests/format/flow-repo/refinements/number.js b/tests/format/flow/flow-repo/refinements/number.js similarity index 100% rename from tests/format/flow-repo/refinements/number.js rename to tests/format/flow/flow-repo/refinements/number.js diff --git a/tests/format/flow-repo/refinements/property.js b/tests/format/flow/flow-repo/refinements/property.js similarity index 100% rename from tests/format/flow-repo/refinements/property.js rename to tests/format/flow/flow-repo/refinements/property.js diff --git a/tests/format/flow-repo/refinements/refinements.js b/tests/format/flow/flow-repo/refinements/refinements.js similarity index 100% rename from tests/format/flow-repo/refinements/refinements.js rename to tests/format/flow/flow-repo/refinements/refinements.js diff --git a/tests/format/flow-repo/refinements/string.js b/tests/format/flow/flow-repo/refinements/string.js similarity index 100% rename from tests/format/flow-repo/refinements/string.js rename to tests/format/flow/flow-repo/refinements/string.js diff --git a/tests/format/flow-repo/refinements/super_member.js b/tests/format/flow/flow-repo/refinements/super_member.js similarity index 100% rename from tests/format/flow-repo/refinements/super_member.js rename to tests/format/flow/flow-repo/refinements/super_member.js diff --git a/tests/format/flow-repo/refinements/switch.js b/tests/format/flow/flow-repo/refinements/switch.js similarity index 100% rename from tests/format/flow-repo/refinements/switch.js rename to tests/format/flow/flow-repo/refinements/switch.js diff --git a/tests/format/flow-repo/refinements/tagged_union.js b/tests/format/flow/flow-repo/refinements/tagged_union.js similarity index 100% rename from tests/format/flow-repo/refinements/tagged_union.js rename to tests/format/flow/flow-repo/refinements/tagged_union.js diff --git a/tests/format/flow-repo/refinements/tagged_union_import.js b/tests/format/flow/flow-repo/refinements/tagged_union_import.js similarity index 100% rename from tests/format/flow-repo/refinements/tagged_union_import.js rename to tests/format/flow/flow-repo/refinements/tagged_union_import.js diff --git a/tests/format/flow-repo/refinements/typeof.js b/tests/format/flow/flow-repo/refinements/typeof.js similarity index 100% rename from tests/format/flow-repo/refinements/typeof.js rename to tests/format/flow/flow-repo/refinements/typeof.js diff --git a/tests/format/flow-repo/refinements/undef.js b/tests/format/flow/flow-repo/refinements/undef.js similarity index 100% rename from tests/format/flow-repo/refinements/undef.js rename to tests/format/flow/flow-repo/refinements/undef.js diff --git a/tests/format/flow-repo/refinements/union.js b/tests/format/flow/flow-repo/refinements/union.js similarity index 100% rename from tests/format/flow-repo/refinements/union.js rename to tests/format/flow/flow-repo/refinements/union.js diff --git a/tests/format/flow-repo/refinements/void.js b/tests/format/flow/flow-repo/refinements/void.js similarity index 100% rename from tests/format/flow-repo/refinements/void.js rename to tests/format/flow/flow-repo/refinements/void.js diff --git a/tests/format/flow-repo/reflection/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/reflection/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/reflection/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/reflection/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/reflection/format.test.js b/tests/format/flow/flow-repo/reflection/format.test.js similarity index 100% rename from tests/format/flow-repo/reflection/format.test.js rename to tests/format/flow/flow-repo/reflection/format.test.js diff --git a/tests/format/flow-repo/reflection/type.js b/tests/format/flow/flow-repo/reflection/type.js similarity index 100% rename from tests/format/flow-repo/reflection/type.js rename to tests/format/flow/flow-repo/reflection/type.js diff --git a/tests/format/flow-repo/regexp/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/regexp/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/regexp/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/regexp/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/regexp/format.test.js b/tests/format/flow/flow-repo/regexp/format.test.js similarity index 100% rename from tests/format/flow-repo/regexp/format.test.js rename to tests/format/flow/flow-repo/regexp/format.test.js diff --git a/tests/format/flow-repo/regexp/regexp.js b/tests/format/flow/flow-repo/regexp/regexp.js similarity index 100% rename from tests/format/flow-repo/regexp/regexp.js rename to tests/format/flow/flow-repo/regexp/regexp.js diff --git a/tests/format/flow-repo/replace/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/replace/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/replace/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/replace/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/replace/format.test.js b/tests/format/flow/flow-repo/replace/format.test.js similarity index 100% rename from tests/format/flow-repo/replace/format.test.js rename to tests/format/flow/flow-repo/replace/format.test.js diff --git a/tests/format/flow-repo/replace/test.js b/tests/format/flow/flow-repo/replace/test.js similarity index 100% rename from tests/format/flow-repo/replace/test.js rename to tests/format/flow/flow-repo/replace/test.js diff --git a/tests/format/flow-repo/require/B.js b/tests/format/flow/flow-repo/require/B.js similarity index 100% rename from tests/format/flow-repo/require/B.js rename to tests/format/flow/flow-repo/require/B.js diff --git a/tests/format/flow-repo/require/C.js b/tests/format/flow/flow-repo/require/C.js similarity index 100% rename from tests/format/flow-repo/require/C.js rename to tests/format/flow/flow-repo/require/C.js diff --git a/tests/format/flow-repo/require/E.js b/tests/format/flow/flow-repo/require/E.js similarity index 100% rename from tests/format/flow-repo/require/E.js rename to tests/format/flow/flow-repo/require/E.js diff --git a/tests/format/flow-repo/require/ProvidesModuleA.js b/tests/format/flow/flow-repo/require/ProvidesModuleA.js similarity index 100% rename from tests/format/flow-repo/require/ProvidesModuleA.js rename to tests/format/flow/flow-repo/require/ProvidesModuleA.js diff --git a/tests/format/flow-repo/require/ProvidesModuleD.js b/tests/format/flow/flow-repo/require/ProvidesModuleD.js similarity index 100% rename from tests/format/flow-repo/require/ProvidesModuleD.js rename to tests/format/flow/flow-repo/require/ProvidesModuleD.js diff --git a/tests/format/flow-repo/require/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/require/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/require/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/require/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/require/format.test.js b/tests/format/flow/flow-repo/require/format.test.js similarity index 100% rename from tests/format/flow-repo/require/format.test.js rename to tests/format/flow/flow-repo/require/format.test.js diff --git a/tests/format/flow-repo/require/not_builtin_require.js b/tests/format/flow/flow-repo/require/not_builtin_require.js similarity index 100% rename from tests/format/flow-repo/require/not_builtin_require.js rename to tests/format/flow/flow-repo/require/not_builtin_require.js diff --git a/tests/format/flow-repo/require/not_builtin_require2.js b/tests/format/flow/flow-repo/require/not_builtin_require2.js similarity index 100% rename from tests/format/flow-repo/require/not_builtin_require2.js rename to tests/format/flow/flow-repo/require/not_builtin_require2.js diff --git a/tests/format/flow-repo/require/require.js b/tests/format/flow/flow-repo/require/require.js similarity index 100% rename from tests/format/flow-repo/require/require.js rename to tests/format/flow/flow-repo/require/require.js diff --git a/tests/format/flow-repo/requireLazy/A.js b/tests/format/flow/flow-repo/requireLazy/A.js similarity index 100% rename from tests/format/flow-repo/requireLazy/A.js rename to tests/format/flow/flow-repo/requireLazy/A.js diff --git a/tests/format/flow-repo/requireLazy/B.js b/tests/format/flow/flow-repo/requireLazy/B.js similarity index 100% rename from tests/format/flow-repo/requireLazy/B.js rename to tests/format/flow/flow-repo/requireLazy/B.js diff --git a/tests/format/flow-repo/requireLazy/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/requireLazy/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/requireLazy/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/requireLazy/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/requireLazy/format.test.js b/tests/format/flow/flow-repo/requireLazy/format.test.js similarity index 100% rename from tests/format/flow-repo/requireLazy/format.test.js rename to tests/format/flow/flow-repo/requireLazy/format.test.js diff --git a/tests/format/flow-repo/requireLazy/requireLazy.js b/tests/format/flow/flow-repo/requireLazy/requireLazy.js similarity index 100% rename from tests/format/flow-repo/requireLazy/requireLazy.js rename to tests/format/flow/flow-repo/requireLazy/requireLazy.js diff --git a/tests/format/flow-repo/return/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/return/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/return/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/return/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/return/format.test.js b/tests/format/flow/flow-repo/return/format.test.js similarity index 100% rename from tests/format/flow-repo/return/format.test.js rename to tests/format/flow/flow-repo/return/format.test.js diff --git a/tests/format/flow-repo/return/function_return.js b/tests/format/flow/flow-repo/return/function_return.js similarity index 100% rename from tests/format/flow-repo/return/function_return.js rename to tests/format/flow/flow-repo/return/function_return.js diff --git a/tests/format/flow-repo/return/void.js b/tests/format/flow/flow-repo/return/void.js similarity index 100% rename from tests/format/flow-repo/return/void.js rename to tests/format/flow/flow-repo/return/void.js diff --git a/tests/format/flow-repo/return_new/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/return_new/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/return_new/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/return_new/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/return_new/format.test.js b/tests/format/flow/flow-repo/return_new/format.test.js similarity index 100% rename from tests/format/flow-repo/return_new/format.test.js rename to tests/format/flow/flow-repo/return_new/format.test.js diff --git a/tests/format/flow-repo/return_new/test.js b/tests/format/flow/flow-repo/return_new/test.js similarity index 100% rename from tests/format/flow-repo/return_new/test.js rename to tests/format/flow/flow-repo/return_new/test.js diff --git a/tests/format/flow-repo/return_new/test2.js b/tests/format/flow/flow-repo/return_new/test2.js similarity index 100% rename from tests/format/flow-repo/return_new/test2.js rename to tests/format/flow/flow-repo/return_new/test2.js diff --git a/tests/format/flow-repo/seal/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/seal/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/seal/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/seal/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/seal/format.test.js b/tests/format/flow/flow-repo/seal/format.test.js similarity index 100% rename from tests/format/flow-repo/seal/format.test.js rename to tests/format/flow/flow-repo/seal/format.test.js diff --git a/tests/format/flow-repo/seal/imp.js b/tests/format/flow/flow-repo/seal/imp.js similarity index 100% rename from tests/format/flow-repo/seal/imp.js rename to tests/format/flow/flow-repo/seal/imp.js diff --git a/tests/format/flow-repo/seal/obj_annot.js b/tests/format/flow/flow-repo/seal/obj_annot.js similarity index 100% rename from tests/format/flow-repo/seal/obj_annot.js rename to tests/format/flow/flow-repo/seal/obj_annot.js diff --git a/tests/format/flow-repo/sealed/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/sealed/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/sealed/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/sealed/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/sealed/format.test.js b/tests/format/flow/flow-repo/sealed/format.test.js similarity index 100% rename from tests/format/flow-repo/sealed/format.test.js rename to tests/format/flow/flow-repo/sealed/format.test.js diff --git a/tests/format/flow-repo/sealed/function.js b/tests/format/flow/flow-repo/sealed/function.js similarity index 100% rename from tests/format/flow-repo/sealed/function.js rename to tests/format/flow/flow-repo/sealed/function.js diff --git a/tests/format/flow-repo/sealed/proto.js b/tests/format/flow/flow-repo/sealed/proto.js similarity index 100% rename from tests/format/flow-repo/sealed/proto.js rename to tests/format/flow/flow-repo/sealed/proto.js diff --git a/tests/format/flow-repo/sealed/sealed.js b/tests/format/flow/flow-repo/sealed/sealed.js similarity index 100% rename from tests/format/flow-repo/sealed/sealed.js rename to tests/format/flow/flow-repo/sealed/sealed.js diff --git a/tests/format/flow-repo/sealed_objects/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/sealed_objects/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/sealed_objects/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/sealed_objects/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/sealed_objects/format.test.js b/tests/format/flow/flow-repo/sealed_objects/format.test.js similarity index 100% rename from tests/format/flow-repo/sealed_objects/format.test.js rename to tests/format/flow/flow-repo/sealed_objects/format.test.js diff --git a/tests/format/flow-repo/sealed_objects/test.js b/tests/format/flow/flow-repo/sealed_objects/test.js similarity index 100% rename from tests/format/flow-repo/sealed_objects/test.js rename to tests/format/flow/flow-repo/sealed_objects/test.js diff --git a/tests/format/flow-repo/shape/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/shape/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/shape/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/shape/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/shape/format.test.js b/tests/format/flow/flow-repo/shape/format.test.js similarity index 100% rename from tests/format/flow-repo/shape/format.test.js rename to tests/format/flow/flow-repo/shape/format.test.js diff --git a/tests/format/flow-repo/shape/shadow.js b/tests/format/flow/flow-repo/shape/shadow.js similarity index 100% rename from tests/format/flow-repo/shape/shadow.js rename to tests/format/flow/flow-repo/shape/shadow.js diff --git a/tests/format/flow-repo/shape/test.js b/tests/format/flow/flow-repo/shape/test.js similarity index 100% rename from tests/format/flow-repo/shape/test.js rename to tests/format/flow/flow-repo/shape/test.js diff --git a/tests/format/flow-repo/simple_arrays/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/simple_arrays/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/simple_arrays/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/simple_arrays/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/simple_arrays/array.js b/tests/format/flow/flow-repo/simple_arrays/array.js similarity index 100% rename from tests/format/flow-repo/simple_arrays/array.js rename to tests/format/flow/flow-repo/simple_arrays/array.js diff --git a/tests/format/flow-repo/simple_arrays/array2.js b/tests/format/flow/flow-repo/simple_arrays/array2.js similarity index 100% rename from tests/format/flow-repo/simple_arrays/array2.js rename to tests/format/flow/flow-repo/simple_arrays/array2.js diff --git a/tests/format/flow-repo/simple_arrays/format.test.js b/tests/format/flow/flow-repo/simple_arrays/format.test.js similarity index 100% rename from tests/format/flow-repo/simple_arrays/format.test.js rename to tests/format/flow/flow-repo/simple_arrays/format.test.js diff --git a/tests/format/flow-repo/singleton/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/singleton/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/singleton/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/singleton/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/singleton/boolean.js b/tests/format/flow/flow-repo/singleton/boolean.js similarity index 100% rename from tests/format/flow-repo/singleton/boolean.js rename to tests/format/flow/flow-repo/singleton/boolean.js diff --git a/tests/format/flow-repo/singleton/format.test.js b/tests/format/flow/flow-repo/singleton/format.test.js similarity index 100% rename from tests/format/flow-repo/singleton/format.test.js rename to tests/format/flow/flow-repo/singleton/format.test.js diff --git a/tests/format/flow-repo/singleton/number.js b/tests/format/flow/flow-repo/singleton/number.js similarity index 100% rename from tests/format/flow-repo/singleton/number.js rename to tests/format/flow/flow-repo/singleton/number.js diff --git a/tests/format/flow-repo/singleton/string.js b/tests/format/flow/flow-repo/singleton/string.js similarity index 100% rename from tests/format/flow-repo/singleton/string.js rename to tests/format/flow/flow-repo/singleton/string.js diff --git a/tests/format/flow-repo/sketchy_null_default/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/sketchy_null_default/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/sketchy_null_default/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/sketchy_null_default/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/sketchy_null_default/format.test.js b/tests/format/flow/flow-repo/sketchy_null_default/format.test.js similarity index 100% rename from tests/format/flow-repo/sketchy_null_default/format.test.js rename to tests/format/flow/flow-repo/sketchy_null_default/format.test.js diff --git a/tests/format/flow-repo/sketchy_null_default/test.js b/tests/format/flow/flow-repo/sketchy_null_default/test.js similarity index 100% rename from tests/format/flow-repo/sketchy_null_default/test.js rename to tests/format/flow/flow-repo/sketchy_null_default/test.js diff --git a/tests/format/flow-repo/spread/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/spread/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/spread/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/spread/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/spread/format.test.js b/tests/format/flow/flow-repo/spread/format.test.js similarity index 100% rename from tests/format/flow-repo/spread/format.test.js rename to tests/format/flow/flow-repo/spread/format.test.js diff --git a/tests/format/flow-repo/spread/test.js b/tests/format/flow/flow-repo/spread/test.js similarity index 100% rename from tests/format/flow-repo/spread/test.js rename to tests/format/flow/flow-repo/spread/test.js diff --git a/tests/format/flow-repo/spread/test2.js b/tests/format/flow/flow-repo/spread/test2.js similarity index 100% rename from tests/format/flow-repo/spread/test2.js rename to tests/format/flow/flow-repo/spread/test2.js diff --git a/tests/format/flow-repo/spread/test3.js b/tests/format/flow/flow-repo/spread/test3.js similarity index 100% rename from tests/format/flow-repo/spread/test3.js rename to tests/format/flow/flow-repo/spread/test3.js diff --git a/tests/format/flow-repo/spread/test4.js b/tests/format/flow/flow-repo/spread/test4.js similarity index 100% rename from tests/format/flow-repo/spread/test4.js rename to tests/format/flow/flow-repo/spread/test4.js diff --git a/tests/format/flow-repo/spread/test5.js b/tests/format/flow/flow-repo/spread/test5.js similarity index 100% rename from tests/format/flow-repo/spread/test5.js rename to tests/format/flow/flow-repo/spread/test5.js diff --git a/tests/format/flow-repo/spread/test6.js b/tests/format/flow/flow-repo/spread/test6.js similarity index 100% rename from tests/format/flow-repo/spread/test6.js rename to tests/format/flow/flow-repo/spread/test6.js diff --git a/tests/format/flow-repo/spread/test7.js b/tests/format/flow/flow-repo/spread/test7.js similarity index 100% rename from tests/format/flow-repo/spread/test7.js rename to tests/format/flow/flow-repo/spread/test7.js diff --git a/tests/format/flow-repo/static_overload/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/static_overload/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/static_overload/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/static_overload/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/static_overload/format.test.js b/tests/format/flow/flow-repo/static_overload/format.test.js similarity index 100% rename from tests/format/flow-repo/static_overload/format.test.js rename to tests/format/flow/flow-repo/static_overload/format.test.js diff --git a/tests/format/flow-repo/static_overload/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/static_overload/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/static_overload/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/static_overload/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/static_overload/lib/format.test.js b/tests/format/flow/flow-repo/static_overload/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/static_overload/lib/format.test.js rename to tests/format/flow/flow-repo/static_overload/lib/format.test.js diff --git a/tests/format/flow-repo/static_overload/lib/lib.js b/tests/format/flow/flow-repo/static_overload/lib/lib.js similarity index 100% rename from tests/format/flow-repo/static_overload/lib/lib.js rename to tests/format/flow/flow-repo/static_overload/lib/lib.js diff --git a/tests/format/flow-repo/static_overload/test.js b/tests/format/flow/flow-repo/static_overload/test.js similarity index 100% rename from tests/format/flow-repo/static_overload/test.js rename to tests/format/flow/flow-repo/static_overload/test.js diff --git a/tests/format/flow-repo/statics/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/statics/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/statics/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/statics/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/statics/class_statics.js b/tests/format/flow/flow-repo/statics/class_statics.js similarity index 100% rename from tests/format/flow-repo/statics/class_statics.js rename to tests/format/flow/flow-repo/statics/class_statics.js diff --git a/tests/format/flow-repo/statics/format.test.js b/tests/format/flow/flow-repo/statics/format.test.js similarity index 100% rename from tests/format/flow-repo/statics/format.test.js rename to tests/format/flow/flow-repo/statics/format.test.js diff --git a/tests/format/flow-repo/statics/funstatics.js b/tests/format/flow/flow-repo/statics/funstatics.js similarity index 100% rename from tests/format/flow-repo/statics/funstatics.js rename to tests/format/flow/flow-repo/statics/funstatics.js diff --git a/tests/format/flow-repo/strict/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/strict/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/strict/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/strict/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/strict/annot.js b/tests/format/flow/flow-repo/strict/annot.js similarity index 100% rename from tests/format/flow-repo/strict/annot.js rename to tests/format/flow/flow-repo/strict/annot.js diff --git a/tests/format/flow-repo/strict/format.test.js b/tests/format/flow/flow-repo/strict/format.test.js similarity index 100% rename from tests/format/flow-repo/strict/format.test.js rename to tests/format/flow/flow-repo/strict/format.test.js diff --git a/tests/format/flow-repo/strict/fun.js b/tests/format/flow/flow-repo/strict/fun.js similarity index 100% rename from tests/format/flow-repo/strict/fun.js rename to tests/format/flow/flow-repo/strict/fun.js diff --git a/tests/format/flow-repo/strict/obj.js b/tests/format/flow/flow-repo/strict/obj.js similarity index 100% rename from tests/format/flow-repo/strict/obj.js rename to tests/format/flow/flow-repo/strict/obj.js diff --git a/tests/format/flow-repo/strict_requires/A.js b/tests/format/flow/flow-repo/strict_requires/A.js similarity index 100% rename from tests/format/flow-repo/strict_requires/A.js rename to tests/format/flow/flow-repo/strict_requires/A.js diff --git a/tests/format/flow-repo/strict_requires/B.js b/tests/format/flow/flow-repo/strict_requires/B.js similarity index 100% rename from tests/format/flow-repo/strict_requires/B.js rename to tests/format/flow/flow-repo/strict_requires/B.js diff --git a/tests/format/flow-repo/strict_requires/C.js b/tests/format/flow/flow-repo/strict_requires/C.js similarity index 100% rename from tests/format/flow-repo/strict_requires/C.js rename to tests/format/flow/flow-repo/strict_requires/C.js diff --git a/tests/format/flow-repo/strict_requires/D.js b/tests/format/flow/flow-repo/strict_requires/D.js similarity index 100% rename from tests/format/flow-repo/strict_requires/D.js rename to tests/format/flow/flow-repo/strict_requires/D.js diff --git a/tests/format/flow-repo/strict_requires/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/strict_requires/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/strict_requires/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/strict_requires/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/strict_requires/format.test.js b/tests/format/flow/flow-repo/strict_requires/format.test.js similarity index 100% rename from tests/format/flow-repo/strict_requires/format.test.js rename to tests/format/flow/flow-repo/strict_requires/format.test.js diff --git a/tests/format/flow-repo/structural_subtyping/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/structural_subtyping/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/structural_subtyping/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/structural_subtyping/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/structural_subtyping/builtin.js b/tests/format/flow/flow-repo/structural_subtyping/builtin.js similarity index 100% rename from tests/format/flow-repo/structural_subtyping/builtin.js rename to tests/format/flow/flow-repo/structural_subtyping/builtin.js diff --git a/tests/format/flow-repo/structural_subtyping/class.js b/tests/format/flow/flow-repo/structural_subtyping/class.js similarity index 100% rename from tests/format/flow-repo/structural_subtyping/class.js rename to tests/format/flow/flow-repo/structural_subtyping/class.js diff --git a/tests/format/flow-repo/structural_subtyping/format.test.js b/tests/format/flow/flow-repo/structural_subtyping/format.test.js similarity index 100% rename from tests/format/flow-repo/structural_subtyping/format.test.js rename to tests/format/flow/flow-repo/structural_subtyping/format.test.js diff --git a/tests/format/flow-repo/structural_subtyping/obj.js b/tests/format/flow/flow-repo/structural_subtyping/obj.js similarity index 100% rename from tests/format/flow-repo/structural_subtyping/obj.js rename to tests/format/flow/flow-repo/structural_subtyping/obj.js diff --git a/tests/format/flow-repo/structural_subtyping/optional.js b/tests/format/flow/flow-repo/structural_subtyping/optional.js similarity index 100% rename from tests/format/flow-repo/structural_subtyping/optional.js rename to tests/format/flow/flow-repo/structural_subtyping/optional.js diff --git a/tests/format/flow-repo/suggest/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/suggest/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/suggest/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/suggest/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/suggest/format.test.js b/tests/format/flow/flow-repo/suggest/format.test.js similarity index 100% rename from tests/format/flow-repo/suggest/format.test.js rename to tests/format/flow/flow-repo/suggest/format.test.js diff --git a/tests/format/flow-repo/suggest/lib.js b/tests/format/flow/flow-repo/suggest/lib.js similarity index 100% rename from tests/format/flow-repo/suggest/lib.js rename to tests/format/flow/flow-repo/suggest/lib.js diff --git a/tests/format/flow-repo/suggest/suggest.js b/tests/format/flow/flow-repo/suggest/suggest.js similarity index 100% rename from tests/format/flow-repo/suggest/suggest.js rename to tests/format/flow/flow-repo/suggest/suggest.js diff --git a/tests/format/flow-repo/super/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/super/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/super/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/super/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/super/constructor.js b/tests/format/flow/flow-repo/super/constructor.js similarity index 100% rename from tests/format/flow-repo/super/constructor.js rename to tests/format/flow/flow-repo/super/constructor.js diff --git a/tests/format/flow-repo/super/format.test.js b/tests/format/flow/flow-repo/super/format.test.js similarity index 100% rename from tests/format/flow-repo/super/format.test.js rename to tests/format/flow/flow-repo/super/format.test.js diff --git a/tests/format/flow-repo/super/import.js b/tests/format/flow/flow-repo/super/import.js similarity index 100% rename from tests/format/flow-repo/super/import.js rename to tests/format/flow/flow-repo/super/import.js diff --git a/tests/format/flow-repo/super/super.js b/tests/format/flow/flow-repo/super/super.js similarity index 100% rename from tests/format/flow-repo/super/super.js rename to tests/format/flow/flow-repo/super/super.js diff --git a/tests/format/flow-repo/super/test.js b/tests/format/flow/flow-repo/super/test.js similarity index 100% rename from tests/format/flow-repo/super/test.js rename to tests/format/flow/flow-repo/super/test.js diff --git a/tests/format/flow-repo/suppress/A.js b/tests/format/flow/flow-repo/suppress/A.js similarity index 100% rename from tests/format/flow-repo/suppress/A.js rename to tests/format/flow/flow-repo/suppress/A.js diff --git a/tests/format/flow-repo/suppress/B.js b/tests/format/flow/flow-repo/suppress/B.js similarity index 100% rename from tests/format/flow-repo/suppress/B.js rename to tests/format/flow/flow-repo/suppress/B.js diff --git a/tests/format/flow-repo/suppress/C.js b/tests/format/flow/flow-repo/suppress/C.js similarity index 100% rename from tests/format/flow-repo/suppress/C.js rename to tests/format/flow/flow-repo/suppress/C.js diff --git a/tests/format/flow-repo/suppress/D.js b/tests/format/flow/flow-repo/suppress/D.js similarity index 100% rename from tests/format/flow-repo/suppress/D.js rename to tests/format/flow/flow-repo/suppress/D.js diff --git a/tests/format/flow-repo/suppress/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/suppress/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/suppress/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/suppress/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/suppress/format.test.js b/tests/format/flow/flow-repo/suppress/format.test.js similarity index 100% rename from tests/format/flow-repo/suppress/format.test.js rename to tests/format/flow/flow-repo/suppress/format.test.js diff --git a/tests/format/flow-repo/suppress/lib.js b/tests/format/flow/flow-repo/suppress/lib.js similarity index 100% rename from tests/format/flow-repo/suppress/lib.js rename to tests/format/flow/flow-repo/suppress/lib.js diff --git a/tests/format/flow-repo/suppress_incremental/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/suppress_incremental/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/suppress_incremental/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/suppress_incremental/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/suppress_incremental/format.test.js b/tests/format/flow/flow-repo/suppress_incremental/format.test.js similarity index 100% rename from tests/format/flow-repo/suppress_incremental/format.test.js rename to tests/format/flow/flow-repo/suppress_incremental/format.test.js diff --git a/tests/format/flow-repo/suppress_incremental/test.js b/tests/format/flow/flow-repo/suppress_incremental/test.js similarity index 100% rename from tests/format/flow-repo/suppress_incremental/test.js rename to tests/format/flow/flow-repo/suppress_incremental/test.js diff --git a/tests/format/flow-repo/suppress_traces/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/suppress_traces/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/suppress_traces/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/suppress_traces/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/suppress_traces/format.test.js b/tests/format/flow/flow-repo/suppress_traces/format.test.js similarity index 100% rename from tests/format/flow-repo/suppress_traces/format.test.js rename to tests/format/flow/flow-repo/suppress_traces/format.test.js diff --git a/tests/format/flow-repo/suppress_traces/traces.js b/tests/format/flow/flow-repo/suppress_traces/traces.js similarity index 100% rename from tests/format/flow-repo/suppress_traces/traces.js rename to tests/format/flow/flow-repo/suppress_traces/traces.js diff --git a/tests/format/flow-repo/switch/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/switch/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/switch/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/switch/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/switch/format.test.js b/tests/format/flow/flow-repo/switch/format.test.js similarity index 100% rename from tests/format/flow-repo/switch/format.test.js rename to tests/format/flow/flow-repo/switch/format.test.js diff --git a/tests/format/flow-repo/switch/more_switch.js b/tests/format/flow/flow-repo/switch/more_switch.js similarity index 100% rename from tests/format/flow-repo/switch/more_switch.js rename to tests/format/flow/flow-repo/switch/more_switch.js diff --git a/tests/format/flow-repo/switch/switch.js b/tests/format/flow/flow-repo/switch/switch.js similarity index 100% rename from tests/format/flow-repo/switch/switch.js rename to tests/format/flow/flow-repo/switch/switch.js diff --git a/tests/format/flow-repo/switch/switch_default_fallthrough.js b/tests/format/flow/flow-repo/switch/switch_default_fallthrough.js similarity index 100% rename from tests/format/flow-repo/switch/switch_default_fallthrough.js rename to tests/format/flow/flow-repo/switch/switch_default_fallthrough.js diff --git a/tests/format/flow-repo/switch/trailing_cases.js b/tests/format/flow/flow-repo/switch/trailing_cases.js similarity index 100% rename from tests/format/flow-repo/switch/trailing_cases.js rename to tests/format/flow/flow-repo/switch/trailing_cases.js diff --git a/tests/format/flow-repo/symbol/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/symbol/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/symbol/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/symbol/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/symbol/format.test.js b/tests/format/flow/flow-repo/symbol/format.test.js similarity index 100% rename from tests/format/flow-repo/symbol/format.test.js rename to tests/format/flow/flow-repo/symbol/format.test.js diff --git a/tests/format/flow-repo/symbol/symbol.js b/tests/format/flow/flow-repo/symbol/symbol.js similarity index 100% rename from tests/format/flow-repo/symbol/symbol.js rename to tests/format/flow/flow-repo/symbol/symbol.js diff --git a/tests/format/flow-repo/symlink/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/symlink/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/symlink/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/symlink/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/symlink/bar.js b/tests/format/flow/flow-repo/symlink/bar.js similarity index 100% rename from tests/format/flow-repo/symlink/bar.js rename to tests/format/flow/flow-repo/symlink/bar.js diff --git a/tests/format/flow-repo/symlink/foo.js b/tests/format/flow/flow-repo/symlink/foo.js similarity index 100% rename from tests/format/flow-repo/symlink/foo.js rename to tests/format/flow/flow-repo/symlink/foo.js diff --git a/tests/format/flow-repo/symlink/format.test.js b/tests/format/flow/flow-repo/symlink/format.test.js similarity index 100% rename from tests/format/flow-repo/symlink/format.test.js rename to tests/format/flow/flow-repo/symlink/format.test.js diff --git a/tests/format/flow-repo/symlink/qux.js b/tests/format/flow/flow-repo/symlink/qux.js similarity index 100% rename from tests/format/flow-repo/symlink/qux.js rename to tests/format/flow/flow-repo/symlink/qux.js diff --git a/tests/format/flow-repo/tagged-unions/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/tagged-unions/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/tagged-unions/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/tagged-unions/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/tagged-unions/classes.js b/tests/format/flow/flow-repo/tagged-unions/classes.js similarity index 100% rename from tests/format/flow-repo/tagged-unions/classes.js rename to tests/format/flow/flow-repo/tagged-unions/classes.js diff --git a/tests/format/flow-repo/tagged-unions/format.test.js b/tests/format/flow/flow-repo/tagged-unions/format.test.js similarity index 100% rename from tests/format/flow-repo/tagged-unions/format.test.js rename to tests/format/flow/flow-repo/tagged-unions/format.test.js diff --git a/tests/format/flow-repo/tagged-unions/interfaces-neg.js b/tests/format/flow/flow-repo/tagged-unions/interfaces-neg.js similarity index 100% rename from tests/format/flow-repo/tagged-unions/interfaces-neg.js rename to tests/format/flow/flow-repo/tagged-unions/interfaces-neg.js diff --git a/tests/format/flow-repo/tagged-unions/interfaces-pos.js b/tests/format/flow/flow-repo/tagged-unions/interfaces-pos.js similarity index 100% rename from tests/format/flow-repo/tagged-unions/interfaces-pos.js rename to tests/format/flow/flow-repo/tagged-unions/interfaces-pos.js diff --git a/tests/format/flow-repo/tagged-unions/type-decls-neg.js b/tests/format/flow/flow-repo/tagged-unions/type-decls-neg.js similarity index 100% rename from tests/format/flow-repo/tagged-unions/type-decls-neg.js rename to tests/format/flow/flow-repo/tagged-unions/type-decls-neg.js diff --git a/tests/format/flow-repo/tagged-unions/type-decls-pos.js b/tests/format/flow/flow-repo/tagged-unions/type-decls-pos.js similarity index 100% rename from tests/format/flow-repo/tagged-unions/type-decls-pos.js rename to tests/format/flow/flow-repo/tagged-unions/type-decls-pos.js diff --git a/tests/format/flow-repo/taint/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/taint/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/taint/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/taint/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/taint/adder.js b/tests/format/flow/flow-repo/taint/adder.js similarity index 100% rename from tests/format/flow-repo/taint/adder.js rename to tests/format/flow/flow-repo/taint/adder.js diff --git a/tests/format/flow-repo/taint/any_object.js b/tests/format/flow/flow-repo/taint/any_object.js similarity index 100% rename from tests/format/flow-repo/taint/any_object.js rename to tests/format/flow/flow-repo/taint/any_object.js diff --git a/tests/format/flow-repo/taint/call-object-property.js b/tests/format/flow/flow-repo/taint/call-object-property.js similarity index 100% rename from tests/format/flow-repo/taint/call-object-property.js rename to tests/format/flow/flow-repo/taint/call-object-property.js diff --git a/tests/format/flow-repo/taint/comparator.js b/tests/format/flow/flow-repo/taint/comparator.js similarity index 100% rename from tests/format/flow-repo/taint/comparator.js rename to tests/format/flow/flow-repo/taint/comparator.js diff --git a/tests/format/flow-repo/taint/format.test.js b/tests/format/flow/flow-repo/taint/format.test.js similarity index 100% rename from tests/format/flow-repo/taint/format.test.js rename to tests/format/flow/flow-repo/taint/format.test.js diff --git a/tests/format/flow-repo/taint/function.js b/tests/format/flow/flow-repo/taint/function.js similarity index 100% rename from tests/format/flow-repo/taint/function.js rename to tests/format/flow/flow-repo/taint/function.js diff --git a/tests/format/flow-repo/taint/globals.js b/tests/format/flow/flow-repo/taint/globals.js similarity index 100% rename from tests/format/flow-repo/taint/globals.js rename to tests/format/flow/flow-repo/taint/globals.js diff --git a/tests/format/flow-repo/taint/lib.js b/tests/format/flow/flow-repo/taint/lib.js similarity index 100% rename from tests/format/flow-repo/taint/lib.js rename to tests/format/flow/flow-repo/taint/lib.js diff --git a/tests/format/flow-repo/taint/taint1.js b/tests/format/flow/flow-repo/taint/taint1.js similarity index 100% rename from tests/format/flow-repo/taint/taint1.js rename to tests/format/flow/flow-repo/taint/taint1.js diff --git a/tests/format/flow-repo/taint/taint2.js b/tests/format/flow/flow-repo/taint/taint2.js similarity index 100% rename from tests/format/flow-repo/taint/taint2.js rename to tests/format/flow/flow-repo/taint/taint2.js diff --git a/tests/format/flow-repo/taint/taint3.js b/tests/format/flow/flow-repo/taint/taint3.js similarity index 100% rename from tests/format/flow-repo/taint/taint3.js rename to tests/format/flow/flow-repo/taint/taint3.js diff --git a/tests/format/flow-repo/taint/taint4.js b/tests/format/flow/flow-repo/taint/taint4.js similarity index 100% rename from tests/format/flow-repo/taint/taint4.js rename to tests/format/flow/flow-repo/taint/taint4.js diff --git a/tests/format/flow-repo/taint/use-types.js b/tests/format/flow/flow-repo/taint/use-types.js similarity index 100% rename from tests/format/flow-repo/taint/use-types.js rename to tests/format/flow/flow-repo/taint/use-types.js diff --git a/tests/format/flow-repo/template/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/template/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/template/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/template/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/template/format.test.js b/tests/format/flow/flow-repo/template/format.test.js similarity index 100% rename from tests/format/flow-repo/template/format.test.js rename to tests/format/flow/flow-repo/template/format.test.js diff --git a/tests/format/flow-repo/template/template.js b/tests/format/flow/flow-repo/template/template.js similarity index 100% rename from tests/format/flow-repo/template/template.js rename to tests/format/flow/flow-repo/template/template.js diff --git a/tests/format/flow-repo/this/This.js b/tests/format/flow/flow-repo/this/This.js similarity index 100% rename from tests/format/flow-repo/this/This.js rename to tests/format/flow/flow-repo/this/This.js diff --git a/tests/format/flow-repo/this/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/this/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/this/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/this/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/this/arrows.js b/tests/format/flow/flow-repo/this/arrows.js similarity index 100% rename from tests/format/flow-repo/this/arrows.js rename to tests/format/flow/flow-repo/this/arrows.js diff --git a/tests/format/flow-repo/this/format.test.js b/tests/format/flow/flow-repo/this/format.test.js similarity index 100% rename from tests/format/flow-repo/this/format.test.js rename to tests/format/flow/flow-repo/this/format.test.js diff --git a/tests/format/flow-repo/this_ctor/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/this_ctor/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/this_ctor/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/this_ctor/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/this_ctor/format.test.js b/tests/format/flow/flow-repo/this_ctor/format.test.js similarity index 100% rename from tests/format/flow-repo/this_ctor/format.test.js rename to tests/format/flow/flow-repo/this_ctor/format.test.js diff --git a/tests/format/flow-repo/this_ctor/test.js b/tests/format/flow/flow-repo/this_ctor/test.js similarity index 100% rename from tests/format/flow-repo/this_ctor/test.js rename to tests/format/flow/flow-repo/this_ctor/test.js diff --git a/tests/format/flow-repo/this_type/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/this_type/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/this_type/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/this_type/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/this_type/class_expr.js b/tests/format/flow/flow-repo/this_type/class_expr.js similarity index 100% rename from tests/format/flow-repo/this_type/class_expr.js rename to tests/format/flow/flow-repo/this_type/class_expr.js diff --git a/tests/format/flow-repo/this_type/contra.js b/tests/format/flow/flow-repo/this_type/contra.js similarity index 100% rename from tests/format/flow-repo/this_type/contra.js rename to tests/format/flow/flow-repo/this_type/contra.js diff --git a/tests/format/flow-repo/this_type/export.js b/tests/format/flow/flow-repo/this_type/export.js similarity index 100% rename from tests/format/flow-repo/this_type/export.js rename to tests/format/flow/flow-repo/this_type/export.js diff --git a/tests/format/flow-repo/this_type/format.test.js b/tests/format/flow/flow-repo/this_type/format.test.js similarity index 100% rename from tests/format/flow-repo/this_type/format.test.js rename to tests/format/flow/flow-repo/this_type/format.test.js diff --git a/tests/format/flow-repo/this_type/generics.js b/tests/format/flow/flow-repo/this_type/generics.js similarity index 100% rename from tests/format/flow-repo/this_type/generics.js rename to tests/format/flow/flow-repo/this_type/generics.js diff --git a/tests/format/flow-repo/this_type/import.js b/tests/format/flow/flow-repo/this_type/import.js similarity index 100% rename from tests/format/flow-repo/this_type/import.js rename to tests/format/flow/flow-repo/this_type/import.js diff --git a/tests/format/flow-repo/this_type/interface.js b/tests/format/flow/flow-repo/this_type/interface.js similarity index 100% rename from tests/format/flow-repo/this_type/interface.js rename to tests/format/flow/flow-repo/this_type/interface.js diff --git a/tests/format/flow-repo/this_type/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/this_type/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/this_type/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/this_type/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/this_type/lib/decl.js b/tests/format/flow/flow-repo/this_type/lib/decl.js similarity index 100% rename from tests/format/flow-repo/this_type/lib/decl.js rename to tests/format/flow/flow-repo/this_type/lib/decl.js diff --git a/tests/format/flow-repo/this_type/lib/format.test.js b/tests/format/flow/flow-repo/this_type/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/this_type/lib/format.test.js rename to tests/format/flow/flow-repo/this_type/lib/format.test.js diff --git a/tests/format/flow-repo/this_type/lib_client.js b/tests/format/flow/flow-repo/this_type/lib_client.js similarity index 100% rename from tests/format/flow-repo/this_type/lib_client.js rename to tests/format/flow/flow-repo/this_type/lib_client.js diff --git a/tests/format/flow-repo/this_type/self.js b/tests/format/flow/flow-repo/this_type/self.js similarity index 100% rename from tests/format/flow-repo/this_type/self.js rename to tests/format/flow/flow-repo/this_type/self.js diff --git a/tests/format/flow-repo/this_type/statics.js b/tests/format/flow/flow-repo/this_type/statics.js similarity index 100% rename from tests/format/flow-repo/this_type/statics.js rename to tests/format/flow/flow-repo/this_type/statics.js diff --git a/tests/format/flow-repo/this_type/test.js b/tests/format/flow/flow-repo/this_type/test.js similarity index 100% rename from tests/format/flow-repo/this_type/test.js rename to tests/format/flow/flow-repo/this_type/test.js diff --git a/tests/format/flow-repo/throw/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/throw/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/throw/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/throw/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/throw/format.test.js b/tests/format/flow/flow-repo/throw/format.test.js similarity index 100% rename from tests/format/flow-repo/throw/format.test.js rename to tests/format/flow/flow-repo/throw/format.test.js diff --git a/tests/format/flow-repo/throw/test.js b/tests/format/flow/flow-repo/throw/test.js similarity index 100% rename from tests/format/flow-repo/throw/test.js rename to tests/format/flow/flow-repo/throw/test.js diff --git a/tests/format/flow-repo/traces/Traces.js b/tests/format/flow/flow-repo/traces/Traces.js similarity index 100% rename from tests/format/flow-repo/traces/Traces.js rename to tests/format/flow/flow-repo/traces/Traces.js diff --git a/tests/format/flow-repo/traces/Traces2.js b/tests/format/flow/flow-repo/traces/Traces2.js similarity index 100% rename from tests/format/flow-repo/traces/Traces2.js rename to tests/format/flow/flow-repo/traces/Traces2.js diff --git a/tests/format/flow-repo/traces/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/traces/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/traces/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/traces/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/traces/format.test.js b/tests/format/flow/flow-repo/traces/format.test.js similarity index 100% rename from tests/format/flow-repo/traces/format.test.js rename to tests/format/flow/flow-repo/traces/format.test.js diff --git a/tests/format/flow-repo/traits/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/traits/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/traits/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/traits/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/traits/format.test.js b/tests/format/flow/flow-repo/traits/format.test.js similarity index 100% rename from tests/format/flow-repo/traits/format.test.js rename to tests/format/flow/flow-repo/traits/format.test.js diff --git a/tests/format/flow-repo/traits/test.js b/tests/format/flow/flow-repo/traits/test.js similarity index 100% rename from tests/format/flow-repo/traits/test.js rename to tests/format/flow/flow-repo/traits/test.js diff --git a/tests/format/flow-repo/traits/test2.js b/tests/format/flow/flow-repo/traits/test2.js similarity index 100% rename from tests/format/flow-repo/traits/test2.js rename to tests/format/flow/flow-repo/traits/test2.js diff --git a/tests/format/flow-repo/try/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/try/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/try/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/try/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/try/abnormals.js b/tests/format/flow/flow-repo/try/abnormals.js similarity index 100% rename from tests/format/flow-repo/try/abnormals.js rename to tests/format/flow/flow-repo/try/abnormals.js diff --git a/tests/format/flow-repo/try/format.test.js b/tests/format/flow/flow-repo/try/format.test.js similarity index 100% rename from tests/format/flow-repo/try/format.test.js rename to tests/format/flow/flow-repo/try/format.test.js diff --git a/tests/format/flow-repo/try/init.js b/tests/format/flow/flow-repo/try/init.js similarity index 100% rename from tests/format/flow-repo/try/init.js rename to tests/format/flow/flow-repo/try/init.js diff --git a/tests/format/flow-repo/try/return.js b/tests/format/flow/flow-repo/try/return.js similarity index 100% rename from tests/format/flow-repo/try/return.js rename to tests/format/flow/flow-repo/try/return.js diff --git a/tests/format/flow-repo/try/test.js b/tests/format/flow/flow-repo/try/test.js similarity index 100% rename from tests/format/flow-repo/try/test.js rename to tests/format/flow/flow-repo/try/test.js diff --git a/tests/format/flow-repo/tuples/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/tuples/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/tuples/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/tuples/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/tuples/array.js b/tests/format/flow/flow-repo/tuples/array.js similarity index 100% rename from tests/format/flow-repo/tuples/array.js rename to tests/format/flow/flow-repo/tuples/array.js diff --git a/tests/format/flow-repo/tuples/format.test.js b/tests/format/flow/flow-repo/tuples/format.test.js similarity index 100% rename from tests/format/flow-repo/tuples/format.test.js rename to tests/format/flow/flow-repo/tuples/format.test.js diff --git a/tests/format/flow-repo/tuples/optional.js b/tests/format/flow/flow-repo/tuples/optional.js similarity index 100% rename from tests/format/flow-repo/tuples/optional.js rename to tests/format/flow/flow-repo/tuples/optional.js diff --git a/tests/format/flow-repo/tuples/spread.js b/tests/format/flow/flow-repo/tuples/spread.js similarity index 100% rename from tests/format/flow-repo/tuples/spread.js rename to tests/format/flow/flow-repo/tuples/spread.js diff --git a/tests/format/flow-repo/tuples/too-few.js b/tests/format/flow/flow-repo/tuples/too-few.js similarity index 100% rename from tests/format/flow-repo/tuples/too-few.js rename to tests/format/flow/flow-repo/tuples/too-few.js diff --git a/tests/format/flow-repo/tuples/tuples.js b/tests/format/flow/flow-repo/tuples/tuples.js similarity index 100% rename from tests/format/flow-repo/tuples/tuples.js rename to tests/format/flow/flow-repo/tuples/tuples.js diff --git a/tests/format/flow-repo/type-at-pos/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type-at-pos/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type-at-pos/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type-at-pos/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type-at-pos/destructuring.js b/tests/format/flow/flow-repo/type-at-pos/destructuring.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/destructuring.js rename to tests/format/flow/flow-repo/type-at-pos/destructuring.js diff --git a/tests/format/flow-repo/type-at-pos/format.test.js b/tests/format/flow/flow-repo/type-at-pos/format.test.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/format.test.js rename to tests/format/flow/flow-repo/type-at-pos/format.test.js diff --git a/tests/format/flow-repo/type-at-pos/function_expressions.js b/tests/format/flow/flow-repo/type-at-pos/function_expressions.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/function_expressions.js rename to tests/format/flow/flow-repo/type-at-pos/function_expressions.js diff --git a/tests/format/flow-repo/type-at-pos/generics.js b/tests/format/flow/flow-repo/type-at-pos/generics.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/generics.js rename to tests/format/flow/flow-repo/type-at-pos/generics.js diff --git a/tests/format/flow-repo/type-at-pos/import.js b/tests/format/flow/flow-repo/type-at-pos/import.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/import.js rename to tests/format/flow/flow-repo/type-at-pos/import.js diff --git a/tests/format/flow-repo/type-at-pos/object_special_cases.js b/tests/format/flow/flow-repo/type-at-pos/object_special_cases.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/object_special_cases.js rename to tests/format/flow/flow-repo/type-at-pos/object_special_cases.js diff --git a/tests/format/flow-repo/type-at-pos/optional.js b/tests/format/flow/flow-repo/type-at-pos/optional.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/optional.js rename to tests/format/flow/flow-repo/type-at-pos/optional.js diff --git a/tests/format/flow-repo/type-at-pos/predicates.js b/tests/format/flow/flow-repo/type-at-pos/predicates.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/predicates.js rename to tests/format/flow/flow-repo/type-at-pos/predicates.js diff --git a/tests/format/flow-repo/type-at-pos/react.js b/tests/format/flow/flow-repo/type-at-pos/react.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/react.js rename to tests/format/flow/flow-repo/type-at-pos/react.js diff --git a/tests/format/flow-repo/type-at-pos/templates.js b/tests/format/flow/flow-repo/type-at-pos/templates.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/templates.js rename to tests/format/flow/flow-repo/type-at-pos/templates.js diff --git a/tests/format/flow-repo/type-at-pos/test.js b/tests/format/flow/flow-repo/type-at-pos/test.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/test.js rename to tests/format/flow/flow-repo/type-at-pos/test.js diff --git a/tests/format/flow-repo/type-at-pos/trycatch.js b/tests/format/flow/flow-repo/type-at-pos/trycatch.js similarity index 100% rename from tests/format/flow-repo/type-at-pos/trycatch.js rename to tests/format/flow/flow-repo/type-at-pos/trycatch.js diff --git a/tests/format/flow-repo/type-destructors/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type-destructors/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type-destructors/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type-destructors/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type-destructors/format.test.js b/tests/format/flow/flow-repo/type-destructors/format.test.js similarity index 100% rename from tests/format/flow-repo/type-destructors/format.test.js rename to tests/format/flow/flow-repo/type-destructors/format.test.js diff --git a/tests/format/flow-repo/type-destructors/non_maybe_type.js b/tests/format/flow/flow-repo/type-destructors/non_maybe_type.js similarity index 100% rename from tests/format/flow-repo/type-destructors/non_maybe_type.js rename to tests/format/flow/flow-repo/type-destructors/non_maybe_type.js diff --git a/tests/format/flow-repo/type-destructors/property_type.js b/tests/format/flow/flow-repo/type-destructors/property_type.js similarity index 100% rename from tests/format/flow-repo/type-destructors/property_type.js rename to tests/format/flow/flow-repo/type-destructors/property_type.js diff --git a/tests/format/flow-repo/type-destructors/union.js b/tests/format/flow/flow-repo/type-destructors/union.js similarity index 100% rename from tests/format/flow-repo/type-destructors/union.js rename to tests/format/flow/flow-repo/type-destructors/union.js diff --git a/tests/format/flow-repo/type-guards/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type-guards/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type-guards/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type-guards/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type-guards/comments-in-type-annotations.js b/tests/format/flow/flow-repo/type-guards/comments-in-type-annotations.js similarity index 100% rename from tests/format/flow-repo/type-guards/comments-in-type-annotations.js rename to tests/format/flow/flow-repo/type-guards/comments-in-type-annotations.js diff --git a/tests/format/flow-repo/type-guards/format.test.js b/tests/format/flow/flow-repo/type-guards/format.test.js similarity index 100% rename from tests/format/flow-repo/type-guards/format.test.js rename to tests/format/flow/flow-repo/type-guards/format.test.js diff --git a/tests/format/flow-repo/type-guards/passing.js b/tests/format/flow/flow-repo/type-guards/passing.js similarity index 100% rename from tests/format/flow-repo/type-guards/passing.js rename to tests/format/flow/flow-repo/type-guards/passing.js diff --git a/tests/format/flow-repo/type-printer/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type-printer/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type-printer/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type-printer/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type-printer/format.test.js b/tests/format/flow/flow-repo/type-printer/format.test.js similarity index 100% rename from tests/format/flow-repo/type-printer/format.test.js rename to tests/format/flow/flow-repo/type-printer/format.test.js diff --git a/tests/format/flow-repo/type-printer/printBinaryExpression.js b/tests/format/flow/flow-repo/type-printer/printBinaryExpression.js similarity index 100% rename from tests/format/flow-repo/type-printer/printBinaryExpression.js rename to tests/format/flow/flow-repo/type-printer/printBinaryExpression.js diff --git a/tests/format/flow-repo/type-printer/types.js b/tests/format/flow/flow-repo/type-printer/types.js similarity index 100% rename from tests/format/flow-repo/type-printer/types.js rename to tests/format/flow/flow-repo/type-printer/types.js diff --git a/tests/format/flow-repo/type_args_nonstrict/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_args_nonstrict/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_args_nonstrict/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_args_nonstrict/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_args_nonstrict/format.test.js b/tests/format/flow/flow-repo/type_args_nonstrict/format.test.js similarity index 100% rename from tests/format/flow-repo/type_args_nonstrict/format.test.js rename to tests/format/flow/flow-repo/type_args_nonstrict/format.test.js diff --git a/tests/format/flow-repo/type_args_nonstrict/test.js b/tests/format/flow/flow-repo/type_args_nonstrict/test.js similarity index 100% rename from tests/format/flow-repo/type_args_nonstrict/test.js rename to tests/format/flow/flow-repo/type_args_nonstrict/test.js diff --git a/tests/format/flow-repo/type_args_strict/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_args_strict/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_args_strict/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_args_strict/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_args_strict/format.test.js b/tests/format/flow/flow-repo/type_args_strict/format.test.js similarity index 100% rename from tests/format/flow-repo/type_args_strict/format.test.js rename to tests/format/flow/flow-repo/type_args_strict/format.test.js diff --git a/tests/format/flow-repo/type_args_strict/test.js b/tests/format/flow/flow-repo/type_args_strict/test.js similarity index 100% rename from tests/format/flow-repo/type_args_strict/test.js rename to tests/format/flow/flow-repo/type_args_strict/test.js diff --git a/tests/format/flow-repo/type_only_vars/A.js b/tests/format/flow/flow-repo/type_only_vars/A.js similarity index 100% rename from tests/format/flow-repo/type_only_vars/A.js rename to tests/format/flow/flow-repo/type_only_vars/A.js diff --git a/tests/format/flow-repo/type_only_vars/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_only_vars/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_only_vars/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_only_vars/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_only_vars/bad_shadowing.js b/tests/format/flow/flow-repo/type_only_vars/bad_shadowing.js similarity index 100% rename from tests/format/flow-repo/type_only_vars/bad_shadowing.js rename to tests/format/flow/flow-repo/type_only_vars/bad_shadowing.js diff --git a/tests/format/flow-repo/type_only_vars/format.test.js b/tests/format/flow/flow-repo/type_only_vars/format.test.js similarity index 100% rename from tests/format/flow-repo/type_only_vars/format.test.js rename to tests/format/flow/flow-repo/type_only_vars/format.test.js diff --git a/tests/format/flow-repo/type_only_vars/good_shadowing.js b/tests/format/flow/flow-repo/type_only_vars/good_shadowing.js similarity index 100% rename from tests/format/flow-repo/type_only_vars/good_shadowing.js rename to tests/format/flow/flow-repo/type_only_vars/good_shadowing.js diff --git a/tests/format/flow-repo/type_only_vars/import_type.js b/tests/format/flow/flow-repo/type_only_vars/import_type.js similarity index 100% rename from tests/format/flow-repo/type_only_vars/import_type.js rename to tests/format/flow/flow-repo/type_only_vars/import_type.js diff --git a/tests/format/flow-repo/type_only_vars/type_alias.js b/tests/format/flow/flow-repo/type_only_vars/type_alias.js similarity index 100% rename from tests/format/flow-repo/type_only_vars/type_alias.js rename to tests/format/flow/flow-repo/type_only_vars/type_alias.js diff --git a/tests/format/flow-repo/type_param_defaults/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_param_defaults/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_param_defaults/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_param_defaults/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_param_defaults/classes.js b/tests/format/flow/flow-repo/type_param_defaults/classes.js similarity index 100% rename from tests/format/flow-repo/type_param_defaults/classes.js rename to tests/format/flow/flow-repo/type_param_defaults/classes.js diff --git a/tests/format/flow-repo/type_param_defaults/format.test.js b/tests/format/flow/flow-repo/type_param_defaults/format.test.js similarity index 100% rename from tests/format/flow-repo/type_param_defaults/format.test.js rename to tests/format/flow/flow-repo/type_param_defaults/format.test.js diff --git a/tests/format/flow-repo/type_param_scope/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_param_scope/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_param_scope/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_param_scope/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_param_scope/class.js b/tests/format/flow/flow-repo/type_param_scope/class.js similarity index 100% rename from tests/format/flow-repo/type_param_scope/class.js rename to tests/format/flow/flow-repo/type_param_scope/class.js diff --git a/tests/format/flow-repo/type_param_scope/default_params.js b/tests/format/flow/flow-repo/type_param_scope/default_params.js similarity index 100% rename from tests/format/flow-repo/type_param_scope/default_params.js rename to tests/format/flow/flow-repo/type_param_scope/default_params.js diff --git a/tests/format/flow-repo/type_param_scope/format.test.js b/tests/format/flow/flow-repo/type_param_scope/format.test.js similarity index 100% rename from tests/format/flow-repo/type_param_scope/format.test.js rename to tests/format/flow/flow-repo/type_param_scope/format.test.js diff --git a/tests/format/flow-repo/type_param_scope/method_shadow.js b/tests/format/flow/flow-repo/type_param_scope/method_shadow.js similarity index 100% rename from tests/format/flow-repo/type_param_scope/method_shadow.js rename to tests/format/flow/flow-repo/type_param_scope/method_shadow.js diff --git a/tests/format/flow-repo/type_param_variance/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_param_variance/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_param_variance/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_param_variance/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_param_variance/format.test.js b/tests/format/flow/flow-repo/type_param_variance/format.test.js similarity index 100% rename from tests/format/flow-repo/type_param_variance/format.test.js rename to tests/format/flow/flow-repo/type_param_variance/format.test.js diff --git a/tests/format/flow-repo/type_param_variance/promise.js b/tests/format/flow/flow-repo/type_param_variance/promise.js similarity index 100% rename from tests/format/flow-repo/type_param_variance/promise.js rename to tests/format/flow/flow-repo/type_param_variance/promise.js diff --git a/tests/format/flow-repo/type_param_variance2/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_param_variance2/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_param_variance2/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_param_variance2/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_param_variance2/format.test.js b/tests/format/flow/flow-repo/type_param_variance2/format.test.js similarity index 100% rename from tests/format/flow-repo/type_param_variance2/format.test.js rename to tests/format/flow/flow-repo/type_param_variance2/format.test.js diff --git a/tests/format/flow-repo/type_param_variance2/libs/Promise.js b/tests/format/flow/flow-repo/type_param_variance2/libs/Promise.js similarity index 100% rename from tests/format/flow-repo/type_param_variance2/libs/Promise.js rename to tests/format/flow/flow-repo/type_param_variance2/libs/Promise.js diff --git a/tests/format/flow-repo/type_param_variance2/libs/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/type_param_variance2/libs/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/type_param_variance2/libs/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/type_param_variance2/libs/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/type_param_variance2/libs/format.test.js b/tests/format/flow/flow-repo/type_param_variance2/libs/format.test.js similarity index 100% rename from tests/format/flow-repo/type_param_variance2/libs/format.test.js rename to tests/format/flow/flow-repo/type_param_variance2/libs/format.test.js diff --git a/tests/format/flow-repo/type_param_variance2/promise.js b/tests/format/flow/flow-repo/type_param_variance2/promise.js similarity index 100% rename from tests/format/flow-repo/type_param_variance2/promise.js rename to tests/format/flow/flow-repo/type_param_variance2/promise.js diff --git a/tests/format/flow-repo/typeapp_perf/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/typeapp_perf/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/typeapp_perf/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/typeapp_perf/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/typeapp_perf/format.test.js b/tests/format/flow/flow-repo/typeapp_perf/format.test.js similarity index 100% rename from tests/format/flow-repo/typeapp_perf/format.test.js rename to tests/format/flow/flow-repo/typeapp_perf/format.test.js diff --git a/tests/format/flow-repo/typeapp_perf/test1.js b/tests/format/flow/flow-repo/typeapp_perf/test1.js similarity index 100% rename from tests/format/flow-repo/typeapp_perf/test1.js rename to tests/format/flow/flow-repo/typeapp_perf/test1.js diff --git a/tests/format/flow-repo/typeapp_perf/test2.js b/tests/format/flow/flow-repo/typeapp_perf/test2.js similarity index 100% rename from tests/format/flow-repo/typeapp_perf/test2.js rename to tests/format/flow/flow-repo/typeapp_perf/test2.js diff --git a/tests/format/flow-repo/typecast/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/typecast/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/typecast/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/typecast/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/typecast/format.test.js b/tests/format/flow/flow-repo/typecast/format.test.js similarity index 100% rename from tests/format/flow-repo/typecast/format.test.js rename to tests/format/flow/flow-repo/typecast/format.test.js diff --git a/tests/format/flow-repo/typecast/typecast.js b/tests/format/flow/flow-repo/typecast/typecast.js similarity index 100% rename from tests/format/flow-repo/typecast/typecast.js rename to tests/format/flow/flow-repo/typecast/typecast.js diff --git a/tests/format/flow-repo/typeof/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/typeof/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/typeof/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/typeof/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/typeof/format.test.js b/tests/format/flow/flow-repo/typeof/format.test.js similarity index 100% rename from tests/format/flow-repo/typeof/format.test.js rename to tests/format/flow/flow-repo/typeof/format.test.js diff --git a/tests/format/flow-repo/typeof/typeof.js b/tests/format/flow/flow-repo/typeof/typeof.js similarity index 100% rename from tests/format/flow-repo/typeof/typeof.js rename to tests/format/flow/flow-repo/typeof/typeof.js diff --git a/tests/format/flow-repo/unary/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/unary/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/unary/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/unary/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/unary/format.test.js b/tests/format/flow/flow-repo/unary/format.test.js similarity index 100% rename from tests/format/flow-repo/unary/format.test.js rename to tests/format/flow/flow-repo/unary/format.test.js diff --git a/tests/format/flow-repo/unary/unary.js b/tests/format/flow/flow-repo/unary/unary.js similarity index 100% rename from tests/format/flow-repo/unary/unary.js rename to tests/format/flow/flow-repo/unary/unary.js diff --git a/tests/format/flow-repo/unary/update.js b/tests/format/flow/flow-repo/unary/update.js similarity index 100% rename from tests/format/flow-repo/unary/update.js rename to tests/format/flow/flow-repo/unary/update.js diff --git a/tests/format/flow-repo/unchecked_haste_module_vs_lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/unchecked_haste_module_vs_lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/unchecked_haste_module_vs_lib/buffer.js b/tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/buffer.js similarity index 100% rename from tests/format/flow-repo/unchecked_haste_module_vs_lib/buffer.js rename to tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/buffer.js diff --git a/tests/format/flow-repo/unchecked_haste_module_vs_lib/format.test.js b/tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/format.test.js similarity index 100% rename from tests/format/flow-repo/unchecked_haste_module_vs_lib/format.test.js rename to tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/format.test.js diff --git a/tests/format/flow-repo/unchecked_haste_module_vs_lib/test.js b/tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/test.js similarity index 100% rename from tests/format/flow-repo/unchecked_haste_module_vs_lib/test.js rename to tests/format/flow/flow-repo/unchecked_haste_module_vs_lib/test.js diff --git a/tests/format/flow-repo/unchecked_node_module_vs_lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/unchecked_node_module_vs_lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/unchecked_node_module_vs_lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/unchecked_node_module_vs_lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/unchecked_node_module_vs_lib/format.test.js b/tests/format/flow/flow-repo/unchecked_node_module_vs_lib/format.test.js similarity index 100% rename from tests/format/flow-repo/unchecked_node_module_vs_lib/format.test.js rename to tests/format/flow/flow-repo/unchecked_node_module_vs_lib/format.test.js diff --git a/tests/format/flow-repo/unchecked_node_module_vs_lib/test.js b/tests/format/flow/flow-repo/unchecked_node_module_vs_lib/test.js similarity index 100% rename from tests/format/flow-repo/unchecked_node_module_vs_lib/test.js rename to tests/format/flow/flow-repo/unchecked_node_module_vs_lib/test.js diff --git a/tests/format/flow-repo/undefined/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/undefined/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/undefined/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/undefined/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/undefined/format.test.js b/tests/format/flow/flow-repo/undefined/format.test.js similarity index 100% rename from tests/format/flow-repo/undefined/format.test.js rename to tests/format/flow/flow-repo/undefined/format.test.js diff --git a/tests/format/flow-repo/undefined/issue-518.js b/tests/format/flow/flow-repo/undefined/issue-518.js similarity index 100% rename from tests/format/flow-repo/undefined/issue-518.js rename to tests/format/flow/flow-repo/undefined/issue-518.js diff --git a/tests/format/flow-repo/undefined/undefined.js b/tests/format/flow/flow-repo/undefined/undefined.js similarity index 100% rename from tests/format/flow-repo/undefined/undefined.js rename to tests/format/flow/flow-repo/undefined/undefined.js diff --git a/tests/format/flow-repo/undefined/undefined2.js b/tests/format/flow/flow-repo/undefined/undefined2.js similarity index 100% rename from tests/format/flow-repo/undefined/undefined2.js rename to tests/format/flow/flow-repo/undefined/undefined2.js diff --git a/tests/format/flow-repo/unicode/UnicodeUtils.js b/tests/format/flow/flow-repo/unicode/UnicodeUtils.js similarity index 100% rename from tests/format/flow-repo/unicode/UnicodeUtils.js rename to tests/format/flow/flow-repo/unicode/UnicodeUtils.js diff --git a/tests/format/flow-repo/unicode/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/unicode/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/unicode/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/unicode/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/unicode/format.test.js b/tests/format/flow/flow-repo/unicode/format.test.js similarity index 100% rename from tests/format/flow-repo/unicode/format.test.js rename to tests/format/flow/flow-repo/unicode/format.test.js diff --git a/tests/format/flow-repo/union-intersection/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/union-intersection/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/union-intersection/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/union-intersection/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/union-intersection/format.test.js b/tests/format/flow/flow-repo/union-intersection/format.test.js similarity index 100% rename from tests/format/flow-repo/union-intersection/format.test.js rename to tests/format/flow/flow-repo/union-intersection/format.test.js diff --git a/tests/format/flow-repo/union-intersection/gen_big_disjoint_union.js b/tests/format/flow/flow-repo/union-intersection/gen_big_disjoint_union.js similarity index 100% rename from tests/format/flow-repo/union-intersection/gen_big_disjoint_union.js rename to tests/format/flow/flow-repo/union-intersection/gen_big_disjoint_union.js diff --git a/tests/format/flow-repo/union-intersection/test.js b/tests/format/flow/flow-repo/union-intersection/test.js similarity index 100% rename from tests/format/flow-repo/union-intersection/test.js rename to tests/format/flow/flow-repo/union-intersection/test.js diff --git a/tests/format/flow-repo/union/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/union/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/union/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/union/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/union/blowup.js b/tests/format/flow/flow-repo/union/blowup.js similarity index 100% rename from tests/format/flow-repo/union/blowup.js rename to tests/format/flow/flow-repo/union/blowup.js diff --git a/tests/format/flow-repo/union/fields.js b/tests/format/flow/flow-repo/union/fields.js similarity index 100% rename from tests/format/flow-repo/union/fields.js rename to tests/format/flow/flow-repo/union/fields.js diff --git a/tests/format/flow-repo/union/fields2.js b/tests/format/flow/flow-repo/union/fields2.js similarity index 100% rename from tests/format/flow-repo/union/fields2.js rename to tests/format/flow/flow-repo/union/fields2.js diff --git a/tests/format/flow-repo/union/format.test.js b/tests/format/flow/flow-repo/union/format.test.js similarity index 100% rename from tests/format/flow-repo/union/format.test.js rename to tests/format/flow/flow-repo/union/format.test.js diff --git a/tests/format/flow-repo/union/issue-17.js b/tests/format/flow/flow-repo/union/issue-17.js similarity index 100% rename from tests/format/flow-repo/union/issue-17.js rename to tests/format/flow/flow-repo/union/issue-17.js diff --git a/tests/format/flow-repo/union/issue-198.js b/tests/format/flow/flow-repo/union/issue-198.js similarity index 100% rename from tests/format/flow-repo/union/issue-198.js rename to tests/format/flow/flow-repo/union/issue-198.js diff --git a/tests/format/flow-repo/union/issue-256.js b/tests/format/flow/flow-repo/union/issue-256.js similarity index 100% rename from tests/format/flow-repo/union/issue-256.js rename to tests/format/flow/flow-repo/union/issue-256.js diff --git a/tests/format/flow-repo/union/issue-323-lib.js b/tests/format/flow/flow-repo/union/issue-323-lib.js similarity index 100% rename from tests/format/flow-repo/union/issue-323-lib.js rename to tests/format/flow/flow-repo/union/issue-323-lib.js diff --git a/tests/format/flow-repo/union/issue-323.js b/tests/format/flow/flow-repo/union/issue-323.js similarity index 100% rename from tests/format/flow-repo/union/issue-323.js rename to tests/format/flow/flow-repo/union/issue-323.js diff --git a/tests/format/flow-repo/union/issue-324.js b/tests/format/flow/flow-repo/union/issue-324.js similarity index 100% rename from tests/format/flow-repo/union/issue-324.js rename to tests/format/flow/flow-repo/union/issue-324.js diff --git a/tests/format/flow-repo/union/issue-325.js b/tests/format/flow/flow-repo/union/issue-325.js similarity index 100% rename from tests/format/flow-repo/union/issue-325.js rename to tests/format/flow/flow-repo/union/issue-325.js diff --git a/tests/format/flow-repo/union/issue-326.js b/tests/format/flow/flow-repo/union/issue-326.js similarity index 100% rename from tests/format/flow-repo/union/issue-326.js rename to tests/format/flow/flow-repo/union/issue-326.js diff --git a/tests/format/flow-repo/union/issue-582.js b/tests/format/flow/flow-repo/union/issue-582.js similarity index 100% rename from tests/format/flow-repo/union/issue-582.js rename to tests/format/flow/flow-repo/union/issue-582.js diff --git a/tests/format/flow-repo/union/issue-963.js b/tests/format/flow/flow-repo/union/issue-963.js similarity index 100% rename from tests/format/flow-repo/union/issue-963.js rename to tests/format/flow/flow-repo/union/issue-963.js diff --git a/tests/format/flow-repo/union/test-lib.js b/tests/format/flow/flow-repo/union/test-lib.js similarity index 100% rename from tests/format/flow-repo/union/test-lib.js rename to tests/format/flow/flow-repo/union/test-lib.js diff --git a/tests/format/flow-repo/union/test.js b/tests/format/flow/flow-repo/union/test.js similarity index 100% rename from tests/format/flow-repo/union/test.js rename to tests/format/flow/flow-repo/union/test.js diff --git a/tests/format/flow-repo/union/type-app.js b/tests/format/flow/flow-repo/union/type-app.js similarity index 100% rename from tests/format/flow-repo/union/type-app.js rename to tests/format/flow/flow-repo/union/type-app.js diff --git a/tests/format/flow-repo/union/union.js b/tests/format/flow/flow-repo/union/union.js similarity index 100% rename from tests/format/flow-repo/union/union.js rename to tests/format/flow/flow-repo/union/union.js diff --git a/tests/format/flow-repo/union/yuge.js b/tests/format/flow/flow-repo/union/yuge.js similarity index 100% rename from tests/format/flow-repo/union/yuge.js rename to tests/format/flow/flow-repo/union/yuge.js diff --git a/tests/format/flow-repo/union_new/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/union_new/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/union_new/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/union_new/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/union_new/format.test.js b/tests/format/flow/flow-repo/union_new/format.test.js similarity index 100% rename from tests/format/flow-repo/union_new/format.test.js rename to tests/format/flow/flow-repo/union_new/format.test.js diff --git a/tests/format/flow-repo/union_new/issue-1349.js b/tests/format/flow/flow-repo/union_new/issue-1349.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1349.js rename to tests/format/flow/flow-repo/union_new/issue-1349.js diff --git a/tests/format/flow-repo/union_new/issue-1371.js b/tests/format/flow/flow-repo/union_new/issue-1371.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1371.js rename to tests/format/flow/flow-repo/union_new/issue-1371.js diff --git a/tests/format/flow-repo/union_new/issue-1455-helper.js b/tests/format/flow/flow-repo/union_new/issue-1455-helper.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1455-helper.js rename to tests/format/flow/flow-repo/union_new/issue-1455-helper.js diff --git a/tests/format/flow-repo/union_new/issue-1455.js b/tests/format/flow/flow-repo/union_new/issue-1455.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1455.js rename to tests/format/flow/flow-repo/union_new/issue-1455.js diff --git a/tests/format/flow-repo/union_new/issue-1462-i.js b/tests/format/flow/flow-repo/union_new/issue-1462-i.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1462-i.js rename to tests/format/flow/flow-repo/union_new/issue-1462-i.js diff --git a/tests/format/flow-repo/union_new/issue-1462-ii.js b/tests/format/flow/flow-repo/union_new/issue-1462-ii.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1462-ii.js rename to tests/format/flow/flow-repo/union_new/issue-1462-ii.js diff --git a/tests/format/flow-repo/union_new/issue-1664.js b/tests/format/flow/flow-repo/union_new/issue-1664.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1664.js rename to tests/format/flow/flow-repo/union_new/issue-1664.js diff --git a/tests/format/flow-repo/union_new/issue-1759.js b/tests/format/flow/flow-repo/union_new/issue-1759.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-1759.js rename to tests/format/flow/flow-repo/union_new/issue-1759.js diff --git a/tests/format/flow-repo/union_new/issue-2232.js b/tests/format/flow/flow-repo/union_new/issue-2232.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-2232.js rename to tests/format/flow/flow-repo/union_new/issue-2232.js diff --git a/tests/format/flow-repo/union_new/issue-815.js b/tests/format/flow/flow-repo/union_new/issue-815.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-815.js rename to tests/format/flow/flow-repo/union_new/issue-815.js diff --git a/tests/format/flow-repo/union_new/issue-824-helper.js b/tests/format/flow/flow-repo/union_new/issue-824-helper.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-824-helper.js rename to tests/format/flow/flow-repo/union_new/issue-824-helper.js diff --git a/tests/format/flow-repo/union_new/issue-824.js b/tests/format/flow/flow-repo/union_new/issue-824.js similarity index 100% rename from tests/format/flow-repo/union_new/issue-824.js rename to tests/format/flow/flow-repo/union_new/issue-824.js diff --git a/tests/format/flow-repo/union_new/lib/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/union_new/lib/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/union_new/lib/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/union_new/lib/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/union_new/lib/format.test.js b/tests/format/flow/flow-repo/union_new/lib/format.test.js similarity index 100% rename from tests/format/flow-repo/union_new/lib/format.test.js rename to tests/format/flow/flow-repo/union_new/lib/format.test.js diff --git a/tests/format/flow-repo/union_new/lib/test23_lib.js b/tests/format/flow/flow-repo/union_new/lib/test23_lib.js similarity index 100% rename from tests/format/flow-repo/union_new/lib/test23_lib.js rename to tests/format/flow/flow-repo/union_new/lib/test23_lib.js diff --git a/tests/format/flow-repo/union_new/lib/test25_lib.js b/tests/format/flow/flow-repo/union_new/lib/test25_lib.js similarity index 100% rename from tests/format/flow-repo/union_new/lib/test25_lib.js rename to tests/format/flow/flow-repo/union_new/lib/test25_lib.js diff --git a/tests/format/flow-repo/union_new/lib/test32_lib.js b/tests/format/flow/flow-repo/union_new/lib/test32_lib.js similarity index 100% rename from tests/format/flow-repo/union_new/lib/test32_lib.js rename to tests/format/flow/flow-repo/union_new/lib/test32_lib.js diff --git a/tests/format/flow-repo/union_new/test1.js b/tests/format/flow/flow-repo/union_new/test1.js similarity index 100% rename from tests/format/flow-repo/union_new/test1.js rename to tests/format/flow/flow-repo/union_new/test1.js diff --git a/tests/format/flow-repo/union_new/test10.js b/tests/format/flow/flow-repo/union_new/test10.js similarity index 100% rename from tests/format/flow-repo/union_new/test10.js rename to tests/format/flow/flow-repo/union_new/test10.js diff --git a/tests/format/flow-repo/union_new/test11.js b/tests/format/flow/flow-repo/union_new/test11.js similarity index 100% rename from tests/format/flow-repo/union_new/test11.js rename to tests/format/flow/flow-repo/union_new/test11.js diff --git a/tests/format/flow-repo/union_new/test12.js b/tests/format/flow/flow-repo/union_new/test12.js similarity index 100% rename from tests/format/flow-repo/union_new/test12.js rename to tests/format/flow/flow-repo/union_new/test12.js diff --git a/tests/format/flow-repo/union_new/test13.js b/tests/format/flow/flow-repo/union_new/test13.js similarity index 100% rename from tests/format/flow-repo/union_new/test13.js rename to tests/format/flow/flow-repo/union_new/test13.js diff --git a/tests/format/flow-repo/union_new/test14.js b/tests/format/flow/flow-repo/union_new/test14.js similarity index 100% rename from tests/format/flow-repo/union_new/test14.js rename to tests/format/flow/flow-repo/union_new/test14.js diff --git a/tests/format/flow-repo/union_new/test15.js b/tests/format/flow/flow-repo/union_new/test15.js similarity index 100% rename from tests/format/flow-repo/union_new/test15.js rename to tests/format/flow/flow-repo/union_new/test15.js diff --git a/tests/format/flow-repo/union_new/test16.js b/tests/format/flow/flow-repo/union_new/test16.js similarity index 100% rename from tests/format/flow-repo/union_new/test16.js rename to tests/format/flow/flow-repo/union_new/test16.js diff --git a/tests/format/flow-repo/union_new/test17.js b/tests/format/flow/flow-repo/union_new/test17.js similarity index 100% rename from tests/format/flow-repo/union_new/test17.js rename to tests/format/flow/flow-repo/union_new/test17.js diff --git a/tests/format/flow-repo/union_new/test18.js b/tests/format/flow/flow-repo/union_new/test18.js similarity index 100% rename from tests/format/flow-repo/union_new/test18.js rename to tests/format/flow/flow-repo/union_new/test18.js diff --git a/tests/format/flow-repo/union_new/test19.js b/tests/format/flow/flow-repo/union_new/test19.js similarity index 100% rename from tests/format/flow-repo/union_new/test19.js rename to tests/format/flow/flow-repo/union_new/test19.js diff --git a/tests/format/flow-repo/union_new/test2.js b/tests/format/flow/flow-repo/union_new/test2.js similarity index 100% rename from tests/format/flow-repo/union_new/test2.js rename to tests/format/flow/flow-repo/union_new/test2.js diff --git a/tests/format/flow-repo/union_new/test20.js b/tests/format/flow/flow-repo/union_new/test20.js similarity index 100% rename from tests/format/flow-repo/union_new/test20.js rename to tests/format/flow/flow-repo/union_new/test20.js diff --git a/tests/format/flow-repo/union_new/test21.js b/tests/format/flow/flow-repo/union_new/test21.js similarity index 100% rename from tests/format/flow-repo/union_new/test21.js rename to tests/format/flow/flow-repo/union_new/test21.js diff --git a/tests/format/flow-repo/union_new/test22.js b/tests/format/flow/flow-repo/union_new/test22.js similarity index 100% rename from tests/format/flow-repo/union_new/test22.js rename to tests/format/flow/flow-repo/union_new/test22.js diff --git a/tests/format/flow-repo/union_new/test23.js b/tests/format/flow/flow-repo/union_new/test23.js similarity index 100% rename from tests/format/flow-repo/union_new/test23.js rename to tests/format/flow/flow-repo/union_new/test23.js diff --git a/tests/format/flow-repo/union_new/test24.js b/tests/format/flow/flow-repo/union_new/test24.js similarity index 100% rename from tests/format/flow-repo/union_new/test24.js rename to tests/format/flow/flow-repo/union_new/test24.js diff --git a/tests/format/flow-repo/union_new/test25.js b/tests/format/flow/flow-repo/union_new/test25.js similarity index 100% rename from tests/format/flow-repo/union_new/test25.js rename to tests/format/flow/flow-repo/union_new/test25.js diff --git a/tests/format/flow-repo/union_new/test26.js b/tests/format/flow/flow-repo/union_new/test26.js similarity index 100% rename from tests/format/flow-repo/union_new/test26.js rename to tests/format/flow/flow-repo/union_new/test26.js diff --git a/tests/format/flow-repo/union_new/test27.js b/tests/format/flow/flow-repo/union_new/test27.js similarity index 100% rename from tests/format/flow-repo/union_new/test27.js rename to tests/format/flow/flow-repo/union_new/test27.js diff --git a/tests/format/flow-repo/union_new/test29.js b/tests/format/flow/flow-repo/union_new/test29.js similarity index 100% rename from tests/format/flow-repo/union_new/test29.js rename to tests/format/flow/flow-repo/union_new/test29.js diff --git a/tests/format/flow-repo/union_new/test3.js b/tests/format/flow/flow-repo/union_new/test3.js similarity index 100% rename from tests/format/flow-repo/union_new/test3.js rename to tests/format/flow/flow-repo/union_new/test3.js diff --git a/tests/format/flow-repo/union_new/test30-helper.js b/tests/format/flow/flow-repo/union_new/test30-helper.js similarity index 100% rename from tests/format/flow-repo/union_new/test30-helper.js rename to tests/format/flow/flow-repo/union_new/test30-helper.js diff --git a/tests/format/flow-repo/union_new/test30.js b/tests/format/flow/flow-repo/union_new/test30.js similarity index 100% rename from tests/format/flow-repo/union_new/test30.js rename to tests/format/flow/flow-repo/union_new/test30.js diff --git a/tests/format/flow-repo/union_new/test31.js b/tests/format/flow/flow-repo/union_new/test31.js similarity index 100% rename from tests/format/flow-repo/union_new/test31.js rename to tests/format/flow/flow-repo/union_new/test31.js diff --git a/tests/format/flow-repo/union_new/test32.js b/tests/format/flow/flow-repo/union_new/test32.js similarity index 100% rename from tests/format/flow-repo/union_new/test32.js rename to tests/format/flow/flow-repo/union_new/test32.js diff --git a/tests/format/flow-repo/union_new/test4.js b/tests/format/flow/flow-repo/union_new/test4.js similarity index 100% rename from tests/format/flow-repo/union_new/test4.js rename to tests/format/flow/flow-repo/union_new/test4.js diff --git a/tests/format/flow-repo/union_new/test5.js b/tests/format/flow/flow-repo/union_new/test5.js similarity index 100% rename from tests/format/flow-repo/union_new/test5.js rename to tests/format/flow/flow-repo/union_new/test5.js diff --git a/tests/format/flow-repo/union_new/test6.js b/tests/format/flow/flow-repo/union_new/test6.js similarity index 100% rename from tests/format/flow-repo/union_new/test6.js rename to tests/format/flow/flow-repo/union_new/test6.js diff --git a/tests/format/flow-repo/union_new/test7.js b/tests/format/flow/flow-repo/union_new/test7.js similarity index 100% rename from tests/format/flow-repo/union_new/test7.js rename to tests/format/flow/flow-repo/union_new/test7.js diff --git a/tests/format/flow-repo/union_new/test8.js b/tests/format/flow/flow-repo/union_new/test8.js similarity index 100% rename from tests/format/flow-repo/union_new/test8.js rename to tests/format/flow/flow-repo/union_new/test8.js diff --git a/tests/format/flow-repo/union_new/test9.js b/tests/format/flow/flow-repo/union_new/test9.js similarity index 100% rename from tests/format/flow-repo/union_new/test9.js rename to tests/format/flow/flow-repo/union_new/test9.js diff --git a/tests/format/flow-repo/unreachable/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/unreachable/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/unreachable/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/unreachable/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/unreachable/format.test.js b/tests/format/flow/flow-repo/unreachable/format.test.js similarity index 100% rename from tests/format/flow-repo/unreachable/format.test.js rename to tests/format/flow/flow-repo/unreachable/format.test.js diff --git a/tests/format/flow-repo/unreachable/typecheck.js b/tests/format/flow/flow-repo/unreachable/typecheck.js similarity index 100% rename from tests/format/flow-repo/unreachable/typecheck.js rename to tests/format/flow/flow-repo/unreachable/typecheck.js diff --git a/tests/format/flow-repo/unreachable/unreachable.js b/tests/format/flow/flow-repo/unreachable/unreachable.js similarity index 100% rename from tests/format/flow-repo/unreachable/unreachable.js rename to tests/format/flow/flow-repo/unreachable/unreachable.js diff --git a/tests/format/flow-repo/unused_function_args/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/unused_function_args/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/unused_function_args/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/unused_function_args/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/unused_function_args/format.test.js b/tests/format/flow/flow-repo/unused_function_args/format.test.js similarity index 100% rename from tests/format/flow-repo/unused_function_args/format.test.js rename to tests/format/flow/flow-repo/unused_function_args/format.test.js diff --git a/tests/format/flow-repo/unused_function_args/test.js b/tests/format/flow/flow-repo/unused_function_args/test.js similarity index 100% rename from tests/format/flow-repo/unused_function_args/test.js rename to tests/format/flow/flow-repo/unused_function_args/test.js diff --git a/tests/format/flow-repo/value/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/value/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/value/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/value/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/value/format.test.js b/tests/format/flow/flow-repo/value/format.test.js similarity index 100% rename from tests/format/flow-repo/value/format.test.js rename to tests/format/flow/flow-repo/value/format.test.js diff --git a/tests/format/flow-repo/value/value.js b/tests/format/flow/flow-repo/value/value.js similarity index 100% rename from tests/format/flow-repo/value/value.js rename to tests/format/flow/flow-repo/value/value.js diff --git a/tests/format/flow-repo/vim_emacs_errors/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/vim_emacs_errors/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/vim_emacs_errors/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/vim_emacs_errors/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/vim_emacs_errors/format.test.js b/tests/format/flow/flow-repo/vim_emacs_errors/format.test.js similarity index 100% rename from tests/format/flow-repo/vim_emacs_errors/format.test.js rename to tests/format/flow/flow-repo/vim_emacs_errors/format.test.js diff --git a/tests/format/flow-repo/vim_emacs_errors/test.js b/tests/format/flow/flow-repo/vim_emacs_errors/test.js similarity index 100% rename from tests/format/flow-repo/vim_emacs_errors/test.js rename to tests/format/flow/flow-repo/vim_emacs_errors/test.js diff --git a/tests/format/flow-repo/weakmode/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/weakmode/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/weakmode/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/weakmode/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/weakmode/format.test.js b/tests/format/flow/flow-repo/weakmode/format.test.js similarity index 100% rename from tests/format/flow-repo/weakmode/format.test.js rename to tests/format/flow/flow-repo/weakmode/format.test.js diff --git a/tests/format/flow-repo/weakmode/should_fail_without_weak.js b/tests/format/flow/flow-repo/weakmode/should_fail_without_weak.js similarity index 100% rename from tests/format/flow-repo/weakmode/should_fail_without_weak.js rename to tests/format/flow/flow-repo/weakmode/should_fail_without_weak.js diff --git a/tests/format/flow-repo/weakmode/should_pass_with_weak.js b/tests/format/flow/flow-repo/weakmode/should_pass_with_weak.js similarity index 100% rename from tests/format/flow-repo/weakmode/should_pass_with_weak.js rename to tests/format/flow/flow-repo/weakmode/should_pass_with_weak.js diff --git a/tests/format/flow-repo/while/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/while/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/while/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/while/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/while/abnormal.js b/tests/format/flow/flow-repo/while/abnormal.js similarity index 100% rename from tests/format/flow-repo/while/abnormal.js rename to tests/format/flow/flow-repo/while/abnormal.js diff --git a/tests/format/flow-repo/while/format.test.js b/tests/format/flow/flow-repo/while/format.test.js similarity index 100% rename from tests/format/flow-repo/while/format.test.js rename to tests/format/flow/flow-repo/while/format.test.js diff --git a/tests/format/flow-repo/while/test.js b/tests/format/flow/flow-repo/while/test.js similarity index 100% rename from tests/format/flow-repo/while/test.js rename to tests/format/flow/flow-repo/while/test.js diff --git a/tests/format/flow-repo/window/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/window/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/window/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/window/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/window/format.test.js b/tests/format/flow/flow-repo/window/format.test.js similarity index 100% rename from tests/format/flow-repo/window/format.test.js rename to tests/format/flow/flow-repo/window/format.test.js diff --git a/tests/format/flow-repo/window/window1.js b/tests/format/flow/flow-repo/window/window1.js similarity index 100% rename from tests/format/flow-repo/window/window1.js rename to tests/format/flow/flow-repo/window/window1.js diff --git a/tests/format/flow-repo/window/window2.js b/tests/format/flow/flow-repo/window/window2.js similarity index 100% rename from tests/format/flow-repo/window/window2.js rename to tests/format/flow/flow-repo/window/window2.js diff --git a/tests/format/flow-repo/x/XControllerURIBuilder.js b/tests/format/flow/flow-repo/x/XControllerURIBuilder.js similarity index 100% rename from tests/format/flow-repo/x/XControllerURIBuilder.js rename to tests/format/flow/flow-repo/x/XControllerURIBuilder.js diff --git a/tests/format/flow-repo/x/__snapshots__/format.test.js.snap b/tests/format/flow/flow-repo/x/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/flow-repo/x/__snapshots__/format.test.js.snap rename to tests/format/flow/flow-repo/x/__snapshots__/format.test.js.snap diff --git a/tests/format/flow-repo/x/format.test.js b/tests/format/flow/flow-repo/x/format.test.js similarity index 100% rename from tests/format/flow-repo/x/format.test.js rename to tests/format/flow/flow-repo/x/format.test.js diff --git a/tests/format/filename-matters/flow-ambient/__snapshots__/format.test.js.snap b/tests/format/misc/filename-matters/flow-ambient/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/filename-matters/flow-ambient/__snapshots__/format.test.js.snap rename to tests/format/misc/filename-matters/flow-ambient/__snapshots__/format.test.js.snap diff --git a/tests/format/filename-matters/flow-ambient/ambient.js.flow b/tests/format/misc/filename-matters/flow-ambient/ambient.js.flow similarity index 100% rename from tests/format/filename-matters/flow-ambient/ambient.js.flow rename to tests/format/misc/filename-matters/flow-ambient/ambient.js.flow diff --git a/tests/format/filename-matters/flow-ambient/format.test.js b/tests/format/misc/filename-matters/flow-ambient/format.test.js similarity index 100% rename from tests/format/filename-matters/flow-ambient/format.test.js rename to tests/format/misc/filename-matters/flow-ambient/format.test.js diff --git a/tests/format/filename-matters/html-doctype/__snapshots__/format.test.js.snap b/tests/format/misc/filename-matters/html-doctype/__snapshots__/format.test.js.snap similarity index 100% rename from tests/format/filename-matters/html-doctype/__snapshots__/format.test.js.snap rename to tests/format/misc/filename-matters/html-doctype/__snapshots__/format.test.js.snap diff --git a/tests/format/filename-matters/html-doctype/format.test.js b/tests/format/misc/filename-matters/html-doctype/format.test.js similarity index 100% rename from tests/format/filename-matters/html-doctype/format.test.js rename to tests/format/misc/filename-matters/html-doctype/format.test.js diff --git a/tests/format/filename-matters/html-doctype/xhtml-doctype.xhtml b/tests/format/misc/filename-matters/html-doctype/xhtml-doctype.xhtml similarity index 100% rename from tests/format/filename-matters/html-doctype/xhtml-doctype.xhtml rename to tests/format/misc/filename-matters/html-doctype/xhtml-doctype.xhtml