diff --git a/test/fixtures/transformation/classes/accessing-super-class/actual.js b/test/fixtures/transformation/es6-classes/accessing-super-class/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/accessing-super-class/actual.js
rename to test/fixtures/transformation/es6-classes/accessing-super-class/actual.js
diff --git a/test/fixtures/transformation/classes/accessing-super-class/expected.js b/test/fixtures/transformation/es6-classes/accessing-super-class/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/accessing-super-class/expected.js
rename to test/fixtures/transformation/es6-classes/accessing-super-class/expected.js
diff --git a/test/fixtures/transformation/classes/accessing-super-properties/actual.js b/test/fixtures/transformation/es6-classes/accessing-super-properties/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/accessing-super-properties/actual.js
rename to test/fixtures/transformation/es6-classes/accessing-super-properties/actual.js
diff --git a/test/fixtures/transformation/classes/accessing-super-properties/expected.js b/test/fixtures/transformation/es6-classes/accessing-super-properties/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/accessing-super-properties/expected.js
rename to test/fixtures/transformation/es6-classes/accessing-super-properties/expected.js
diff --git a/test/fixtures/transformation/classes/calling-super-properties/actual.js b/test/fixtures/transformation/es6-classes/calling-super-properties/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/calling-super-properties/actual.js
rename to test/fixtures/transformation/es6-classes/calling-super-properties/actual.js
diff --git a/test/fixtures/transformation/classes/calling-super-properties/expected.js b/test/fixtures/transformation/es6-classes/calling-super-properties/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/calling-super-properties/expected.js
rename to test/fixtures/transformation/es6-classes/calling-super-properties/expected.js
diff --git a/test/fixtures/transformation/classes/constructor/actual.js b/test/fixtures/transformation/es6-classes/constructor/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/constructor/actual.js
rename to test/fixtures/transformation/es6-classes/constructor/actual.js
diff --git a/test/fixtures/transformation/classes/constructor/expected.js b/test/fixtures/transformation/es6-classes/constructor/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/constructor/expected.js
rename to test/fixtures/transformation/es6-classes/constructor/expected.js
diff --git a/test/fixtures/transformation/classes/defining-constructor-as-a-mutator/actual.js b/test/fixtures/transformation/es6-classes/defining-constructor-as-a-mutator/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/defining-constructor-as-a-mutator/actual.js
rename to test/fixtures/transformation/es6-classes/defining-constructor-as-a-mutator/actual.js
diff --git a/test/fixtures/transformation/classes/defining-constructor-as-a-mutator/options.json b/test/fixtures/transformation/es6-classes/defining-constructor-as-a-mutator/options.json
similarity index 100%
rename from test/fixtures/transformation/classes/defining-constructor-as-a-mutator/options.json
rename to test/fixtures/transformation/es6-classes/defining-constructor-as-a-mutator/options.json
diff --git a/test/fixtures/transformation/classes/instance-getter-and-setter/actual.js b/test/fixtures/transformation/es6-classes/instance-getter-and-setter/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-getter-and-setter/actual.js
rename to test/fixtures/transformation/es6-classes/instance-getter-and-setter/actual.js
diff --git a/test/fixtures/transformation/classes/instance-getter-and-setter/expected.js b/test/fixtures/transformation/es6-classes/instance-getter-and-setter/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-getter-and-setter/expected.js
rename to test/fixtures/transformation/es6-classes/instance-getter-and-setter/expected.js
diff --git a/test/fixtures/transformation/classes/instance-getter/actual.js b/test/fixtures/transformation/es6-classes/instance-getter/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-getter/actual.js
rename to test/fixtures/transformation/es6-classes/instance-getter/actual.js
diff --git a/test/fixtures/transformation/classes/instance-getter/expected.js b/test/fixtures/transformation/es6-classes/instance-getter/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-getter/expected.js
rename to test/fixtures/transformation/es6-classes/instance-getter/expected.js
diff --git a/test/fixtures/transformation/classes/instance-method/actual.js b/test/fixtures/transformation/es6-classes/instance-method/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-method/actual.js
rename to test/fixtures/transformation/es6-classes/instance-method/actual.js
diff --git a/test/fixtures/transformation/classes/instance-method/expected.js b/test/fixtures/transformation/es6-classes/instance-method/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-method/expected.js
rename to test/fixtures/transformation/es6-classes/instance-method/expected.js
diff --git a/test/fixtures/transformation/classes/instance-setter/actual.js b/test/fixtures/transformation/es6-classes/instance-setter/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-setter/actual.js
rename to test/fixtures/transformation/es6-classes/instance-setter/actual.js
diff --git a/test/fixtures/transformation/classes/instance-setter/expected.js b/test/fixtures/transformation/es6-classes/instance-setter/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/instance-setter/expected.js
rename to test/fixtures/transformation/es6-classes/instance-setter/expected.js
diff --git a/test/fixtures/transformation/classes/plain-class/actual.js b/test/fixtures/transformation/es6-classes/plain-class/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/plain-class/actual.js
rename to test/fixtures/transformation/es6-classes/plain-class/actual.js
diff --git a/test/fixtures/transformation/classes/plain-class/expected.js b/test/fixtures/transformation/es6-classes/plain-class/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/plain-class/expected.js
rename to test/fixtures/transformation/es6-classes/plain-class/expected.js
diff --git a/test/fixtures/transformation/classes/statement/actual.js b/test/fixtures/transformation/es6-classes/statement/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/statement/actual.js
rename to test/fixtures/transformation/es6-classes/statement/actual.js
diff --git a/test/fixtures/transformation/classes/statement/expected.js b/test/fixtures/transformation/es6-classes/statement/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/statement/expected.js
rename to test/fixtures/transformation/es6-classes/statement/expected.js
diff --git a/test/fixtures/transformation/classes/static/actual.js b/test/fixtures/transformation/es6-classes/static/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/static/actual.js
rename to test/fixtures/transformation/es6-classes/static/actual.js
diff --git a/test/fixtures/transformation/classes/static/expected.js b/test/fixtures/transformation/es6-classes/static/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/static/expected.js
rename to test/fixtures/transformation/es6-classes/static/expected.js
diff --git a/test/fixtures/transformation/classes/super-class-id-member-expression/actual.js b/test/fixtures/transformation/es6-classes/super-class-id-member-expression/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-class-id-member-expression/actual.js
rename to test/fixtures/transformation/es6-classes/super-class-id-member-expression/actual.js
diff --git a/test/fixtures/transformation/classes/super-class-id-member-expression/expected.js b/test/fixtures/transformation/es6-classes/super-class-id-member-expression/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-class-id-member-expression/expected.js
rename to test/fixtures/transformation/es6-classes/super-class-id-member-expression/expected.js
diff --git a/test/fixtures/transformation/classes/super-class-id-non-identifiers/actual.js b/test/fixtures/transformation/es6-classes/super-class-id-non-identifiers/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-class-id-non-identifiers/actual.js
rename to test/fixtures/transformation/es6-classes/super-class-id-non-identifiers/actual.js
diff --git a/test/fixtures/transformation/classes/super-class-id-non-identifiers/expected.js b/test/fixtures/transformation/es6-classes/super-class-id-non-identifiers/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-class-id-non-identifiers/expected.js
rename to test/fixtures/transformation/es6-classes/super-class-id-non-identifiers/expected.js
diff --git a/test/fixtures/transformation/classes/super-class/actual.js b/test/fixtures/transformation/es6-classes/super-class/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-class/actual.js
rename to test/fixtures/transformation/es6-classes/super-class/actual.js
diff --git a/test/fixtures/transformation/classes/super-class/expected.js b/test/fixtures/transformation/es6-classes/super-class/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-class/expected.js
rename to test/fixtures/transformation/es6-classes/super-class/expected.js
diff --git a/test/fixtures/transformation/classes/super-function-fallback/actual.js b/test/fixtures/transformation/es6-classes/super-function-fallback/actual.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-function-fallback/actual.js
rename to test/fixtures/transformation/es6-classes/super-function-fallback/actual.js
diff --git a/test/fixtures/transformation/classes/super-function-fallback/expected.js b/test/fixtures/transformation/es6-classes/super-function-fallback/expected.js
similarity index 100%
rename from test/fixtures/transformation/classes/super-function-fallback/expected.js
rename to test/fixtures/transformation/es6-classes/super-function-fallback/expected.js
diff --git a/test/fixtures/transformation/destructuring/array/actual.js b/test/fixtures/transformation/es6-destructuring/array/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/array/actual.js
rename to test/fixtures/transformation/es6-destructuring/array/actual.js
diff --git a/test/fixtures/transformation/destructuring/array/expected.js b/test/fixtures/transformation/es6-destructuring/array/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/array/expected.js
rename to test/fixtures/transformation/es6-destructuring/array/expected.js
diff --git a/test/fixtures/transformation/destructuring/assignment-expression-statement-only/actual.js b/test/fixtures/transformation/es6-destructuring/assignment-expression-statement-only/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/assignment-expression-statement-only/actual.js
rename to test/fixtures/transformation/es6-destructuring/assignment-expression-statement-only/actual.js
diff --git a/test/fixtures/transformation/destructuring/assignment-expression-statement-only/options.json b/test/fixtures/transformation/es6-destructuring/assignment-expression-statement-only/options.json
similarity index 100%
rename from test/fixtures/transformation/destructuring/assignment-expression-statement-only/options.json
rename to test/fixtures/transformation/es6-destructuring/assignment-expression-statement-only/options.json
diff --git a/test/fixtures/transformation/destructuring/assignment-expression/actual.js b/test/fixtures/transformation/es6-destructuring/assignment-expression/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/assignment-expression/actual.js
rename to test/fixtures/transformation/es6-destructuring/assignment-expression/actual.js
diff --git a/test/fixtures/transformation/destructuring/assignment-expression/options.json b/test/fixtures/transformation/es6-destructuring/assignment-expression/options.json
similarity index 100%
rename from test/fixtures/transformation/destructuring/assignment-expression/options.json
rename to test/fixtures/transformation/es6-destructuring/assignment-expression/options.json
diff --git a/test/fixtures/transformation/destructuring/assignment-statement/actual.js b/test/fixtures/transformation/es6-destructuring/assignment-statement/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/assignment-statement/actual.js
rename to test/fixtures/transformation/es6-destructuring/assignment-statement/actual.js
diff --git a/test/fixtures/transformation/destructuring/assignment-statement/expected.js b/test/fixtures/transformation/es6-destructuring/assignment-statement/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/assignment-statement/expected.js
rename to test/fixtures/transformation/es6-destructuring/assignment-statement/expected.js
diff --git a/test/fixtures/transformation/destructuring/empty/actual.js b/test/fixtures/transformation/es6-destructuring/empty/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/empty/actual.js
rename to test/fixtures/transformation/es6-destructuring/empty/actual.js
diff --git a/test/fixtures/transformation/destructuring/empty/expected.js b/test/fixtures/transformation/es6-destructuring/empty/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/empty/expected.js
rename to test/fixtures/transformation/es6-destructuring/empty/expected.js
diff --git a/test/fixtures/transformation/destructuring/for-in/actual.js b/test/fixtures/transformation/es6-destructuring/for-in/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/for-in/actual.js
rename to test/fixtures/transformation/es6-destructuring/for-in/actual.js
diff --git a/test/fixtures/transformation/destructuring/for-in/expected.js b/test/fixtures/transformation/es6-destructuring/for-in/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/for-in/expected.js
rename to test/fixtures/transformation/es6-destructuring/for-in/expected.js
diff --git a/test/fixtures/transformation/destructuring/for-of/actual.js b/test/fixtures/transformation/es6-destructuring/for-of/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/for-of/actual.js
rename to test/fixtures/transformation/es6-destructuring/for-of/actual.js
diff --git a/test/fixtures/transformation/destructuring/for-of/expected.js b/test/fixtures/transformation/es6-destructuring/for-of/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/for-of/expected.js
rename to test/fixtures/transformation/es6-destructuring/for-of/expected.js
diff --git a/test/fixtures/transformation/destructuring/member-expression/actual.js b/test/fixtures/transformation/es6-destructuring/member-expression/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/member-expression/actual.js
rename to test/fixtures/transformation/es6-destructuring/member-expression/actual.js
diff --git a/test/fixtures/transformation/destructuring/member-expression/expected.js b/test/fixtures/transformation/es6-destructuring/member-expression/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/member-expression/expected.js
rename to test/fixtures/transformation/es6-destructuring/member-expression/expected.js
diff --git a/test/fixtures/transformation/destructuring/mixed/actual.js b/test/fixtures/transformation/es6-destructuring/mixed/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/mixed/actual.js
rename to test/fixtures/transformation/es6-destructuring/mixed/actual.js
diff --git a/test/fixtures/transformation/destructuring/mixed/expected.js b/test/fixtures/transformation/es6-destructuring/mixed/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/mixed/expected.js
rename to test/fixtures/transformation/es6-destructuring/mixed/expected.js
diff --git a/test/fixtures/transformation/destructuring/multiple/actual.js b/test/fixtures/transformation/es6-destructuring/multiple/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/multiple/actual.js
rename to test/fixtures/transformation/es6-destructuring/multiple/actual.js
diff --git a/test/fixtures/transformation/destructuring/multiple/expected.js b/test/fixtures/transformation/es6-destructuring/multiple/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/multiple/expected.js
rename to test/fixtures/transformation/es6-destructuring/multiple/expected.js
diff --git a/test/fixtures/transformation/destructuring/object-advanced/actual.js b/test/fixtures/transformation/es6-destructuring/object-advanced/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/object-advanced/actual.js
rename to test/fixtures/transformation/es6-destructuring/object-advanced/actual.js
diff --git a/test/fixtures/transformation/destructuring/object-advanced/expected.js b/test/fixtures/transformation/es6-destructuring/object-advanced/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/object-advanced/expected.js
rename to test/fixtures/transformation/es6-destructuring/object-advanced/expected.js
diff --git a/test/fixtures/transformation/destructuring/object-basic/actual.js b/test/fixtures/transformation/es6-destructuring/object-basic/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/object-basic/actual.js
rename to test/fixtures/transformation/es6-destructuring/object-basic/actual.js
diff --git a/test/fixtures/transformation/destructuring/object-basic/expected.js b/test/fixtures/transformation/es6-destructuring/object-basic/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/object-basic/expected.js
rename to test/fixtures/transformation/es6-destructuring/object-basic/expected.js
diff --git a/test/fixtures/transformation/destructuring/parameters/actual.js b/test/fixtures/transformation/es6-destructuring/parameters/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/parameters/actual.js
rename to test/fixtures/transformation/es6-destructuring/parameters/actual.js
diff --git a/test/fixtures/transformation/destructuring/parameters/expected.js b/test/fixtures/transformation/es6-destructuring/parameters/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/parameters/expected.js
rename to test/fixtures/transformation/es6-destructuring/parameters/expected.js
diff --git a/test/fixtures/transformation/destructuring/spread-generator/exec.js b/test/fixtures/transformation/es6-destructuring/spread-generator/exec.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/spread-generator/exec.js
rename to test/fixtures/transformation/es6-destructuring/spread-generator/exec.js
diff --git a/test/fixtures/transformation/destructuring/spread/actual.js b/test/fixtures/transformation/es6-destructuring/spread/actual.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/spread/actual.js
rename to test/fixtures/transformation/es6-destructuring/spread/actual.js
diff --git a/test/fixtures/transformation/destructuring/spread/expected.js b/test/fixtures/transformation/es6-destructuring/spread/expected.js
similarity index 100%
rename from test/fixtures/transformation/destructuring/spread/expected.js
rename to test/fixtures/transformation/es6-destructuring/spread/expected.js