diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-abrupt.js b/test/language/expressions/class/async-gen-method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-abrupt.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/async-gen-method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-arg-val-undefined.js b/test/language/expressions/class/async-gen-method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-duplicates.js b/test/language/expressions/class/async-gen-method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-duplicates.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-ref-later.js b/test/language/expressions/class/async-gen-method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-ref-later.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-ref-prior.js b/test/language/expressions/class/async-gen-method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-ref-prior.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-ref-self.js b/test/language/expressions/class/async-gen-method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-ref-self.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-rest.js b/test/language/expressions/class/async-gen-method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-rest.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-rest.js
diff --git a/test/language/expressions/class/async-gen-meth-static/dflt-params-trailing-comma.js b/test/language/expressions/class/async-gen-method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/dflt-params-trailing-comma.js
rename to test/language/expressions/class/async-gen-method-static/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/async-gen-meth-static/params-trailing-comma-multiple.js b/test/language/expressions/class/async-gen-method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/params-trailing-comma-multiple.js
rename to test/language/expressions/class/async-gen-method-static/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/async-gen-meth-static/params-trailing-comma-single.js b/test/language/expressions/class/async-gen-method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/params-trailing-comma-single.js
rename to test/language/expressions/class/async-gen-method-static/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/async-gen-meth-static/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-gen-method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/async-gen-method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-abrupt.js b/test/language/expressions/class/async-gen-method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-abrupt.js
rename to test/language/expressions/class/async-gen-method/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/async-gen-method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/async-gen-method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-arg-val-undefined.js b/test/language/expressions/class/async-gen-method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/async-gen-method/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-duplicates.js b/test/language/expressions/class/async-gen-method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-duplicates.js
rename to test/language/expressions/class/async-gen-method/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-ref-later.js b/test/language/expressions/class/async-gen-method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-ref-later.js
rename to test/language/expressions/class/async-gen-method/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-ref-prior.js b/test/language/expressions/class/async-gen-method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-ref-prior.js
rename to test/language/expressions/class/async-gen-method/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-ref-self.js b/test/language/expressions/class/async-gen-method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-ref-self.js
rename to test/language/expressions/class/async-gen-method/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-rest.js b/test/language/expressions/class/async-gen-method/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-rest.js
rename to test/language/expressions/class/async-gen-method/dflt-params-rest.js
diff --git a/test/language/expressions/class/async-gen-meth/dflt-params-trailing-comma.js b/test/language/expressions/class/async-gen-method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/dflt-params-trailing-comma.js
rename to test/language/expressions/class/async-gen-method/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/async-gen-meth/params-trailing-comma-multiple.js b/test/language/expressions/class/async-gen-method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/params-trailing-comma-multiple.js
rename to test/language/expressions/class/async-gen-method/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/async-gen-meth/params-trailing-comma-single.js b/test/language/expressions/class/async-gen-method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/params-trailing-comma-single.js
rename to test/language/expressions/class/async-gen-method/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/async-gen-meth/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-gen-method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/async-gen-meth/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/async-gen-method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-abrupt.js b/test/language/expressions/class/async-method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-abrupt.js
rename to test/language/expressions/class/async-method-static/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/async-method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/async-method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-arg-val-undefined.js b/test/language/expressions/class/async-method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/async-method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-duplicates.js b/test/language/expressions/class/async-method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-duplicates.js
rename to test/language/expressions/class/async-method-static/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-ref-later.js b/test/language/expressions/class/async-method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-ref-later.js
rename to test/language/expressions/class/async-method-static/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-ref-prior.js b/test/language/expressions/class/async-method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-ref-prior.js
rename to test/language/expressions/class/async-method-static/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-ref-self.js b/test/language/expressions/class/async-method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-ref-self.js
rename to test/language/expressions/class/async-method-static/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-rest.js b/test/language/expressions/class/async-method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-rest.js
rename to test/language/expressions/class/async-method-static/dflt-params-rest.js
diff --git a/test/language/expressions/class/async-meth-static/dflt-params-trailing-comma.js b/test/language/expressions/class/async-method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/dflt-params-trailing-comma.js
rename to test/language/expressions/class/async-method-static/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/async-meth-static/params-trailing-comma-multiple.js b/test/language/expressions/class/async-method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/params-trailing-comma-multiple.js
rename to test/language/expressions/class/async-method-static/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/async-meth-static/params-trailing-comma-single.js b/test/language/expressions/class/async-method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/params-trailing-comma-single.js
rename to test/language/expressions/class/async-method-static/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/async-meth-static/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/async-meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/async-method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-abrupt.js b/test/language/expressions/class/async-method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-abrupt.js
rename to test/language/expressions/class/async-method/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/async-method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/async-method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-arg-val-undefined.js b/test/language/expressions/class/async-method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/async-method/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-duplicates.js b/test/language/expressions/class/async-method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-duplicates.js
rename to test/language/expressions/class/async-method/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-ref-later.js b/test/language/expressions/class/async-method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-ref-later.js
rename to test/language/expressions/class/async-method/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-ref-prior.js b/test/language/expressions/class/async-method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-ref-prior.js
rename to test/language/expressions/class/async-method/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-ref-self.js b/test/language/expressions/class/async-method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-ref-self.js
rename to test/language/expressions/class/async-method/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-rest.js b/test/language/expressions/class/async-method/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-rest.js
rename to test/language/expressions/class/async-method/dflt-params-rest.js
diff --git a/test/language/expressions/class/async-meth/dflt-params-trailing-comma.js b/test/language/expressions/class/async-method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/async-meth/dflt-params-trailing-comma.js
rename to test/language/expressions/class/async-method/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/async-meth/params-trailing-comma-multiple.js b/test/language/expressions/class/async-method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/async-meth/params-trailing-comma-multiple.js
rename to test/language/expressions/class/async-method/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/async-meth/params-trailing-comma-single.js b/test/language/expressions/class/async-method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/async-meth/params-trailing-comma-single.js
rename to test/language/expressions/class/async-method/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/async-meth/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/async-method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/async-meth/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/async-method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/await-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method-static/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/await-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/await-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/await-as-binding-identifier.js b/test/language/expressions/class/elements/async-gen-private-method-static/await-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/await-as-binding-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/await-as-binding-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/await-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/async-gen-private-method-static/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/await-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/await-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/await-as-identifier-reference.js b/test/language/expressions/class/elements/async-gen-private-method-static/await-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/await-as-identifier-reference.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/await-as-identifier-reference.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/await-as-label-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method-static/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/await-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/await-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/await-as-label-identifier.js b/test/language/expressions/class/elements/async-gen-private-method-static/await-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/await-as-label-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/await-as-label-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-as-binding-identifier.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-as-binding-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-as-binding-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-as-identifier-reference.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-as-identifier-reference.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-as-identifier-reference.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-as-label-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-as-label-identifier.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-as-label-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-as-label-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-identifier-spread-strict.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-identifier-spread-strict.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-identifier-spread-strict.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-identifier-strict.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-identifier-strict.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-identifier-strict.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-identifier-strict.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-catch.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-catch.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-catch.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-catch.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-promise-reject-next.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-promise-reject-next.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-spread-arr-multiple.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-spread-arr-multiple.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-arr-multiple.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-spread-arr-single.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-arr-single.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-spread-arr-single.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-arr-single.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-spread-obj.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-obj.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-spread-obj.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-obj.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-async-next.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-async-next.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-async-next.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-async-next.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-async-return.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-async-return.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-async-return.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-async-return.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-async-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-async-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-async-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-async-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-expr-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-expr-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-expr-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-expr-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-sync-next.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-sync-next.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-sync-next.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-sync-next.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-sync-return.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-sync-return.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-sync-return.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-sync-return.js
diff --git a/test/language/expressions/class/async-gen-private-method-static/yield-star-sync-throw.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-star-sync-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method-static/yield-star-sync-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method-static/yield-star-sync-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/await-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/await-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method/await-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method/await-as-binding-identifier.js b/test/language/expressions/class/elements/async-gen-private-method/await-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/await-as-binding-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method/await-as-binding-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method/await-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/async-gen-private-method/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/await-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method/await-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method/await-as-identifier-reference.js b/test/language/expressions/class/elements/async-gen-private-method/await-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/await-as-identifier-reference.js
rename to test/language/expressions/class/elements/async-gen-private-method/await-as-identifier-reference.js
diff --git a/test/language/expressions/class/async-gen-private-method/await-as-label-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/await-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method/await-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method/await-as-label-identifier.js b/test/language/expressions/class/elements/async-gen-private-method/await-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/await-as-label-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method/await-as-label-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-as-binding-identifier.js b/test/language/expressions/class/elements/async-gen-private-method/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-as-binding-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-as-binding-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/async-gen-private-method/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-as-identifier-reference.js b/test/language/expressions/class/elements/async-gen-private-method/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-as-identifier-reference.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-as-identifier-reference.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-as-label-identifier-escaped.js b/test/language/expressions/class/elements/async-gen-private-method/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-as-label-identifier.js b/test/language/expressions/class/elements/async-gen-private-method/yield-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-as-label-identifier.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-as-label-identifier.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-identifier-spread-strict.js b/test/language/expressions/class/elements/async-gen-private-method/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-identifier-spread-strict.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-identifier-spread-strict.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-identifier-strict.js b/test/language/expressions/class/elements/async-gen-private-method/yield-identifier-strict.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-identifier-strict.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-identifier-strict.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-catch.js b/test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-catch.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-catch.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-catch.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js b/test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js b/test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js b/test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js b/test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-promise-reject-next.js b/test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-promise-reject-next.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-promise-reject-next.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-spread-arr-multiple.js b/test/language/expressions/class/elements/async-gen-private-method/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-spread-arr-multiple.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-spread-arr-multiple.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-spread-arr-single.js b/test/language/expressions/class/elements/async-gen-private-method/yield-spread-arr-single.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-spread-arr-single.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-spread-arr-single.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-spread-obj.js b/test/language/expressions/class/elements/async-gen-private-method/yield-spread-obj.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-spread-obj.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-spread-obj.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-async-next.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-async-next.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-async-next.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-async-next.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-async-return.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-async-return.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-async-return.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-async-return.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-async-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-async-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-async-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-async-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-expr-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-expr-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-expr-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-expr-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-call-done-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-call-done-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-call-done-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-call-done-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-call-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-call-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-call-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-call-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-call-value-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-call-value-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-call-value-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-call-value-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-non-object-ignores-then.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-non-object-ignores-then.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-non-object-ignores-then.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-non-object-ignores-then.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-null-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-null-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-null-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-null-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-number-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-number-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-number-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-number-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-object-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-object-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-object-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-object-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-string-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-string-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-string-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-string-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-get-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-get-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-get-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-get-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-next-then-returns-abrupt.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-returns-abrupt.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-next-then-returns-abrupt.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-next-then-returns-abrupt.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-sync-next.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-sync-next.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-sync-next.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-sync-next.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-sync-return.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-sync-return.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-sync-return.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-sync-return.js
diff --git a/test/language/expressions/class/async-gen-private-method/yield-star-sync-throw.js b/test/language/expressions/class/elements/async-gen-private-method/yield-star-sync-throw.js
similarity index 100%
rename from test/language/expressions/class/async-gen-private-method/yield-star-sync-throw.js
rename to test/language/expressions/class/elements/async-gen-private-method/yield-star-sync-throw.js
diff --git a/test/language/expressions/class/async-private-method-static/await-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/async-private-method-static/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-private-method-static/await-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/async-private-method-static/await-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/async-private-method-static/await-as-binding-identifier.js b/test/language/expressions/class/elements/async-private-method-static/await-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-private-method-static/await-as-binding-identifier.js
rename to test/language/expressions/class/elements/async-private-method-static/await-as-binding-identifier.js
diff --git a/test/language/expressions/class/async-private-method-static/await-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/async-private-method-static/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-private-method-static/await-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/async-private-method-static/await-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/async-private-method-static/await-as-identifier-reference.js b/test/language/expressions/class/elements/async-private-method-static/await-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/async-private-method-static/await-as-identifier-reference.js
rename to test/language/expressions/class/elements/async-private-method-static/await-as-identifier-reference.js
diff --git a/test/language/expressions/class/async-private-method-static/await-as-label-identifier-escaped.js b/test/language/expressions/class/elements/async-private-method-static/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-private-method-static/await-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/async-private-method-static/await-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/async-private-method-static/await-as-label-identifier.js b/test/language/expressions/class/elements/async-private-method-static/await-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-private-method-static/await-as-label-identifier.js
rename to test/language/expressions/class/elements/async-private-method-static/await-as-label-identifier.js
diff --git a/test/language/expressions/class/async-private-method/await-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/async-private-method/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-private-method/await-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/async-private-method/await-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/async-private-method/await-as-binding-identifier.js b/test/language/expressions/class/elements/async-private-method/await-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-private-method/await-as-binding-identifier.js
rename to test/language/expressions/class/elements/async-private-method/await-as-binding-identifier.js
diff --git a/test/language/expressions/class/async-private-method/await-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/async-private-method/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-private-method/await-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/async-private-method/await-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/async-private-method/await-as-identifier-reference.js b/test/language/expressions/class/elements/async-private-method/await-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/async-private-method/await-as-identifier-reference.js
rename to test/language/expressions/class/elements/async-private-method/await-as-identifier-reference.js
diff --git a/test/language/expressions/class/async-private-method/await-as-label-identifier-escaped.js b/test/language/expressions/class/elements/async-private-method/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/async-private-method/await-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/async-private-method/await-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/async-private-method/await-as-label-identifier.js b/test/language/expressions/class/elements/async-private-method/await-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/async-private-method/await-as-label-identifier.js
rename to test/language/expressions/class/elements/async-private-method/await-as-label-identifier.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/gen-private-method-static/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-as-binding-identifier.js b/test/language/expressions/class/elements/gen-private-method-static/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-as-binding-identifier.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-as-binding-identifier.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/gen-private-method-static/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-as-identifier-reference.js b/test/language/expressions/class/elements/gen-private-method-static/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-as-identifier-reference.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-as-identifier-reference.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-as-label-identifier-escaped.js b/test/language/expressions/class/elements/gen-private-method-static/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-as-label-identifier.js b/test/language/expressions/class/elements/gen-private-method-static/yield-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-as-label-identifier.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-as-label-identifier.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-identifier-spread-strict.js b/test/language/expressions/class/elements/gen-private-method-static/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-identifier-spread-strict.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-identifier-spread-strict.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-identifier-strict.js b/test/language/expressions/class/elements/gen-private-method-static/yield-identifier-strict.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-identifier-strict.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-identifier-strict.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-spread-arr-multiple.js b/test/language/expressions/class/elements/gen-private-method-static/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-spread-arr-multiple.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-spread-arr-multiple.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-spread-arr-single.js b/test/language/expressions/class/elements/gen-private-method-static/yield-spread-arr-single.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-spread-arr-single.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-spread-arr-single.js
diff --git a/test/language/expressions/class/gen-private-method-static/yield-spread-obj.js b/test/language/expressions/class/elements/gen-private-method-static/yield-spread-obj.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method-static/yield-spread-obj.js
rename to test/language/expressions/class/elements/gen-private-method-static/yield-spread-obj.js
diff --git a/test/language/expressions/class/gen-private-method/yield-as-binding-identifier-escaped.js b/test/language/expressions/class/elements/gen-private-method/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-as-binding-identifier-escaped.js
rename to test/language/expressions/class/elements/gen-private-method/yield-as-binding-identifier-escaped.js
diff --git a/test/language/expressions/class/gen-private-method/yield-as-binding-identifier.js b/test/language/expressions/class/elements/gen-private-method/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-as-binding-identifier.js
rename to test/language/expressions/class/elements/gen-private-method/yield-as-binding-identifier.js
diff --git a/test/language/expressions/class/gen-private-method/yield-as-identifier-reference-escaped.js b/test/language/expressions/class/elements/gen-private-method/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-as-identifier-reference-escaped.js
rename to test/language/expressions/class/elements/gen-private-method/yield-as-identifier-reference-escaped.js
diff --git a/test/language/expressions/class/gen-private-method/yield-as-identifier-reference.js b/test/language/expressions/class/elements/gen-private-method/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-as-identifier-reference.js
rename to test/language/expressions/class/elements/gen-private-method/yield-as-identifier-reference.js
diff --git a/test/language/expressions/class/gen-private-method/yield-as-label-identifier-escaped.js b/test/language/expressions/class/elements/gen-private-method/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-as-label-identifier-escaped.js
rename to test/language/expressions/class/elements/gen-private-method/yield-as-label-identifier-escaped.js
diff --git a/test/language/expressions/class/gen-private-method/yield-as-label-identifier.js b/test/language/expressions/class/elements/gen-private-method/yield-as-label-identifier.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-as-label-identifier.js
rename to test/language/expressions/class/elements/gen-private-method/yield-as-label-identifier.js
diff --git a/test/language/expressions/class/gen-private-method/yield-identifier-spread-strict.js b/test/language/expressions/class/elements/gen-private-method/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-identifier-spread-strict.js
rename to test/language/expressions/class/elements/gen-private-method/yield-identifier-spread-strict.js
diff --git a/test/language/expressions/class/gen-private-method/yield-identifier-strict.js b/test/language/expressions/class/elements/gen-private-method/yield-identifier-strict.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-identifier-strict.js
rename to test/language/expressions/class/elements/gen-private-method/yield-identifier-strict.js
diff --git a/test/language/expressions/class/gen-private-method/yield-spread-arr-multiple.js b/test/language/expressions/class/elements/gen-private-method/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-spread-arr-multiple.js
rename to test/language/expressions/class/elements/gen-private-method/yield-spread-arr-multiple.js
diff --git a/test/language/expressions/class/gen-private-method/yield-spread-arr-single.js b/test/language/expressions/class/elements/gen-private-method/yield-spread-arr-single.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-spread-arr-single.js
rename to test/language/expressions/class/elements/gen-private-method/yield-spread-arr-single.js
diff --git a/test/language/expressions/class/gen-private-method/yield-spread-obj.js b/test/language/expressions/class/elements/gen-private-method/yield-spread-obj.js
similarity index 100%
rename from test/language/expressions/class/gen-private-method/yield-spread-obj.js
rename to test/language/expressions/class/elements/gen-private-method/yield-spread-obj.js
diff --git a/test/language/expressions/class/private-methods/prod-private-async-generator.js b/test/language/expressions/class/elements/private-methods/prod-private-async-generator.js
similarity index 100%
rename from test/language/expressions/class/private-methods/prod-private-async-generator.js
rename to test/language/expressions/class/elements/private-methods/prod-private-async-generator.js
diff --git a/test/language/expressions/class/private-methods/prod-private-async-method.js b/test/language/expressions/class/elements/private-methods/prod-private-async-method.js
similarity index 100%
rename from test/language/expressions/class/private-methods/prod-private-async-method.js
rename to test/language/expressions/class/elements/private-methods/prod-private-async-method.js
diff --git a/test/language/expressions/class/private-methods/prod-private-generator.js b/test/language/expressions/class/elements/private-methods/prod-private-generator.js
similarity index 100%
rename from test/language/expressions/class/private-methods/prod-private-generator.js
rename to test/language/expressions/class/elements/private-methods/prod-private-generator.js
diff --git a/test/language/expressions/class/private-methods/prod-private-method-initialize-order.js b/test/language/expressions/class/elements/private-methods/prod-private-method-initialize-order.js
similarity index 100%
rename from test/language/expressions/class/private-methods/prod-private-method-initialize-order.js
rename to test/language/expressions/class/elements/private-methods/prod-private-method-initialize-order.js
diff --git a/test/language/expressions/class/private-methods/prod-private-method.js b/test/language/expressions/class/elements/private-methods/prod-private-method.js
similarity index 100%
rename from test/language/expressions/class/private-methods/prod-private-method.js
rename to test/language/expressions/class/elements/private-methods/prod-private-method.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-abrupt.js b/test/language/expressions/class/gen-method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-abrupt.js
rename to test/language/expressions/class/gen-method-static/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/gen-method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/gen-method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-arg-val-undefined.js b/test/language/expressions/class/gen-method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/gen-method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-duplicates.js b/test/language/expressions/class/gen-method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-duplicates.js
rename to test/language/expressions/class/gen-method-static/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-ref-later.js b/test/language/expressions/class/gen-method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-ref-later.js
rename to test/language/expressions/class/gen-method-static/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-ref-prior.js b/test/language/expressions/class/gen-method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-ref-prior.js
rename to test/language/expressions/class/gen-method-static/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-ref-self.js b/test/language/expressions/class/gen-method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-ref-self.js
rename to test/language/expressions/class/gen-method-static/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-rest.js b/test/language/expressions/class/gen-method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-rest.js
rename to test/language/expressions/class/gen-method-static/dflt-params-rest.js
diff --git a/test/language/expressions/class/gen-meth-static/dflt-params-trailing-comma.js b/test/language/expressions/class/gen-method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/dflt-params-trailing-comma.js
rename to test/language/expressions/class/gen-method-static/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/gen-meth-static/params-trailing-comma-multiple.js b/test/language/expressions/class/gen-method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/params-trailing-comma-multiple.js
rename to test/language/expressions/class/gen-method-static/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/gen-meth-static/params-trailing-comma-single.js b/test/language/expressions/class/gen-method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/params-trailing-comma-single.js
rename to test/language/expressions/class/gen-method-static/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/gen-meth-static/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/gen-method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/gen-meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/gen-method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-abrupt.js b/test/language/expressions/class/gen-method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-abrupt.js
rename to test/language/expressions/class/gen-method/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/gen-method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/gen-method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-arg-val-undefined.js b/test/language/expressions/class/gen-method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/gen-method/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-duplicates.js b/test/language/expressions/class/gen-method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-duplicates.js
rename to test/language/expressions/class/gen-method/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-ref-later.js b/test/language/expressions/class/gen-method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-ref-later.js
rename to test/language/expressions/class/gen-method/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-ref-prior.js b/test/language/expressions/class/gen-method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-ref-prior.js
rename to test/language/expressions/class/gen-method/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-ref-self.js b/test/language/expressions/class/gen-method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-ref-self.js
rename to test/language/expressions/class/gen-method/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-rest.js b/test/language/expressions/class/gen-method/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-rest.js
rename to test/language/expressions/class/gen-method/dflt-params-rest.js
diff --git a/test/language/expressions/class/gen-meth/dflt-params-trailing-comma.js b/test/language/expressions/class/gen-method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/dflt-params-trailing-comma.js
rename to test/language/expressions/class/gen-method/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/gen-meth/params-trailing-comma-multiple.js b/test/language/expressions/class/gen-method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/params-trailing-comma-multiple.js
rename to test/language/expressions/class/gen-method/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/gen-meth/params-trailing-comma-single.js b/test/language/expressions/class/gen-method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/params-trailing-comma-single.js
rename to test/language/expressions/class/gen-method/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/gen-meth/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/gen-method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/gen-meth/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/gen-method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-abrupt.js b/test/language/expressions/class/method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-abrupt.js
rename to test/language/expressions/class/method-static/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-arg-val-undefined.js b/test/language/expressions/class/method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-duplicates.js b/test/language/expressions/class/method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-duplicates.js
rename to test/language/expressions/class/method-static/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-ref-later.js b/test/language/expressions/class/method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-ref-later.js
rename to test/language/expressions/class/method-static/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-ref-prior.js b/test/language/expressions/class/method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-ref-prior.js
rename to test/language/expressions/class/method-static/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-ref-self.js b/test/language/expressions/class/method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-ref-self.js
rename to test/language/expressions/class/method-static/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-rest.js b/test/language/expressions/class/method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-rest.js
rename to test/language/expressions/class/method-static/dflt-params-rest.js
diff --git a/test/language/expressions/class/meth-static/dflt-params-trailing-comma.js b/test/language/expressions/class/method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/meth-static/dflt-params-trailing-comma.js
rename to test/language/expressions/class/method-static/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/meth-static/params-trailing-comma-multiple.js b/test/language/expressions/class/method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/meth-static/params-trailing-comma-multiple.js
rename to test/language/expressions/class/method-static/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/meth-static/params-trailing-comma-single.js b/test/language/expressions/class/method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/meth-static/params-trailing-comma-single.js
rename to test/language/expressions/class/method-static/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/meth-static/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/expressions/class/meth/dflt-params-abrupt.js b/test/language/expressions/class/method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-abrupt.js
rename to test/language/expressions/class/method/dflt-params-abrupt.js
diff --git a/test/language/expressions/class/meth/dflt-params-arg-val-not-undefined.js b/test/language/expressions/class/method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-arg-val-not-undefined.js
rename to test/language/expressions/class/method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/expressions/class/meth/dflt-params-arg-val-undefined.js b/test/language/expressions/class/method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-arg-val-undefined.js
rename to test/language/expressions/class/method/dflt-params-arg-val-undefined.js
diff --git a/test/language/expressions/class/meth/dflt-params-duplicates.js b/test/language/expressions/class/method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-duplicates.js
rename to test/language/expressions/class/method/dflt-params-duplicates.js
diff --git a/test/language/expressions/class/meth/dflt-params-ref-later.js b/test/language/expressions/class/method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-ref-later.js
rename to test/language/expressions/class/method/dflt-params-ref-later.js
diff --git a/test/language/expressions/class/meth/dflt-params-ref-prior.js b/test/language/expressions/class/method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-ref-prior.js
rename to test/language/expressions/class/method/dflt-params-ref-prior.js
diff --git a/test/language/expressions/class/meth/dflt-params-ref-self.js b/test/language/expressions/class/method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-ref-self.js
rename to test/language/expressions/class/method/dflt-params-ref-self.js
diff --git a/test/language/expressions/class/meth/dflt-params-rest.js b/test/language/expressions/class/method/dflt-params-rest.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-rest.js
rename to test/language/expressions/class/method/dflt-params-rest.js
diff --git a/test/language/expressions/class/meth/dflt-params-trailing-comma.js b/test/language/expressions/class/method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/expressions/class/meth/dflt-params-trailing-comma.js
rename to test/language/expressions/class/method/dflt-params-trailing-comma.js
diff --git a/test/language/expressions/class/meth/params-trailing-comma-multiple.js b/test/language/expressions/class/method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/expressions/class/meth/params-trailing-comma-multiple.js
rename to test/language/expressions/class/method/params-trailing-comma-multiple.js
diff --git a/test/language/expressions/class/meth/params-trailing-comma-single.js b/test/language/expressions/class/method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/expressions/class/meth/params-trailing-comma-single.js
rename to test/language/expressions/class/method/params-trailing-comma-single.js
diff --git a/test/language/expressions/class/meth/rest-params-trailing-comma-early-error.js b/test/language/expressions/class/method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/expressions/class/meth/rest-params-trailing-comma-early-error.js
rename to test/language/expressions/class/method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-abrupt.js b/test/language/statements/class/async-gen-method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-abrupt.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-abrupt.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/async-gen-method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-arg-val-undefined.js b/test/language/statements/class/async-gen-method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-duplicates.js b/test/language/statements/class/async-gen-method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-duplicates.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-duplicates.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-ref-later.js b/test/language/statements/class/async-gen-method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-ref-later.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-ref-later.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-ref-prior.js b/test/language/statements/class/async-gen-method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-ref-prior.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-ref-self.js b/test/language/statements/class/async-gen-method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-ref-self.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-ref-self.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-rest.js b/test/language/statements/class/async-gen-method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-rest.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-rest.js
diff --git a/test/language/statements/class/async-gen-meth-static/dflt-params-trailing-comma.js b/test/language/statements/class/async-gen-method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/dflt-params-trailing-comma.js
rename to test/language/statements/class/async-gen-method-static/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/async-gen-meth-static/params-trailing-comma-multiple.js b/test/language/statements/class/async-gen-method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/params-trailing-comma-multiple.js
rename to test/language/statements/class/async-gen-method-static/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/async-gen-meth-static/params-trailing-comma-single.js b/test/language/statements/class/async-gen-method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/params-trailing-comma-single.js
rename to test/language/statements/class/async-gen-method-static/params-trailing-comma-single.js
diff --git a/test/language/statements/class/async-gen-meth-static/rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-gen-method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/async-gen-method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-abrupt.js b/test/language/statements/class/async-gen-method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-abrupt.js
rename to test/language/statements/class/async-gen-method/dflt-params-abrupt.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/async-gen-method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/async-gen-method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-arg-val-undefined.js b/test/language/statements/class/async-gen-method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/async-gen-method/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-duplicates.js b/test/language/statements/class/async-gen-method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-duplicates.js
rename to test/language/statements/class/async-gen-method/dflt-params-duplicates.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-ref-later.js b/test/language/statements/class/async-gen-method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-ref-later.js
rename to test/language/statements/class/async-gen-method/dflt-params-ref-later.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-ref-prior.js b/test/language/statements/class/async-gen-method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-ref-prior.js
rename to test/language/statements/class/async-gen-method/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-ref-self.js b/test/language/statements/class/async-gen-method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-ref-self.js
rename to test/language/statements/class/async-gen-method/dflt-params-ref-self.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-rest.js b/test/language/statements/class/async-gen-method/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-rest.js
rename to test/language/statements/class/async-gen-method/dflt-params-rest.js
diff --git a/test/language/statements/class/async-gen-meth/dflt-params-trailing-comma.js b/test/language/statements/class/async-gen-method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/dflt-params-trailing-comma.js
rename to test/language/statements/class/async-gen-method/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/async-gen-meth/params-trailing-comma-multiple.js b/test/language/statements/class/async-gen-method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/params-trailing-comma-multiple.js
rename to test/language/statements/class/async-gen-method/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/async-gen-meth/params-trailing-comma-single.js b/test/language/statements/class/async-gen-method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/params-trailing-comma-single.js
rename to test/language/statements/class/async-gen-method/params-trailing-comma-single.js
diff --git a/test/language/statements/class/async-gen-meth/rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-gen-method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/async-gen-meth/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/async-gen-method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-abrupt.js b/test/language/statements/class/async-method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-abrupt.js
rename to test/language/statements/class/async-method-static/dflt-params-abrupt.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/async-method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/async-method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-arg-val-undefined.js b/test/language/statements/class/async-method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/async-method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-duplicates.js b/test/language/statements/class/async-method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-duplicates.js
rename to test/language/statements/class/async-method-static/dflt-params-duplicates.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-ref-later.js b/test/language/statements/class/async-method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-ref-later.js
rename to test/language/statements/class/async-method-static/dflt-params-ref-later.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-ref-prior.js b/test/language/statements/class/async-method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-ref-prior.js
rename to test/language/statements/class/async-method-static/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-ref-self.js b/test/language/statements/class/async-method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-ref-self.js
rename to test/language/statements/class/async-method-static/dflt-params-ref-self.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-rest.js b/test/language/statements/class/async-method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-rest.js
rename to test/language/statements/class/async-method-static/dflt-params-rest.js
diff --git a/test/language/statements/class/async-meth-static/dflt-params-trailing-comma.js b/test/language/statements/class/async-method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/dflt-params-trailing-comma.js
rename to test/language/statements/class/async-method-static/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/async-meth-static/params-trailing-comma-multiple.js b/test/language/statements/class/async-method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/params-trailing-comma-multiple.js
rename to test/language/statements/class/async-method-static/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/async-meth-static/params-trailing-comma-single.js b/test/language/statements/class/async-method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/params-trailing-comma-single.js
rename to test/language/statements/class/async-method-static/params-trailing-comma-single.js
diff --git a/test/language/statements/class/async-meth-static/rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/async-meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/async-method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/async-meth/dflt-params-abrupt.js b/test/language/statements/class/async-method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-abrupt.js
rename to test/language/statements/class/async-method/dflt-params-abrupt.js
diff --git a/test/language/statements/class/async-meth/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/async-method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/async-method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/async-meth/dflt-params-arg-val-undefined.js b/test/language/statements/class/async-method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/async-method/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/async-meth/dflt-params-duplicates.js b/test/language/statements/class/async-method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-duplicates.js
rename to test/language/statements/class/async-method/dflt-params-duplicates.js
diff --git a/test/language/statements/class/async-meth/dflt-params-ref-later.js b/test/language/statements/class/async-method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-ref-later.js
rename to test/language/statements/class/async-method/dflt-params-ref-later.js
diff --git a/test/language/statements/class/async-meth/dflt-params-ref-prior.js b/test/language/statements/class/async-method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-ref-prior.js
rename to test/language/statements/class/async-method/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/async-meth/dflt-params-ref-self.js b/test/language/statements/class/async-method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-ref-self.js
rename to test/language/statements/class/async-method/dflt-params-ref-self.js
diff --git a/test/language/statements/class/async-meth/dflt-params-rest.js b/test/language/statements/class/async-method/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-rest.js
rename to test/language/statements/class/async-method/dflt-params-rest.js
diff --git a/test/language/statements/class/async-meth/dflt-params-trailing-comma.js b/test/language/statements/class/async-method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/async-meth/dflt-params-trailing-comma.js
rename to test/language/statements/class/async-method/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/async-meth/params-trailing-comma-multiple.js b/test/language/statements/class/async-method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/async-meth/params-trailing-comma-multiple.js
rename to test/language/statements/class/async-method/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/async-meth/params-trailing-comma-single.js b/test/language/statements/class/async-method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/async-meth/params-trailing-comma-single.js
rename to test/language/statements/class/async-method/params-trailing-comma-single.js
diff --git a/test/language/statements/class/async-meth/rest-params-trailing-comma-early-error.js b/test/language/statements/class/async-method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/async-meth/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/async-method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/async-gen-private-method-static/await-as-binding-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method-static/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/await-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method-static/await-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method-static/await-as-binding-identifier.js b/test/language/statements/class/elements/async-gen-private-method-static/await-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/await-as-binding-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method-static/await-as-binding-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method-static/await-as-identifier-reference-escaped.js b/test/language/statements/class/elements/async-gen-private-method-static/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/await-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method-static/await-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method-static/await-as-identifier-reference.js b/test/language/statements/class/elements/async-gen-private-method-static/await-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/await-as-identifier-reference.js
rename to test/language/statements/class/elements/async-gen-private-method-static/await-as-identifier-reference.js
diff --git a/test/language/statements/class/async-gen-private-method-static/await-as-label-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method-static/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/await-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method-static/await-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method-static/await-as-label-identifier.js b/test/language/statements/class/elements/async-gen-private-method-static/await-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/await-as-label-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method-static/await-as-label-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-as-binding-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-as-binding-identifier.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-as-binding-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-as-binding-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-as-identifier-reference-escaped.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-as-identifier-reference.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-as-identifier-reference.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-as-identifier-reference.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-as-label-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-as-label-identifier.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-as-label-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-as-label-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-identifier-spread-strict.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-identifier-spread-strict.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-identifier-spread-strict.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-identifier-strict.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-identifier-strict.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-identifier-strict.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-identifier-strict.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-catch.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-catch.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-catch.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-catch.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-async-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-for-await-of-sync-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-async-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next-yield-star-sync-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-promise-reject-next.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-promise-reject-next.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-spread-arr-multiple.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-spread-arr-multiple.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-spread-arr-multiple.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-spread-arr-single.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-arr-single.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-spread-arr-single.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-spread-arr-single.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-spread-obj.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-obj.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-spread-obj.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-spread-obj.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-async-next.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-async-next.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-async-next.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-async-next.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-async-return.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-async-return.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-async-return.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-async-return.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-async-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-async-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-async-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-async-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-expr-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-expr-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-expr-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-expr-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-object-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-not-callable-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-null-sync-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-null-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-returns-undefined-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-async-undefined-sync-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-object-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-not-callable-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-null-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-getiter-sync-returns-undefined-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-call-done-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-call-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-call-value-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-non-object-ignores-then.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-null-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-object-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-not-callable-undefined-throw.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-boolean-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-null-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-number-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-object-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-string-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-symbol-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-non-callable-undefined-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-next-then-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-sync-next.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-sync-next.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-sync-next.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-sync-next.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-sync-return.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-sync-return.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-sync-return.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-sync-return.js
diff --git a/test/language/statements/class/async-gen-private-method-static/yield-star-sync-throw.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-star-sync-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method-static/yield-star-sync-throw.js
rename to test/language/statements/class/elements/async-gen-private-method-static/yield-star-sync-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/await-as-binding-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/await-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method/await-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method/await-as-binding-identifier.js b/test/language/statements/class/elements/async-gen-private-method/await-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/await-as-binding-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method/await-as-binding-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method/await-as-identifier-reference-escaped.js b/test/language/statements/class/elements/async-gen-private-method/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/await-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method/await-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method/await-as-identifier-reference.js b/test/language/statements/class/elements/async-gen-private-method/await-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/await-as-identifier-reference.js
rename to test/language/statements/class/elements/async-gen-private-method/await-as-identifier-reference.js
diff --git a/test/language/statements/class/async-gen-private-method/await-as-label-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/await-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method/await-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method/await-as-label-identifier.js b/test/language/statements/class/elements/async-gen-private-method/await-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/await-as-label-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method/await-as-label-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-as-binding-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-as-binding-identifier.js b/test/language/statements/class/elements/async-gen-private-method/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-as-binding-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-as-binding-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-as-identifier-reference-escaped.js b/test/language/statements/class/elements/async-gen-private-method/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-as-identifier-reference.js b/test/language/statements/class/elements/async-gen-private-method/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-as-identifier-reference.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-as-identifier-reference.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-as-label-identifier-escaped.js b/test/language/statements/class/elements/async-gen-private-method/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-as-label-identifier.js b/test/language/statements/class/elements/async-gen-private-method/yield-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-as-label-identifier.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-as-label-identifier.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-identifier-spread-strict.js b/test/language/statements/class/elements/async-gen-private-method/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-identifier-spread-strict.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-identifier-spread-strict.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-identifier-strict.js b/test/language/statements/class/elements/async-gen-private-method/yield-identifier-strict.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-identifier-strict.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-identifier-strict.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-promise-reject-next-catch.js b/test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-catch.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-promise-reject-next-catch.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-catch.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js b/test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-async-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js b/test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-for-await-of-sync-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js b/test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-async-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js b/test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next-yield-star-sync-iterator.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-promise-reject-next.js b/test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-promise-reject-next.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-promise-reject-next.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-spread-arr-multiple.js b/test/language/statements/class/elements/async-gen-private-method/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-spread-arr-multiple.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-spread-arr-multiple.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-spread-arr-single.js b/test/language/statements/class/elements/async-gen-private-method/yield-spread-arr-single.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-spread-arr-single.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-spread-arr-single.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-spread-obj.js b/test/language/statements/class/elements/async-gen-private-method/yield-spread-obj.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-spread-obj.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-spread-obj.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-async-next.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-async-next.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-async-next.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-async-next.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-async-return.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-async-return.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-async-return.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-async-return.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-async-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-async-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-async-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-async-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-expr-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-expr-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-expr-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-expr-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-object-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-not-callable-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-null-sync-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-null-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-returns-undefined-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-async-undefined-sync-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-object-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-not-callable-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-null-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-getiter-sync-returns-undefined-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-call-done-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-call-done-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-call-done-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-call-done-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-call-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-call-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-call-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-call-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-call-value-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-call-value-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-call-value-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-call-value-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-non-object-ignores-then.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-non-object-ignores-then.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-non-object-ignores-then.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-non-object-ignores-then.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-boolean-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-null-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-null-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-null-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-null-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-number-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-number-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-number-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-number-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-object-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-object-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-object-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-object-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-string-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-string-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-string-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-string-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-symbol-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-not-callable-undefined-throw.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-get-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-get-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-get-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-get-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-boolean-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-null-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-number-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-object-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-string-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-symbol-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-non-callable-undefined-fulfillpromise.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-next-then-returns-abrupt.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-returns-abrupt.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-next-then-returns-abrupt.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-next-then-returns-abrupt.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-sync-next.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-sync-next.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-sync-next.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-sync-next.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-sync-return.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-sync-return.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-sync-return.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-sync-return.js
diff --git a/test/language/statements/class/async-gen-private-method/yield-star-sync-throw.js b/test/language/statements/class/elements/async-gen-private-method/yield-star-sync-throw.js
similarity index 100%
rename from test/language/statements/class/async-gen-private-method/yield-star-sync-throw.js
rename to test/language/statements/class/elements/async-gen-private-method/yield-star-sync-throw.js
diff --git a/test/language/statements/class/async-private-method-static/await-as-binding-identifier-escaped.js b/test/language/statements/class/elements/async-private-method-static/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-private-method-static/await-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/async-private-method-static/await-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/async-private-method-static/await-as-binding-identifier.js b/test/language/statements/class/elements/async-private-method-static/await-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/async-private-method-static/await-as-binding-identifier.js
rename to test/language/statements/class/elements/async-private-method-static/await-as-binding-identifier.js
diff --git a/test/language/statements/class/async-private-method-static/await-as-identifier-reference-escaped.js b/test/language/statements/class/elements/async-private-method-static/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/async-private-method-static/await-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/async-private-method-static/await-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/async-private-method-static/await-as-identifier-reference.js b/test/language/statements/class/elements/async-private-method-static/await-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/async-private-method-static/await-as-identifier-reference.js
rename to test/language/statements/class/elements/async-private-method-static/await-as-identifier-reference.js
diff --git a/test/language/statements/class/async-private-method-static/await-as-label-identifier-escaped.js b/test/language/statements/class/elements/async-private-method-static/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-private-method-static/await-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/async-private-method-static/await-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/async-private-method-static/await-as-label-identifier.js b/test/language/statements/class/elements/async-private-method-static/await-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/async-private-method-static/await-as-label-identifier.js
rename to test/language/statements/class/elements/async-private-method-static/await-as-label-identifier.js
diff --git a/test/language/statements/class/async-private-method/await-as-binding-identifier-escaped.js b/test/language/statements/class/elements/async-private-method/await-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-private-method/await-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/async-private-method/await-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/async-private-method/await-as-binding-identifier.js b/test/language/statements/class/elements/async-private-method/await-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/async-private-method/await-as-binding-identifier.js
rename to test/language/statements/class/elements/async-private-method/await-as-binding-identifier.js
diff --git a/test/language/statements/class/async-private-method/await-as-identifier-reference-escaped.js b/test/language/statements/class/elements/async-private-method/await-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/async-private-method/await-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/async-private-method/await-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/async-private-method/await-as-identifier-reference.js b/test/language/statements/class/elements/async-private-method/await-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/async-private-method/await-as-identifier-reference.js
rename to test/language/statements/class/elements/async-private-method/await-as-identifier-reference.js
diff --git a/test/language/statements/class/async-private-method/await-as-label-identifier-escaped.js b/test/language/statements/class/elements/async-private-method/await-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/async-private-method/await-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/async-private-method/await-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/async-private-method/await-as-label-identifier.js b/test/language/statements/class/elements/async-private-method/await-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/async-private-method/await-as-label-identifier.js
rename to test/language/statements/class/elements/async-private-method/await-as-label-identifier.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-as-binding-identifier-escaped.js b/test/language/statements/class/elements/gen-private-method-static/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-as-binding-identifier.js b/test/language/statements/class/elements/gen-private-method-static/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-as-binding-identifier.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-as-binding-identifier.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-as-identifier-reference-escaped.js b/test/language/statements/class/elements/gen-private-method-static/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-as-identifier-reference.js b/test/language/statements/class/elements/gen-private-method-static/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-as-identifier-reference.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-as-identifier-reference.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-as-label-identifier-escaped.js b/test/language/statements/class/elements/gen-private-method-static/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-as-label-identifier.js b/test/language/statements/class/elements/gen-private-method-static/yield-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-as-label-identifier.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-as-label-identifier.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-identifier-spread-strict.js b/test/language/statements/class/elements/gen-private-method-static/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-identifier-spread-strict.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-identifier-spread-strict.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-identifier-strict.js b/test/language/statements/class/elements/gen-private-method-static/yield-identifier-strict.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-identifier-strict.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-identifier-strict.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-spread-arr-multiple.js b/test/language/statements/class/elements/gen-private-method-static/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-spread-arr-multiple.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-spread-arr-multiple.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-spread-arr-single.js b/test/language/statements/class/elements/gen-private-method-static/yield-spread-arr-single.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-spread-arr-single.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-spread-arr-single.js
diff --git a/test/language/statements/class/gen-private-method-static/yield-spread-obj.js b/test/language/statements/class/elements/gen-private-method-static/yield-spread-obj.js
similarity index 100%
rename from test/language/statements/class/gen-private-method-static/yield-spread-obj.js
rename to test/language/statements/class/elements/gen-private-method-static/yield-spread-obj.js
diff --git a/test/language/statements/class/gen-private-method/yield-as-binding-identifier-escaped.js b/test/language/statements/class/elements/gen-private-method/yield-as-binding-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-as-binding-identifier-escaped.js
rename to test/language/statements/class/elements/gen-private-method/yield-as-binding-identifier-escaped.js
diff --git a/test/language/statements/class/gen-private-method/yield-as-binding-identifier.js b/test/language/statements/class/elements/gen-private-method/yield-as-binding-identifier.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-as-binding-identifier.js
rename to test/language/statements/class/elements/gen-private-method/yield-as-binding-identifier.js
diff --git a/test/language/statements/class/gen-private-method/yield-as-identifier-reference-escaped.js b/test/language/statements/class/elements/gen-private-method/yield-as-identifier-reference-escaped.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-as-identifier-reference-escaped.js
rename to test/language/statements/class/elements/gen-private-method/yield-as-identifier-reference-escaped.js
diff --git a/test/language/statements/class/gen-private-method/yield-as-identifier-reference.js b/test/language/statements/class/elements/gen-private-method/yield-as-identifier-reference.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-as-identifier-reference.js
rename to test/language/statements/class/elements/gen-private-method/yield-as-identifier-reference.js
diff --git a/test/language/statements/class/gen-private-method/yield-as-label-identifier-escaped.js b/test/language/statements/class/elements/gen-private-method/yield-as-label-identifier-escaped.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-as-label-identifier-escaped.js
rename to test/language/statements/class/elements/gen-private-method/yield-as-label-identifier-escaped.js
diff --git a/test/language/statements/class/gen-private-method/yield-as-label-identifier.js b/test/language/statements/class/elements/gen-private-method/yield-as-label-identifier.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-as-label-identifier.js
rename to test/language/statements/class/elements/gen-private-method/yield-as-label-identifier.js
diff --git a/test/language/statements/class/gen-private-method/yield-identifier-spread-strict.js b/test/language/statements/class/elements/gen-private-method/yield-identifier-spread-strict.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-identifier-spread-strict.js
rename to test/language/statements/class/elements/gen-private-method/yield-identifier-spread-strict.js
diff --git a/test/language/statements/class/gen-private-method/yield-identifier-strict.js b/test/language/statements/class/elements/gen-private-method/yield-identifier-strict.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-identifier-strict.js
rename to test/language/statements/class/elements/gen-private-method/yield-identifier-strict.js
diff --git a/test/language/statements/class/gen-private-method/yield-spread-arr-multiple.js b/test/language/statements/class/elements/gen-private-method/yield-spread-arr-multiple.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-spread-arr-multiple.js
rename to test/language/statements/class/elements/gen-private-method/yield-spread-arr-multiple.js
diff --git a/test/language/statements/class/gen-private-method/yield-spread-arr-single.js b/test/language/statements/class/elements/gen-private-method/yield-spread-arr-single.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-spread-arr-single.js
rename to test/language/statements/class/elements/gen-private-method/yield-spread-arr-single.js
diff --git a/test/language/statements/class/gen-private-method/yield-spread-obj.js b/test/language/statements/class/elements/gen-private-method/yield-spread-obj.js
similarity index 100%
rename from test/language/statements/class/gen-private-method/yield-spread-obj.js
rename to test/language/statements/class/elements/gen-private-method/yield-spread-obj.js
diff --git a/test/language/statements/class/private-methods/prod-private-async-generator.js b/test/language/statements/class/elements/private-methods/prod-private-async-generator.js
similarity index 100%
rename from test/language/statements/class/private-methods/prod-private-async-generator.js
rename to test/language/statements/class/elements/private-methods/prod-private-async-generator.js
diff --git a/test/language/statements/class/private-methods/prod-private-async-method.js b/test/language/statements/class/elements/private-methods/prod-private-async-method.js
similarity index 100%
rename from test/language/statements/class/private-methods/prod-private-async-method.js
rename to test/language/statements/class/elements/private-methods/prod-private-async-method.js
diff --git a/test/language/statements/class/private-methods/prod-private-generator.js b/test/language/statements/class/elements/private-methods/prod-private-generator.js
similarity index 100%
rename from test/language/statements/class/private-methods/prod-private-generator.js
rename to test/language/statements/class/elements/private-methods/prod-private-generator.js
diff --git a/test/language/statements/class/private-methods/prod-private-method-initialize-order.js b/test/language/statements/class/elements/private-methods/prod-private-method-initialize-order.js
similarity index 100%
rename from test/language/statements/class/private-methods/prod-private-method-initialize-order.js
rename to test/language/statements/class/elements/private-methods/prod-private-method-initialize-order.js
diff --git a/test/language/statements/class/private-methods/prod-private-method.js b/test/language/statements/class/elements/private-methods/prod-private-method.js
similarity index 100%
rename from test/language/statements/class/private-methods/prod-private-method.js
rename to test/language/statements/class/elements/private-methods/prod-private-method.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-abrupt.js b/test/language/statements/class/gen-method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-abrupt.js
rename to test/language/statements/class/gen-method-static/dflt-params-abrupt.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/gen-method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/gen-method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-arg-val-undefined.js b/test/language/statements/class/gen-method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/gen-method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-duplicates.js b/test/language/statements/class/gen-method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-duplicates.js
rename to test/language/statements/class/gen-method-static/dflt-params-duplicates.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-ref-later.js b/test/language/statements/class/gen-method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-ref-later.js
rename to test/language/statements/class/gen-method-static/dflt-params-ref-later.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-ref-prior.js b/test/language/statements/class/gen-method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-ref-prior.js
rename to test/language/statements/class/gen-method-static/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-ref-self.js b/test/language/statements/class/gen-method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-ref-self.js
rename to test/language/statements/class/gen-method-static/dflt-params-ref-self.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-rest.js b/test/language/statements/class/gen-method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-rest.js
rename to test/language/statements/class/gen-method-static/dflt-params-rest.js
diff --git a/test/language/statements/class/gen-meth-static/dflt-params-trailing-comma.js b/test/language/statements/class/gen-method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/dflt-params-trailing-comma.js
rename to test/language/statements/class/gen-method-static/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/gen-meth-static/params-trailing-comma-multiple.js b/test/language/statements/class/gen-method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/params-trailing-comma-multiple.js
rename to test/language/statements/class/gen-method-static/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/gen-meth-static/params-trailing-comma-single.js b/test/language/statements/class/gen-method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/params-trailing-comma-single.js
rename to test/language/statements/class/gen-method-static/params-trailing-comma-single.js
diff --git a/test/language/statements/class/gen-meth-static/rest-params-trailing-comma-early-error.js b/test/language/statements/class/gen-method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/gen-meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/gen-method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-abrupt.js b/test/language/statements/class/gen-method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-abrupt.js
rename to test/language/statements/class/gen-method/dflt-params-abrupt.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/gen-method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/gen-method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-arg-val-undefined.js b/test/language/statements/class/gen-method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/gen-method/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-duplicates.js b/test/language/statements/class/gen-method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-duplicates.js
rename to test/language/statements/class/gen-method/dflt-params-duplicates.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-ref-later.js b/test/language/statements/class/gen-method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-ref-later.js
rename to test/language/statements/class/gen-method/dflt-params-ref-later.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-ref-prior.js b/test/language/statements/class/gen-method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-ref-prior.js
rename to test/language/statements/class/gen-method/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-ref-self.js b/test/language/statements/class/gen-method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-ref-self.js
rename to test/language/statements/class/gen-method/dflt-params-ref-self.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-rest.js b/test/language/statements/class/gen-method/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-rest.js
rename to test/language/statements/class/gen-method/dflt-params-rest.js
diff --git a/test/language/statements/class/gen-meth/dflt-params-trailing-comma.js b/test/language/statements/class/gen-method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/gen-meth/dflt-params-trailing-comma.js
rename to test/language/statements/class/gen-method/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/gen-meth/params-trailing-comma-multiple.js b/test/language/statements/class/gen-method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/gen-meth/params-trailing-comma-multiple.js
rename to test/language/statements/class/gen-method/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/gen-meth/params-trailing-comma-single.js b/test/language/statements/class/gen-method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/gen-meth/params-trailing-comma-single.js
rename to test/language/statements/class/gen-method/params-trailing-comma-single.js
diff --git a/test/language/statements/class/gen-meth/rest-params-trailing-comma-early-error.js b/test/language/statements/class/gen-method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/gen-meth/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/gen-method/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/meth-static/dflt-params-abrupt.js b/test/language/statements/class/method-static/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-abrupt.js
rename to test/language/statements/class/method-static/dflt-params-abrupt.js
diff --git a/test/language/statements/class/meth-static/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/method-static/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/method-static/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/meth-static/dflt-params-arg-val-undefined.js b/test/language/statements/class/method-static/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/method-static/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/meth-static/dflt-params-duplicates.js b/test/language/statements/class/method-static/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-duplicates.js
rename to test/language/statements/class/method-static/dflt-params-duplicates.js
diff --git a/test/language/statements/class/meth-static/dflt-params-ref-later.js b/test/language/statements/class/method-static/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-ref-later.js
rename to test/language/statements/class/method-static/dflt-params-ref-later.js
diff --git a/test/language/statements/class/meth-static/dflt-params-ref-prior.js b/test/language/statements/class/method-static/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-ref-prior.js
rename to test/language/statements/class/method-static/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/meth-static/dflt-params-ref-self.js b/test/language/statements/class/method-static/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-ref-self.js
rename to test/language/statements/class/method-static/dflt-params-ref-self.js
diff --git a/test/language/statements/class/meth-static/dflt-params-rest.js b/test/language/statements/class/method-static/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-rest.js
rename to test/language/statements/class/method-static/dflt-params-rest.js
diff --git a/test/language/statements/class/meth-static/dflt-params-trailing-comma.js b/test/language/statements/class/method-static/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/meth-static/dflt-params-trailing-comma.js
rename to test/language/statements/class/method-static/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/meth-static/params-trailing-comma-multiple.js b/test/language/statements/class/method-static/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/meth-static/params-trailing-comma-multiple.js
rename to test/language/statements/class/method-static/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/meth-static/params-trailing-comma-single.js b/test/language/statements/class/method-static/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/meth-static/params-trailing-comma-single.js
rename to test/language/statements/class/method-static/params-trailing-comma-single.js
diff --git a/test/language/statements/class/meth-static/rest-params-trailing-comma-early-error.js b/test/language/statements/class/method-static/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/meth-static/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/method-static/rest-params-trailing-comma-early-error.js
diff --git a/test/language/statements/class/meth/dflt-params-abrupt.js b/test/language/statements/class/method/dflt-params-abrupt.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-abrupt.js
rename to test/language/statements/class/method/dflt-params-abrupt.js
diff --git a/test/language/statements/class/meth/dflt-params-arg-val-not-undefined.js b/test/language/statements/class/method/dflt-params-arg-val-not-undefined.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-arg-val-not-undefined.js
rename to test/language/statements/class/method/dflt-params-arg-val-not-undefined.js
diff --git a/test/language/statements/class/meth/dflt-params-arg-val-undefined.js b/test/language/statements/class/method/dflt-params-arg-val-undefined.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-arg-val-undefined.js
rename to test/language/statements/class/method/dflt-params-arg-val-undefined.js
diff --git a/test/language/statements/class/meth/dflt-params-duplicates.js b/test/language/statements/class/method/dflt-params-duplicates.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-duplicates.js
rename to test/language/statements/class/method/dflt-params-duplicates.js
diff --git a/test/language/statements/class/meth/dflt-params-ref-later.js b/test/language/statements/class/method/dflt-params-ref-later.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-ref-later.js
rename to test/language/statements/class/method/dflt-params-ref-later.js
diff --git a/test/language/statements/class/meth/dflt-params-ref-prior.js b/test/language/statements/class/method/dflt-params-ref-prior.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-ref-prior.js
rename to test/language/statements/class/method/dflt-params-ref-prior.js
diff --git a/test/language/statements/class/meth/dflt-params-ref-self.js b/test/language/statements/class/method/dflt-params-ref-self.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-ref-self.js
rename to test/language/statements/class/method/dflt-params-ref-self.js
diff --git a/test/language/statements/class/meth/dflt-params-rest.js b/test/language/statements/class/method/dflt-params-rest.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-rest.js
rename to test/language/statements/class/method/dflt-params-rest.js
diff --git a/test/language/statements/class/meth/dflt-params-trailing-comma.js b/test/language/statements/class/method/dflt-params-trailing-comma.js
similarity index 100%
rename from test/language/statements/class/meth/dflt-params-trailing-comma.js
rename to test/language/statements/class/method/dflt-params-trailing-comma.js
diff --git a/test/language/statements/class/meth/params-trailing-comma-multiple.js b/test/language/statements/class/method/params-trailing-comma-multiple.js
similarity index 100%
rename from test/language/statements/class/meth/params-trailing-comma-multiple.js
rename to test/language/statements/class/method/params-trailing-comma-multiple.js
diff --git a/test/language/statements/class/meth/params-trailing-comma-single.js b/test/language/statements/class/method/params-trailing-comma-single.js
similarity index 100%
rename from test/language/statements/class/meth/params-trailing-comma-single.js
rename to test/language/statements/class/method/params-trailing-comma-single.js
diff --git a/test/language/statements/class/meth/rest-params-trailing-comma-early-error.js b/test/language/statements/class/method/rest-params-trailing-comma-early-error.js
similarity index 100%
rename from test/language/statements/class/meth/rest-params-trailing-comma-early-error.js
rename to test/language/statements/class/method/rest-params-trailing-comma-early-error.js