diff --git a/test/language/module-code/dynamic-import/assign-expr-get-value-abrupt-throws.js b/test/language/expressions/dynamic-import/assign-expr-get-value-abrupt-throws.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr-get-value-abrupt-throws.js
rename to test/language/expressions/dynamic-import/assign-expr-get-value-abrupt-throws.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/additive-expr.js b/test/language/expressions/dynamic-import/assign-expr/additive-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/additive-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/additive-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/array-literal.js b/test/language/expressions/dynamic-import/assign-expr/array-literal.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/array-literal.js
rename to test/language/expressions/dynamic-import/assign-expr/array-literal.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/arrow-function.js b/test/language/expressions/dynamic-import/assign-expr/arrow-function.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/arrow-function.js
rename to test/language/expressions/dynamic-import/assign-expr/arrow-function.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/await-expr.js b/test/language/expressions/dynamic-import/assign-expr/await-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/await-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/await-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/await-identifier.js b/test/language/expressions/dynamic-import/assign-expr/await-identifier.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/await-identifier.js
rename to test/language/expressions/dynamic-import/assign-expr/await-identifier.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/call-expr-arguments.js b/test/language/expressions/dynamic-import/assign-expr/call-expr-arguments.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/call-expr-arguments.js
rename to test/language/expressions/dynamic-import/assign-expr/call-expr-arguments.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/call-expr-expr.js b/test/language/expressions/dynamic-import/assign-expr/call-expr-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/call-expr-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/call-expr-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/call-expr-identifier.js b/test/language/expressions/dynamic-import/assign-expr/call-expr-identifier.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/call-expr-identifier.js
rename to test/language/expressions/dynamic-import/assign-expr/call-expr-identifier.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/cover-call-expr.js b/test/language/expressions/dynamic-import/assign-expr/cover-call-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/cover-call-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/cover-call-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/cover-parenthesized-expr.js b/test/language/expressions/dynamic-import/assign-expr/cover-parenthesized-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/cover-parenthesized-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/cover-parenthesized-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/identifier.js b/test/language/expressions/dynamic-import/assign-expr/identifier.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/identifier.js
rename to test/language/expressions/dynamic-import/assign-expr/identifier.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js b/test/language/expressions/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/lhs-eq-assign-expr.js b/test/language/expressions/dynamic-import/assign-expr/lhs-eq-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/lhs-eq-assign-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/lhs-eq-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/logical-and-expr.js b/test/language/expressions/dynamic-import/assign-expr/logical-and-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/logical-and-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/logical-and-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/logical-or-expr.js b/test/language/expressions/dynamic-import/assign-expr/logical-or-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/logical-or-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/logical-or-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/member-expr.js b/test/language/expressions/dynamic-import/assign-expr/member-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/member-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/member-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/module-code-other_FIXTURE.js b/test/language/expressions/dynamic-import/assign-expr/module-code-other_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/module-code-other_FIXTURE.js
rename to test/language/expressions/dynamic-import/assign-expr/module-code-other_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/assign-expr/module-code_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/module-code_FIXTURE.js
rename to test/language/expressions/dynamic-import/assign-expr/module-code_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/new-target.js b/test/language/expressions/dynamic-import/assign-expr/new-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/new-target.js
rename to test/language/expressions/dynamic-import/assign-expr/new-target.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/object-literal.js b/test/language/expressions/dynamic-import/assign-expr/object-literal.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/object-literal.js
rename to test/language/expressions/dynamic-import/assign-expr/object-literal.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/tagged-function-call.js b/test/language/expressions/dynamic-import/assign-expr/tagged-function-call.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/tagged-function-call.js
rename to test/language/expressions/dynamic-import/assign-expr/tagged-function-call.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/ternary.js b/test/language/expressions/dynamic-import/assign-expr/ternary.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/ternary.js
rename to test/language/expressions/dynamic-import/assign-expr/ternary.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/this.js b/test/language/expressions/dynamic-import/assign-expr/this.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/this.js
rename to test/language/expressions/dynamic-import/assign-expr/this.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/unary-expr.js b/test/language/expressions/dynamic-import/assign-expr/unary-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/unary-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/unary-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-assign-expr.js b/test/language/expressions/dynamic-import/assign-expr/yield-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/yield-assign-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/yield-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-expr.js b/test/language/expressions/dynamic-import/assign-expr/yield-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/yield-expr.js
rename to test/language/expressions/dynamic-import/assign-expr/yield-expr.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-identifier.js b/test/language/expressions/dynamic-import/assign-expr/yield-identifier.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/yield-identifier.js
rename to test/language/expressions/dynamic-import/assign-expr/yield-identifier.js
diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-star.js b/test/language/expressions/dynamic-import/assign-expr/yield-star.js
similarity index 100%
rename from test/language/module-code/dynamic-import/assign-expr/yield-star.js
rename to test/language/expressions/dynamic-import/assign-expr/yield-star.js
diff --git a/test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js b/test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js b/test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-function-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-function-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-do-while-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-do-while-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/catch/script-code_FIXTURE.js b/test/language/expressions/dynamic-import/catch/script-code_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/script-code_FIXTURE.js
rename to test/language/expressions/dynamic-import/catch/script-code_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js
diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js
similarity index 100%
rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js
rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js
diff --git a/test/language/module-code/dynamic-import/dynamic-import-module_FIXTURE.js b/test/language/expressions/dynamic-import/dynamic-import-module_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/dynamic-import-module_FIXTURE.js
rename to test/language/expressions/dynamic-import/dynamic-import-module_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/empty_FIXTURE.js b/test/language/expressions/dynamic-import/empty_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/empty_FIXTURE.js
rename to test/language/expressions/dynamic-import/empty_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-cls-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-cls-anon.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-cls-anon.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-cls-anon.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-cls-name-meth.js b/test/language/expressions/dynamic-import/eval-export-dflt-cls-name-meth.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-cls-name-meth.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-cls-name-meth.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-cls-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-cls-named.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-cls-named.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-cls-named.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-anon.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-anon.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-anon.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-name-meth.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-name-meth.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-name-meth.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-name-meth.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-named.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-named.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-named.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-anon.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-anon.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-anon.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-named.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-named.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-named.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-anon.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-anon.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-anon.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-named.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-named.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-named.js
diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-in.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-in.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-in.js
rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-in.js
diff --git a/test/language/module-code/dynamic-import/eval-rqstd-once.js b/test/language/expressions/dynamic-import/eval-rqstd-once.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-rqstd-once.js
rename to test/language/expressions/dynamic-import/eval-rqstd-once.js
diff --git a/test/language/module-code/dynamic-import/eval-rqstd-once_FIXTURE.js b/test/language/expressions/dynamic-import/eval-rqstd-once_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-rqstd-once_FIXTURE.js
rename to test/language/expressions/dynamic-import/eval-rqstd-once_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/eval-self-once-module.js b/test/language/expressions/dynamic-import/eval-self-once-module.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-self-once-module.js
rename to test/language/expressions/dynamic-import/eval-self-once-module.js
diff --git a/test/language/module-code/dynamic-import/eval-self-once-script.js b/test/language/expressions/dynamic-import/eval-self-once-script.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-self-once-script.js
rename to test/language/expressions/dynamic-import/eval-self-once-script.js
diff --git a/test/language/module-code/dynamic-import/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/module-code_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/module-code_FIXTURE.js
rename to test/language/expressions/dynamic-import/module-code_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-Symbol-toStringTag.js b/test/language/expressions/dynamic-import/ns/await-ns-Symbol-toStringTag.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-Symbol-toStringTag.js
rename to test/language/expressions/dynamic-import/ns/await-ns-Symbol-toStringTag.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-define-own-property.js b/test/language/expressions/dynamic-import/ns/await-ns-define-own-property.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-define-own-property.js
rename to test/language/expressions/dynamic-import/ns/await-ns-define-own-property.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-extensible.js b/test/language/expressions/dynamic-import/ns/await-ns-extensible.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-extensible.js
rename to test/language/expressions/dynamic-import/ns/await-ns-extensible.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js b/test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js b/test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js b/test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-found-init.js b/test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-found-init.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-found-init.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-found-init.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-not-found.js b/test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-not-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-own-property-sym.js b/test/language/expressions/dynamic-import/ns/await-ns-get-own-property-sym.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-own-property-sym.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-own-property-sym.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-str-found.js b/test/language/expressions/dynamic-import/ns/await-ns-get-str-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-str-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-str-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-str-not-found.js b/test/language/expressions/dynamic-import/ns/await-ns-get-str-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-str-not-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-str-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-sym-found.js b/test/language/expressions/dynamic-import/ns/await-ns-get-sym-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-sym-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-sym-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-sym-not-found.js b/test/language/expressions/dynamic-import/ns/await-ns-get-sym-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-get-sym-not-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-get-sym-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-str-found-init.js b/test/language/expressions/dynamic-import/ns/await-ns-has-property-str-found-init.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-str-found-init.js
rename to test/language/expressions/dynamic-import/ns/await-ns-has-property-str-found-init.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-str-not-found.js b/test/language/expressions/dynamic-import/ns/await-ns-has-property-str-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-str-not-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-has-property-str-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-found.js b/test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-not-found.js b/test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-not-found.js
rename to test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-no-iterator.js b/test/language/expressions/dynamic-import/ns/await-ns-no-iterator.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-no-iterator.js
rename to test/language/expressions/dynamic-import/ns/await-ns-no-iterator.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-own-property-keys-sort.js b/test/language/expressions/dynamic-import/ns/await-ns-own-property-keys-sort.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-own-property-keys-sort.js
rename to test/language/expressions/dynamic-import/ns/await-ns-own-property-keys-sort.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-object.js b/test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-object.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-object.js
rename to test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-object.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-reflect.js b/test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-reflect.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-reflect.js
rename to test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-reflect.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prop-descs.js b/test/language/expressions/dynamic-import/ns/await-ns-prop-descs.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-prop-descs.js
rename to test/language/expressions/dynamic-import/ns/await-ns-prop-descs.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prototype.js b/test/language/expressions/dynamic-import/ns/await-ns-prototype.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-prototype.js
rename to test/language/expressions/dynamic-import/ns/await-ns-prototype.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-no-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-set-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-set-no-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-set-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of-null.js b/test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of-null.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of-null.js
rename to test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of-null.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of.js b/test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of.js
rename to test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-same-values-no-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-set-same-values-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-set-same-values-no-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-set-same-values-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-same-values-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-set-same-values-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-set-same-values-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-set-same-values-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-strict.js b/test/language/expressions/dynamic-import/ns/await-ns-set-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/await-ns-set-strict.js
rename to test/language/expressions/dynamic-import/ns/await-ns-set-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/default-property-not-set-own.js b/test/language/expressions/dynamic-import/ns/default-property-not-set-own.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/default-property-not-set-own.js
rename to test/language/expressions/dynamic-import/ns/default-property-not-set-own.js
diff --git a/test/language/module-code/dynamic-import/ns/define-own-property_FIXTURE.js b/test/language/expressions/dynamic-import/ns/define-own-property_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/define-own-property_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/define-own-property_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/empty_FIXTURE.js b/test/language/expressions/dynamic-import/ns/empty_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/empty_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/empty_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js b/test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/ns/module-code_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/module-code_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/module-code_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/own-keys-sort_FIXTURE.js b/test/language/expressions/dynamic-import/ns/own-keys-sort_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/own-keys-sort_FIXTURE.js
rename to test/language/expressions/dynamic-import/ns/own-keys-sort_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-define-own-property.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-define-own-property.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-define-own-property.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-define-own-property.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-extensible.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-extensible.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-extensible.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-extensible.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-sym.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-sym.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-sym.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-sym.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-not-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-not-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-not-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-not-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-no-iterator.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-no-iterator.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-no-iterator.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-no-iterator.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prop-descs.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-prop-descs.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prop-descs.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-prop-descs.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prototype.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-prototype.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prototype.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-prototype.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-no-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-set-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-no-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-set-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-strict.js
diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-strict.js b/test/language/expressions/dynamic-import/ns/promise-then-ns-set-strict.js
similarity index 100%
rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-strict.js
rename to test/language/expressions/dynamic-import/ns/promise-then-ns-set-strict.js
diff --git a/test/language/module-code/dynamic-import/returns-promise.js b/test/language/expressions/dynamic-import/returns-promise.js
similarity index 100%
rename from test/language/module-code/dynamic-import/returns-promise.js
rename to test/language/expressions/dynamic-import/returns-promise.js
diff --git a/test/language/module-code/dynamic-import/reuse-namespace-object-from-import.js b/test/language/expressions/dynamic-import/reuse-namespace-object-from-import.js
similarity index 100%
rename from test/language/module-code/dynamic-import/reuse-namespace-object-from-import.js
rename to test/language/expressions/dynamic-import/reuse-namespace-object-from-import.js
diff --git a/test/language/module-code/dynamic-import/reuse-namespace-object-from-script.js b/test/language/expressions/dynamic-import/reuse-namespace-object-from-script.js
similarity index 100%
rename from test/language/module-code/dynamic-import/reuse-namespace-object-from-script.js
rename to test/language/expressions/dynamic-import/reuse-namespace-object-from-script.js
diff --git a/test/language/module-code/dynamic-import/reuse-namespace-object.js b/test/language/expressions/dynamic-import/reuse-namespace-object.js
similarity index 100%
rename from test/language/module-code/dynamic-import/reuse-namespace-object.js
rename to test/language/expressions/dynamic-import/reuse-namespace-object.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js
rename to test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-args.js
rename to test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js
diff --git a/test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js
rename to test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/empty_FIXTURE.js b/test/language/expressions/dynamic-import/syntax/valid/empty_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/empty_FIXTURE.js
rename to test/language/expressions/dynamic-import/syntax/valid/empty_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-do-while-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-do-while-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-return-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-return-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-while-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-while-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-while-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-while-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-with-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-with-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-with-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-with-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-with-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-with-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/nested-with-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/nested-with-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js
rename to test/language/expressions/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/top-level-nested-imports.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/top-level-nested-imports.js
rename to test/language/expressions/dynamic-import/syntax/valid/top-level-nested-imports.js
diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/top-level-script-code-valid.js
similarity index 100%
rename from test/language/module-code/dynamic-import/syntax/valid/top-level-script-code-valid.js
rename to test/language/expressions/dynamic-import/syntax/valid/top-level-script-code-valid.js
diff --git a/test/language/module-code/dynamic-import/usage/dynamic-import-module_FIXTURE.js b/test/language/expressions/dynamic-import/usage/dynamic-import-module_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/dynamic-import-module_FIXTURE.js
rename to test/language/expressions/dynamic-import/usage/dynamic-import-module_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js b/test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js
rename to test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js b/test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js
rename to test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/usage/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/usage/module-code_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/module-code_FIXTURE.js
rename to test/language/expressions/dynamic-import/usage/module-code_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-function-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-function-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-function-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-function-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-do-while-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-do-while-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-do-while-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-do-while-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-do-while-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-do-while-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js
diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js
rename to test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js
diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js
rename to test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js
diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js
rename to test/language/expressions/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js
diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js
rename to test/language/expressions/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js
diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-returns-thenable.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/top-level-import-then-returns-thenable.js
rename to test/language/expressions/dynamic-import/usage/top-level-import-then-returns-thenable.js
diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-specifier-tostring.js
similarity index 100%
rename from test/language/module-code/dynamic-import/usage/top-level-import-then-specifier-tostring.js
rename to test/language/expressions/dynamic-import/usage/top-level-import-then-specifier-tostring.js