diff --git a/src/dstr-binding-async-iteration/ary-init-iter-close.case b/src/dstr-binding-for-await/ary-init-iter-close.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-init-iter-close.case
rename to src/dstr-binding-for-await/ary-init-iter-close.case
diff --git a/src/dstr-binding-async-iteration/ary-init-iter-get-err.case b/src/dstr-binding-for-await/ary-init-iter-get-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-init-iter-get-err.case
rename to src/dstr-binding-for-await/ary-init-iter-get-err.case
diff --git a/src/dstr-binding-async-iteration/ary-init-iter-no-close.case b/src/dstr-binding-for-await/ary-init-iter-no-close.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-init-iter-no-close.case
rename to src/dstr-binding-for-await/ary-init-iter-no-close.case
diff --git a/src/dstr-binding-async-iteration/ary-name-iter-val.case b/src/dstr-binding-for-await/ary-name-iter-val.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-name-iter-val.case
rename to src/dstr-binding-for-await/ary-name-iter-val.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elem-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-elem-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elem-init.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-elem-init.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elem-iter.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-elem-iter.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elem-iter.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-elem-iter.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elision-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-elision-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elision-init.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-elision-init.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elision-iter.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-elision-iter.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-elision-iter.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-elision-iter.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-empty-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-empty-init.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-init.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-empty-iter.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-iter.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-empty-iter.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-empty-iter.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-rest-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-rest-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-rest-init.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-rest-init.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-rest-iter.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-rest-iter.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-rest-iter.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-rest-iter.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-ary-val-null.case b/src/dstr-binding-for-await/ary-ptrn-elem-ary-val-null.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-ary-val-null.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-ary-val-null.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-exhausted.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-exhausted.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-exhausted.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-exhausted.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-arrow.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-arrow.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-arrow.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-arrow.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-class.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-class.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-class.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-class.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-cover.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-cover.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-cover.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-cover.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-fn.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-fn.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-fn.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-fn.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-gen.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-gen.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-fn-name-gen.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-fn-name-gen.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-hole.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-hole.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-hole.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-hole.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-skipped.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-skipped.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-skipped.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-skipped.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-throws.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-throws.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-throws.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-throws.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-undef.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-undef.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-undef.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-undef.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-unresolvable.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-init-unresolvable.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-init-unresolvable.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-init-unresolvable.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-complete.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-iter-complete.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-complete.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-iter-complete.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-done.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-iter-done.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-done.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-iter-done.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-step-err.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-iter-step-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-step-err.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-iter-step-err.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-val-err.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-iter-val-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-val-err.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-iter-val-err.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-val.case b/src/dstr-binding-for-await/ary-ptrn-elem-id-iter-val.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-id-iter-val.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-id-iter-val.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-obj-id-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-obj-id-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-obj-id-init.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-obj-id-init.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-obj-id.case b/src/dstr-binding-for-await/ary-ptrn-elem-obj-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-obj-id.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-obj-id.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-obj-prop-id-init.case b/src/dstr-binding-for-await/ary-ptrn-elem-obj-prop-id-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-obj-prop-id-init.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-obj-prop-id-init.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-obj-prop-id.case b/src/dstr-binding-for-await/ary-ptrn-elem-obj-prop-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-obj-prop-id.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-obj-prop-id.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-obj-val-null.case b/src/dstr-binding-for-await/ary-ptrn-elem-obj-val-null.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-obj-val-null.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-obj-val-null.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elem-obj-val-undef.case b/src/dstr-binding-for-await/ary-ptrn-elem-obj-val-undef.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elem-obj-val-undef.case
rename to src/dstr-binding-for-await/ary-ptrn-elem-obj-val-undef.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elision-exhausted.case b/src/dstr-binding-for-await/ary-ptrn-elision-exhausted.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elision-exhausted.case
rename to src/dstr-binding-for-await/ary-ptrn-elision-exhausted.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elision-iter-close.case b/src/dstr-binding-for-await/ary-ptrn-elision-iter-close.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elision-iter-close.case
rename to src/dstr-binding-for-await/ary-ptrn-elision-iter-close.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elision-step-err.case b/src/dstr-binding-for-await/ary-ptrn-elision-step-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elision-step-err.case
rename to src/dstr-binding-for-await/ary-ptrn-elision-step-err.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-elision.case b/src/dstr-binding-for-await/ary-ptrn-elision.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-elision.case
rename to src/dstr-binding-for-await/ary-ptrn-elision.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-empty.case b/src/dstr-binding-for-await/ary-ptrn-empty.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-empty.case
rename to src/dstr-binding-for-await/ary-ptrn-empty.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-ary-elem.case b/src/dstr-binding-for-await/ary-ptrn-rest-ary-elem.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-ary-elem.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-ary-elem.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-ary-elision.case b/src/dstr-binding-for-await/ary-ptrn-rest-ary-elision.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-ary-elision.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-ary-elision.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-ary-empty.case b/src/dstr-binding-for-await/ary-ptrn-rest-ary-empty.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-ary-empty.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-ary-empty.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-ary-rest.case b/src/dstr-binding-for-await/ary-ptrn-rest-ary-rest.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-ary-rest.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-ary-rest.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id-elision-next-err.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-elision-next-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id-elision-next-err.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id-elision-next-err.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id-elision.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-elision.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id-elision.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id-elision.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id-exhausted.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-exhausted.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id-exhausted.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id-exhausted.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id-iter-close.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-close.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id-iter-close.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id-iter-close.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id-iter-step-err.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-step-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id-iter-step-err.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id-iter-step-err.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id-iter-val-err.case b/src/dstr-binding-for-await/ary-ptrn-rest-id-iter-val-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id-iter-val-err.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id-iter-val-err.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-id.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-id.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-init-ary.case b/src/dstr-binding-for-await/ary-ptrn-rest-init-ary.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-init-ary.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-init-ary.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-init-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-init-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-init-id.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-init-id.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-init-obj.case b/src/dstr-binding-for-await/ary-ptrn-rest-init-obj.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-init-obj.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-init-obj.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-not-final-ary.case b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-ary.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-not-final-ary.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-not-final-ary.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-not-final-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-not-final-id.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-not-final-id.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-not-final-obj.case b/src/dstr-binding-for-await/ary-ptrn-rest-not-final-obj.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-not-final-obj.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-not-final-obj.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-obj-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-obj-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-obj-id.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-obj-id.case
diff --git a/src/dstr-binding-async-iteration/ary-ptrn-rest-obj-prop-id.case b/src/dstr-binding-for-await/ary-ptrn-rest-obj-prop-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/ary-ptrn-rest-obj-prop-id.case
rename to src/dstr-binding-for-await/ary-ptrn-rest-obj-prop-id.case
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-func-const-async.template b/src/dstr-binding-for-await/default/for-await-of-async-func-const-async.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-func-const-async.template
rename to src/dstr-binding-for-await/default/for-await-of-async-func-const-async.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-func-const.template b/src/dstr-binding-for-await/default/for-await-of-async-func-const.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-func-const.template
rename to src/dstr-binding-for-await/default/for-await-of-async-func-const.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-func-let-async.template b/src/dstr-binding-for-await/default/for-await-of-async-func-let-async.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-func-let-async.template
rename to src/dstr-binding-for-await/default/for-await-of-async-func-let-async.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-func-let.template b/src/dstr-binding-for-await/default/for-await-of-async-func-let.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-func-let.template
rename to src/dstr-binding-for-await/default/for-await-of-async-func-let.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-func-var-async.template b/src/dstr-binding-for-await/default/for-await-of-async-func-var-async.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-func-var-async.template
rename to src/dstr-binding-for-await/default/for-await-of-async-func-var-async.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-func-var.template b/src/dstr-binding-for-await/default/for-await-of-async-func-var.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-func-var.template
rename to src/dstr-binding-for-await/default/for-await-of-async-func-var.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-gen-const-async.template b/src/dstr-binding-for-await/default/for-await-of-async-gen-const-async.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-gen-const-async.template
rename to src/dstr-binding-for-await/default/for-await-of-async-gen-const-async.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-gen-const.template b/src/dstr-binding-for-await/default/for-await-of-async-gen-const.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-gen-const.template
rename to src/dstr-binding-for-await/default/for-await-of-async-gen-const.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-gen-let-async.template b/src/dstr-binding-for-await/default/for-await-of-async-gen-let-async.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-gen-let-async.template
rename to src/dstr-binding-for-await/default/for-await-of-async-gen-let-async.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-gen-let.template b/src/dstr-binding-for-await/default/for-await-of-async-gen-let.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-gen-let.template
rename to src/dstr-binding-for-await/default/for-await-of-async-gen-let.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-gen-var-async.template b/src/dstr-binding-for-await/default/for-await-of-async-gen-var-async.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-gen-var-async.template
rename to src/dstr-binding-for-await/default/for-await-of-async-gen-var-async.template
diff --git a/src/dstr-binding-async-iteration/default/for-await-of-async-gen-var.template b/src/dstr-binding-for-await/default/for-await-of-async-gen-var.template
similarity index 100%
rename from src/dstr-binding-async-iteration/default/for-await-of-async-gen-var.template
rename to src/dstr-binding-for-await/default/for-await-of-async-gen-var.template
diff --git a/src/dstr-binding-async-iteration/error/for-await-of-async-func-const.template b/src/dstr-binding-for-await/error/for-await-of-async-func-const.template
similarity index 100%
rename from src/dstr-binding-async-iteration/error/for-await-of-async-func-const.template
rename to src/dstr-binding-for-await/error/for-await-of-async-func-const.template
diff --git a/src/dstr-binding-async-iteration/error/for-await-of-async-func-let.template b/src/dstr-binding-for-await/error/for-await-of-async-func-let.template
similarity index 100%
rename from src/dstr-binding-async-iteration/error/for-await-of-async-func-let.template
rename to src/dstr-binding-for-await/error/for-await-of-async-func-let.template
diff --git a/src/dstr-binding-async-iteration/error/for-await-of-async-func-var.template b/src/dstr-binding-for-await/error/for-await-of-async-func-var.template
similarity index 100%
rename from src/dstr-binding-async-iteration/error/for-await-of-async-func-var.template
rename to src/dstr-binding-for-await/error/for-await-of-async-func-var.template
diff --git a/src/dstr-binding-async-iteration/error/for-await-of-async-gen-const.template b/src/dstr-binding-for-await/error/for-await-of-async-gen-const.template
similarity index 100%
rename from src/dstr-binding-async-iteration/error/for-await-of-async-gen-const.template
rename to src/dstr-binding-for-await/error/for-await-of-async-gen-const.template
diff --git a/src/dstr-binding-async-iteration/error/for-await-of-async-gen-let.template b/src/dstr-binding-for-await/error/for-await-of-async-gen-let.template
similarity index 100%
rename from src/dstr-binding-async-iteration/error/for-await-of-async-gen-let.template
rename to src/dstr-binding-for-await/error/for-await-of-async-gen-let.template
diff --git a/src/dstr-binding-async-iteration/error/for-await-of-async-gen-var.template b/src/dstr-binding-for-await/error/for-await-of-async-gen-var.template
similarity index 100%
rename from src/dstr-binding-async-iteration/error/for-await-of-async-gen-var.template
rename to src/dstr-binding-for-await/error/for-await-of-async-gen-var.template
diff --git a/src/dstr-binding-async-iteration/iter-close/for-await-of-async-func-const.template b/src/dstr-binding-for-await/iter-close/for-await-of-async-func-const.template
similarity index 100%
rename from src/dstr-binding-async-iteration/iter-close/for-await-of-async-func-const.template
rename to src/dstr-binding-for-await/iter-close/for-await-of-async-func-const.template
diff --git a/src/dstr-binding-async-iteration/iter-close/for-await-of-async-func-let.template b/src/dstr-binding-for-await/iter-close/for-await-of-async-func-let.template
similarity index 100%
rename from src/dstr-binding-async-iteration/iter-close/for-await-of-async-func-let.template
rename to src/dstr-binding-for-await/iter-close/for-await-of-async-func-let.template
diff --git a/src/dstr-binding-async-iteration/iter-close/for-await-of-async-func-var.template b/src/dstr-binding-for-await/iter-close/for-await-of-async-func-var.template
similarity index 100%
rename from src/dstr-binding-async-iteration/iter-close/for-await-of-async-func-var.template
rename to src/dstr-binding-for-await/iter-close/for-await-of-async-func-var.template
diff --git a/src/dstr-binding-async-iteration/iter-close/for-await-of-async-gen-const.template b/src/dstr-binding-for-await/iter-close/for-await-of-async-gen-const.template
similarity index 100%
rename from src/dstr-binding-async-iteration/iter-close/for-await-of-async-gen-const.template
rename to src/dstr-binding-for-await/iter-close/for-await-of-async-gen-const.template
diff --git a/src/dstr-binding-async-iteration/iter-close/for-await-of-async-gen-let.template b/src/dstr-binding-for-await/iter-close/for-await-of-async-gen-let.template
similarity index 100%
rename from src/dstr-binding-async-iteration/iter-close/for-await-of-async-gen-let.template
rename to src/dstr-binding-for-await/iter-close/for-await-of-async-gen-let.template
diff --git a/src/dstr-binding-async-iteration/iter-close/for-await-of-async-gen-var.template b/src/dstr-binding-for-await/iter-close/for-await-of-async-gen-var.template
similarity index 100%
rename from src/dstr-binding-async-iteration/iter-close/for-await-of-async-gen-var.template
rename to src/dstr-binding-for-await/iter-close/for-await-of-async-gen-var.template
diff --git a/src/dstr-binding-async-iteration/obj-init-null.case b/src/dstr-binding-for-await/obj-init-null.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-init-null.case
rename to src/dstr-binding-for-await/obj-init-null.case
diff --git a/src/dstr-binding-async-iteration/obj-init-undefined.case b/src/dstr-binding-for-await/obj-init-undefined.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-init-undefined.case
rename to src/dstr-binding-for-await/obj-init-undefined.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-empty.case b/src/dstr-binding-for-await/obj-ptrn-empty.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-empty.case
rename to src/dstr-binding-for-await/obj-ptrn-empty.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-get-value-err.case b/src/dstr-binding-for-await/obj-ptrn-id-get-value-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-get-value-err.case
rename to src/dstr-binding-for-await/obj-ptrn-id-get-value-err.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-arrow.case b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-arrow.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-arrow.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-arrow.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-class.case b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-class.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-class.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-class.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-cover.case b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-cover.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-cover.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-cover.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-fn.case b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-fn.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-fn.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-fn.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-gen.case b/src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-gen.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-fn-name-gen.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-fn-name-gen.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-skipped.case b/src/dstr-binding-for-await/obj-ptrn-id-init-skipped.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-skipped.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-skipped.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-throws.case b/src/dstr-binding-for-await/obj-ptrn-id-init-throws.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-throws.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-throws.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-init-unresolvable.case b/src/dstr-binding-for-await/obj-ptrn-id-init-unresolvable.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-init-unresolvable.case
rename to src/dstr-binding-for-await/obj-ptrn-id-init-unresolvable.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-id-trailing-comma.case b/src/dstr-binding-for-await/obj-ptrn-id-trailing-comma.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-id-trailing-comma.case
rename to src/dstr-binding-for-await/obj-ptrn-id-trailing-comma.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-list-err.case b/src/dstr-binding-for-await/obj-ptrn-list-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-list-err.case
rename to src/dstr-binding-for-await/obj-ptrn-list-err.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-ary-init.case b/src/dstr-binding-for-await/obj-ptrn-prop-ary-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-ary-init.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-ary-init.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-ary-trailing-comma.case b/src/dstr-binding-for-await/obj-ptrn-prop-ary-trailing-comma.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-ary-trailing-comma.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-ary-trailing-comma.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-ary-value-null.case b/src/dstr-binding-for-await/obj-ptrn-prop-ary-value-null.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-ary-value-null.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-ary-value-null.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-ary.case b/src/dstr-binding-for-await/obj-ptrn-prop-ary.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-ary.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-ary.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-eval-err.case b/src/dstr-binding-for-await/obj-ptrn-prop-eval-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-eval-err.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-eval-err.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id-get-value-err.case b/src/dstr-binding-for-await/obj-ptrn-prop-id-get-value-err.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id-get-value-err.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id-get-value-err.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id-init-skipped.case b/src/dstr-binding-for-await/obj-ptrn-prop-id-init-skipped.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id-init-skipped.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id-init-skipped.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id-init-throws.case b/src/dstr-binding-for-await/obj-ptrn-prop-id-init-throws.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id-init-throws.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id-init-throws.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id-init-unresolvable.case b/src/dstr-binding-for-await/obj-ptrn-prop-id-init-unresolvable.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id-init-unresolvable.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id-init-unresolvable.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id-init.case b/src/dstr-binding-for-await/obj-ptrn-prop-id-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id-init.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id-init.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id-trailing-comma.case b/src/dstr-binding-for-await/obj-ptrn-prop-id-trailing-comma.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id-trailing-comma.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id-trailing-comma.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-id.case b/src/dstr-binding-for-await/obj-ptrn-prop-id.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-id.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-id.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-obj-init.case b/src/dstr-binding-for-await/obj-ptrn-prop-obj-init.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-obj-init.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-obj-init.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-obj-value-null.case b/src/dstr-binding-for-await/obj-ptrn-prop-obj-value-null.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-obj-value-null.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-obj-value-null.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-obj-value-undef.case b/src/dstr-binding-for-await/obj-ptrn-prop-obj-value-undef.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-obj-value-undef.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-obj-value-undef.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-prop-obj.case b/src/dstr-binding-for-await/obj-ptrn-prop-obj.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-prop-obj.case
rename to src/dstr-binding-for-await/obj-ptrn-prop-obj.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-rest-getter.case b/src/dstr-binding-for-await/obj-ptrn-rest-getter.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-rest-getter.case
rename to src/dstr-binding-for-await/obj-ptrn-rest-getter.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-rest-nested-obj.case b/src/dstr-binding-for-await/obj-ptrn-rest-nested-obj.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-rest-nested-obj.case
rename to src/dstr-binding-for-await/obj-ptrn-rest-nested-obj.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-rest-obj-nested-rest.case b/src/dstr-binding-for-await/obj-ptrn-rest-obj-nested-rest.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-rest-obj-nested-rest.case
rename to src/dstr-binding-for-await/obj-ptrn-rest-obj-nested-rest.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-rest-obj-own-property.case b/src/dstr-binding-for-await/obj-ptrn-rest-obj-own-property.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-rest-obj-own-property.case
rename to src/dstr-binding-for-await/obj-ptrn-rest-obj-own-property.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-rest-skip-non-enumerable.case b/src/dstr-binding-for-await/obj-ptrn-rest-skip-non-enumerable.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-rest-skip-non-enumerable.case
rename to src/dstr-binding-for-await/obj-ptrn-rest-skip-non-enumerable.case
diff --git a/src/dstr-binding-async-iteration/obj-ptrn-rest-val-obj.case b/src/dstr-binding-for-await/obj-ptrn-rest-val-obj.case
similarity index 100%
rename from src/dstr-binding-async-iteration/obj-ptrn-rest-val-obj.case
rename to src/dstr-binding-for-await/obj-ptrn-rest-val-obj.case