diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49bca53ec7..eb5bce0833 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,8 +61,6 @@ _Note: Gaps between patch versions are faulty/broken releases._
      * `methodBinding` -> `playground.methodBinding`
      * `memoizationOperator` -> `playground.memoizationOperator`
      * `objectGetterMemoization` -> `playground.objectGetterMemoization`
-     * `asyncToGenerator` -> `misc.asyncToGenerator`
-     * `bluebirdCoroutines` -> `misc.bluebirdCoroutines`
      * `modules` -> `es6.modules`
      * `propertyNameShorthand` -> `es6.properties.shorthand`
      * `arrayComprehension` -> `es7.comprehensions`
diff --git a/lib/6to5/transformation/transform.js b/lib/6to5/transformation/transform.js
index 6663a61697..2cea841086 100644
--- a/lib/6to5/transformation/transform.js
+++ b/lib/6to5/transformation/transform.js
@@ -59,8 +59,8 @@ _.each({
   "playground.memoizationOperator":     require("./transformers/playground/memoization-operator"),
   "playground.objectGetterMemoization": require("./transformers/playground/object-getter-memoization"),
 
-  "misc.asyncToGenerator":   require("./transformers/misc/async-to-generator"),
-  "misc.bluebirdCoroutines": require("./transformers/misc/bluebird-coroutines"),
+  asyncToGenerator:                   require("./transformers/other/async-to-generator"),
+  bluebirdCoroutines:                 require("./transformers/other/bluebird-coroutines"),
 
   react:                              require("./transformers/other/react"),
 
@@ -112,7 +112,7 @@ _.each({
   // needs to be after `regenerator` due to needing `regeneratorRuntime` references
   // needs to be after `es6.forOf` due to needing `Symbol.iterator` references
   // needs to be before `es6.modules` due to dynamic imports
-  "misc.selfContained":               require("./transformers/misc/self-contained"),
+  selfContained:                      require("./transformers/other/self-contained"),
 
   _blockHoist:                        require("./transformers/_block-hoist"),
 
diff --git a/lib/6to5/transformation/transformers/misc/async-to-generator.js b/lib/6to5/transformation/transformers/other/async-to-generator.js
similarity index 100%
rename from lib/6to5/transformation/transformers/misc/async-to-generator.js
rename to lib/6to5/transformation/transformers/other/async-to-generator.js
diff --git a/lib/6to5/transformation/transformers/misc/bluebird-coroutines.js b/lib/6to5/transformation/transformers/other/bluebird-coroutines.js
similarity index 100%
rename from lib/6to5/transformation/transformers/misc/bluebird-coroutines.js
rename to lib/6to5/transformation/transformers/other/bluebird-coroutines.js
diff --git a/lib/6to5/transformation/transformers/misc/self-contained.js b/lib/6to5/transformation/transformers/other/self-contained.js
similarity index 100%
rename from lib/6to5/transformation/transformers/misc/self-contained.js
rename to lib/6to5/transformation/transformers/other/self-contained.js
diff --git a/test/fixtures/transformation/misc-async-to-generator/expression/actual.js b/test/fixtures/transformation/async-to-generator/expression/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-async-to-generator/expression/actual.js
rename to test/fixtures/transformation/async-to-generator/expression/actual.js
diff --git a/test/fixtures/transformation/misc-async-to-generator/expression/expected.js b/test/fixtures/transformation/async-to-generator/expression/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-async-to-generator/expression/expected.js
rename to test/fixtures/transformation/async-to-generator/expression/expected.js
diff --git a/test/fixtures/transformation/async-to-generator/options.json b/test/fixtures/transformation/async-to-generator/options.json
new file mode 100644
index 0000000000..9dbdefeeb0
--- /dev/null
+++ b/test/fixtures/transformation/async-to-generator/options.json
@@ -0,0 +1,4 @@
+{
+  "noCheckAst": true,
+  "optional": ["asyncToGenerator"]
+}
diff --git a/test/fixtures/transformation/misc-async-to-generator/statement/actual.js b/test/fixtures/transformation/async-to-generator/statement/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-async-to-generator/statement/actual.js
rename to test/fixtures/transformation/async-to-generator/statement/actual.js
diff --git a/test/fixtures/transformation/misc-async-to-generator/statement/expected.js b/test/fixtures/transformation/async-to-generator/statement/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-async-to-generator/statement/expected.js
rename to test/fixtures/transformation/async-to-generator/statement/expected.js
diff --git a/test/fixtures/transformation/misc-bluebird-coroutines/expression/actual.js b/test/fixtures/transformation/bluebird-coroutines/expression/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-bluebird-coroutines/expression/actual.js
rename to test/fixtures/transformation/bluebird-coroutines/expression/actual.js
diff --git a/test/fixtures/transformation/misc-bluebird-coroutines/expression/expected.js b/test/fixtures/transformation/bluebird-coroutines/expression/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-bluebird-coroutines/expression/expected.js
rename to test/fixtures/transformation/bluebird-coroutines/expression/expected.js
diff --git a/test/fixtures/transformation/bluebird-coroutines/options.json b/test/fixtures/transformation/bluebird-coroutines/options.json
new file mode 100644
index 0000000000..beb0408342
--- /dev/null
+++ b/test/fixtures/transformation/bluebird-coroutines/options.json
@@ -0,0 +1,4 @@
+{
+  "optional": ["bluebirdCoroutines"],
+  "noCheckAst": true
+}
diff --git a/test/fixtures/transformation/misc-bluebird-coroutines/statement/actual.js b/test/fixtures/transformation/bluebird-coroutines/statement/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-bluebird-coroutines/statement/actual.js
rename to test/fixtures/transformation/bluebird-coroutines/statement/actual.js
diff --git a/test/fixtures/transformation/misc-bluebird-coroutines/statement/expected.js b/test/fixtures/transformation/bluebird-coroutines/statement/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-bluebird-coroutines/statement/expected.js
rename to test/fixtures/transformation/bluebird-coroutines/statement/expected.js
diff --git a/test/fixtures/transformation/misc-async-to-generator/options.json b/test/fixtures/transformation/misc-async-to-generator/options.json
deleted file mode 100644
index f5ac3882dd..0000000000
--- a/test/fixtures/transformation/misc-async-to-generator/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "noCheckAst": true,
-  "optional": ["misc.asyncToGenerator"]
-}
diff --git a/test/fixtures/transformation/misc-bluebird-coroutines/options.json b/test/fixtures/transformation/misc-bluebird-coroutines/options.json
deleted file mode 100644
index 5a66a3ffe6..0000000000
--- a/test/fixtures/transformation/misc-bluebird-coroutines/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "optional": ["misc.bluebirdCoroutines"],
-  "noCheckAst": true
-}
diff --git a/test/fixtures/transformation/misc-self-contained/options.json b/test/fixtures/transformation/misc-self-contained/options.json
deleted file mode 100644
index a28ebc7a9e..0000000000
--- a/test/fixtures/transformation/misc-self-contained/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "optional": ["misc.selfContained"],
-  "experimental": true
-}
diff --git a/test/fixtures/transformation/misc-self-contained/aliased-constructors/actual.js b/test/fixtures/transformation/self-contained/aliased-constructors/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/aliased-constructors/actual.js
rename to test/fixtures/transformation/self-contained/aliased-constructors/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/aliased-constructors/expected.js b/test/fixtures/transformation/self-contained/aliased-constructors/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/aliased-constructors/expected.js
rename to test/fixtures/transformation/self-contained/aliased-constructors/expected.js
diff --git a/test/fixtures/transformation/misc-self-contained/es6-for-of/actual.js b/test/fixtures/transformation/self-contained/es6-for-of/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/es6-for-of/actual.js
rename to test/fixtures/transformation/self-contained/es6-for-of/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/es6-for-of/expected.js b/test/fixtures/transformation/self-contained/es6-for-of/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/es6-for-of/expected.js
rename to test/fixtures/transformation/self-contained/es6-for-of/expected.js
diff --git a/test/fixtures/transformation/misc-self-contained/es7-array-comprehensions/actual.js b/test/fixtures/transformation/self-contained/es7-array-comprehensions/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/es7-array-comprehensions/actual.js
rename to test/fixtures/transformation/self-contained/es7-array-comprehensions/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/es7-array-comprehensions/expected.js b/test/fixtures/transformation/self-contained/es7-array-comprehensions/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/es7-array-comprehensions/expected.js
rename to test/fixtures/transformation/self-contained/es7-array-comprehensions/expected.js
diff --git a/test/fixtures/transformation/misc-self-contained/full/actual.js b/test/fixtures/transformation/self-contained/full/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/full/actual.js
rename to test/fixtures/transformation/self-contained/full/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/full/expected.js b/test/fixtures/transformation/self-contained/full/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/full/expected.js
rename to test/fixtures/transformation/self-contained/full/expected.js
diff --git a/test/fixtures/transformation/self-contained/options.json b/test/fixtures/transformation/self-contained/options.json
new file mode 100644
index 0000000000..079cf304ad
--- /dev/null
+++ b/test/fixtures/transformation/self-contained/options.json
@@ -0,0 +1,4 @@
+{
+  "optional": ["selfContained"],
+  "experimental": true
+}
diff --git a/test/fixtures/transformation/misc-self-contained/regenerator-runtime/actual.js b/test/fixtures/transformation/self-contained/regenerator-runtime/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/regenerator-runtime/actual.js
rename to test/fixtures/transformation/self-contained/regenerator-runtime/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/regenerator-runtime/expected.js b/test/fixtures/transformation/self-contained/regenerator-runtime/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/regenerator-runtime/expected.js
rename to test/fixtures/transformation/self-contained/regenerator-runtime/expected.js
diff --git a/test/fixtures/transformation/misc-self-contained/runtime-amd/actual.js b/test/fixtures/transformation/self-contained/runtime-amd/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/runtime-amd/actual.js
rename to test/fixtures/transformation/self-contained/runtime-amd/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/runtime-amd/expected.js b/test/fixtures/transformation/self-contained/runtime-amd/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/runtime-amd/expected.js
rename to test/fixtures/transformation/self-contained/runtime-amd/expected.js
diff --git a/test/fixtures/transformation/misc-self-contained/runtime-amd/options.json b/test/fixtures/transformation/self-contained/runtime-amd/options.json
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/runtime-amd/options.json
rename to test/fixtures/transformation/self-contained/runtime-amd/options.json
diff --git a/test/fixtures/transformation/misc-self-contained/runtime-commonjs/actual.js b/test/fixtures/transformation/self-contained/runtime-commonjs/actual.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/runtime-commonjs/actual.js
rename to test/fixtures/transformation/self-contained/runtime-commonjs/actual.js
diff --git a/test/fixtures/transformation/misc-self-contained/runtime-commonjs/expected.js b/test/fixtures/transformation/self-contained/runtime-commonjs/expected.js
similarity index 100%
rename from test/fixtures/transformation/misc-self-contained/runtime-commonjs/expected.js
rename to test/fixtures/transformation/self-contained/runtime-commonjs/expected.js