diff --git a/.6to5rc b/.babelrc
similarity index 100%
rename from .6to5rc
rename to .babelrc
diff --git a/.gitignore b/.gitignore
index 8d55145894..ab255e6959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,5 @@ test/tmp
 coverage
 dist
 .package.json
-packages/6to5-runtime/*.js
-packages/6to5-runtime/regenerator/*.js
+packages/babel-runtime/*.js
+packages/babel-runtime/regenerator/*.js
diff --git a/.gitmodules b/.gitmodules
index 9f64ea3f37..68ac264ec3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/google/traceur-compiler
 [submodule "vendor/regenerator"]
 	path = vendor/regenerator
-	url = https://github.com/6to5/regenerator-6to5
+	url = https://github.com/babel/regenerator-babel
 [submodule "vendor/test262"]
 	path = vendor/test262
 	url = https://github.com/tc39/test262
diff --git a/.jscsrc b/.jscsrc
index 9e60dd5719..92ceeea268 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,5 +1,5 @@
 {
-  "excludeFiles": ["lib/6to5/transformation/templates"],
+  "excludeFiles": ["lib/babel/transformation/templates"],
   "disallowSpacesInNamedFunctionExpression": {
     "beforeOpeningRoundBrace": true
   },
diff --git a/.jshintignore b/.jshintignore
index 7b9eaccb48..60c0292be4 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1 +1 @@
-lib/6to5/transformation/templates
+lib/babel/transformation/templates
diff --git a/.npmignore b/.npmignore
index 34a941b95c..5e135bc1d1 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,7 +1,7 @@
 node_modules
 *.log
 *.cache
-lib/6to5/transformation/templates
+lib/babel/transformation/templates
 test
 benchmark
 Makefile
diff --git a/CHANGELOG-6to5.md b/CHANGELOG-6to5.md
new file mode 100644
index 0000000000..555d4e7db4
--- /dev/null
+++ b/CHANGELOG-6to5.md
@@ -0,0 +1,1093 @@
+# 6to5 Changelog
+
+## 3.6.6
+
+ * **Internal**
+  * Upgrade `core-js`.
+ * **Bug Fix**
+  * Fix temp variables not being properly pushed inside of `while` loops.
+ * **New Feature**
+  * Add `auxilaryComment`/`--auxilary-comment` option that prepend auxilary helpers.
+
+## 3.6.5
+
+ * **Internal**
+  * Upgrade `core-js`.
+ * **Bug Fix**
+  * Fix block scoping leaking variables in IIFE mode.
+  * Fix tail call transformer exploding on return statements as the consequent of an if statement.
+ * **New Feature**
+  * Add `validation.react` transformer.
+
+## 3.6.4
+
+ * **New Feature**
+  * Add support for flow type casts and module types.
+
+## 3.6.3
+
+ * **Internal**
+  * Upgrade `acorn-6to5`.
+  * Use `default` property on `6to5-runtime`.
+
+## 3.6.2
+
+ * **Polish**
+  * Use better iterator detection in `slicedToArray` helper and add support for it to the `selfContained` transformer.
+
+## 3.6.1
+
+ * **Bug Fix**
+  * Multiline JSX string literals are now supported.
+  * Fix scope tracking import specifiers incorrectly.
+  * Fix templates incorrectly recursing into their replacements.
+ * **Internal**
+  * Type inferrence now extends to function return types.
+  * Upgrade `acorn-6to5`.
+
+## 3.6.0
+
+ * **New Feature**
+  * Add playground class property initializers.
+ * **Polish**
+  * Completely reimplemented scope tracking, can now track types and optimise certain helpers based on it.
+  * Extremely fast tail recursion optimisation implementation. Thanks [@RReverser](https://github.com/RReverser)!
+ * **Internal**
+  * `kexec` has been removed as an optional dependency and must be user installed.
+  * Upgrade `regenerator-6to5`.
+  * Upgrade `acorn-6to5`.
+  * Upgrade `core-js`.
+
+## 3.5.3
+
+ * Enable `es6.tailCall` transformer with the first implementation that only works with self referencing calls until we can implement nested tail calls elegantly.
+
+## 3.5.2
+
+ * Disable `es6.tailCall` temporairly after reports of it breaking.
+
+## 3.5.1
+
+ * **Polish**
+  * Allow tail calls to work across files without the runtime.
+ * **Internal**
+  * Upgrade `acorn-6to5`.
+
+## 3.5.0
+
+ * **Bug Fix**
+  * Destructuring patterns as the left operator in `ForInStatement`/`ForOfStatement`.
+ * **Polish**
+  * Make default parameter IIFE invocation smarter.
+  * Make `__esModule` flag non-enumerable. Thanks [@daliwali](https://github.com/daliwali)!
+ * **Internal**
+  * More performance improvements.
+  * Parsing is now ~30% faster thanks to [marijnh/acorn@7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f](https://github.com/marijnh/acorn/commit/7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f).
+ * **New Feature**
+  * Optional `es6.blockScopingTDZ` is now completely functional and handles all edgecases.
+  * `super` in object literals.
+  * Tail call optimisation. Thanks [@RReverser](https://github.com/RReverser)!
+
+## 3.4.1
+
+ * **Bug Fix**
+  * Fix conflicting `--module-ids` shorthand arg in `$ 6to5`.
+  * Add require hook options to cache key.
+  * Fix strict module formatter.
+
+## 3.4.0
+
+ * **New Feature**
+  * Add `commonStandard` module formatter.
+ * **Bug Fix**
+  * Fix conflicting `--module-ids` shorthand arg in `$ 6to5`.
+ * **Internal**
+  * Lots of internal refactoring with scope tracking and traversal.
+ * **Polish**
+  * Don't return `map` in the API result if `sourceMap` was set to `"inline"`.
+
+## 3.3.12
+
+ * **Bug Fix**
+  * Don't override `MemberExpression`s with `core-js` in `selfContained` if a local binding exists.
+
+## 3.3.11
+
+ * **Bug Fix**
+  * Fix the require cache.
+
+## 3.3.10
+
+ * **Internal**
+  * Restructure transformers so they're only ran if the AST contains nodes that they need to worry about. Improves transpilation speed significantly.
+ * **Bug Fix**
+  * Fix source maps not tracking end of node locations.
+ * **Spec Compliancy**
+  * Use static super references as the home object is actually done at definition time.
+ * **Polish**
+  * Force the `es6.destructuring` transformer to be whitelisted when the `es7.objectSpread` transformer is.
+  * Join sibling string literals when creating JSX.
+
+## 3.3.9
+
+ * **Bug Fix**
+  * Fix super inside of functions.
+  * Fix super constructor inheritance.
+
+## 3.3.7
+
+ * **Bug Fix**
+  * Add `--use-strict` to valid node flags in `6to5-node`.
+  * Fix booleans not being properly stripped from the arguments in `6to5-node`.
+  * Force `.js` extension when writing files to directories with `6to5`.
+
+## 3.3.5
+
+ * **Bug Fix**
+  * Fix block scoping inside of while loops.
+  * Make module name regex more conservative. Thanks [@johlrich](https://github.com/johlrich)!
+  * Fix block scoping of constants.
+  * Fix istanbul interop.
+  * Make JSX transforming more inline with the official transformer with spaces after non-empty last lines.
+ * **Polish**
+  * Make it illegal to export a property called `__esModule`.
+
+## 3.3.4
+
+ * **Polish**
+  * Add istanbul `require` interop.
+ * **Bug Fix**
+  * Fix incorrect source map column tracking in specific scenarios.
+
+## 3.3.3
+
+ * **Polish**
+  * Remap top level `this` to `undefined` instead of throwing an error.
+ * **Bug Fix**
+  * Run `selfContained` transformer over the regenerator runtime when building `6to5-runtime`.
+  * Fix `t.isReferenced` not properly allowing `value` nodes.
+
+## 3.3.1
+
+ * **Bug Fix**
+  * Block hoist assignment pattern destructuring.
+
+## 3.3.0
+
+ * **Bug Fix**
+  * Do all transforms before the regenerator transform is ran.
+ * **New Feature**
+  * Added back the 2.x optional runtime.
+
+## 3.2.1
+
+ * **Bug Fix**
+  * Fix block scoping transformer rewriting breaks and continues to inner labels.
+
+## 3.2.0
+
+ * **Bug Fix**
+  * Fixed scope tracking for default parameters IIFE.
+  * Fixed block scoped functions.
+  * Improved `bin/6to5` path resolution.
+ * **New Feature**
+  * You can now trigger super setters in classes. Thanks [@kruppel](https://github.com/kruppel)!
+  * Add `resolveSourceMap` option.
+  * Better support and output for block scoping loops with labels.
+
+## 3.1.1
+
+ * **Polish**
+  * Drop `enumerable: false` clause from class method definitions as `enumerable` already defaults to `false`.
+ * **Bug Fix**
+  * Properly transform `XJSIdentifier` nodes referencing `this` into a `ThisExpression`.
+
+## 3.1.0
+
+ * **Breaking Change**
+  * [Make class methods unenumerable](https://esdiscuss.org/topic/classes-and-enumerability#content-61).
+
+## 3.0.16
+
+ * **Bug Fix**
+  * Don't ignore dynamic import specifiers.
+ * **Internal**
+  * Upgrade `regenerator-6to5`.
+ * **Polish**
+  * Use `Object.assign` in place of extends helper if it exists.
+  * Require individual `lodash` methods. Thanks [@stefanpenner](https://github.com/stefanpenner)!
+
+## 3.0.15
+
+ * **Bug Fix**
+  * Use `debug/node` instead of `debug` to avoid browserify using the browser version that references `window`.
+
+## 3.0.14
+
+ * **New Feature**
+  * Add `--optional` argument to `6to5-node`.
+ * **Bug Fix**
+  * Fix bug in `asyncToGenerator` helper where it was incorrectly calling generator iterator functions.
+
+## 3.0.13
+
+ * **Bug Fix**
+  * Fix modules loose mode using `modules` instead of `es6.modules`.
+
+## 3.0.12
+
+ * **Internal**
+  * Add internal debug messages.
+ * **Bug Fix**
+  * Add `noScope` option to `traverse.clearProperties`.
+
+## 3.0.11
+
+ * **Bug Fix**
+  * Fix `ast-types` `RestElement` definition.
+  * Make `es6.forOf` loose mode more versatile and support destructuring.
+
+## 3.0.10
+
+ * **Bug Fix**
+  * In `types.getIds` make sure the `declaration` inside of `ExportDeclaration` is actually a `Declaration`.
+
+## 3.0.9
+
+ * **Bug Fix**
+  * Make `t.isReferenced` more powerful, actually take into consideration all contexts were identifier nodes aren't actually references.
+  * Don't camelcase underscores when converting a string to a valid identifier.
+
+## 3.0.8
+
+ * **Bug Fix**
+  * Split up default function declaration exports due to regenerator destroying the parent export declaration.
+
+## 3.0.7
+
+ * **Internal**
+  * Upgrade `core-js` to `0.4.9`.
+ * **Bug Fix**
+  * Add id to function express scope tracking.
+
+## 3.0.6
+
+ * **Bug Fix**
+  * Fix block scope variable tracking stopping whenever it hits a new scope.
+  * Fix block scope variable tracking breaking on all block statement scopes that have a for loop parent.
+
+## 3.0.5
+
+ * **Internal**
+  * More reliable default parameter scope.
+
+## 3.0.4
+
+ * **Bug Fix**
+  * Remove traversal stops from block scope tracking.
+
+## 3.0.3
+
+ * **Internal**
+  * Ignore options starting with `_`.
+
+## 3.0.2
+
+ * **Internal**
+  * Add common plugin options to valid options list.
+
+## 3.0.1
+
+ * **Internal**
+  * Downgrade `kexec` as `1.1.0` throws compilation errors.
+
+## 3.0.0
+
+ * **Polish**
+  * Generated code autoindentation.
+  * Moved global uid registry to a scope registry resulting in nicer uids.
+  * `this` is now illegal in the top level scope when using the default `useStrict` transformer.
+  * New `asyncToGenerator` helper that's much more compact.
+  * Throw errors on unknown options.
+  * More reliable default parameter scope.
+  * Helpers are now compact and have no newlines.
+ * **Internal**
+  * Rewritten a lot of the internals to much simpler.
+  * Removed TDZ from default parameters as it was very wonky and unreliable.
+  * Upgrade `core-js` to `0.4.6`.
+  * Upgrade `acorn-6to5`.
+   * JSX support is now on-par with react-tools/esprima.
+   * Shorthand destructuring.
+ * **Bug Fix**
+  * Generators now work flawlessly with any parameter transformers.
+  * Optional async function transformers should not name their functions.
+  * Remove `unlink` event watching in `bin/6to5`.
+  * Fix regenerator variable declarations being incorrectly hoisted breaking scope.
+  * Transformers that attempted to simplify expressions that had no consequence now take into account whether it's one of the last statements/expressions in the script.
+ * **New Feature**
+  * New `selfContained` transformer.
+  * New `undeclaredVariableCheck` optional transformer.
+  * Added `--blacklist` and `--whitelist` options to `6to5-node`.
+ * **Breaking Change**
+  * Caching is now always enabled for the require hook. It also now no longer caches require resolutions.
+  * Bare `super();` only works inside of constructors.
+  * Removed the optional runtime in favor of the `selfContained` transformer.
+  * This shorthand has been removed from the playground.
+  * `6to5/polyfill` can now only be required **once**.
+  * **CLI**
+    * `--indent` option has been removed.
+    * `--include-regenerator` option has been removed.
+    * `--amd-modules-id` option has been removed, use `--module-ids` instead.
+  * **Options**
+    * `amdModuleIds` option has been removed, use `moduleIds` instead.
+    * `includeRegenerator` has been removed.
+    * `ignoreRegex` fallback has now been dropped from the require hook. `register(/foo/);`, `register({ ignoreRegex: /foo/ })` -> `register({ ignore: /foo/ })`.
+  * **Modules**
+    * Module interop now only collapses to `module.exports` when there's a **single** export that's default.
+    * Imports and exports are now illegal anywhere except the root level by default. Set `modules` to [loose mode](http://6to5.org/docs/usage/loose) to allow them everywhere.
+  * **Transformers**
+    * Optional fast transformer backwards compatibility support has been removed. Use [loose mode](https://6to5.org/docs/usage/loose).
+    * Removed the `coreAliasing` transformer in favor of `selfContained`.
+    * Renamed transformers:
+     * `specNoForInOfAssignment` -> `validation.noForInOfAssignment`
+     * `specSetters` -> `validation.setters`
+     * `specBlockScopedFunctions` -> `spec.blockScopedFunctions`
+     * `malletOperator` -> `playground.malletOperator`
+     * `methodBinding` -> `playground.methodBinding`
+     * `memoizationOperator` -> `playground.memoizationOperator`
+     * `objectGetterMemoization` -> `playground.objectGetterMemoization`
+     * `modules` -> `es6.modules`
+     * `propertyNameShorthand` -> `es6.properties.shorthand`
+     * `arrayComprehension` -> `es7.comprehensions`
+     * `generatorComprehension` -> `es7.comprehensions`
+     * `arrowFunctions` -> `es6.arrowFunctions`
+     * `classes` -> `es6.classes`
+     * `objectSpread` -> `es7.objectSpread`
+     * `exponentiationOperator` -> `es7.exponentiationOperator`
+     * `spread` -> `es6.spread`
+     * `templateLiterals` -> `es6.templateLiterals`
+     * `propertyMethodAssignment` -> `es6.properties.shorthand`
+     * `computedPropertyNames` -> `es6.properties.computed`
+     * `defaultParameters` -> `es6.parameters.default`
+     * `restParameters` -> `es6.parameters.rest`
+     * `destructuring` -> `es6.destructuring`
+     * `forOf` -> `es6.forOf`
+     * `unicodeRegex` -> `es6.unicodeRegex`
+     * `abstractReferences` -> `es7.abstractReferences`
+     * `constants` -> `es6.constants`
+     * `letScoping` -> `es6.blockScoping`
+     * `blockScopingTDZ` -> `es6.blockScopingTDZ`
+     * `generators` -> `regenerator`
+     * `protoToAssign` -> `spec.protoToAssign`
+     * `typeofSymbol` -> `spec.typeofSymbol`
+     * `coreAliasing` -> `selfContained`
+     * `undefinedToVoid` -> `spec.undefinedToVoid`
+     * `undeclaredVariableCheck` -> `validation.undeclaredVariableCheck`
+     * `specPropertyLiterals` -> `minification.propertyLiterals`
+     * `specMemberExpressionLiterals` -> `minification.memberExpressionLiterals`
+
+## 2.13.7
+
+ * **Bug Fix**
+  * Don't realias variables that are already declared in optional `coreAliasing` transformer.
+
+## 2.13.6
+
+ * **Bug Fix**
+  * Add `NewExpression` as a valid parent for parentheses insertion for `ConditionalExpression`.
+
+## 2.13.5
+
+ * **Bug Fix**
+  * Allow rest parameters to be destructuring patterns.
+ * **Internal**
+  * Upgrade `kexec` to `1.1.0`.
+
+## 2.13.4
+
+ * **Bug Fix**
+  * Fix ordering of destructuring and default params.
+  * Fix loop body scope.
+  * Fix `for...of` transformation not retaining it's scope.
+  * Add destructuring assignment support to scope tracking.
+ * **Polish**
+  * More reliable newlines for pretty printing variable declarations.
+
+## 2.13.3
+
+ * **Internal**
+  * Add `coverage` and `vendor` to npmignore.
+
+## 2.13.2
+
+ * **Bug Fix**
+  * Fix `super` inside of nested functions.
+ * **Internal**
+  * Move let scoping TDZ into a separate transformer until it's more solid.
+  * Use `process.stdin.write` instead of `console.log` in `bin` to avoid sprintfification.
+
+## 2.13.1
+
+ * **New Feature**
+  * Temporal dead zone for block binding.
+
+## 2.13.0
+
+ * **New Feature**
+  * Block scoped functions.
+  * Add `--loose all` option.
+  * Add playground mallet operator thanks to [@jridgewell](https://github.com/jridgewell).
+ * **Bug Fix**
+  * Rewrote large parts of the let scoping transformer. Now passes all known tests.
+ * **Internal**
+  * Even more optimisations thanks to the awesome [@gaearon](https://github.com/gaearon).
+  * Upgrade `acorn-6to5`.
+    * Fixes exponentation operator thanks to [@charliesome](https://github.com/charliesome).
+    * Fix flow optional parameters with types.
+  * Upgrade `chokidar` to `0.12.6`.
+  * Upgrade `commander` to `2.6.0`.
+  * Upgrade `core-js` to `0.4.5`.
+  * Upgrade `estraverse` to `1.9.1`.
+  * Upgrade `jshint` to `2.5.11`.
+  * Upgrade `regenerator` to `0.8.9`.
+  * Upgrade `regexpu` to `1.0.0`.
+  * Upgrade `source-map` to `0.1.43`.
+  * Upgrade `source-map-support` to `0.2.9`.
+  * Upgrade `browserify` to `8.1.1`.
+  * Upgrade `chai` to `1.10.0`.
+  * Upgrade `istanbul` to `0.3.5`.
+  * Upgrade `mocha` to `2.1.0`.
+  * Upgrade `uglify-js` to `2.4.16`.
+
+## 2.12.6
+
+ * **Bug Fix**
+  * Add missing flow type traversal keys.
+
+## 2.12.5
+
+ * **Internal**
+  * Fix incorrect `for...in` loop still causing `ember-script` issues.
+
+## 2.12.4
+
+ * **Polish**
+  * Rest parameters now allocate the array before populating.
+ * **Internal**
+  * `for...in` loops have been changed to optimized `for` loops - better performance and no enumeration of protoype keys.
+  * Parts of the code generator have now been optimized thanks to [gaearon](https://github.com/gaearon).
+
+## 2.12.3
+
+ * **Spec Compliancy**
+  * Optional `typeof` transformer checks for `undefined` before passing it to the helper.
+  * Class methods are now named.
+
+## 2.12.2
+
+ * **Internal**
+  * Exclude nodes in function parameters and catch clauses from `isReferenced` check.
+
+## 2.12.1
+
+ * **Internal**
+  * Add `.jsx` to list of allowed extensions.
+
+## 2.12.0
+
+ * **Bug Fix**
+  * Support non-string JSX literals.
+ * **New Feature**
+  * Loose mode for some transformers that enables non-spec behavior.
+ * **Internal**
+  * Uglify `--mangle sort` has been added to the build script, cutting minified scripts in half.
+
+## 2.11.4
+
+ * **Internal**
+  * Make all dependency versions fixed.
+
+## 2.11.3
+
+ * **Bug Fix**
+  * Allow a string to be passed as the `optional` option.
+
+## 2.11.2
+
+ * **Bug Fix**
+  * Support esprima-style catch clause handlers.
+ * **Polish**
+  * Don't print a stacktrace for syntax errors in the CLI.
+
+## 2.11.1
+
+ * **Bug Fix**
+  * Remove stray `console.log` outputting debug code.
+  * Remove `Dict` from `coreAliasing`.
+
+## 2.11.0
+
+ * **Bug Fix**
+  * Fix unnecessary IIFE in default parameters on method calls.
+  * Add support for supers inside of closures.
+ * **New Feature**
+  * Add `--keep-module-id-extensions`/`keepModuleIdExtensions` option to keep extensions in module ids.
+ * **Polish**
+  * Special case single argument spread properties in `super` inside classes.
+  * Don't use a variable declaration for class declaration IFFE.
+  * Rename `inherits` helper parameters.
+  * `coreAliasing` transformer now aliases `Promise`, `Set`, `Map` and more. Thanks [@AluisioASG](https://github.com/AluisioASG).
+
+## 2.10.1
+
+ * **Internal**
+  * Upgrade `core-js` to `0.4.4`.
+ * **New Feature**
+  * Added `--include-regenerator` option to CLI and `includeRegenerator` option to API that includes the regenerator runtime if necessary.
+
+## 2.10.0
+
+ * **New Feature**
+  * Add `classesFastSuper` optional transformer that doesn't support parent getters and prototype changing.
+  * Add `forOfFast` transformer that speeds up `for...of` on arrays but produces more code.
+  * Add `--react-compat` to `bin/6to5`.
+ * **Spec Compliancy**
+  * Disallow setters without a single parameter.
+  * Add `configurable` and `writable` to defined properties.
+  * Use define instead of assignment for class methods.
+ * **Polish**
+  * Fix bin name in `6to5-node --help`.
+  * Fix shorthand `--whitelist` name in `bin/6to5`.
+ * **Internal**
+  * Hot code optimisation of traversal etc thanks to [gaearon](https://github.com/gaearon).
+
+## 2.9.4
+
+ * **Bug Fix**
+  * Support `UpdateExpression`s as `MemberExpression` objects.
+
+## 2.9.3
+
+ * **Bug Fix**
+  * Remove `exportsWildcard` helper in favor of `defaults`.
+
+## 2.9.2
+
+ * **Bug Fix**
+  * Pass `exports` to `exportWildcard` helper to allow for use inside the optional runtime.
+
+## 2.9.1
+
+ * **Bug Fix**
+  * Fix runtime generator breaking the helper inclusion loop.
+
+## 2.9.0
+
+ * **Internal**
+  * Upgrade `acorn-6to5`.
+    * Now supports destructuring shorthand properties.
+
+## 2.8.1
+
+ * **Bug Fix**
+  * Fix computed accessors on object literals.
+
+## 2.8.0
+
+ * **New Feature**
+  * Add `commonStrict`, `amdStrict` and `umdStrict` module formatters that remove `module.exports` interop assignment.
+  * Add `--indent` option to the 6to5 CLI.
+
+## 2.7.4
+
+ * **Polish**
+  * Inherit assignments from their declaration in destructuring.
+  * Properly align multi-declarator variable declarations.
+
+## 2.7.3
+
+ * **Polish**
+  * Indent and add newlines to `React.createElement` calls in `react` transformer.
+  * Remove `Object.assign` calls and replace it with an `extends` helper.
+
+## 2.7.1
+
+ * **New Feature**
+  * Expose `version` on browser and node API.
+ * **Internal**
+  * Upgrade `core-js` to 0.4.1
+
+## 2.7.0
+
+ * **Spec Compliancy**
+  * Disallow reassignments of imports.
+ * **New Feature**
+  * `reactCompat` option to enable pre-v0.12 react components.
+
+## 2.6.3
+
+ * **Bug Fix**
+  * Fix 2.6.0 regression caused by faulty export default from a source handling.
+
+## 2.6.2
+
+ * **Bug Fix**
+  * Fix rest parameter keys when on functions with params.
+
+## 2.6.1
+
+ * **Bug Fix**
+  * Fix rest parameter arguments key.
+
+## 2.6.0
+
+ * **Bug Fix**
+  * Better handling of number literal property keys.
+  * Handle `NewExpression` paren insertion edegcases better.
+ * **Internal**
+  * Fix incorrect AST node `identifier("this")`.
+  * Better `toIdentifier` method that handles reserved words.
+  * Upgrade `acorn-6to5`.
+    * Fix exponentiation operator precedence.
+    * Fix line terminators after async contextual keywords.
+    * Add semicolons as class elements inside of a class body.
+  * Upgrade to `core-js` 4.0.0.
+  * Upgrade to `regenerator` 0.8.3.
+    * Fix non-loop labeled statements.
+ * **New Feature**
+  * Basic destructuring defaults
+  * Add `.es` to list of supported extensions.
+  * Add optional `typeofSymbol` transformer.
+  * Use a `for` loop for rest parameters instead of `Array.prototype.slice`.
+ * **Polish**
+  * Move `"use strict";` to inside module bodies instead of at the top of the file.
+  * Better handling of dynamic imports.
+ * **Spec Compliancy**
+  * Class inheritance now has a `function` or `null` type check.
+  * Add `interopRequireWildcard` around wildcard imports and exports to handle non-object exports.
+
+## 2.5.0
+
+ * Remove `noDuplicateProperties` transformer.
+ * Better generated UIDs based on nodes.
+ * Default parameters now use `arguments[i]`, conditionals and variable declarations instead of using long-form if statements.
+
+## 2.4.10
+
+ * Upgrade `acorn-6to5`.
+
+## 2.4.9
+
+ * Upgrade `acorn-6to5`.
+ * Add optional `protoToAssign` transformer.
+ * Fix missing properties from computed property keys.
+ * Make ES7 comprehensions `let` variables.
+
+## 2.4.8
+
+ * Make `require("6to5/register")` work with browserify - [#370](https://github.com/6to5/6to5/pull/370). Thanks [@hughsk](https://github.com/hughsk)!
+
+## 2.4.7
+
+ * Upgrade `acorn-6to5`.
+
+## 2.4.6
+
+ * Move `coreAliasing` and `undefinedToVoid` transformers down to catch `moduleFormatter` transforms.
+
+## 2.4.5
+
+ * Avoid printing comments if they've already been output.
+
+## 2.4.4
+
+ * Add `module` type to browser build `<script>` handler.
+ * Fix some `MemberExpression` modifying incorrectly setting `property` to a `MemberExpression`.
+
+## 2.4.3
+
+ * Upgrade `acorn-6to5`.
+ * Add support for `FunctionDeclaration`s in `bluebirdCoroutines` and `asyncToGenerators` transformers.
+
+## 2.4.2
+
+ * Upgrade `acorn-6to5`.
+ * Better uids generated for various transformers based on parent node.
+ * Alias flat references in `coreAliasing` transformer.
+
+## 2.4.1
+
+ * Better whitespace handling of parenthesized expressions due to trailing comments.
+ * Fix `yield` inside of comprehensions.
+
+## 2.4.0
+
+ * Use a closure always for classes with a super.
+ * Always use native loops for array comprehensions.
+ * Allow `yield` inside of comprehensions.
+ * Add optional `bluebirdCoroutine` transformer.
+ * Add optional `asyncToGenerator` transformer.
+ * Move `useStrict` transformer to before `_moduleFormatter` causing `"use strict";` to always be placed the very top.
+
+## 2.3.2
+
+ * Add parens on expressions with trailing comments.
+
+## 2.3.1
+
+ * Add `undefinedToVoid` optional transformer.
+ * Use `Object.defineProperty` for computed properties.
+
+## 2.3.0
+
+ * Upgrade `acorn-6to5`.
+ * Support circular references and hoist variable declarations in `system` module formatter.
+ * Add optional transformers, including a new `coreAliasing` transformer that aliases native ES6 static properties to their `core-js` equivalent.
+
+## 2.2.0
+
+ * Make `system` module formatter modules anonymous by default.
+ * Fix duplicate comments being output, breaking code.
+
+## 2.1.0
+
+ * Add `cache` option to register hook.
+ * Update `core-js`.
+ * Fix starting newline not being added on case statements.
+ * Fix destructuring `VariableDeclaration`s not inside `BlockStatement`s and `Program`.
+
+## 2.0.4
+
+ * Avoid being greedy when destructuring array iterables.
+
+## 2.0.3
+
+ * Hoist function declarations in system module formatter for circular references.
+ * Hoist default function declarations in umd and amd module formatters for circular references.
+
+## 2.0.2
+
+ * Inherit comments in `for-of` transformer.
+ * Remove `interopRequire` from `system` module formatter.
+
+## 2.0.1
+
+ * Remap `UpdateExpression` module export binding.
+ * Fix automatic closure on `PrivateDeclaration` in classes.
+
+## 2.0.0
+
+ * Make string literal generation only escapes unicode that it has to.
+ * Internal code generation format options have been exposed.
+ * Change playground method binding operator from `:` to `#` removing ambiguous syntax with terns.
+ * Fix rest parameters in async and generator functions.
+ * Export/import declarations replace by the modules transformer now inherit comments.
+ * Added playground flag to `6to5-node`.
+ * `6to5-node` now behaves the same as `node`.
+ * `6to5-node` now uses `kexec` to become the forked process to correctly propagate signals on unix.
+ * Constants are now block scoped.
+ * Exposed ast transformer.
+ * Merged `commonInterop` and `common` module formatters.
+ * Fix generator comprehensions not inheriting `arguments`, `this` etc.
+ * Object and class mutator shorthand are now enumerable.
+ * Remove regenerator `Generator has already finished` error which isn't spec-compliant.
+ * Expose internal `spec` transformers that nicen up code output.
+ * Add export variable declaration default initializers.
+ * Propagate export declaration reassignments.
+ * Add initializer default to block scoped variable declarations within a loop.
+ * Flow type support.
+ * Make async/await contextual keywords.
+ * Allow `yield`ing of non-objects.
+ * Class declarations now lack an IIFE.
+ * Support falsy and `null` super classes.
+ * Add support for experimental abstract references `private` declarations.
+ * Leave out IIFE for class declarations.
+ * Switched to [core-js](https://github.com/zloirock/core-js) from [es6-symbol](https://github.com/medikoo/es6-symbol) and [es6-shim](https://github.com/paulmillr/es6-shim/) for built-in polyfill.
+ * `amd` and `umd` module formatters now behave the same as `common` with `interopRequire`.
+ * Micro-optimizations to boost performance by 200%.
+ * Rename module formatter methods `import` to `importDeclaration` and `export` to `exportDeclaration`.
+ * Support multiple declarators in export variable declarations.
+ * Freeze tagged template literal object.
+ * Remove inlined `regenerator` fork.
+ * Remove `ParenthesizedExpression`.
+ * Rename `object-spread` helper to `object-without-properties`.
+ * Rename `class-props` helper to `prototype-properties`.
+ * Rename `extends` helper to `inherits`.
+ * Completely rewritten `system` module formatter.
+
+## 1.15.0
+
+ * Don't alias `GeneratorFunction` and check the name which causes minifiers to remove the name and throw an error later on when we check if it's set.
+
+## 1.14.18
+
+ * Fix files only containg comments not being output.
+ * Fix duplicate comments on property key shorthands.
+
+## 1.14.17
+
+ * Add default initializer to let variables within loop bodies.
+ * Fix excessive `break` replacement inside of switches in let scoping.
+
+## 1.14.16
+
+ * Add object getter memos and this shorthand to playground.
+ * Fix while loops in let scoping.
+ * Upgrade `acorn-6to5`.
+
+## 1.14.14
+
+ * Fix template literals escaping.
+
+## 1.14.13
+
+ * Fix let scoping of `while` loops.
+ * Make class methods enumerable.
+
+## 1.14.12
+
+ * Fix duplicate dynamic expressions in call spread.
+
+## 1.14.10
+
+ * Fix let scoping unneccesary override.
+
+## 1.14.6
+
+ * Avoid ensuring a block on non-array node replacements.
+
+## 1.14.5
+
+ * Upgrade `acorn-6to5`.
+ * Fix JSON recursion error for unknown code generator node types.
+ * Ensure that a statement is a block on block/statement types when replacing them with multiple nodes.
+
+## 1.14.4
+
+ * Merge pretzel maps and method binding.
+
+## 1.14.3
+
+ * Add playground pretzel maps.
+
+## 1.14.2
+
+ * Fix `commonInterop` default export handling.
+ * Fix keyworded property key identifiers being turned into computed property key literals.
+
+## 1.14.1
+
+ * Inherit comments from `ClassDeclaration`.
+
+## 1.14.0
+
+ * Add [playground](https://6to5.github.io/playground.html).
+
+## 1.13.13
+
+ * Fix `--debug` in `bin/6to5-node`. Thanks [@timoxley](https://github.com/timoxley).
+
+## 1.13.12
+
+ * Ignore `XJSEmptyExpression`s in `react` transformer output.
+
+## 1.13.11
+
+ * Fix `util.regexify` on falsy values.
+ * Fix `_aliasFunction` with rest parameters.
+ * Export as `module.exports` instead of `exports.default` if there are no other `ExportDeclaration`s in `commonInterop` module formatter.
+ * Add `system` module formatter. Thanks [@douglasduteil](https://github.com/douglasduteil).
+
+## 1.13.10
+
+ * Add support for `AssignmentExpression` destructuring outside of `ExpressionStatement`.
+
+## 1.13.9
+
+ * Fix `VirtualPropertyExpression` visitor keys.
+
+## 1.13.8
+
+ * Only use a single reference in abstract references.
+
+## 1.13.7
+
+ * Upgrade `acorn-6to5`.
+ * Add experimental exponentiation operator support.
+
+## 1.13.6
+
+ * Fix experimental object spread/rest helper.
+
+## 1.13.5
+
+ * Upgrade `acorn-6to5`.
+ * Add experimental support for object spread/rest.
+ * Change `arguments` to array to an additional helper method.
+
+## 1.13.4
+
+ * Fix single spread element returning itself.
+
+## 1.13.3
+
+ * Upgrade `acorn-6to5`.
+ * Add experimental support for abstract references.
+
+## 1.13.2
+
+ * Optimize `Array.from` usage by adding a helper method.
+ * Upgrade `acorn-6to5`.
+
+## 1.13.1
+
+ * Fix constructor spread optimisation. Thanks [@zloirock](https://github.com/zloirock).
+
+## 1.13.0
+
+ * Put experimental ES7 features behind a flag `--experimental` and `experimental` option.
+ * Constructor spread performance increase. Thanks [@RReverser](https://github.com/RReverser).
+ * Use `self` instead of `window` in the optional 6to5 runtime. Thanks [@RReverser](https://github.com/RReverser).
+
+## 1.12.26
+
+ * Support computed property destructuring.
+
+## 1.12.25
+
+ * Update `acorn-6to5`, `ast-types`, `es6-shim`, `chokidar`, `estraverse` and `private`.
+
+## 1.12.24
+
+ * Collect references that haven't been declared in scope.
+
+## 1.12.23
+
+ * Fix generator function export hoisting.
+
+## 1.12.22
+
+ * Update `fs-readdir-recursive` and `chokidar`.
+ * Support array destructuring on iterables.
+ * Make amd module id optional. Thanks [@webpro](https://github.com/webpro).
+
+## 1.12.21
+
+ * Fix unneccesary let scoping replacement.
+ * Add `commonInterop` module formatter. Thanks [@Naddiseo](https://github.com/Naddiseo).
+ * Fix `return` outside of function body bug. Thanks [@brentburg](https://github.com/brentburg).
+ * Add more flexible option types.
+
+## 1.12.20
+
+ * Append `sourceMappingURL` when using `bin/6to5` and output sourcemaps.
+
+## 1.12.19
+
+ * Add `comments` option and `--remove-comments` flag. Thanks [@webpro](htps://github.com/webpro).
+ * Embed `regenerator`.
+
+## 1.12.18
+
+ * Use `global` reference instead of `window`.
+
+## 1.12.17
+
+ * Add `moduleName`, `sourceRoot` and `filenameRelative` options. Thanks [@darvelo](https://github.com/darvelo).
+ * Traversal optimisations.
+
+## 1.12.16
+
+ * Fix comments not being retained from `MethodDefinition` in classes.
+ * Add temporal dead zone in default parameters.
+
+## 1.12.15
+
+ * Update `acorn-6to5`.
+
+## 1.12.14
+
+ * Fix duplicate let scoping in functions.
+ * Make JSX whitespace more React-compliant.
+ * Add `_memberExpressionKeywords` transformer that turns keyword identifiers to computed literals.
+ * Upgrade `regenerator-6to5`.
+
+## 1.12.13
+
+ * Support duplicate constants within different block scopes.
+ * Fix for-head duplication testing and replacement.
+ * Support `raw` property on tagged template literals.
+
+## 1.12.12
+
+ * Make scope tracker more reliable to handle all edgecases.
+
+## 1.12.11
+
+ * Block scope classes.
+ * Fix generation of integer `Literal`s in `MemberExpression`.
+
+## 1.12.10
+
+ * Fix let scoping var hoisting.
+
+## 1.12.9
+
+ * Escape unicode characters when generating string `Literal`s.
+ * Fix semicolons being output for statements in `ExportDeclaration`.
+ * Fix `WithStatement` missing parenthesis.
+
+## 1.12.8
+
+ * Temporarily forbid `AssignmentExpression` destructuring outside of `ExpressionStatement`.
+
+## 1.12.7
+
+ * Update to latest `acorn-6to5`.
+
+## 1.12.6
+
+ * Update to latest `acorn-6to5`.
+
+## 1.12.5
+
+ * Fix excessive whitespace trimming resulting in innaccurate sourcemap line.
+
+## 1.12.4
+
+ * Add `doc` folder for documentation.
+
+## 1.12.3
+
+ * Support generator comprehensions.
+ * Use `Array.from` instead of `Array.prototype.slice` in spread transformer.
+ * Support spread in `NewExpression`s.
+
+## 1.12.2
+
+ * Upgrade `matcha` to `0.6.0` and `browserify` to `6.3.2`.
+ * Add own `trimRight` helper instead of relying on the string instance method.
+ * Support JSX spreads that aren't the first.
+
+## 1.12.1
+
+ * Fix `this` and `arguments` mapping in the `_aliasFunctions` transformer.
+
+## 1.12.0
+
+ * Combine `jsx` and `react` transformers to `react`.
+ * Update `react` syntax output to React v0.12.
+
+## 1.11.15
+
+ * Fix JSX literal whitespace generation.
+
+## 1.11.14
+
+ * Avoid using a switch for let-scoping continue and break statements and use an if statement instead.
+ * Remove excess whitespace and newlines from JSX literals.
+
+## 1.11.13
+
+ * Update regenerator-6to5
+ * Add support for most escodegen formatting options
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c3acd0839..71a3059062 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,1085 +11,9 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
-## 3.6.5
+See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the previous 6to5 version changelog.
 
- * **Internal**
-  * Upgrade `core-js`.
- * **Bug Fix**
-  * Fix block scoping leaking variables in IIFE mode.
-  * Fix tail call transformer exploding on return statements as the consequent of an if statement.
- * **New Feature**
-  * Add `validation.react` transformer.
+## 1.0.0
 
-## 3.6.4
-
- * **New Feature**
-  * Add support for flow type casts and module types.
-
-## 3.6.3
-
- * **Internal**
-  * Upgrade `acorn-6to5`.
-  * Use `default` property on `6to5-runtime`.
-
-## 3.6.2
-
- * **Polish**
-  * Use better iterator detection in `slicedToArray` helper and add support for it to the `selfContained` transformer.
-
-## 3.6.1
-
- * **Bug Fix**
-  * Multiline JSX string literals are now supported.
-  * Fix scope tracking import specifiers incorrectly.
-  * Fix templates incorrectly recursing into their replacements.
- * **Internal**
-  * Type inferrence now extends to function return types.
-  * Upgrade `acorn-6to5`.
-
-## 3.6.0
-
- * **New Feature**
-  * Add playground class property initializers.
- * **Polish**
-  * Completely reimplemented scope tracking, can now track types and optimise certain helpers based on it.
-  * Extremely fast tail recursion optimisation implementation. Thanks [@RReverser](https://github.com/RReverser)!
- * **Internal**
-  * `kexec` has been removed as an optional dependency and must be user installed.
-  * Upgrade `regenerator-6to5`.
-  * Upgrade `acorn-6to5`.
-  * Upgrade `core-js`.
-
-## 3.5.3
-
- * Enable `es6.tailCall` transformer with the first implementation that only works with self referencing calls until we can implement nested tail calls elegantly.
-
-## 3.5.2
-
- * Disable `es6.tailCall` temporairly after reports of it breaking.
-
-## 3.5.1
-
- * **Polish**
-  * Allow tail calls to work across files without the runtime.
- * **Internal**
-  * Upgrade `acorn-6to5`.
-
-## 3.5.0
-
- * **Bug Fix**
-  * Destructuring patterns as the left operator in `ForInStatement`/`ForOfStatement`.
- * **Polish**
-  * Make default parameter IIFE invocation smarter.
-  * Make `__esModule` flag non-enumerable. Thanks [@daliwali](https://github.com/daliwali)!
- * **Internal**
-  * More performance improvements.
-  * Parsing is now ~30% faster thanks to [marijnh/acorn@7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f](https://github.com/marijnh/acorn/commit/7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f).
- * **New Feature**
-  * Optional `es6.blockScopingTDZ` is now completely functional and handles all edgecases.
-  * `super` in object literals.
-  * Tail call optimisation. Thanks [@RReverser](https://github.com/RReverser)!
-
-## 3.4.1
-
- * **Bug Fix**
-  * Fix conflicting `--module-ids` shorthand arg in `$ 6to5`.
-  * Add require hook options to cache key.
-  * Fix strict module formatter.
-
-## 3.4.0
-
- * **New Feature**
-  * Add `commonStandard` module formatter.
- * **Bug Fix**
-  * Fix conflicting `--module-ids` shorthand arg in `$ 6to5`.
- * **Internal**
-  * Lots of internal refactoring with scope tracking and traversal.
- * **Polish**
-  * Don't return `map` in the API result if `sourceMap` was set to `"inline"`.
-
-## 3.3.12
-
- * **Bug Fix**
-  * Don't override `MemberExpression`s with `core-js` in `selfContained` if a local binding exists.
-
-## 3.3.11
-
- * **Bug Fix**
-  * Fix the require cache.
-
-## 3.3.10
-
- * **Internal**
-  * Restructure transformers so they're only ran if the AST contains nodes that they need to worry about. Improves transpilation speed significantly.
- * **Bug Fix**
-  * Fix source maps not tracking end of node locations.
- * **Spec Compliancy**
-  * Use static super references as the home object is actually done at definition time.
- * **Polish**
-  * Force the `es6.destructuring` transformer to be whitelisted when the `es7.objectSpread` transformer is.
-  * Join sibling string literals when creating JSX.
-
-## 3.3.9
-
- * **Bug Fix**
-  * Fix super inside of functions.
-  * Fix super constructor inheritance.
-
-## 3.3.7
-
- * **Bug Fix**
-  * Add `--use-strict` to valid node flags in `6to5-node`.
-  * Fix booleans not being properly stripped from the arguments in `6to5-node`.
-  * Force `.js` extension when writing files to directories with `6to5`.
-
-## 3.3.5
-
- * **Bug Fix**
-  * Fix block scoping inside of while loops.
-  * Make module name regex more conservative. Thanks [@johlrich](https://github.com/johlrich)!
-  * Fix block scoping of constants.
-  * Fix istanbul interop.
-  * Make JSX transforming more inline with the official transformer with spaces after non-empty last lines.
- * **Polish**
-  * Make it illegal to export a property called `__esModule`.
-
-## 3.3.4
-
- * **Polish**
-  * Add istanbul `require` interop.
- * **Bug Fix**
-  * Fix incorrect source map column tracking in specific scenarios.
-
-## 3.3.3
-
- * **Polish**
-  * Remap top level `this` to `undefined` instead of throwing an error.
- * **Bug Fix**
-  * Run `selfContained` transformer over the regenerator runtime when building `6to5-runtime`.
-  * Fix `t.isReferenced` not properly allowing `value` nodes.
-
-## 3.3.1
-
- * **Bug Fix**
-  * Block hoist assignment pattern destructuring.
-
-## 3.3.0
-
- * **Bug Fix**
-  * Do all transforms before the regenerator transform is ran.
- * **New Feature**
-  * Added back the 2.x optional runtime.
-
-## 3.2.1
-
- * **Bug Fix**
-  * Fix block scoping transformer rewriting breaks and continues to inner labels.
-
-## 3.2.0
-
- * **Bug Fix**
-  * Fixed scope tracking for default parameters IIFE.
-  * Fixed block scoped functions.
-  * Improved `bin/6to5` path resolution.
- * **New Feature**
-  * You can now trigger super setters in classes. Thanks [@kruppel](https://github.com/kruppel)!
-  * Add `resolveSourceMap` option.
-  * Better support and output for block scoping loops with labels.
-
-## 3.1.1
-
- * **Polish**
-  * Drop `enumerable: false` clause from class method definitions as `enumerable` already defaults to `false`.
- * **Bug Fix**
-  * Properly transform `XJSIdentifier` nodes referencing `this` into a `ThisExpression`.
-
-## 3.1.0
-
- * **Breaking Change**
-  * [Make class methods unenumerable](https://esdiscuss.org/topic/classes-and-enumerability#content-61).
-
-## 3.0.16
-
- * **Bug Fix**
-  * Don't ignore dynamic import specifiers.
- * **Internal**
-  * Upgrade `regenerator-6to5`.
- * **Polish**
-  * Use `Object.assign` in place of extends helper if it exists.
-  * Require individual `lodash` methods. Thanks [@stefanpenner](https://github.com/stefanpenner)!
-
-## 3.0.15
-
- * **Bug Fix**
-  * Use `debug/node` instead of `debug` to avoid browserify using the browser version that references `window`.
-
-## 3.0.14
-
- * **New Feature**
-  * Add `--optional` argument to `6to5-node`.
- * **Bug Fix**
-  * Fix bug in `asyncToGenerator` helper where it was incorrectly calling generator iterator functions.
-
-## 3.0.13
-
- * **Bug Fix**
-  * Fix modules loose mode using `modules` instead of `es6.modules`.
-
-## 3.0.12
-
- * **Internal**
-  * Add internal debug messages.
- * **Bug Fix**
-  * Add `noScope` option to `traverse.clearProperties`.
-
-## 3.0.11
-
- * **Bug Fix**
-  * Fix `ast-types` `RestElement` definition.
-  * Make `es6.forOf` loose mode more versatile and support destructuring.
-
-## 3.0.10
-
- * **Bug Fix**
-  * In `types.getIds` make sure the `declaration` inside of `ExportDeclaration` is actually a `Declaration`.
-
-## 3.0.9
-
- * **Bug Fix**
-  * Make `t.isReferenced` more powerful, actually take into consideration all contexts were identifier nodes aren't actually references.
-  * Don't camelcase underscores when converting a string to a valid identifier.
-
-## 3.0.8
-
- * **Bug Fix**
-  * Split up default function declaration exports due to regenerator destroying the parent export declaration.
-
-## 3.0.7
-
- * **Internal**
-  * Upgrade `core-js` to `0.4.9`.
- * **Bug Fix**
-  * Add id to function express scope tracking.
-
-## 3.0.6
-
- * **Bug Fix**
-  * Fix block scope variable tracking stopping whenever it hits a new scope.
-  * Fix block scope variable tracking breaking on all block statement scopes that have a for loop parent.
-
-## 3.0.5
-
- * **Internal**
-  * More reliable default parameter scope.
-
-## 3.0.4
-
- * **Bug Fix**
-  * Remove traversal stops from block scope tracking.
-
-## 3.0.3
-
- * **Internal**
-  * Ignore options starting with `_`.
-
-## 3.0.2
-
- * **Internal**
-  * Add common plugin options to valid options list.
-
-## 3.0.1
-
- * **Internal**
-  * Downgrade `kexec` as `1.1.0` throws compilation errors.
-
-## 3.0.0
-
- * **Polish**
-  * Generated code autoindentation.
-  * Moved global uid registry to a scope registry resulting in nicer uids.
-  * `this` is now illegal in the top level scope when using the default `useStrict` transformer.
-  * New `asyncToGenerator` helper that's much more compact.
-  * Throw errors on unknown options.
-  * More reliable default parameter scope.
-  * Helpers are now compact and have no newlines.
- * **Internal**
-  * Rewritten a lot of the internals to much simpler.
-  * Removed TDZ from default parameters as it was very wonky and unreliable.
-  * Upgrade `core-js` to `0.4.6`.
-  * Upgrade `acorn-6to5`.
-   * JSX support is now on-par with react-tools/esprima.
-   * Shorthand destructuring.
- * **Bug Fix**
-  * Generators now work flawlessly with any parameter transformers.
-  * Optional async function transformers should not name their functions.
-  * Remove `unlink` event watching in `bin/6to5`.
-  * Fix regenerator variable declarations being incorrectly hoisted breaking scope.
-  * Transformers that attempted to simplify expressions that had no consequence now take into account whether it's one of the last statements/expressions in the script.
- * **New Feature**
-  * New `selfContained` transformer.
-  * New `undeclaredVariableCheck` optional transformer.
-  * Added `--blacklist` and `--whitelist` options to `6to5-node`.
- * **Breaking Change**
-  * Caching is now always enabled for the require hook. It also now no longer caches require resolutions.
-  * Bare `super();` only works inside of constructors.
-  * Removed the optional runtime in favor of the `selfContained` transformer.
-  * This shorthand has been removed from the playground.
-  * `6to5/polyfill` can now only be required **once**.
-  * **CLI**
-    * `--indent` option has been removed.
-    * `--include-regenerator` option has been removed.
-    * `--amd-modules-id` option has been removed, use `--module-ids` instead.
-  * **Options**
-    * `amdModuleIds` option has been removed, use `moduleIds` instead.
-    * `includeRegenerator` has been removed.
-    * `ignoreRegex` fallback has now been dropped from the require hook. `register(/foo/);`, `register({ ignoreRegex: /foo/ })` -> `register({ ignore: /foo/ })`.
-  * **Modules**
-    * Module interop now only collapses to `module.exports` when there's a **single** export that's default.
-    * Imports and exports are now illegal anywhere except the root level by default. Set `modules` to [loose mode](http://6to5.org/docs/usage/loose) to allow them everywhere.
-  * **Transformers**
-    * Optional fast transformer backwards compatibility support has been removed. Use [loose mode](https://6to5.org/docs/usage/loose).
-    * Removed the `coreAliasing` transformer in favor of `selfContained`.
-    * Renamed transformers:
-     * `specNoForInOfAssignment` -> `validation.noForInOfAssignment`
-     * `specSetters` -> `validation.setters`
-     * `specBlockScopedFunctions` -> `spec.blockScopedFunctions`
-     * `malletOperator` -> `playground.malletOperator`
-     * `methodBinding` -> `playground.methodBinding`
-     * `memoizationOperator` -> `playground.memoizationOperator`
-     * `objectGetterMemoization` -> `playground.objectGetterMemoization`
-     * `modules` -> `es6.modules`
-     * `propertyNameShorthand` -> `es6.properties.shorthand`
-     * `arrayComprehension` -> `es7.comprehensions`
-     * `generatorComprehension` -> `es7.comprehensions`
-     * `arrowFunctions` -> `es6.arrowFunctions`
-     * `classes` -> `es6.classes`
-     * `objectSpread` -> `es7.objectSpread`
-     * `exponentiationOperator` -> `es7.exponentiationOperator`
-     * `spread` -> `es6.spread`
-     * `templateLiterals` -> `es6.templateLiterals`
-     * `propertyMethodAssignment` -> `es6.properties.shorthand`
-     * `computedPropertyNames` -> `es6.properties.computed`
-     * `defaultParameters` -> `es6.parameters.default`
-     * `restParameters` -> `es6.parameters.rest`
-     * `destructuring` -> `es6.destructuring`
-     * `forOf` -> `es6.forOf`
-     * `unicodeRegex` -> `es6.unicodeRegex`
-     * `abstractReferences` -> `es7.abstractReferences`
-     * `constants` -> `es6.constants`
-     * `letScoping` -> `es6.blockScoping`
-     * `blockScopingTDZ` -> `es6.blockScopingTDZ`
-     * `generators` -> `regenerator`
-     * `protoToAssign` -> `spec.protoToAssign`
-     * `typeofSymbol` -> `spec.typeofSymbol`
-     * `coreAliasing` -> `selfContained`
-     * `undefinedToVoid` -> `spec.undefinedToVoid`
-     * `undeclaredVariableCheck` -> `validation.undeclaredVariableCheck`
-     * `specPropertyLiterals` -> `minification.propertyLiterals`
-     * `specMemberExpressionLiterals` -> `minification.memberExpressionLiterals`
-
-## 2.13.7
-
- * **Bug Fix**
-  * Don't realias variables that are already declared in optional `coreAliasing` transformer.
-
-## 2.13.6
-
- * **Bug Fix**
-  * Add `NewExpression` as a valid parent for parentheses insertion for `ConditionalExpression`.
-
-## 2.13.5
-
- * **Bug Fix**
-  * Allow rest parameters to be destructuring patterns.
- * **Internal**
-  * Upgrade `kexec` to `1.1.0`.
-
-## 2.13.4
-
- * **Bug Fix**
-  * Fix ordering of destructuring and default params.
-  * Fix loop body scope.
-  * Fix `for...of` transformation not retaining it's scope.
-  * Add destructuring assignment support to scope tracking.
- * **Polish**
-  * More reliable newlines for pretty printing variable declarations.
-
-## 2.13.3
-
- * **Internal**
-  * Add `coverage` and `vendor` to npmignore.
-
-## 2.13.2
-
- * **Bug Fix**
-  * Fix `super` inside of nested functions.
- * **Internal**
-  * Move let scoping TDZ into a separate transformer until it's more solid.
-  * Use `process.stdin.write` instead of `console.log` in `bin` to avoid sprintfification.
-
-## 2.13.1
-
- * **New Feature**
-  * Temporal dead zone for block binding.
-
-## 2.13.0
-
- * **New Feature**
-  * Block scoped functions.
-  * Add `--loose all` option.
-  * Add playground mallet operator thanks to [@jridgewell](https://github.com/jridgewell).
- * **Bug Fix**
-  * Rewrote large parts of the let scoping transformer. Now passes all known tests.
- * **Internal**
-  * Even more optimisations thanks to the awesome [@gaearon](https://github.com/gaearon).
-  * Upgrade `acorn-6to5`.
-    * Fixes exponentation operator thanks to [@charliesome](https://github.com/charliesome).
-    * Fix flow optional parameters with types.
-  * Upgrade `chokidar` to `0.12.6`.
-  * Upgrade `commander` to `2.6.0`.
-  * Upgrade `core-js` to `0.4.5`.
-  * Upgrade `estraverse` to `1.9.1`.
-  * Upgrade `jshint` to `2.5.11`.
-  * Upgrade `regenerator` to `0.8.9`.
-  * Upgrade `regexpu` to `1.0.0`.
-  * Upgrade `source-map` to `0.1.43`.
-  * Upgrade `source-map-support` to `0.2.9`.
-  * Upgrade `browserify` to `8.1.1`.
-  * Upgrade `chai` to `1.10.0`.
-  * Upgrade `istanbul` to `0.3.5`.
-  * Upgrade `mocha` to `2.1.0`.
-  * Upgrade `uglify-js` to `2.4.16`.
-
-## 2.12.6
-
- * **Bug Fix**
-  * Add missing flow type traversal keys.
-
-## 2.12.5
-
- * **Internal**
-  * Fix incorrect `for...in` loop still causing `ember-script` issues.
-
-## 2.12.4
-
- * **Polish**
-  * Rest parameters now allocate the array before populating.
- * **Internal**
-  * `for...in` loops have been changed to optimized `for` loops - better performance and no enumeration of protoype keys.
-  * Parts of the code generator have now been optimized thanks to [gaearon](https://github.com/gaearon).
-
-## 2.12.3
-
- * **Spec Compliancy**
-  * Optional `typeof` transformer checks for `undefined` before passing it to the helper.
-  * Class methods are now named.
-
-## 2.12.2
-
- * **Internal**
-  * Exclude nodes in function parameters and catch clauses from `isReferenced` check.
-
-## 2.12.1
-
- * **Internal**
-  * Add `.jsx` to list of allowed extensions.
-
-## 2.12.0
-
- * **Bug Fix**
-  * Support non-string JSX literals.
- * **New Feature**
-  * Loose mode for some transformers that enables non-spec behavior.
- * **Internal**
-  * Uglify `--mangle sort` has been added to the build script, cutting minified scripts in half.
-
-## 2.11.4
-
- * **Internal**
-  * Make all dependency versions fixed.
-
-## 2.11.3
-
- * **Bug Fix**
-  * Allow a string to be passed as the `optional` option.
-
-## 2.11.2
-
- * **Bug Fix**
-  * Support esprima-style catch clause handlers.
- * **Polish**
-  * Don't print a stacktrace for syntax errors in the CLI.
-
-## 2.11.1
-
- * **Bug Fix**
-  * Remove stray `console.log` outputting debug code.
-  * Remove `Dict` from `coreAliasing`.
-
-## 2.11.0
-
- * **Bug Fix**
-  * Fix unnecessary IIFE in default parameters on method calls.
-  * Add support for supers inside of closures.
- * **New Feature**
-  * Add `--keep-module-id-extensions`/`keepModuleIdExtensions` option to keep extensions in module ids.
- * **Polish**
-  * Special case single argument spread properties in `super` inside classes.
-  * Don't use a variable declaration for class declaration IFFE.
-  * Rename `inherits` helper parameters.
-  * `coreAliasing` transformer now aliases `Promise`, `Set`, `Map` and more. Thanks [@AluisioASG](https://github.com/AluisioASG).
-
-## 2.10.1
-
- * **Internal**
-  * Upgrade `core-js` to `0.4.4`.
- * **New Feature**
-  * Added `--include-regenerator` option to CLI and `includeRegenerator` option to API that includes the regenerator runtime if necessary.
-
-## 2.10.0
-
- * **New Feature**
-  * Add `classesFastSuper` optional transformer that doesn't support parent getters and prototype changing.
-  * Add `forOfFast` transformer that speeds up `for...of` on arrays but produces more code.
-  * Add `--react-compat` to `bin/6to5`.
- * **Spec Compliancy**
-  * Disallow setters without a single parameter.
-  * Add `configurable` and `writable` to defined properties.
-  * Use define instead of assignment for class methods.
- * **Polish**
-  * Fix bin name in `6to5-node --help`.
-  * Fix shorthand `--whitelist` name in `bin/6to5`.
- * **Internal**
-  * Hot code optimisation of traversal etc thanks to [gaearon](https://github.com/gaearon).
-
-## 2.9.4
-
- * **Bug Fix**
-  * Support `UpdateExpression`s as `MemberExpression` objects.
-
-## 2.9.3
-
- * **Bug Fix**
-  * Remove `exportsWildcard` helper in favor of `defaults`.
-
-## 2.9.2
-
- * **Bug Fix**
-  * Pass `exports` to `exportWildcard` helper to allow for use inside the optional runtime.
-
-## 2.9.1
-
- * **Bug Fix**
-  * Fix runtime generator breaking the helper inclusion loop.
-
-## 2.9.0
-
- * **Internal**
-  * Upgrade `acorn-6to5`.
-    * Now supports destructuring shorthand properties.
-
-## 2.8.1
-
- * **Bug Fix**
-  * Fix computed accessors on object literals.
-
-## 2.8.0
-
- * **New Feature**
-  * Add `commonStrict`, `amdStrict` and `umdStrict` module formatters that remove `module.exports` interop assignment.
-  * Add `--indent` option to the 6to5 CLI.
-
-## 2.7.4
-
- * **Polish**
-  * Inherit assignments from their declaration in destructuring.
-  * Properly align multi-declarator variable declarations.
-
-## 2.7.3
-
- * **Polish**
-  * Indent and add newlines to `React.createElement` calls in `react` transformer.
-  * Remove `Object.assign` calls and replace it with an `extends` helper.
-
-## 2.7.1
-
- * **New Feature**
-  * Expose `version` on browser and node API.
- * **Internal**
-  * Upgrade `core-js` to 0.4.1
-
-## 2.7.0
-
- * **Spec Compliancy**
-  * Disallow reassignments of imports.
- * **New Feature**
-  * `reactCompat` option to enable pre-v0.12 react components.
-
-## 2.6.3
-
- * **Bug Fix**
-  * Fix 2.6.0 regression caused by faulty export default from a source handling.
-
-## 2.6.2
-
- * **Bug Fix**
-  * Fix rest parameter keys when on functions with params.
-
-## 2.6.1
-
- * **Bug Fix**
-  * Fix rest parameter arguments key.
-
-## 2.6.0
-
- * **Bug Fix**
-  * Better handling of number literal property keys.
-  * Handle `NewExpression` paren insertion edegcases better.
- * **Internal**
-  * Fix incorrect AST node `identifier("this")`.
-  * Better `toIdentifier` method that handles reserved words.
-  * Upgrade `acorn-6to5`.
-    * Fix exponentiation operator precedence.
-    * Fix line terminators after async contextual keywords.
-    * Add semicolons as class elements inside of a class body.
-  * Upgrade to `core-js` 4.0.0.
-  * Upgrade to `regenerator` 0.8.3.
-    * Fix non-loop labeled statements.
- * **New Feature**
-  * Basic destructuring defaults
-  * Add `.es` to list of supported extensions.
-  * Add optional `typeofSymbol` transformer.
-  * Use a `for` loop for rest parameters instead of `Array.prototype.slice`.
- * **Polish**
-  * Move `"use strict";` to inside module bodies instead of at the top of the file.
-  * Better handling of dynamic imports.
- * **Spec Compliancy**
-  * Class inheritance now has a `function` or `null` type check.
-  * Add `interopRequireWildcard` around wildcard imports and exports to handle non-object exports.
-
-## 2.5.0
-
- * Remove `noDuplicateProperties` transformer.
- * Better generated UIDs based on nodes.
- * Default parameters now use `arguments[i]`, conditionals and variable declarations instead of using long-form if statements.
-
-## 2.4.10
-
- * Upgrade `acorn-6to5`.
-
-## 2.4.9
-
- * Upgrade `acorn-6to5`.
- * Add optional `protoToAssign` transformer.
- * Fix missing properties from computed property keys.
- * Make ES7 comprehensions `let` variables.
-
-## 2.4.8
-
- * Make `require("6to5/register")` work with browserify - [#370](https://github.com/6to5/6to5/pull/370). Thanks [@hughsk](https://github.com/hughsk)!
-
-## 2.4.7
-
- * Upgrade `acorn-6to5`.
-
-## 2.4.6
-
- * Move `coreAliasing` and `undefinedToVoid` transformers down to catch `moduleFormatter` transforms.
-
-## 2.4.5
-
- * Avoid printing comments if they've already been output.
-
-## 2.4.4
-
- * Add `module` type to browser build `<script>` handler.
- * Fix some `MemberExpression` modifying incorrectly setting `property` to a `MemberExpression`.
-
-## 2.4.3
-
- * Upgrade `acorn-6to5`.
- * Add support for `FunctionDeclaration`s in `bluebirdCoroutines` and `asyncToGenerators` transformers.
-
-## 2.4.2
-
- * Upgrade `acorn-6to5`.
- * Better uids generated for various transformers based on parent node.
- * Alias flat references in `coreAliasing` transformer.
-
-## 2.4.1
-
- * Better whitespace handling of parenthesized expressions due to trailing comments.
- * Fix `yield` inside of comprehensions.
-
-## 2.4.0
-
- * Use a closure always for classes with a super.
- * Always use native loops for array comprehensions.
- * Allow `yield` inside of comprehensions.
- * Add optional `bluebirdCoroutine` transformer.
- * Add optional `asyncToGenerator` transformer.
- * Move `useStrict` transformer to before `_moduleFormatter` causing `"use strict";` to always be placed the very top.
-
-## 2.3.2
-
- * Add parens on expressions with trailing comments.
-
-## 2.3.1
-
- * Add `undefinedToVoid` optional transformer.
- * Use `Object.defineProperty` for computed properties.
-
-## 2.3.0
-
- * Upgrade `acorn-6to5`.
- * Support circular references and hoist variable declarations in `system` module formatter.
- * Add optional transformers, including a new `coreAliasing` transformer that aliases native ES6 static properties to their `core-js` equivalent.
-
-## 2.2.0
-
- * Make `system` module formatter modules anonymous by default.
- * Fix duplicate comments being output, breaking code.
-
-## 2.1.0
-
- * Add `cache` option to register hook.
- * Update `core-js`.
- * Fix starting newline not being added on case statements.
- * Fix destructuring `VariableDeclaration`s not inside `BlockStatement`s and `Program`.
-
-## 2.0.4
-
- * Avoid being greedy when destructuring array iterables.
-
-## 2.0.3
-
- * Hoist function declarations in system module formatter for circular references.
- * Hoist default function declarations in umd and amd module formatters for circular references.
-
-## 2.0.2
-
- * Inherit comments in `for-of` transformer.
- * Remove `interopRequire` from `system` module formatter.
-
-## 2.0.1
-
- * Remap `UpdateExpression` module export binding.
- * Fix automatic closure on `PrivateDeclaration` in classes.
-
-## 2.0.0
-
- * Make string literal generation only escapes unicode that it has to.
- * Internal code generation format options have been exposed.
- * Change playground method binding operator from `:` to `#` removing ambiguous syntax with terns.
- * Fix rest parameters in async and generator functions.
- * Export/import declarations replace by the modules transformer now inherit comments.
- * Added playground flag to `6to5-node`.
- * `6to5-node` now behaves the same as `node`.
- * `6to5-node` now uses `kexec` to become the forked process to correctly propagate signals on unix.
- * Constants are now block scoped.
- * Exposed ast transformer.
- * Merged `commonInterop` and `common` module formatters.
- * Fix generator comprehensions not inheriting `arguments`, `this` etc.
- * Object and class mutator shorthand are now enumerable.
- * Remove regenerator `Generator has already finished` error which isn't spec-compliant.
- * Expose internal `spec` transformers that nicen up code output.
- * Add export variable declaration default initializers.
- * Propagate export declaration reassignments.
- * Add initializer default to block scoped variable declarations within a loop.
- * Flow type support.
- * Make async/await contextual keywords.
- * Allow `yield`ing of non-objects.
- * Class declarations now lack an IIFE.
- * Support falsy and `null` super classes.
- * Add support for experimental abstract references `private` declarations.
- * Leave out IIFE for class declarations.
- * Switched to [core-js](https://github.com/zloirock/core-js) from [es6-symbol](https://github.com/medikoo/es6-symbol) and [es6-shim](https://github.com/paulmillr/es6-shim/) for built-in polyfill.
- * `amd` and `umd` module formatters now behave the same as `common` with `interopRequire`.
- * Micro-optimizations to boost performance by 200%.
- * Rename module formatter methods `import` to `importDeclaration` and `export` to `exportDeclaration`.
- * Support multiple declarators in export variable declarations.
- * Freeze tagged template literal object.
- * Remove inlined `regenerator` fork.
- * Remove `ParenthesizedExpression`.
- * Rename `object-spread` helper to `object-without-properties`.
- * Rename `class-props` helper to `prototype-properties`.
- * Rename `extends` helper to `inherits`.
- * Completely rewritten `system` module formatter.
-
-## 1.15.0
-
- * Don't alias `GeneratorFunction` and check the name which causes minifiers to remove the name and throw an error later on when we check if it's set.
-
-## 1.14.18
-
- * Fix files only containg comments not being output.
- * Fix duplicate comments on property key shorthands.
-
-## 1.14.17
-
- * Add default initializer to let variables within loop bodies.
- * Fix excessive `break` replacement inside of switches in let scoping.
-
-## 1.14.16
-
- * Add object getter memos and this shorthand to playground.
- * Fix while loops in let scoping.
- * Upgrade `acorn-6to5`.
-
-## 1.14.14
-
- * Fix template literals escaping.
-
-## 1.14.13
-
- * Fix let scoping of `while` loops.
- * Make class methods enumerable.
-
-## 1.14.12
-
- * Fix duplicate dynamic expressions in call spread.
-
-## 1.14.10
-
- * Fix let scoping unneccesary override.
-
-## 1.14.6
-
- * Avoid ensuring a block on non-array node replacements.
-
-## 1.14.5
-
- * Upgrade `acorn-6to5`.
- * Fix JSON recursion error for unknown code generator node types.
- * Ensure that a statement is a block on block/statement types when replacing them with multiple nodes.
-
-## 1.14.4
-
- * Merge pretzel maps and method binding.
-
-## 1.14.3
-
- * Add playground pretzel maps.
-
-## 1.14.2
-
- * Fix `commonInterop` default export handling.
- * Fix keyworded property key identifiers being turned into computed property key literals.
-
-## 1.14.1
-
- * Inherit comments from `ClassDeclaration`.
-
-## 1.14.0
-
- * Add [playground](https://6to5.github.io/playground.html).
-
-## 1.13.13
-
- * Fix `--debug` in `bin/6to5-node`. Thanks [@timoxley](https://github.com/timoxley).
-
-## 1.13.12
-
- * Ignore `XJSEmptyExpression`s in `react` transformer output.
-
-## 1.13.11
-
- * Fix `util.regexify` on falsy values.
- * Fix `_aliasFunction` with rest parameters.
- * Export as `module.exports` instead of `exports.default` if there are no other `ExportDeclaration`s in `commonInterop` module formatter.
- * Add `system` module formatter. Thanks [@douglasduteil](https://github.com/douglasduteil).
-
-## 1.13.10
-
- * Add support for `AssignmentExpression` destructuring outside of `ExpressionStatement`.
-
-## 1.13.9
-
- * Fix `VirtualPropertyExpression` visitor keys.
-
-## 1.13.8
-
- * Only use a single reference in abstract references.
-
-## 1.13.7
-
- * Upgrade `acorn-6to5`.
- * Add experimental exponentiation operator support.
-
-## 1.13.6
-
- * Fix experimental object spread/rest helper.
-
-## 1.13.5
-
- * Upgrade `acorn-6to5`.
- * Add experimental support for object spread/rest.
- * Change `arguments` to array to an additional helper method.
-
-## 1.13.4
-
- * Fix single spread element returning itself.
-
-## 1.13.3
-
- * Upgrade `acorn-6to5`.
- * Add experimental support for abstract references.
-
-## 1.13.2
-
- * Optimize `Array.from` usage by adding a helper method.
- * Upgrade `acorn-6to5`.
-
-## 1.13.1
-
- * Fix constructor spread optimisation. Thanks [@zloirock](https://github.com/zloirock).
-
-## 1.13.0
-
- * Put experimental ES7 features behind a flag `--experimental` and `experimental` option.
- * Constructor spread performance increase. Thanks [@RReverser](https://github.com/RReverser).
- * Use `self` instead of `window` in the optional 6to5 runtime. Thanks [@RReverser](https://github.com/RReverser).
-
-## 1.12.26
-
- * Support computed property destructuring.
-
-## 1.12.25
-
- * Update `acorn-6to5`, `ast-types`, `es6-shim`, `chokidar`, `estraverse` and `private`.
-
-## 1.12.24
-
- * Collect references that haven't been declared in scope.
-
-## 1.12.23
-
- * Fix generator function export hoisting.
-
-## 1.12.22
-
- * Update `fs-readdir-recursive` and `chokidar`.
- * Support array destructuring on iterables.
- * Make amd module id optional. Thanks [@webpro](https://github.com/webpro).
-
-## 1.12.21
-
- * Fix unneccesary let scoping replacement.
- * Add `commonInterop` module formatter. Thanks [@Naddiseo](https://github.com/Naddiseo).
- * Fix `return` outside of function body bug. Thanks [@brentburg](https://github.com/brentburg).
- * Add more flexible option types.
-
-## 1.12.20
-
- * Append `sourceMappingURL` when using `bin/6to5` and output sourcemaps.
-
-## 1.12.19
-
- * Add `comments` option and `--remove-comments` flag. Thanks [@webpro](htps://github.com/webpro).
- * Embed `regenerator`.
-
-## 1.12.18
-
- * Use `global` reference instead of `window`.
-
-## 1.12.17
-
- * Add `moduleName`, `sourceRoot` and `filenameRelative` options. Thanks [@darvelo](https://github.com/darvelo).
- * Traversal optimisations.
-
-## 1.12.16
-
- * Fix comments not being retained from `MethodDefinition` in classes.
- * Add temporal dead zone in default parameters.
-
-## 1.12.15
-
- * Update `acorn-6to5`.
-
-## 1.12.14
-
- * Fix duplicate let scoping in functions.
- * Make JSX whitespace more React-compliant.
- * Add `_memberExpressionKeywords` transformer that turns keyword identifiers to computed literals.
- * Upgrade `regenerator-6to5`.
-
-## 1.12.13
-
- * Support duplicate constants within different block scopes.
- * Fix for-head duplication testing and replacement.
- * Support `raw` property on tagged template literals.
-
-## 1.12.12
-
- * Make scope tracker more reliable to handle all edgecases.
-
-## 1.12.11
-
- * Block scope classes.
- * Fix generation of integer `Literal`s in `MemberExpression`.
-
-## 1.12.10
-
- * Fix let scoping var hoisting.
-
-## 1.12.9
-
- * Escape unicode characters when generating string `Literal`s.
- * Fix semicolons being output for statements in `ExportDeclaration`.
- * Fix `WithStatement` missing parenthesis.
-
-## 1.12.8
-
- * Temporarily forbid `AssignmentExpression` destructuring outside of `ExpressionStatement`.
-
-## 1.12.7
-
- * Update to latest `acorn-6to5`.
-
-## 1.12.6
-
- * Update to latest `acorn-6to5`.
-
-## 1.12.5
-
- * Fix excessive whitespace trimming resulting in innaccurate sourcemap line.
-
-## 1.12.4
-
- * Add `doc` folder for documentation.
-
-## 1.12.3
-
- * Support generator comprehensions.
- * Use `Array.from` instead of `Array.prototype.slice` in spread transformer.
- * Support spread in `NewExpression`s.
-
-## 1.12.2
-
- * Upgrade `matcha` to `0.6.0` and `browserify` to `6.3.2`.
- * Add own `trimRight` helper instead of relying on the string instance method.
- * Support JSX spreads that aren't the first.
-
-## 1.12.1
-
- * Fix `this` and `arguments` mapping in the `_aliasFunctions` transformer.
-
-## 1.12.0
-
- * Combine `jsx` and `react` transformers to `react`.
- * Update `react` syntax output to React v0.12.
-
-## 1.11.15
-
- * Fix JSX literal whitespace generation.
-
-## 1.11.14
-
- * Avoid using a switch for let-scoping continue and break statements and use an if statement instead.
- * Remove excess whitespace and newlines from JSX literals.
-
-## 1.11.13
-
- * Update regenerator-6to5
- * Add support for most escodegen formatting options
+ * 6to5 is now known as Babel.
+ * Global helpers/runtime has now been given the more descriptive name of "external helpers".
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 208e904a47..d113233c2a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Contributions are always welcome, no matter how large or small. Before
 contributing, please read the
-[code of conduct](https://github.com/6to5/6to5/blob/master/CODE_OF_CONDUCT.md).
+[code of conduct](https://github.com/babel/babel/blob/master/CODE_OF_CONDUCT.md).
 
 **NOTE:** Please do not send pull requests that fix linting issues. It's highly
 likely that they've already been fixed by the time it's submitted and it just
@@ -13,7 +13,7 @@ pollutes the git tree.
 #### Workflow
 
 * Fork the repository
-* Clone your fork and change directory to it (`git clone git@github.com:yourUserName/6to5.git && cd 6to5`)
+* Clone your fork and change directory to it (`git clone git@github.com:yourUserName/babel.git && cd 6to5`)
 * Install the project dependencies (`make bootstrap`)
 * Link your forked clone (`npm link`)
 * Develop your changes ensuring you're fetching updates from upstream often
diff --git a/Makefile b/Makefile
index 71fe9fd1e2..7ebdd18b2d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,31 +5,31 @@ UGLIFY_CMD = node_modules/uglify-js/bin/uglifyjs
 JSHINT_CMD = node_modules/jshint/bin/jshint
 MOCHA_CMD = node_modules/mocha/bin/_mocha
 JSCS_CMD = node_modules/jscs/bin/jscs
-6TO5_CMD = node_modules/6to5/bin/6to5
+BABEL_CMD = node_modules/babel/bin/babel
 
 export NODE_ENV = test
 
 .PHONY: clean test test-cov test-clean lint test-travis test-simple test-all test-browser publish build bootstrap publish-core publish-runtime build-core watch-core
 
 build-core:
-	#node $(6TO5_CMD) src --out-dir lib
+	#node $(BABEL_CMD) src --out-dir lib
 
 watch-core:
-	#node $(6TO5_CMD) src --out-dir lib --watch
+	#node $(BABEL_CMD) src --out-dir lib --watch
 
 build:
 	mkdir -p dist
 
 	node tools/cache-templates
 
-	node $(BROWSERIFY_CMD) -e lib/6to5/polyfill.js >dist/polyfill.js
+	node $(BROWSERIFY_CMD) -e lib/babel/polyfill.js >dist/polyfill.js
 	node $(UGLIFY_CMD) dist/polyfill.js >dist/polyfill.min.js
 
-	node $(BROWSERIFY_CMD) lib/6to5/api/browser.js -s to5 >dist/6to5.js
-	node $(UGLIFY_CMD) dist/6to5.js >dist/6to5.min.js
+	node $(BROWSERIFY_CMD) lib/babel/api/browser.js -s to5 >dist/babel.js
+	node $(UGLIFY_CMD) dist/babel.js >dist/babel.min.js
 
-	node bin/6to5-runtime >dist/runtime.js
-	node $(UGLIFY_CMD) dist/runtime.js >dist/runtime.min.js
+	node bin/babel-external-helpers >dist/external-helpers.js
+	node $(UGLIFY_CMD) dist/external-helpers.js >dist/external-helpers.min.js
 
 	rm -rf templates.json
 
@@ -71,7 +71,7 @@ test-browser:
 
 	node tools/cache-templates
 	node tools/cache-tests
-	node $(BROWSERIFY_CMD) -e test/_browser.js >dist/6to5-test.js
+	node $(BROWSERIFY_CMD) -e test/_browser.js >dist/babel-test.js
 	rm -rf templates.json tests.json
 
 	test -n "`which open`" && open test/browser.html
@@ -85,9 +85,9 @@ publish:
 	npm version $$version --message "v%s"
 
 	make build
-	cp dist/6to5.min.js browser.js
+	cp dist/babel.min.js browser.js
 	cp dist/polyfill.min.js browser-polyfill.js
-	cp dist/runtime.min.js runtime.js
+	cp dist/external-helpers.min.js external-helpers.js
 
 	node tools/cache-templates
 	test -f templates.json
@@ -99,12 +99,12 @@ publish:
 	make publish-core
 	make publish-runtime
 
-	rm -rf templates.json browser.js browser-polyfill.js runtime.js
+	rm -rf templates.json browser.js browser-polyfill.js external-helpers.js
 
 publish-runtime:
 	cd packages; \
 	node build-runtime.js; \
-	cd 6to5-runtime; \
+	cd babel-runtime; \
 	npm publish
 
 publish-core:
diff --git a/NOTES.md b/NOTES.md
deleted file mode 100644
index 71d2a5b7f5..0000000000
--- a/NOTES.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Notes
-
- * Wildcard exports/imports wont normalize if `export default` is a non-object. See [#224](https://github.com/6to5/6to5/issues/224).
diff --git a/README.md b/README.md
index d0eb9b4332..7562e95ac5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img alt="6to5" src="https://raw.githubusercontent.com/6to5/logo/master/logo.png" width="546">
+  <img alt="babel" src="https://raw.githubusercontent.com/babel/logo/master/logo.png" width="546">
 </p>
 
 <p align="center">
@@ -7,6 +7,6 @@
 </p>
 
 <p align="center">
-  For more information view the <a href="https://6to5.github.io">documentation</a>. For
-  support visit the <a href="https://gitter.im/6to5/6to5">gitter room</a>.
+  For more information view the <a href="https://babeljs.io/">documentation</a>. For
+  support visit the <a href="https://gitter.im/babel/babel">gitter room</a>.
 </p>
diff --git a/bin/6to5-runtime b/bin/6to5-runtime
deleted file mode 100755
index 41b596c4de..0000000000
--- a/bin/6to5-runtime
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-var runtime = require("../lib/6to5/build-runtime");
-console.log(runtime());
diff --git a/bin/_6to5-node b/bin/_babel-node
similarity index 93%
rename from bin/_6to5-node
rename to bin/_babel-node
index 982ed5dbc9..9d14ca4e2e 100644
--- a/bin/_6to5-node
+++ b/bin/_babel-node
@@ -2,14 +2,14 @@
 
 var commander = require("commander");
 var Module    = require("module");
+var babel     = require("../lib/babel/api/node");
 var path      = require("path");
 var repl      = require("repl");
-var to5       = require("../lib/6to5/api/node");
-var util      = require("../lib/6to5/util");
+var util      = require("../lib/babel/util");
 var vm        = require("vm");
 var _         = require("lodash");
 
-var program = new commander.Command("6to5-node");
+var program = new commander.Command("babel-node");
 
 program.option("-e, --eval [script]", "Evaluate script");
 program.option("-p, --print [code]", "Evaluate script and print result");
@@ -28,7 +28,7 @@ program.parse(process.argv);
 
 //
 
-to5.register({
+babel.register({
   experimental: program.experimental,
   extensions:   program.extensions,
   playground:   program.playground,
@@ -41,7 +41,7 @@ to5.register({
 //
 
 var _eval = function (code, filename) {
-  code = to5.transform(code, {
+  code = babel.transform(code, {
     filename: filename,
     blacklist: ["useStrict"].concat(program.blacklist || []),
     whitelist: program.whitelist,
@@ -60,7 +60,7 @@ if (program.eval || program.print) {
   if (program.print) console.log(result);
 } else {
   if (program.args.length) {
-    // slice all arguments up to the first filename since they're 6to5 args that we handle
+    // slice all arguments up to the first filename since they're babel args that we handle
     var args = process.argv.slice(2);
 
     var i = 0;
diff --git a/bin/babel-external-helpers b/bin/babel-external-helpers
new file mode 100755
index 0000000000..c60b3d36f6
--- /dev/null
+++ b/bin/babel-external-helpers
@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+var runtime = require("../lib/babel/build-external-helpers");
+console.log(runtime());
diff --git a/bin/6to5-minify b/bin/babel-minify
similarity index 76%
rename from bin/6to5-minify
rename to bin/babel-minify
index de65baf7ed..bacb84d628 100755
--- a/bin/6to5-minify
+++ b/bin/babel-minify
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var opts = require("./6to5").opts;
+var opts = require("./babel").opts;
 opts.optional = (opts.optional || []).concat("minification");
 opts.format = {
   compact: true
diff --git a/bin/6to5-node b/bin/babel-node
similarity index 92%
rename from bin/6to5-node
rename to bin/babel-node
index e7d29da39e..99344fc9f4 100755
--- a/bin/6to5-node
+++ b/bin/babel-node
@@ -2,10 +2,10 @@
 
 /**
  * This tiny wrapper file checks for known node flags and appends them
- * when found, before invoking the "real" _6to5-node(1) executable.
+ * when found, before invoking the "real" _babel-node(1) executable.
  */
 
-var args  = [__dirname + "/_6to5-node"];
+var args  = [__dirname + "/_babel-node"];
 
 process.argv.slice(2).forEach(function(arg){
   var flag = arg.split("=")[0];
diff --git a/bin/6to5/dir.js b/bin/babel/dir.js
similarity index 100%
rename from bin/6to5/dir.js
rename to bin/babel/dir.js
diff --git a/bin/6to5/file.js b/bin/babel/file.js
similarity index 98%
rename from bin/6to5/file.js
rename to bin/babel/file.js
index 4193e73bdb..a45fb5ba6a 100644
--- a/bin/6to5/file.js
+++ b/bin/babel/file.js
@@ -1,6 +1,6 @@
 var sourceMap = require("source-map");
 var chokidar  = require("chokidar");
-var util2     = require("../../lib/6to5/util");
+var util2     = require("../../lib/babel/util");
 var path      = require("path");
 var util      = require("./util");
 var fs        = require("fs");
diff --git a/bin/6to5/index.js b/bin/babel/index.js
similarity index 94%
rename from bin/6to5/index.js
rename to bin/babel/index.js
index 5d659da30d..26bfc65a12 100755
--- a/bin/6to5/index.js
+++ b/bin/babel/index.js
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 var commander = require("commander");
-var transform = require("../../lib/6to5/transformation");
-var util      = require("../../lib/6to5/util");
+var transform = require("../../lib/babel/transformation");
+var util      = require("../../lib/babel/util");
 var fs        = require("fs");
 var each      = require("lodash/collection/each");
 var keys      = require("lodash/object/keys");
@@ -11,7 +11,7 @@ commander.option("-t, --source-maps-inline", "Append sourceMappingURL comment to
 commander.option("-s, --source-maps", "Save source map alongside the compiled code");
 commander.option("-f, --filename [filename]", "Filename to use when reading from stdin - this will be used in source-maps, errors etc [stdin]", "stdin");
 commander.option("-w, --watch", "Recompile files on changes");
-commander.option("-r, --runtime", "Replace 6to5 declarations with references to a runtime");
+commander.option("-r, --runtime", "Replace babel helpers with references to a runtime");
 commander.option("-e, --experimental", "Enable experimental support for proposed ES7 features");
 commander.option("-p, --playground", "Enable playground support");
 
@@ -117,7 +117,7 @@ exports.opts = {
 };
 
 setTimeout(function () {
-  // this is just a hack to give `6to5-minify` and other files including this
+  // this is just a hack to give `babel-minify` and other files including this
   // time to modify `exports.opts`
 
   var fn;
diff --git a/bin/6to5/util.js b/bin/babel/util.js
similarity index 88%
rename from bin/6to5/util.js
rename to bin/babel/util.js
index 41d7cf326a..d6b6bc26c1 100644
--- a/bin/6to5/util.js
+++ b/bin/babel/util.js
@@ -1,8 +1,8 @@
 var readdir = require("fs-readdir-recursive");
 var index   = require("./index");
-var util    = require("../../lib/6to5/util");
+var babel   = require("../../lib/babel/api/node");
+var util    = require("../../lib/babel/util");
 var path    = require("path");
-var to5     = require("../../lib/6to5/api/node");
 var fs      = require("fs");
 var _       = require("lodash");
 
@@ -26,7 +26,7 @@ exports.transform = function (filename, code, opts) {
 
   var result;
   try {
-    result = to5.transform(code, opts);
+    result = babel.transform(code, opts);
   } catch (e) {
     if (e instanceof SyntaxError) {
       console.error("SyntaxError:", e.message);
diff --git a/bin/deprecated/6to5 b/bin/deprecated/6to5
new file mode 100755
index 0000000000..ec796656ae
--- /dev/null
+++ b/bin/deprecated/6to5
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5` has been renamed to `babel`");
+require("../babel");
diff --git a/bin/deprecated/6to5-minify b/bin/deprecated/6to5-minify
new file mode 100755
index 0000000000..3d2635fa59
--- /dev/null
+++ b/bin/deprecated/6to5-minify
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5-minify` has been renamed to `babel-minify`");
+require("../babel-minify");
diff --git a/bin/deprecated/6to5-node b/bin/deprecated/6to5-node
new file mode 100755
index 0000000000..5b598d9e9f
--- /dev/null
+++ b/bin/deprecated/6to5-node
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5-node` has been renamed to `babel-node`");
+require("../_babel-node");
diff --git a/bin/deprecated/6to5-runtime b/bin/deprecated/6to5-runtime
new file mode 100755
index 0000000000..ced3b987a4
--- /dev/null
+++ b/bin/deprecated/6to5-runtime
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5-runtime` has been renamed to `babel-external-helpers`");
+require("../babel-external-helpers");
diff --git a/lib/6to5/polyfill.js b/lib/6to5/polyfill.js
deleted file mode 100644
index f9a0420916..0000000000
--- a/lib/6to5/polyfill.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-if (global._6to5Polyfill) {
-  throw new Error("only one instance of 6to5/polyfill is allowed");
-}
-global._6to5Polyfill = true;
-
-require("core-js/shim");
-require("regenerator-6to5/runtime");
diff --git a/lib/6to5/api/browser.js b/lib/babel/api/browser.js
similarity index 96%
rename from lib/6to5/api/browser.js
rename to lib/babel/api/browser.js
index 2de894e56f..dd530e8294 100644
--- a/lib/6to5/api/browser.js
+++ b/lib/babel/api/browser.js
@@ -38,7 +38,7 @@ transform.load = function (url, callback, opts, hold) {
 
 var runScripts = function () {
   var scripts = [];
-  var types   = ["text/ecmascript-6", "text/6to5", "module"];
+  var types   = ["text/ecmascript-6", "text/6to5", "text/babel", "module"];
   var index   = 0;
 
   var exec = function () {
diff --git a/lib/6to5/api/node.js b/lib/babel/api/node.js
similarity index 88%
rename from lib/6to5/api/node.js
rename to lib/babel/api/node.js
index fbe3843d9e..47ae80a08b 100644
--- a/lib/6to5/api/node.js
+++ b/lib/babel/api/node.js
@@ -7,7 +7,7 @@ var fs         = require("fs");
 
 exports.version = require("../../../package").version;
 
-exports.runtime = require("../build-runtime");
+exports.buildExternalHelpers = require("../build-external-helpers");
 
 exports.types = require("../types");
 
@@ -23,7 +23,7 @@ exports.polyfill = function () {
 
 exports.canCompile = util.canCompile;
 
-// do not use this - this is for use by official maintained 6to5 plugins
+// do not use this - this is for use by official maintained babel plugins
 exports._util = util;
 
 exports.transform = transform;
diff --git a/lib/6to5/api/register/browser.js b/lib/babel/api/register/browser.js
similarity index 52%
rename from lib/6to5/api/register/browser.js
rename to lib/babel/api/register/browser.js
index f7576c91ac..7cfc5c1547 100644
--- a/lib/6to5/api/register/browser.js
+++ b/lib/babel/api/register/browser.js
@@ -1,6 +1,6 @@
 "use strict";
 
-// required to safely use 6to5/register within a browserify codebase
+// required to safely use babel/register within a browserify codebase
 
 module.exports = function () {};
 
diff --git a/lib/6to5/api/register/cache.js b/lib/babel/api/register/cache.js
similarity index 92%
rename from lib/6to5/api/register/cache.js
rename to lib/babel/api/register/cache.js
index ad42db0f61..c66629f675 100644
--- a/lib/6to5/api/register/cache.js
+++ b/lib/babel/api/register/cache.js
@@ -4,7 +4,7 @@ var path = require("path");
 var os   = require("os");
 var fs   = require("fs");
 
-var FILENAME = path.join(os.tmpdir(), "6to5.json");
+var FILENAME = path.join(os.tmpdir(), "babel.json");
 var data = {};
 
 exports.save = function () {
diff --git a/lib/6to5/api/register/node.js b/lib/babel/api/register/node.js
similarity index 97%
rename from lib/6to5/api/register/node.js
rename to lib/babel/api/register/node.js
index 3c924627b5..56367f5fa4 100644
--- a/lib/6to5/api/register/node.js
+++ b/lib/babel/api/register/node.js
@@ -5,9 +5,9 @@ require("../../polyfill");
 var sourceMapSupport = require("source-map-support");
 var registerCache    = require("./cache");
 var extend           = require("lodash/object/extend");
+var babel            = require("../node");
 var each             = require("lodash/collection/each");
 var util             = require("../../util");
-var to5              = require("../node");
 var fs               = require("fs");
 
 sourceMapSupport.install({
@@ -54,7 +54,7 @@ var compile = function (filename) {
   }
 
   if (!result) {
-    result = to5.transformFileSync(filename, extend({
+    result = babel.transformFileSync(filename, extend({
       sourceMap: true,
       ast:       false
     }, transformOpts));
diff --git a/lib/6to5/build-runtime.js b/lib/babel/build-external-helpers.js
similarity index 93%
rename from lib/6to5/build-runtime.js
rename to lib/babel/build-external-helpers.js
index 7499093686..d3e4491666 100644
--- a/lib/6to5/build-runtime.js
+++ b/lib/babel/build-external-helpers.js
@@ -6,7 +6,7 @@ var util         = require("./util");
 var t            = require("./types");
 
 module.exports = function () {
-  var namespace = t.identifier("to5Runtime");
+  var namespace = t.identifier("babelHelpers");
 
   var body      = [];
   var container = t.functionExpression(null, [t.identifier("global")], t.blockStatement(body));
diff --git a/lib/6to5/build-helpers.js b/lib/babel/build-helpers.js
similarity index 100%
rename from lib/6to5/build-helpers.js
rename to lib/babel/build-helpers.js
diff --git a/lib/6to5/detection/index.js b/lib/babel/detection/index.js
similarity index 100%
rename from lib/6to5/detection/index.js
rename to lib/babel/detection/index.js
diff --git a/lib/6to5/detection/syntax-keys.json b/lib/babel/detection/syntax-keys.json
similarity index 100%
rename from lib/6to5/detection/syntax-keys.json
rename to lib/babel/detection/syntax-keys.json
diff --git a/lib/6to5/detection/visitors.js b/lib/babel/detection/visitors.js
similarity index 100%
rename from lib/6to5/detection/visitors.js
rename to lib/babel/detection/visitors.js
diff --git a/lib/6to5/generation/buffer.js b/lib/babel/generation/buffer.js
similarity index 100%
rename from lib/6to5/generation/buffer.js
rename to lib/babel/generation/buffer.js
diff --git a/lib/6to5/generation/generators/base.js b/lib/babel/generation/generators/base.js
similarity index 100%
rename from lib/6to5/generation/generators/base.js
rename to lib/babel/generation/generators/base.js
diff --git a/lib/6to5/generation/generators/classes.js b/lib/babel/generation/generators/classes.js
similarity index 100%
rename from lib/6to5/generation/generators/classes.js
rename to lib/babel/generation/generators/classes.js
diff --git a/lib/6to5/generation/generators/comprehensions.js b/lib/babel/generation/generators/comprehensions.js
similarity index 100%
rename from lib/6to5/generation/generators/comprehensions.js
rename to lib/babel/generation/generators/comprehensions.js
diff --git a/lib/6to5/generation/generators/expressions.js b/lib/babel/generation/generators/expressions.js
similarity index 100%
rename from lib/6to5/generation/generators/expressions.js
rename to lib/babel/generation/generators/expressions.js
diff --git a/lib/6to5/generation/generators/flow.js b/lib/babel/generation/generators/flow.js
similarity index 100%
rename from lib/6to5/generation/generators/flow.js
rename to lib/babel/generation/generators/flow.js
diff --git a/lib/6to5/generation/generators/jsx.js b/lib/babel/generation/generators/jsx.js
similarity index 100%
rename from lib/6to5/generation/generators/jsx.js
rename to lib/babel/generation/generators/jsx.js
diff --git a/lib/6to5/generation/generators/methods.js b/lib/babel/generation/generators/methods.js
similarity index 100%
rename from lib/6to5/generation/generators/methods.js
rename to lib/babel/generation/generators/methods.js
diff --git a/lib/6to5/generation/generators/modules.js b/lib/babel/generation/generators/modules.js
similarity index 100%
rename from lib/6to5/generation/generators/modules.js
rename to lib/babel/generation/generators/modules.js
diff --git a/lib/6to5/generation/generators/playground.js b/lib/babel/generation/generators/playground.js
similarity index 100%
rename from lib/6to5/generation/generators/playground.js
rename to lib/babel/generation/generators/playground.js
diff --git a/lib/6to5/generation/generators/statements.js b/lib/babel/generation/generators/statements.js
similarity index 100%
rename from lib/6to5/generation/generators/statements.js
rename to lib/babel/generation/generators/statements.js
diff --git a/lib/6to5/generation/generators/template-literals.js b/lib/babel/generation/generators/template-literals.js
similarity index 100%
rename from lib/6to5/generation/generators/template-literals.js
rename to lib/babel/generation/generators/template-literals.js
diff --git a/lib/6to5/generation/generators/types.js b/lib/babel/generation/generators/types.js
similarity index 100%
rename from lib/6to5/generation/generators/types.js
rename to lib/babel/generation/generators/types.js
diff --git a/lib/6to5/generation/index.js b/lib/babel/generation/index.js
similarity index 100%
rename from lib/6to5/generation/index.js
rename to lib/babel/generation/index.js
diff --git a/lib/6to5/generation/node/index.js b/lib/babel/generation/node/index.js
similarity index 100%
rename from lib/6to5/generation/node/index.js
rename to lib/babel/generation/node/index.js
diff --git a/lib/6to5/generation/node/parentheses.js b/lib/babel/generation/node/parentheses.js
similarity index 100%
rename from lib/6to5/generation/node/parentheses.js
rename to lib/babel/generation/node/parentheses.js
diff --git a/lib/6to5/generation/node/whitespace.js b/lib/babel/generation/node/whitespace.js
similarity index 100%
rename from lib/6to5/generation/node/whitespace.js
rename to lib/babel/generation/node/whitespace.js
diff --git a/lib/6to5/generation/position.js b/lib/babel/generation/position.js
similarity index 100%
rename from lib/6to5/generation/position.js
rename to lib/babel/generation/position.js
diff --git a/lib/6to5/generation/source-map.js b/lib/babel/generation/source-map.js
similarity index 100%
rename from lib/6to5/generation/source-map.js
rename to lib/babel/generation/source-map.js
diff --git a/lib/6to5/generation/whitespace.js b/lib/babel/generation/whitespace.js
similarity index 100%
rename from lib/6to5/generation/whitespace.js
rename to lib/babel/generation/whitespace.js
diff --git a/lib/6to5/helpers/clone.js b/lib/babel/helpers/clone.js
similarity index 100%
rename from lib/6to5/helpers/clone.js
rename to lib/babel/helpers/clone.js
diff --git a/lib/6to5/helpers/code-frame.js b/lib/babel/helpers/code-frame.js
similarity index 100%
rename from lib/6to5/helpers/code-frame.js
rename to lib/babel/helpers/code-frame.js
diff --git a/lib/6to5/helpers/levenshtein.js b/lib/babel/helpers/levenshtein.js
similarity index 100%
rename from lib/6to5/helpers/levenshtein.js
rename to lib/babel/helpers/levenshtein.js
diff --git a/lib/6to5/helpers/normalize-ast.js b/lib/babel/helpers/normalize-ast.js
similarity index 100%
rename from lib/6to5/helpers/normalize-ast.js
rename to lib/babel/helpers/normalize-ast.js
diff --git a/lib/6to5/helpers/object.js b/lib/babel/helpers/object.js
similarity index 100%
rename from lib/6to5/helpers/object.js
rename to lib/babel/helpers/object.js
diff --git a/lib/6to5/helpers/parse.js b/lib/babel/helpers/parse.js
similarity index 93%
rename from lib/6to5/helpers/parse.js
rename to lib/babel/helpers/parse.js
index 1b2a9a8fca..c54a5897aa 100644
--- a/lib/6to5/helpers/parse.js
+++ b/lib/babel/helpers/parse.js
@@ -1,7 +1,7 @@
 var normalizeAst = require("./normalize-ast");
 var estraverse   = require("estraverse");
 var codeFrame    = require("./code-frame");
-var acorn        = require("acorn-6to5");
+var acorn        = require("acorn-babel");
 
 module.exports = function (opts, code, callback) {
   try {
@@ -30,8 +30,8 @@ module.exports = function (opts, code, callback) {
       return ast;
     }
   } catch (err) {
-    if (!err._6to5) {
-      err._6to5 = true;
+    if (!err._babel) {
+      err._babel = true;
       var message = opts.filename + ": " + err.message;
 
       var loc = err.loc;
diff --git a/lib/6to5/helpers/to-fast-properties.js b/lib/babel/helpers/to-fast-properties.js
similarity index 100%
rename from lib/6to5/helpers/to-fast-properties.js
rename to lib/babel/helpers/to-fast-properties.js
diff --git a/lib/6to5/messages.js b/lib/babel/messages.js
similarity index 100%
rename from lib/6to5/messages.js
rename to lib/babel/messages.js
diff --git a/lib/6to5/patch.js b/lib/babel/patch.js
similarity index 98%
rename from lib/6to5/patch.js
rename to lib/babel/patch.js
index 91bde31fbe..6bc58c5c4c 100644
--- a/lib/6to5/patch.js
+++ b/lib/babel/patch.js
@@ -8,7 +8,7 @@ var t      = require("./types");
 var estraverse = require("estraverse");
 extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
 
-// regenerator-6to5/ast-types
+// regenerator-babel/ast-types
 
 var types = require("ast-types");
 var def   = types.Type.def;
diff --git a/lib/babel/polyfill.js b/lib/babel/polyfill.js
new file mode 100644
index 0000000000..4d8f2647ab
--- /dev/null
+++ b/lib/babel/polyfill.js
@@ -0,0 +1,9 @@
+"use strict";
+
+if (global._babelPolyfill) {
+  throw new Error("only one instance of babel/polyfill is allowed");
+}
+global._babelPolyfill = true;
+
+require("core-js/shim");
+require("regenerator-babel/runtime");
diff --git a/lib/6to5/transformation/file.js b/lib/babel/transformation/file.js
similarity index 99%
rename from lib/6to5/transformation/file.js
rename to lib/babel/transformation/file.js
index 30b8e2918c..44216a8554 100644
--- a/lib/6to5/transformation/file.js
+++ b/lib/babel/transformation/file.js
@@ -165,7 +165,7 @@ File.prototype.normalizeOptions = function (opts) {
   }
 
   if (opts.runtime) {
-    this.set("runtimeIdentifier", t.identifier("to5Runtime"));
+    this.set("runtimeIdentifier", t.identifier("babelHelpers"));
   }
 
   opts.blacklist = transform._ensureTransformerNames("blacklist", opts.blacklist);
diff --git a/lib/6to5/transformation/helpers/build-binary-assignment-operator-transformer.js b/lib/babel/transformation/helpers/build-binary-assignment-operator-transformer.js
similarity index 100%
rename from lib/6to5/transformation/helpers/build-binary-assignment-operator-transformer.js
rename to lib/babel/transformation/helpers/build-binary-assignment-operator-transformer.js
diff --git a/lib/6to5/transformation/helpers/build-comprehension.js b/lib/babel/transformation/helpers/build-comprehension.js
similarity index 100%
rename from lib/6to5/transformation/helpers/build-comprehension.js
rename to lib/babel/transformation/helpers/build-comprehension.js
diff --git a/lib/6to5/transformation/helpers/build-conditional-assignment-operator-transformer.js b/lib/babel/transformation/helpers/build-conditional-assignment-operator-transformer.js
similarity index 100%
rename from lib/6to5/transformation/helpers/build-conditional-assignment-operator-transformer.js
rename to lib/babel/transformation/helpers/build-conditional-assignment-operator-transformer.js
diff --git a/lib/6to5/transformation/helpers/build-react-transformer.js b/lib/babel/transformation/helpers/build-react-transformer.js
similarity index 100%
rename from lib/6to5/transformation/helpers/build-react-transformer.js
rename to lib/babel/transformation/helpers/build-react-transformer.js
diff --git a/lib/6to5/transformation/helpers/define-map.js b/lib/babel/transformation/helpers/define-map.js
similarity index 100%
rename from lib/6to5/transformation/helpers/define-map.js
rename to lib/babel/transformation/helpers/define-map.js
diff --git a/lib/6to5/transformation/helpers/explode-assignable-expression.js b/lib/babel/transformation/helpers/explode-assignable-expression.js
similarity index 100%
rename from lib/6to5/transformation/helpers/explode-assignable-expression.js
rename to lib/babel/transformation/helpers/explode-assignable-expression.js
diff --git a/lib/6to5/transformation/helpers/name-method.js b/lib/babel/transformation/helpers/name-method.js
similarity index 100%
rename from lib/6to5/transformation/helpers/name-method.js
rename to lib/babel/transformation/helpers/name-method.js
diff --git a/lib/6to5/transformation/helpers/react.js b/lib/babel/transformation/helpers/react.js
similarity index 100%
rename from lib/6to5/transformation/helpers/react.js
rename to lib/babel/transformation/helpers/react.js
diff --git a/lib/6to5/transformation/helpers/remap-async-to-generator.js b/lib/babel/transformation/helpers/remap-async-to-generator.js
similarity index 100%
rename from lib/6to5/transformation/helpers/remap-async-to-generator.js
rename to lib/babel/transformation/helpers/remap-async-to-generator.js
diff --git a/lib/6to5/transformation/helpers/replace-supers.js b/lib/babel/transformation/helpers/replace-supers.js
similarity index 100%
rename from lib/6to5/transformation/helpers/replace-supers.js
rename to lib/babel/transformation/helpers/replace-supers.js
diff --git a/lib/6to5/transformation/helpers/use-strict.js b/lib/babel/transformation/helpers/use-strict.js
similarity index 100%
rename from lib/6to5/transformation/helpers/use-strict.js
rename to lib/babel/transformation/helpers/use-strict.js
diff --git a/lib/6to5/transformation/index.js b/lib/babel/transformation/index.js
similarity index 96%
rename from lib/6to5/transformation/index.js
rename to lib/babel/transformation/index.js
index 51c99fc225..ff45272959 100644
--- a/lib/6to5/transformation/index.js
+++ b/lib/babel/transformation/index.js
@@ -48,7 +48,7 @@ transform._ensureTransformerNames = function (type, rawKeys) {
         "Unknown transformer " + key + " specified in " + type + " - " +
         "transformer key names have been changed in 3.0.0 see " +
         "the changelog for more info " +
-        "https://github.com/6to5/6to5/blob/master/CHANGELOG.md#300"
+        "https://github.com/babel/babel/blob/master/CHANGELOG.md#300"
       );
     }
   }
diff --git a/lib/6to5/transformation/modules/_default.js b/lib/babel/transformation/modules/_default.js
similarity index 100%
rename from lib/6to5/transformation/modules/_default.js
rename to lib/babel/transformation/modules/_default.js
diff --git a/lib/6to5/transformation/modules/_strict.js b/lib/babel/transformation/modules/_strict.js
similarity index 100%
rename from lib/6to5/transformation/modules/_strict.js
rename to lib/babel/transformation/modules/_strict.js
diff --git a/lib/6to5/transformation/modules/amd-strict.js b/lib/babel/transformation/modules/amd-strict.js
similarity index 100%
rename from lib/6to5/transformation/modules/amd-strict.js
rename to lib/babel/transformation/modules/amd-strict.js
diff --git a/lib/6to5/transformation/modules/amd.js b/lib/babel/transformation/modules/amd.js
similarity index 100%
rename from lib/6to5/transformation/modules/amd.js
rename to lib/babel/transformation/modules/amd.js
diff --git a/lib/6to5/transformation/modules/common-standard.js b/lib/babel/transformation/modules/common-standard.js
similarity index 100%
rename from lib/6to5/transformation/modules/common-standard.js
rename to lib/babel/transformation/modules/common-standard.js
diff --git a/lib/6to5/transformation/modules/common-strict.js b/lib/babel/transformation/modules/common-strict.js
similarity index 100%
rename from lib/6to5/transformation/modules/common-strict.js
rename to lib/babel/transformation/modules/common-strict.js
diff --git a/lib/6to5/transformation/modules/common.js b/lib/babel/transformation/modules/common.js
similarity index 100%
rename from lib/6to5/transformation/modules/common.js
rename to lib/babel/transformation/modules/common.js
diff --git a/lib/6to5/transformation/modules/ignore.js b/lib/babel/transformation/modules/ignore.js
similarity index 100%
rename from lib/6to5/transformation/modules/ignore.js
rename to lib/babel/transformation/modules/ignore.js
diff --git a/lib/6to5/transformation/modules/index.js b/lib/babel/transformation/modules/index.js
similarity index 100%
rename from lib/6to5/transformation/modules/index.js
rename to lib/babel/transformation/modules/index.js
diff --git a/lib/6to5/transformation/modules/system.js b/lib/babel/transformation/modules/system.js
similarity index 100%
rename from lib/6to5/transformation/modules/system.js
rename to lib/babel/transformation/modules/system.js
diff --git a/lib/6to5/transformation/modules/umd-strict b/lib/babel/transformation/modules/umd-strict
similarity index 100%
rename from lib/6to5/transformation/modules/umd-strict
rename to lib/babel/transformation/modules/umd-strict
diff --git a/lib/6to5/transformation/modules/umd.js b/lib/babel/transformation/modules/umd.js
similarity index 100%
rename from lib/6to5/transformation/modules/umd.js
rename to lib/babel/transformation/modules/umd.js
diff --git a/lib/6to5/transformation/templates/.6to5rc b/lib/babel/transformation/templates/.babelrc
similarity index 100%
rename from lib/6to5/transformation/templates/.6to5rc
rename to lib/babel/transformation/templates/.babelrc
diff --git a/lib/6to5/transformation/templates/abstract-expression-call.js b/lib/babel/transformation/templates/abstract-expression-call.js
similarity index 100%
rename from lib/6to5/transformation/templates/abstract-expression-call.js
rename to lib/babel/transformation/templates/abstract-expression-call.js
diff --git a/lib/6to5/transformation/templates/abstract-expression-delete.js b/lib/babel/transformation/templates/abstract-expression-delete.js
similarity index 100%
rename from lib/6to5/transformation/templates/abstract-expression-delete.js
rename to lib/babel/transformation/templates/abstract-expression-delete.js
diff --git a/lib/6to5/transformation/templates/abstract-expression-get.js b/lib/babel/transformation/templates/abstract-expression-get.js
similarity index 100%
rename from lib/6to5/transformation/templates/abstract-expression-get.js
rename to lib/babel/transformation/templates/abstract-expression-get.js
diff --git a/lib/6to5/transformation/templates/abstract-expression-set.js b/lib/babel/transformation/templates/abstract-expression-set.js
similarity index 100%
rename from lib/6to5/transformation/templates/abstract-expression-set.js
rename to lib/babel/transformation/templates/abstract-expression-set.js
diff --git a/lib/6to5/transformation/templates/apply-constructor.js b/lib/babel/transformation/templates/apply-constructor.js
similarity index 100%
rename from lib/6to5/transformation/templates/apply-constructor.js
rename to lib/babel/transformation/templates/apply-constructor.js
diff --git a/lib/6to5/transformation/templates/array-comprehension-container.js b/lib/babel/transformation/templates/array-comprehension-container.js
similarity index 100%
rename from lib/6to5/transformation/templates/array-comprehension-container.js
rename to lib/babel/transformation/templates/array-comprehension-container.js
diff --git a/lib/6to5/transformation/templates/array-from.js b/lib/babel/transformation/templates/array-from.js
similarity index 100%
rename from lib/6to5/transformation/templates/array-from.js
rename to lib/babel/transformation/templates/array-from.js
diff --git a/lib/6to5/transformation/templates/array-push.js b/lib/babel/transformation/templates/array-push.js
similarity index 100%
rename from lib/6to5/transformation/templates/array-push.js
rename to lib/babel/transformation/templates/array-push.js
diff --git a/lib/6to5/transformation/templates/async-to-generator.js b/lib/babel/transformation/templates/async-to-generator.js
similarity index 100%
rename from lib/6to5/transformation/templates/async-to-generator.js
rename to lib/babel/transformation/templates/async-to-generator.js
diff --git a/lib/6to5/transformation/templates/bind.js b/lib/babel/transformation/templates/bind.js
similarity index 100%
rename from lib/6to5/transformation/templates/bind.js
rename to lib/babel/transformation/templates/bind.js
diff --git a/lib/6to5/transformation/templates/call.js b/lib/babel/transformation/templates/call.js
similarity index 100%
rename from lib/6to5/transformation/templates/call.js
rename to lib/babel/transformation/templates/call.js
diff --git a/lib/6to5/transformation/templates/class-call-check.js b/lib/babel/transformation/templates/class-call-check.js
similarity index 100%
rename from lib/6to5/transformation/templates/class-call-check.js
rename to lib/babel/transformation/templates/class-call-check.js
diff --git a/lib/6to5/transformation/templates/class-super-constructor-call-loose.js b/lib/babel/transformation/templates/class-super-constructor-call-loose.js
similarity index 100%
rename from lib/6to5/transformation/templates/class-super-constructor-call-loose.js
rename to lib/babel/transformation/templates/class-super-constructor-call-loose.js
diff --git a/lib/6to5/transformation/templates/class-super-constructor-call.js b/lib/babel/transformation/templates/class-super-constructor-call.js
similarity index 100%
rename from lib/6to5/transformation/templates/class-super-constructor-call.js
rename to lib/babel/transformation/templates/class-super-constructor-call.js
diff --git a/lib/6to5/transformation/templates/corejs-is-iterator.js b/lib/babel/transformation/templates/corejs-is-iterator.js
similarity index 100%
rename from lib/6to5/transformation/templates/corejs-is-iterator.js
rename to lib/babel/transformation/templates/corejs-is-iterator.js
diff --git a/lib/6to5/transformation/templates/corejs-iterator.js b/lib/babel/transformation/templates/corejs-iterator.js
similarity index 100%
rename from lib/6to5/transformation/templates/corejs-iterator.js
rename to lib/babel/transformation/templates/corejs-iterator.js
diff --git a/lib/6to5/transformation/templates/default-parameter.js b/lib/babel/transformation/templates/default-parameter.js
similarity index 100%
rename from lib/6to5/transformation/templates/default-parameter.js
rename to lib/babel/transformation/templates/default-parameter.js
diff --git a/lib/6to5/transformation/templates/defaults.js b/lib/babel/transformation/templates/defaults.js
similarity index 100%
rename from lib/6to5/transformation/templates/defaults.js
rename to lib/babel/transformation/templates/defaults.js
diff --git a/lib/6to5/transformation/templates/define-property.js b/lib/babel/transformation/templates/define-property.js
similarity index 100%
rename from lib/6to5/transformation/templates/define-property.js
rename to lib/babel/transformation/templates/define-property.js
diff --git a/lib/6to5/transformation/templates/exports-assign.js b/lib/babel/transformation/templates/exports-assign.js
similarity index 100%
rename from lib/6to5/transformation/templates/exports-assign.js
rename to lib/babel/transformation/templates/exports-assign.js
diff --git a/lib/6to5/transformation/templates/exports-default-assign.js b/lib/babel/transformation/templates/exports-default-assign.js
similarity index 100%
rename from lib/6to5/transformation/templates/exports-default-assign.js
rename to lib/babel/transformation/templates/exports-default-assign.js
diff --git a/lib/6to5/transformation/templates/exports-module-declaration.js b/lib/babel/transformation/templates/exports-module-declaration.js
similarity index 100%
rename from lib/6to5/transformation/templates/exports-module-declaration.js
rename to lib/babel/transformation/templates/exports-module-declaration.js
diff --git a/lib/6to5/transformation/templates/extends.js b/lib/babel/transformation/templates/extends.js
similarity index 100%
rename from lib/6to5/transformation/templates/extends.js
rename to lib/babel/transformation/templates/extends.js
diff --git a/lib/6to5/transformation/templates/for-of-loose.js b/lib/babel/transformation/templates/for-of-loose.js
similarity index 100%
rename from lib/6to5/transformation/templates/for-of-loose.js
rename to lib/babel/transformation/templates/for-of-loose.js
diff --git a/lib/6to5/transformation/templates/for-of.js b/lib/babel/transformation/templates/for-of.js
similarity index 100%
rename from lib/6to5/transformation/templates/for-of.js
rename to lib/babel/transformation/templates/for-of.js
diff --git a/lib/6to5/transformation/templates/get.js b/lib/babel/transformation/templates/get.js
similarity index 100%
rename from lib/6to5/transformation/templates/get.js
rename to lib/babel/transformation/templates/get.js
diff --git a/lib/6to5/transformation/templates/has-own.js b/lib/babel/transformation/templates/has-own.js
similarity index 100%
rename from lib/6to5/transformation/templates/has-own.js
rename to lib/babel/transformation/templates/has-own.js
diff --git a/lib/6to5/transformation/templates/inherits.js b/lib/babel/transformation/templates/inherits.js
similarity index 100%
rename from lib/6to5/transformation/templates/inherits.js
rename to lib/babel/transformation/templates/inherits.js
diff --git a/lib/6to5/transformation/templates/interop-require-wildcard.js b/lib/babel/transformation/templates/interop-require-wildcard.js
similarity index 100%
rename from lib/6to5/transformation/templates/interop-require-wildcard.js
rename to lib/babel/transformation/templates/interop-require-wildcard.js
diff --git a/lib/6to5/transformation/templates/interop-require.js b/lib/babel/transformation/templates/interop-require.js
similarity index 100%
rename from lib/6to5/transformation/templates/interop-require.js
rename to lib/babel/transformation/templates/interop-require.js
diff --git a/lib/6to5/transformation/templates/let-scoping-return.js b/lib/babel/transformation/templates/let-scoping-return.js
similarity index 100%
rename from lib/6to5/transformation/templates/let-scoping-return.js
rename to lib/babel/transformation/templates/let-scoping-return.js
diff --git a/lib/6to5/transformation/templates/object-destructuring-empty.js b/lib/babel/transformation/templates/object-destructuring-empty.js
similarity index 100%
rename from lib/6to5/transformation/templates/object-destructuring-empty.js
rename to lib/babel/transformation/templates/object-destructuring-empty.js
diff --git a/lib/6to5/transformation/templates/object-without-properties.js b/lib/babel/transformation/templates/object-without-properties.js
similarity index 100%
rename from lib/6to5/transformation/templates/object-without-properties.js
rename to lib/babel/transformation/templates/object-without-properties.js
diff --git a/lib/6to5/transformation/templates/property-method-assignment-wrapper-generator.js b/lib/babel/transformation/templates/property-method-assignment-wrapper-generator.js
similarity index 100%
rename from lib/6to5/transformation/templates/property-method-assignment-wrapper-generator.js
rename to lib/babel/transformation/templates/property-method-assignment-wrapper-generator.js
diff --git a/lib/6to5/transformation/templates/property-method-assignment-wrapper.js b/lib/babel/transformation/templates/property-method-assignment-wrapper.js
similarity index 100%
rename from lib/6to5/transformation/templates/property-method-assignment-wrapper.js
rename to lib/babel/transformation/templates/property-method-assignment-wrapper.js
diff --git a/lib/6to5/transformation/templates/prototype-identifier.js b/lib/babel/transformation/templates/prototype-identifier.js
similarity index 100%
rename from lib/6to5/transformation/templates/prototype-identifier.js
rename to lib/babel/transformation/templates/prototype-identifier.js
diff --git a/lib/6to5/transformation/templates/prototype-properties.js b/lib/babel/transformation/templates/prototype-properties.js
similarity index 100%
rename from lib/6to5/transformation/templates/prototype-properties.js
rename to lib/babel/transformation/templates/prototype-properties.js
diff --git a/lib/6to5/transformation/templates/require-assign-key.js b/lib/babel/transformation/templates/require-assign-key.js
similarity index 100%
rename from lib/6to5/transformation/templates/require-assign-key.js
rename to lib/babel/transformation/templates/require-assign-key.js
diff --git a/lib/6to5/transformation/templates/require.js b/lib/babel/transformation/templates/require.js
similarity index 100%
rename from lib/6to5/transformation/templates/require.js
rename to lib/babel/transformation/templates/require.js
diff --git a/lib/6to5/transformation/templates/rest.js b/lib/babel/transformation/templates/rest.js
similarity index 100%
rename from lib/6to5/transformation/templates/rest.js
rename to lib/babel/transformation/templates/rest.js
diff --git a/lib/6to5/transformation/templates/self-contained-helpers-head.js b/lib/babel/transformation/templates/self-contained-helpers-head.js
similarity index 100%
rename from lib/6to5/transformation/templates/self-contained-helpers-head.js
rename to lib/babel/transformation/templates/self-contained-helpers-head.js
diff --git a/lib/6to5/transformation/templates/self-global.js b/lib/babel/transformation/templates/self-global.js
similarity index 100%
rename from lib/6to5/transformation/templates/self-global.js
rename to lib/babel/transformation/templates/self-global.js
diff --git a/lib/6to5/transformation/templates/set.js b/lib/babel/transformation/templates/set.js
similarity index 100%
rename from lib/6to5/transformation/templates/set.js
rename to lib/babel/transformation/templates/set.js
diff --git a/lib/6to5/transformation/templates/slice.js b/lib/babel/transformation/templates/slice.js
similarity index 100%
rename from lib/6to5/transformation/templates/slice.js
rename to lib/babel/transformation/templates/slice.js
diff --git a/lib/6to5/transformation/templates/sliced-to-array.js b/lib/babel/transformation/templates/sliced-to-array.js
similarity index 100%
rename from lib/6to5/transformation/templates/sliced-to-array.js
rename to lib/babel/transformation/templates/sliced-to-array.js
diff --git a/lib/6to5/transformation/templates/system.js b/lib/babel/transformation/templates/system.js
similarity index 100%
rename from lib/6to5/transformation/templates/system.js
rename to lib/babel/transformation/templates/system.js
diff --git a/lib/6to5/transformation/templates/tagged-template-literal-loose.js b/lib/babel/transformation/templates/tagged-template-literal-loose.js
similarity index 100%
rename from lib/6to5/transformation/templates/tagged-template-literal-loose.js
rename to lib/babel/transformation/templates/tagged-template-literal-loose.js
diff --git a/lib/6to5/transformation/templates/tagged-template-literal.js b/lib/babel/transformation/templates/tagged-template-literal.js
similarity index 100%
rename from lib/6to5/transformation/templates/tagged-template-literal.js
rename to lib/babel/transformation/templates/tagged-template-literal.js
diff --git a/lib/6to5/transformation/templates/tail-call-body.js b/lib/babel/transformation/templates/tail-call-body.js
similarity index 100%
rename from lib/6to5/transformation/templates/tail-call-body.js
rename to lib/babel/transformation/templates/tail-call-body.js
diff --git a/lib/6to5/transformation/templates/tail-call.js b/lib/babel/transformation/templates/tail-call.js
similarity index 100%
rename from lib/6to5/transformation/templates/tail-call.js
rename to lib/babel/transformation/templates/tail-call.js
diff --git a/lib/6to5/transformation/templates/temporal-assert-defined.js b/lib/babel/transformation/templates/temporal-assert-defined.js
similarity index 100%
rename from lib/6to5/transformation/templates/temporal-assert-defined.js
rename to lib/babel/transformation/templates/temporal-assert-defined.js
diff --git a/lib/6to5/transformation/templates/temporal-undefined.js b/lib/babel/transformation/templates/temporal-undefined.js
similarity index 100%
rename from lib/6to5/transformation/templates/temporal-undefined.js
rename to lib/babel/transformation/templates/temporal-undefined.js
diff --git a/lib/6to5/transformation/templates/test-exports.js b/lib/babel/transformation/templates/test-exports.js
similarity index 100%
rename from lib/6to5/transformation/templates/test-exports.js
rename to lib/babel/transformation/templates/test-exports.js
diff --git a/lib/6to5/transformation/templates/test-module.js b/lib/babel/transformation/templates/test-module.js
similarity index 100%
rename from lib/6to5/transformation/templates/test-module.js
rename to lib/babel/transformation/templates/test-module.js
diff --git a/lib/6to5/transformation/templates/to-array.js b/lib/babel/transformation/templates/to-array.js
similarity index 100%
rename from lib/6to5/transformation/templates/to-array.js
rename to lib/babel/transformation/templates/to-array.js
diff --git a/lib/6to5/transformation/templates/to-consumable-array.js b/lib/babel/transformation/templates/to-consumable-array.js
similarity index 100%
rename from lib/6to5/transformation/templates/to-consumable-array.js
rename to lib/babel/transformation/templates/to-consumable-array.js
diff --git a/lib/6to5/transformation/templates/typeof.js b/lib/babel/transformation/templates/typeof.js
similarity index 100%
rename from lib/6to5/transformation/templates/typeof.js
rename to lib/babel/transformation/templates/typeof.js
diff --git a/lib/6to5/transformation/templates/umd-runner-body.js b/lib/babel/transformation/templates/umd-runner-body.js
similarity index 100%
rename from lib/6to5/transformation/templates/umd-runner-body.js
rename to lib/babel/transformation/templates/umd-runner-body.js
diff --git a/lib/6to5/transformation/transformer-pass.js b/lib/babel/transformation/transformer-pass.js
similarity index 100%
rename from lib/6to5/transformation/transformer-pass.js
rename to lib/babel/transformation/transformer-pass.js
diff --git a/lib/6to5/transformation/transformer.js b/lib/babel/transformation/transformer.js
similarity index 100%
rename from lib/6to5/transformation/transformer.js
rename to lib/babel/transformation/transformer.js
diff --git a/lib/6to5/transformation/transformers/deprecated.json b/lib/babel/transformation/transformers/deprecated.json
similarity index 100%
rename from lib/6to5/transformation/transformers/deprecated.json
rename to lib/babel/transformation/transformers/deprecated.json
diff --git a/lib/6to5/transformation/transformers/es3/member-expression-literals.js b/lib/babel/transformation/transformers/es3/member-expression-literals.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es3/member-expression-literals.js
rename to lib/babel/transformation/transformers/es3/member-expression-literals.js
diff --git a/lib/6to5/transformation/transformers/es3/property-literals.js b/lib/babel/transformation/transformers/es3/property-literals.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es3/property-literals.js
rename to lib/babel/transformation/transformers/es3/property-literals.js
diff --git a/lib/6to5/transformation/transformers/es5/properties.mutators.js b/lib/babel/transformation/transformers/es5/properties.mutators.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es5/properties.mutators.js
rename to lib/babel/transformation/transformers/es5/properties.mutators.js
diff --git a/lib/6to5/transformation/transformers/es6/arrow-functions.js b/lib/babel/transformation/transformers/es6/arrow-functions.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/arrow-functions.js
rename to lib/babel/transformation/transformers/es6/arrow-functions.js
diff --git a/lib/6to5/transformation/transformers/es6/block-scoping-tdz.js b/lib/babel/transformation/transformers/es6/block-scoping-tdz.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/block-scoping-tdz.js
rename to lib/babel/transformation/transformers/es6/block-scoping-tdz.js
diff --git a/lib/6to5/transformation/transformers/es6/block-scoping.js b/lib/babel/transformation/transformers/es6/block-scoping.js
similarity index 99%
rename from lib/6to5/transformation/transformers/es6/block-scoping.js
rename to lib/babel/transformation/transformers/es6/block-scoping.js
index 4565456140..9b06f1adac 100644
--- a/lib/6to5/transformation/transformers/es6/block-scoping.js
+++ b/lib/babel/transformation/transformers/es6/block-scoping.js
@@ -16,7 +16,7 @@ var isLet = function (node, parent) {
   if (node._let) return true;
   if (node.kind !== "let") return false;
 
-  // https://github.com/6to5/6to5/issues/255
+  // https://github.com/babel/babel/issues/255
   if (isLetInitable(node, parent)) {
     for (var i = 0; i < node.declarations.length; i++) {
       var declar = node.declarations[i];
diff --git a/lib/6to5/transformation/transformers/es6/classes.js b/lib/babel/transformation/transformers/es6/classes.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/classes.js
rename to lib/babel/transformation/transformers/es6/classes.js
diff --git a/lib/6to5/transformation/transformers/es6/constants.js b/lib/babel/transformation/transformers/es6/constants.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/constants.js
rename to lib/babel/transformation/transformers/es6/constants.js
diff --git a/lib/6to5/transformation/transformers/es6/destructuring.js b/lib/babel/transformation/transformers/es6/destructuring.js
similarity index 99%
rename from lib/6to5/transformation/transformers/es6/destructuring.js
rename to lib/babel/transformation/transformers/es6/destructuring.js
index c7fd3830d0..58b9f2ba31 100644
--- a/lib/6to5/transformation/transformers/es6/destructuring.js
+++ b/lib/babel/transformation/transformers/es6/destructuring.js
@@ -380,7 +380,7 @@ exports.VariableDeclaration = function (node, parent, scope, file) {
   }
 
   if (!t.isProgram(parent) && !t.isBlockStatement(parent)) {
-    // https://github.com/6to5/6to5/issues/113
+    // https://github.com/babel/babel/issues/113
     // for (let [x] = [0]; false;) {}
 
     declar = null;
diff --git a/lib/6to5/transformation/transformers/es6/for-of.js b/lib/babel/transformation/transformers/es6/for-of.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/for-of.js
rename to lib/babel/transformation/transformers/es6/for-of.js
diff --git a/lib/6to5/transformation/transformers/es6/modules.js b/lib/babel/transformation/transformers/es6/modules.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/modules.js
rename to lib/babel/transformation/transformers/es6/modules.js
diff --git a/lib/6to5/transformation/transformers/es6/object-super.js b/lib/babel/transformation/transformers/es6/object-super.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/object-super.js
rename to lib/babel/transformation/transformers/es6/object-super.js
diff --git a/lib/6to5/transformation/transformers/es6/parameters.default.js b/lib/babel/transformation/transformers/es6/parameters.default.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/parameters.default.js
rename to lib/babel/transformation/transformers/es6/parameters.default.js
diff --git a/lib/6to5/transformation/transformers/es6/parameters.rest.js b/lib/babel/transformation/transformers/es6/parameters.rest.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/parameters.rest.js
rename to lib/babel/transformation/transformers/es6/parameters.rest.js
diff --git a/lib/6to5/transformation/transformers/es6/properties.computed.js b/lib/babel/transformation/transformers/es6/properties.computed.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/properties.computed.js
rename to lib/babel/transformation/transformers/es6/properties.computed.js
diff --git a/lib/6to5/transformation/transformers/es6/properties.shorthand.js b/lib/babel/transformation/transformers/es6/properties.shorthand.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/properties.shorthand.js
rename to lib/babel/transformation/transformers/es6/properties.shorthand.js
diff --git a/lib/6to5/transformation/transformers/es6/spread.js b/lib/babel/transformation/transformers/es6/spread.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/spread.js
rename to lib/babel/transformation/transformers/es6/spread.js
diff --git a/lib/6to5/transformation/transformers/es6/tail-call.js b/lib/babel/transformation/transformers/es6/tail-call.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/tail-call.js
rename to lib/babel/transformation/transformers/es6/tail-call.js
diff --git a/lib/6to5/transformation/transformers/es6/template-literals.js b/lib/babel/transformation/transformers/es6/template-literals.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/template-literals.js
rename to lib/babel/transformation/transformers/es6/template-literals.js
diff --git a/lib/6to5/transformation/transformers/es6/unicode-regex.js b/lib/babel/transformation/transformers/es6/unicode-regex.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es6/unicode-regex.js
rename to lib/babel/transformation/transformers/es6/unicode-regex.js
diff --git a/lib/6to5/transformation/transformers/es7/abstract-references.js b/lib/babel/transformation/transformers/es7/abstract-references.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es7/abstract-references.js
rename to lib/babel/transformation/transformers/es7/abstract-references.js
diff --git a/lib/6to5/transformation/transformers/es7/comprehensions.js b/lib/babel/transformation/transformers/es7/comprehensions.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es7/comprehensions.js
rename to lib/babel/transformation/transformers/es7/comprehensions.js
diff --git a/lib/6to5/transformation/transformers/es7/exponentiation-operator.js b/lib/babel/transformation/transformers/es7/exponentiation-operator.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es7/exponentiation-operator.js
rename to lib/babel/transformation/transformers/es7/exponentiation-operator.js
diff --git a/lib/6to5/transformation/transformers/es7/object-rest-spread.js b/lib/babel/transformation/transformers/es7/object-rest-spread.js
similarity index 100%
rename from lib/6to5/transformation/transformers/es7/object-rest-spread.js
rename to lib/babel/transformation/transformers/es7/object-rest-spread.js
diff --git a/lib/6to5/transformation/transformers/index.js b/lib/babel/transformation/transformers/index.js
similarity index 100%
rename from lib/6to5/transformation/transformers/index.js
rename to lib/babel/transformation/transformers/index.js
diff --git a/lib/6to5/transformation/transformers/internal/alias-functions.js b/lib/babel/transformation/transformers/internal/alias-functions.js
similarity index 100%
rename from lib/6to5/transformation/transformers/internal/alias-functions.js
rename to lib/babel/transformation/transformers/internal/alias-functions.js
diff --git a/lib/6to5/transformation/transformers/internal/block-hoist.js b/lib/babel/transformation/transformers/internal/block-hoist.js
similarity index 100%
rename from lib/6to5/transformation/transformers/internal/block-hoist.js
rename to lib/babel/transformation/transformers/internal/block-hoist.js
diff --git a/lib/6to5/transformation/transformers/internal/cleanup.js b/lib/babel/transformation/transformers/internal/cleanup.js
similarity index 100%
rename from lib/6to5/transformation/transformers/internal/cleanup.js
rename to lib/babel/transformation/transformers/internal/cleanup.js
diff --git a/lib/6to5/transformation/transformers/internal/declarations.js b/lib/babel/transformation/transformers/internal/declarations.js
similarity index 100%
rename from lib/6to5/transformation/transformers/internal/declarations.js
rename to lib/babel/transformation/transformers/internal/declarations.js
diff --git a/lib/6to5/transformation/transformers/internal/module-formatter.js b/lib/babel/transformation/transformers/internal/module-formatter.js
similarity index 100%
rename from lib/6to5/transformation/transformers/internal/module-formatter.js
rename to lib/babel/transformation/transformers/internal/module-formatter.js
diff --git a/lib/6to5/transformation/transformers/internal/modules.js b/lib/babel/transformation/transformers/internal/modules.js
similarity index 100%
rename from lib/6to5/transformation/transformers/internal/modules.js
rename to lib/babel/transformation/transformers/internal/modules.js
diff --git a/lib/6to5/transformation/transformers/minification/dead-code-elimination.js b/lib/babel/transformation/transformers/minification/dead-code-elimination.js
similarity index 100%
rename from lib/6to5/transformation/transformers/minification/dead-code-elimination.js
rename to lib/babel/transformation/transformers/minification/dead-code-elimination.js
diff --git a/lib/6to5/transformation/transformers/minification/remove-console-calls.js b/lib/babel/transformation/transformers/minification/remove-console-calls.js
similarity index 100%
rename from lib/6to5/transformation/transformers/minification/remove-console-calls.js
rename to lib/babel/transformation/transformers/minification/remove-console-calls.js
diff --git a/lib/6to5/transformation/transformers/minification/remove-debugger.js b/lib/babel/transformation/transformers/minification/remove-debugger.js
similarity index 100%
rename from lib/6to5/transformation/transformers/minification/remove-debugger.js
rename to lib/babel/transformation/transformers/minification/remove-debugger.js
diff --git a/lib/6to5/transformation/transformers/minification/rename-local-variables.js b/lib/babel/transformation/transformers/minification/rename-local-variables.js
similarity index 100%
rename from lib/6to5/transformation/transformers/minification/rename-local-variables.js
rename to lib/babel/transformation/transformers/minification/rename-local-variables.js
diff --git a/lib/6to5/transformation/transformers/other/async-to-generator.js b/lib/babel/transformation/transformers/other/async-to-generator.js
similarity index 100%
rename from lib/6to5/transformation/transformers/other/async-to-generator.js
rename to lib/babel/transformation/transformers/other/async-to-generator.js
diff --git a/lib/6to5/transformation/transformers/other/bluebird-coroutines.js b/lib/babel/transformation/transformers/other/bluebird-coroutines.js
similarity index 100%
rename from lib/6to5/transformation/transformers/other/bluebird-coroutines.js
rename to lib/babel/transformation/transformers/other/bluebird-coroutines.js
diff --git a/lib/6to5/transformation/transformers/other/flow.js b/lib/babel/transformation/transformers/other/flow.js
similarity index 100%
rename from lib/6to5/transformation/transformers/other/flow.js
rename to lib/babel/transformation/transformers/other/flow.js
diff --git a/lib/6to5/transformation/transformers/other/react-compat.js b/lib/babel/transformation/transformers/other/react-compat.js
similarity index 100%
rename from lib/6to5/transformation/transformers/other/react-compat.js
rename to lib/babel/transformation/transformers/other/react-compat.js
diff --git a/lib/6to5/transformation/transformers/other/react.js b/lib/babel/transformation/transformers/other/react.js
similarity index 100%
rename from lib/6to5/transformation/transformers/other/react.js
rename to lib/babel/transformation/transformers/other/react.js
diff --git a/lib/6to5/transformation/transformers/other/regenerator.js b/lib/babel/transformation/transformers/other/regenerator.js
similarity index 84%
rename from lib/6to5/transformation/transformers/other/regenerator.js
rename to lib/babel/transformation/transformers/other/regenerator.js
index 2f2724d553..8ebb56e701 100644
--- a/lib/6to5/transformation/transformers/other/regenerator.js
+++ b/lib/babel/transformation/transformers/other/regenerator.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var regenerator = require("regenerator-6to5");
+var regenerator = require("regenerator-babel");
 var t           = require("../../../types");
 
 exports.check = function (node) {
diff --git a/lib/6to5/transformation/transformers/other/self-contained.js b/lib/babel/transformation/transformers/other/self-contained.js
similarity index 93%
rename from lib/6to5/transformation/transformers/other/self-contained.js
rename to lib/babel/transformation/transformers/other/self-contained.js
index d6d890038f..eee7e94c77 100644
--- a/lib/6to5/transformation/transformers/other/self-contained.js
+++ b/lib/babel/transformation/transformers/other/self-contained.js
@@ -83,15 +83,15 @@ exports.Program = function (node, parent, scope, file) {
 
 exports.pre = function (file) {
   file.setDynamic("runtimeIdentifier", function () {
-    return file.addImport("6to5-runtime/helpers", "to5Helpers");
+    return file.addImport("babel-runtime/helpers", "babelHelpers");
   });
 
   file.setDynamic("coreIdentifier", function () {
-    return file.addImport("6to5-runtime/core-js", "core");
+    return file.addImport("babel-runtime/core-js", "core");
   });
 
   file.setDynamic("regeneratorIdentifier", function () {
-    return file.addImport("6to5-runtime/regenerator", "regeneratorRuntime");
+    return file.addImport("babel-runtime/regenerator", "regeneratorRuntime");
   });
 };
 
diff --git a/lib/6to5/transformation/transformers/other/use-strict.js b/lib/babel/transformation/transformers/other/use-strict.js
similarity index 100%
rename from lib/6to5/transformation/transformers/other/use-strict.js
rename to lib/babel/transformation/transformers/other/use-strict.js
diff --git a/lib/6to5/transformation/transformers/playground/mallet-operator.js b/lib/babel/transformation/transformers/playground/mallet-operator.js
similarity index 100%
rename from lib/6to5/transformation/transformers/playground/mallet-operator.js
rename to lib/babel/transformation/transformers/playground/mallet-operator.js
diff --git a/lib/6to5/transformation/transformers/playground/memoization-operator.js b/lib/babel/transformation/transformers/playground/memoization-operator.js
similarity index 100%
rename from lib/6to5/transformation/transformers/playground/memoization-operator.js
rename to lib/babel/transformation/transformers/playground/memoization-operator.js
diff --git a/lib/6to5/transformation/transformers/playground/method-binding.js b/lib/babel/transformation/transformers/playground/method-binding.js
similarity index 100%
rename from lib/6to5/transformation/transformers/playground/method-binding.js
rename to lib/babel/transformation/transformers/playground/method-binding.js
diff --git a/lib/6to5/transformation/transformers/playground/object-getter-memoization.js b/lib/babel/transformation/transformers/playground/object-getter-memoization.js
similarity index 100%
rename from lib/6to5/transformation/transformers/playground/object-getter-memoization.js
rename to lib/babel/transformation/transformers/playground/object-getter-memoization.js
diff --git a/lib/6to5/transformation/transformers/spec/block-scoped-functions.js b/lib/babel/transformation/transformers/spec/block-scoped-functions.js
similarity index 100%
rename from lib/6to5/transformation/transformers/spec/block-scoped-functions.js
rename to lib/babel/transformation/transformers/spec/block-scoped-functions.js
diff --git a/lib/6to5/transformation/transformers/spec/proto-to-assign.js b/lib/babel/transformation/transformers/spec/proto-to-assign.js
similarity index 100%
rename from lib/6to5/transformation/transformers/spec/proto-to-assign.js
rename to lib/babel/transformation/transformers/spec/proto-to-assign.js
diff --git a/lib/6to5/transformation/transformers/spec/typeof-symbol.js b/lib/babel/transformation/transformers/spec/typeof-symbol.js
similarity index 100%
rename from lib/6to5/transformation/transformers/spec/typeof-symbol.js
rename to lib/babel/transformation/transformers/spec/typeof-symbol.js
diff --git a/lib/6to5/transformation/transformers/spec/undefined-to-void.js b/lib/babel/transformation/transformers/spec/undefined-to-void.js
similarity index 100%
rename from lib/6to5/transformation/transformers/spec/undefined-to-void.js
rename to lib/babel/transformation/transformers/spec/undefined-to-void.js
diff --git a/lib/6to5/transformation/transformers/validation/no-for-in-of-assignment.js b/lib/babel/transformation/transformers/validation/no-for-in-of-assignment.js
similarity index 100%
rename from lib/6to5/transformation/transformers/validation/no-for-in-of-assignment.js
rename to lib/babel/transformation/transformers/validation/no-for-in-of-assignment.js
diff --git a/lib/6to5/transformation/transformers/validation/react.js b/lib/babel/transformation/transformers/validation/react.js
similarity index 100%
rename from lib/6to5/transformation/transformers/validation/react.js
rename to lib/babel/transformation/transformers/validation/react.js
diff --git a/lib/6to5/transformation/transformers/validation/setters.js b/lib/babel/transformation/transformers/validation/setters.js
similarity index 100%
rename from lib/6to5/transformation/transformers/validation/setters.js
rename to lib/babel/transformation/transformers/validation/setters.js
diff --git a/lib/6to5/transformation/transformers/validation/undeclared-variable-check.js b/lib/babel/transformation/transformers/validation/undeclared-variable-check.js
similarity index 100%
rename from lib/6to5/transformation/transformers/validation/undeclared-variable-check.js
rename to lib/babel/transformation/transformers/validation/undeclared-variable-check.js
diff --git a/lib/6to5/traversal/context.js b/lib/babel/traversal/context.js
similarity index 100%
rename from lib/6to5/traversal/context.js
rename to lib/babel/traversal/context.js
diff --git a/lib/6to5/traversal/index.js b/lib/babel/traversal/index.js
similarity index 100%
rename from lib/6to5/traversal/index.js
rename to lib/babel/traversal/index.js
diff --git a/lib/6to5/traversal/path.js b/lib/babel/traversal/path.js
similarity index 100%
rename from lib/6to5/traversal/path.js
rename to lib/babel/traversal/path.js
diff --git a/lib/6to5/traversal/scope.js b/lib/babel/traversal/scope.js
similarity index 100%
rename from lib/6to5/traversal/scope.js
rename to lib/babel/traversal/scope.js
diff --git a/lib/6to5/types/alias-keys.json b/lib/babel/types/alias-keys.json
similarity index 100%
rename from lib/6to5/types/alias-keys.json
rename to lib/babel/types/alias-keys.json
diff --git a/lib/6to5/types/builder-keys.json b/lib/babel/types/builder-keys.json
similarity index 100%
rename from lib/6to5/types/builder-keys.json
rename to lib/babel/types/builder-keys.json
diff --git a/lib/6to5/types/index.js b/lib/babel/types/index.js
similarity index 100%
rename from lib/6to5/types/index.js
rename to lib/babel/types/index.js
diff --git a/lib/6to5/types/visitor-keys.json b/lib/babel/types/visitor-keys.json
similarity index 100%
rename from lib/6to5/types/visitor-keys.json
rename to lib/babel/types/visitor-keys.json
diff --git a/lib/6to5/util.js b/lib/babel/util.js
similarity index 97%
rename from lib/6to5/util.js
rename to lib/babel/util.js
index 8f658885a4..cec53811fc 100644
--- a/lib/6to5/util.js
+++ b/lib/babel/util.js
@@ -20,7 +20,7 @@ var t          = require("./types");
 
 exports.inherits = util.inherits;
 
-exports.debug = debug("6to5");
+exports.debug = debug("babel");
 
 exports.canCompile = function (filename, altExts) {
   var exts = altExts || exports.canCompile.EXTENSIONS;
@@ -143,7 +143,7 @@ var loadTemplates = function () {
   if (!fs.existsSync(templatesLoc)) {
     throw new Error("no templates directory - this is most likely the " +
                     "result of a broken `npm publish`. Please report to " +
-                    "https://github.com/6to5/6to5/issues");
+                    "https://github.com/babel/babel/issues");
   }
 
   each(fs.readdirSync(templatesLoc), function (name) {
diff --git a/package.json b/package.json
index 43fb19dcb4..ee8b290ef6 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,25 @@
 {
-  "name": "6to5",
+  "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "3.6.5",
+  "version": "1.0.0",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
-  "homepage": "https://6to5.org/",
-  "repository": "6to5/6to5",
+  "homepage": "https://babeljs.io/",
+  "repository": "babel/babel",
   "preferGlobal": true,
-  "main": "lib/6to5/api/node.js",
+  "main": "lib/babel/api/node.js",
   "browser": {
-    "./lib/6to5/api/register/node.js": "./lib/6to5/api/register/browser.js"
+    "./lib/babel/api/register/node.js": "./lib/babel/api/register/browser.js"
   },
   "bin": {
-    "6to5": "./bin/6to5/index.js",
-    "6to5-minify": "./bin/6to5-minify",
-    "6to5-node": "./bin/6to5-node",
-    "6to5-runtime": "./bin/6to5-runtime"
+    "6to5": "./bin/deprecated/6to5",
+    "6to5-minify": "./bin/deprecated/6to5-minify",
+    "6to5-node": "./bin/deprecated/6to5-node",
+    "6to5-runtime": "./bin/deprecated/6to5-runtime",
+
+    "babel": "./bin/babel/index.js",
+    "babel-minify": "./bin/babel-minify",
+    "babel-node": "./bin/babel-node",
+    "babel-external-helpers": "./bin/babel-external-helpers"
   },
   "keywords": [
     "harmony",
@@ -26,19 +31,20 @@
     "es6",
     "transpile",
     "transpiler",
-    "6to5"
+    "6to5",
+    "babel"
   ],
   "scripts": {
     "bench": "make bench",
     "test": "make test"
   },
   "dependencies": {
-    "acorn-6to5": "0.11.1-31",
+    "acorn-babel": "0.11.1-32",
     "ast-types": "~0.6.1",
     "chalk": "^0.5.1",
     "chokidar": "0.12.6",
     "commander": "2.6.0",
-    "core-js": "^0.5.3",
+    "core-js": "^0.5.4",
     "debug": "^2.1.1",
     "detect-indent": "3.0.0",
     "estraverse": "1.9.1",
@@ -49,7 +55,7 @@
     "lodash": "3.0.0",
     "output-file-sync": "1.1.0",
     "private": "0.1.6",
-    "regenerator-6to5": "0.8.10-1",
+    "regenerator-babel": "0.8.10-1",
     "regexpu": "1.1.0",
     "roadrunner": "1.0.4",
     "source-map": "0.1.43",
@@ -58,7 +64,6 @@
     "useragent": "^2.1.5"
   },
   "devDependencies": {
-    "6to5": "3.6.0",
     "browserify": "8.1.1",
     "chai": "1.10.0",
     "esvalid": "1.1.0",
diff --git a/packages/6to5-runtime/README.md b/packages/6to5-runtime/README.md
deleted file mode 100644
index 4a5f9c516b..0000000000
--- a/packages/6to5-runtime/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 6to5-runtime
-
-6to5 self-contained runtime
-
-For more information please look at [6to5](https://github.com/6to5/6to5).
diff --git a/packages/6to5-runtime/package.json b/packages/6to5-runtime/package.json
deleted file mode 100644
index f145ca6dc4..0000000000
--- a/packages/6to5-runtime/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "6to5-runtime",
-  "description": "6to5 selfContained runtime",
-  "version": "3.6.5",
-  "repository": "6to5/6to5",
-  "author": "Sebastian McKenzie <sebmck@gmail.com>"
-}
\ No newline at end of file
diff --git a/packages/README.md b/packages/README.md
index 32595312e8..b04d62316e 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -1,6 +1,6 @@
 # What is this?
 
 This is a folder containing additional packages that are built whenever
-a new version of 6to5 is released.
+a new version of babel is released.
 
-**TODO:** Move `6to5-core` into here.
+**TODO:** Move `babel-core` into here.
diff --git a/packages/babel-runtime/README.md b/packages/babel-runtime/README.md
new file mode 100644
index 0000000000..bde5507297
--- /dev/null
+++ b/packages/babel-runtime/README.md
@@ -0,0 +1,5 @@
+# babel-runtime
+
+Babel self-contained runtime
+
+For more information please look at [babel](https://github.com/babel/babel).
diff --git a/packages/babel-runtime/package.json b/packages/babel-runtime/package.json
new file mode 100644
index 0000000000..a0ea7424ef
--- /dev/null
+++ b/packages/babel-runtime/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "babel-runtime",
+  "description": "babel selfContained runtime",
+  "version": "3.6.5",
+  "repository": "babel/babel",
+  "author": "Sebastian McKenzie <sebmck@gmail.com>"
+}
diff --git a/packages/6to5-runtime/regenerator/.gitkeep b/packages/babel-runtime/regenerator/.gitkeep
similarity index 100%
rename from packages/6to5-runtime/regenerator/.gitkeep
rename to packages/babel-runtime/regenerator/.gitkeep
diff --git a/packages/build-runtime.js b/packages/build-runtime.js
index be6955f64a..d629d2b62d 100644
--- a/packages/build-runtime.js
+++ b/packages/build-runtime.js
@@ -1,14 +1,14 @@
 "use strict";
 
-var buildHelpers = require("../lib/6to5/build-helpers");
-var transform    = require("../lib/6to5/transformation");
-var util         = require("../lib/6to5/util");
+var buildHelpers = require("../lib/babel/build-helpers");
+var transform    = require("../lib/babel/transformation");
+var util         = require("../lib/babel/util");
 var fs           = require("fs");
-var t            = require("../lib/6to5/types");
+var t            = require("../lib/babel/types");
 var _            = require("lodash");
 
 var relative = function (filename) {
-  return __dirname + "/6to5-runtime/" + filename;
+  return __dirname + "/babel-runtime/" + filename;
 };
 
 var writeFile = function (filename, content) {
@@ -56,6 +56,6 @@ var buildHelpers2 = function () {
 
 writeFile("helpers.js", buildHelpers2());
 writeFile("core-js.js", readFile("core-js/library", true));
-writeFile("regenerator/index.js", readFile("regenerator-6to5/runtime-module", true));
-writeFile("regenerator/runtime.js", selfContainify(readFile("regenerator-6to5/runtime")));
+writeFile("regenerator/index.js", readFile("regenerator-babel/runtime-module", true));
+writeFile("regenerator/runtime.js", selfContainify(readFile("regenerator-babel/runtime")));
 updatePackage();
diff --git a/polyfill.js b/polyfill.js
index a33b39912f..68776a0112 100644
--- a/polyfill.js
+++ b/polyfill.js
@@ -1 +1 @@
-module.exports = require("./lib/6to5/polyfill");
+module.exports = require("./lib/babel/polyfill");
diff --git a/register.js b/register.js
index 51f2ac517b..331741fb07 100644
--- a/register.js
+++ b/register.js
@@ -1 +1 @@
-module.exports = require("./lib/6to5/api/register/node");
+module.exports = require("./lib/babel/api/register/node");
diff --git a/test/_browser.js b/test/_browser.js
index e425e1adbb..3725eb8f25 100644
--- a/test/_browser.js
+++ b/test/_browser.js
@@ -1,5 +1,5 @@
 if (process.browser) {
-  require("../lib/6to5/api/browser");
+  require("../lib/babel/api/browser");
   require("./generation");
   require("./transformation");
   require("./traverse");
diff --git a/test/_helper.js b/test/_helper.js
index 657f133804..a60c8fda87 100644
--- a/test/_helper.js
+++ b/test/_helper.js
@@ -1,5 +1,5 @@
 var esvalid = require("esvalid");
-var util    = require("../lib/6to5/util");
+var util    = require("../lib/babel/util");
 var path    = require("path");
 var fs      = require("fs");
 var _       = require("lodash");
diff --git a/test/_transformation-helper.js b/test/_transformation-helper.js
index 489d80934e..c3e5cd19f4 100644
--- a/test/_transformation-helper.js
+++ b/test/_transformation-helper.js
@@ -1,16 +1,16 @@
 var genHelpers = require("./_generator-helpers");
-var transform  = require("../lib/6to5/transformation");
+var transform  = require("../lib/babel/transformation");
 var sourceMap  = require("source-map");
-var codeFrame  = require("../lib/6to5/helpers/code-frame");
+var codeFrame  = require("../lib/babel/helpers/code-frame");
 var Module     = require("module");
 var helper     = require("./_helper");
 var assert     = require("assert");
 var chai       = require("chai");
 var path       = require("path");
-var util       = require("../lib/6to5/util");
+var util       = require("../lib/babel/util");
 var _          = require("lodash");
 
-require("../lib/6to5/polyfill");
+require("../lib/babel/polyfill");
 
 global.assertNoOwnProperties = function (obj) {
   assert.equal(Object.getOwnPropertyNames(obj).length, 0);
diff --git a/test/api.js b/test/api.js
index d3a2171dc6..dc018f31a9 100644
--- a/test/api.js
+++ b/test/api.js
@@ -1,6 +1,6 @@
-var transform = require("../lib/6to5/transformation");
+var transform = require("../lib/babel/transformation");
 var assert    = require("assert");
-var File      = require("../lib/6to5/transformation/file");
+var File      = require("../lib/babel/transformation/file");
 
 suite("api", function () {
   test("{ code: false }", function () {
diff --git a/test/browser.html b/test/browser.html
index 962c39eb40..1b37e5f1bf 100644
--- a/test/browser.html
+++ b/test/browser.html
@@ -9,7 +9,7 @@
     <script src="../node_modules/lodash/lodash.js"></script>
     <script src="../node_modules/mocha/mocha.js"></script>
     <script>mocha.setup("tdd");</script>
-    <script src="../dist/6to5-test.js"></script>
+    <script src="../dist/babel-test.js"></script>
     <script>
       mocha.globals(["regeneratorRuntime"]);
       mocha.checkLeaks();
diff --git a/test/browserify.js b/test/browserify.js
index 4d9d77415c..a7e7b5727e 100644
--- a/test/browserify.js
+++ b/test/browserify.js
@@ -4,7 +4,7 @@ var path = require("path");
 var vm = require("vm");
 
 suite("browserify", function() {
-  test("6to5/register may be used without breaking browserify", function(done) {
+  test("babel/register may be used without breaking browserify", function(done) {
     var bundler = browserify(path.join(__dirname, "fixtures/browserify/register.js"));
 
     bundler.bundle(function(err, bundle) {
diff --git a/test/detection.js b/test/detection.js
index 1b237b2620..e7e922318a 100644
--- a/test/detection.js
+++ b/test/detection.js
@@ -1,6 +1,6 @@
-var detect = require("../lib/6to5/detection");
+var detect = require("../lib/babel/detection");
 var assert = require("assert");
-var parse  = require("../lib/6to5/helpers/parse");
+var parse  = require("../lib/babel/helpers/parse");
 
 suite("detection", function () {
   var checkSyntax = function (code, name) {
diff --git a/test/fixtures/transformation/self-contained/aliased-constructors/expected.js b/test/fixtures/transformation/self-contained/aliased-constructors/expected.js
index 31ee1c4d38..f00771d316 100644
--- a/test/fixtures/transformation/self-contained/aliased-constructors/expected.js
+++ b/test/fixtures/transformation/self-contained/aliased-constructors/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _core = require("6to5-runtime/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 obj.constructor === Object;
 obj.constructor === _core.Promise;
 
diff --git a/test/fixtures/transformation/self-contained/es6-for-of/expected.js b/test/fixtures/transformation/self-contained/es6-for-of/expected.js
index bdb985ddf2..29a0778685 100644
--- a/test/fixtures/transformation/self-contained/es6-for-of/expected.js
+++ b/test/fixtures/transformation/self-contained/es6-for-of/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _core = require("6to5-runtime/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 for (var _iterator = _core.$for.getIterator(arr), _step; !(_step = _iterator.next()).done;) {
   var i = _step.value;
 }
diff --git a/test/fixtures/transformation/self-contained/es7-array-comprehensions/expected.js b/test/fixtures/transformation/self-contained/es7-array-comprehensions/expected.js
index f448a5f2f3..db2347aee3 100644
--- a/test/fixtures/transformation/self-contained/es7-array-comprehensions/expected.js
+++ b/test/fixtures/transformation/self-contained/es7-array-comprehensions/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _core = require("6to5-runtime/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 var arr = (function () {
   var _arr = [];
 
diff --git a/test/fixtures/transformation/self-contained/full/expected.js b/test/fixtures/transformation/self-contained/full/expected.js
index da668d006d..40529f7d09 100644
--- a/test/fixtures/transformation/self-contained/full/expected.js
+++ b/test/fixtures/transformation/self-contained/full/expected.js
@@ -1,8 +1,8 @@
 "use strict";
 
-var _core = require("6to5-runtime/core-js")["default"];
-var _regeneratorRuntime = require("6to5-runtime/regenerator")["default"];
-var _to5Helpers = require("6to5-runtime/helpers")["default"];
+var _core = require("babel-runtime/core-js")["default"];
+var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
+var _babelHelpers = require("babel-runtime/helpers")["default"];
 var giveWord = _regeneratorRuntime.mark(function giveWord() {
   return _regeneratorRuntime.wrap(function giveWord$(context$1$0) {
     while (1) switch (context$1$0.prev = context$1$0.next) {
@@ -19,9 +19,9 @@ var giveWord = _regeneratorRuntime.mark(function giveWord() {
 exports.giveWord = giveWord;
 var _someModule = require("someModule");
 
-var foo = _to5Helpers.interopRequire(_someModule);
+var foo = _babelHelpers.interopRequire(_someModule);
 
-var bar = _to5Helpers.interopRequireWildcard(_someModule);
+var bar = _babelHelpers.interopRequireWildcard(_someModule);
 
 var myWord = exports.myWord = _core.Symbol("abc");
 Object.defineProperty(exports, "__esModule", {
diff --git a/test/fixtures/transformation/self-contained/modules-amd/expected.js b/test/fixtures/transformation/self-contained/modules-amd/expected.js
index 527a0916cf..a7826ee065 100644
--- a/test/fixtures/transformation/self-contained/modules-amd/expected.js
+++ b/test/fixtures/transformation/self-contained/modules-amd/expected.js
@@ -1,6 +1,6 @@
-define(["exports", "foo", "6to5-runtime/helpers"], function (exports, _foo, _to5RuntimeHelpers) {
+define(["exports", "foo", "babel-runtime/helpers"], function (exports, _foo, _babelRuntimeHelpers) {
   "use strict";
 
-  var _to5Helpers = _to5RuntimeHelpers["default"];
-  var foo = _to5Helpers.interopRequire(_foo);
+  var _babelHelpers = _babelRuntimeHelpers["default"];
+  var foo = _babelHelpers.interopRequire(_foo);
 });
diff --git a/test/fixtures/transformation/self-contained/modules-common/expected.js b/test/fixtures/transformation/self-contained/modules-common/expected.js
index fc54eaa84a..5909c60160 100644
--- a/test/fixtures/transformation/self-contained/modules-common/expected.js
+++ b/test/fixtures/transformation/self-contained/modules-common/expected.js
@@ -1,4 +1,4 @@
 "use strict";
 
-var _to5Helpers = require("6to5-runtime/helpers")["default"];
-var foo = _to5Helpers.interopRequire(require("foo"));
+var _babelHelpers = require("babel-runtime/helpers")["default"];
+var foo = _babelHelpers.interopRequire(require("foo"));
diff --git a/test/fixtures/transformation/self-contained/modules-system/expected.js b/test/fixtures/transformation/self-contained/modules-system/expected.js
index 15b44e0942..c876067c45 100644
--- a/test/fixtures/transformation/self-contained/modules-system/expected.js
+++ b/test/fixtures/transformation/self-contained/modules-system/expected.js
@@ -1,13 +1,13 @@
-System.register(["6to5-runtime/helpers"], function (_export) {
+System.register(["babel-runtime/helpers"], function (_export) {
   "use strict";
 
-  var _to5Helpers;
+  var _babelHelpers;
   return {
-    setters: [function (_to5RuntimeHelpers) {
-      _to5Helpers = _to5RuntimeHelpers["default"];
+    setters: [function (_babelRuntimeHelpers) {
+      _babelHelpers = _babelRuntimeHelpers["default"];
     }],
     execute: function () {
-      foo.apply(undefined, _to5Helpers.toConsumableArray(bar));
+      foo.apply(undefined, _babelHelpers.toConsumableArray(bar));
     }
   };
 });
diff --git a/test/fixtures/transformation/self-contained/modules-umd/expected.js b/test/fixtures/transformation/self-contained/modules-umd/expected.js
index f77b369f4e..f99576af2f 100644
--- a/test/fixtures/transformation/self-contained/modules-umd/expected.js
+++ b/test/fixtures/transformation/self-contained/modules-umd/expected.js
@@ -1,12 +1,12 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "6to5-runtime/helpers"], factory);
+    define(["exports", "foo", "babel-runtime/helpers"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"), require("6to5-runtime/helpers"));
+    factory(exports, require("foo"), require("babel-runtime/helpers"));
   }
-})(function (exports, _foo, _to5RuntimeHelpers) {
+})(function (exports, _foo, _babelRuntimeHelpers) {
   "use strict";
 
-  var _to5Helpers = _to5RuntimeHelpers["default"];
-  var foo = _to5Helpers.interopRequire(_foo);
+  var _babelHelpers = _babelRuntimeHelpers["default"];
+  var foo = _babelHelpers.interopRequire(_foo);
 });
diff --git a/test/fixtures/transformation/self-contained/regenerator-runtime/expected.js b/test/fixtures/transformation/self-contained/regenerator-runtime/expected.js
index 2329286ee6..4c76fc466a 100644
--- a/test/fixtures/transformation/self-contained/regenerator-runtime/expected.js
+++ b/test/fixtures/transformation/self-contained/regenerator-runtime/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _regeneratorRuntime = require("6to5-runtime/regenerator")["default"];
+var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
 void _regeneratorRuntime.mark(function callee$0$0() {
   return _regeneratorRuntime.wrap(function callee$0$0$(context$1$0) {
     while (1) switch (context$1$0.prev = context$1$0.next) {
diff --git a/test/fixtures/transformation/self-contained/symbol-iterator-in/expected.js b/test/fixtures/transformation/self-contained/symbol-iterator-in/expected.js
index 0abc1db265..e71041cfad 100644
--- a/test/fixtures/transformation/self-contained/symbol-iterator-in/expected.js
+++ b/test/fixtures/transformation/self-contained/symbol-iterator-in/expected.js
@@ -1,4 +1,4 @@
 "use strict";
 
-var _core = require("6to5-runtime/core-js")["default"];
+var _core = require("babel-runtime/core-js")["default"];
 _core.$for.isIterable(Object(arr));
diff --git a/test/generation.js b/test/generation.js
index e24d1e3e5a..f7768da07e 100644
--- a/test/generation.js
+++ b/test/generation.js
@@ -1,9 +1,9 @@
-var generate = require("../lib/6to5/generation");
+var generate = require("../lib/babel/generation");
 var assert   = require("assert");
 var helper   = require("./_helper");
-var parse    = require("../lib/6to5/helpers/parse");
+var parse    = require("../lib/babel/helpers/parse");
 var chai     = require("chai");
-var t        = require("../lib/6to5/types");
+var t        = require("../lib/babel/types");
 var _        = require("lodash");
 
 suite("generation", function () {
diff --git a/test/kangax.js b/test/kangax.js
index 89496c1ee4..878d6dd062 100644
--- a/test/kangax.js
+++ b/test/kangax.js
@@ -2,7 +2,7 @@ require("./_helper").assertVendor("compat-table");
 
 require("../polyfill");
 
-var transform = require("../lib/6to5/transformation");
+var transform = require("../lib/babel/transformation");
 var assert    = require("assert");
 var data      = require("../vendor/compat-table/data-es6");
 var _         = require("lodash");
@@ -33,7 +33,7 @@ suite("kangax/compat-table", function () {
   for (var key in tests) {
     var data = tests[key];
 
-    if (data.res._6to5 !== true) continue;
+    if (data.res._babel !== true) continue;
 
     var exec = data.exec;
     var code = exec.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1];
diff --git a/test/regenerator.js b/test/regenerator.js
index 1221046e4b..f41125c70f 100644
--- a/test/regenerator.js
+++ b/test/regenerator.js
@@ -2,7 +2,7 @@ if (!process.env.ALL_6TO5_TESTS) return;
 
 require("./_helper").assertVendor("regenerator");
 
-var transform = require("../lib/6to5/transformation");
+var transform = require("../lib/babel/transformation");
 var fs        = require("fs");
 var _         = require("lodash");
 
diff --git a/test/test262.js b/test/test262.js
index e77d04f638..c084c71ac5 100644
--- a/test/test262.js
+++ b/test/test262.js
@@ -2,7 +2,7 @@ if (process.env.SIMPLE_6TO5_TESTS) return;
 
 require("./_helper").assertVendor("test262");
 
-var transform = require("../lib/6to5/transformation");
+var transform = require("../lib/babel/transformation");
 var readdir   = require("fs-readdir-recursive");
 var helper    = require("./_helper");
 var path      = require("path");
diff --git a/test/traceur.js b/test/traceur.js
index eb9bec7ef1..4bfb1c318b 100644
--- a/test/traceur.js
+++ b/test/traceur.js
@@ -67,7 +67,7 @@ require("./_transformation-helper")({
     // they have no names
     "PropertyMethodAssignment/PropertyMethodAssignment",
 
-    // 6to5 assumes that all code transformed is a module so this isn't necessary
+    // Babel assumes that all code transformed is a module so this isn't necessary
     "Strict",
     "Syntax/UseStrictEscapeSequence",
     "Syntax/UseStrictLineContinuation",
diff --git a/test/traverse.js b/test/traverse.js
index 4879752da6..328431f55d 100644
--- a/test/traverse.js
+++ b/test/traverse.js
@@ -1,4 +1,4 @@
-var traverse = require("../lib/6to5/traversal");
+var traverse = require("../lib/babel/traversal");
 var assert   = require("assert");
 var _        = require("lodash");
 
diff --git a/test/types.js b/test/types.js
index 4bf82f3dca..c5c15db2b1 100644
--- a/test/types.js
+++ b/test/types.js
@@ -1,5 +1,5 @@
 var assert = require("assert");
-var t      = require("../lib/6to5/types");
+var t      = require("../lib/babel/types");
 
 suite("types", function () {
   test("isFalsyExpression", function () {
diff --git a/test/util.js b/test/util.js
index 80b80f5b7a..3a87261256 100644
--- a/test/util.js
+++ b/test/util.js
@@ -1,7 +1,7 @@
 var assert = require("assert");
-var util   = require("../lib/6to5/util");
-var parse  = require("../lib/6to5/helpers/parse");
-var t      = require("../lib/6to5/types");
+var util   = require("../lib/babel/util");
+var parse  = require("../lib/babel/helpers/parse");
+var t      = require("../lib/babel/types");
 
 suite("util", function () {
   test("invalid template", function () {
diff --git a/tools/cache-templates b/tools/cache-templates
index da349147e8..08db0b45b4 100755
--- a/tools/cache-templates
+++ b/tools/cache-templates
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
 var fs = require("fs");
-var templates = require("../lib/6to5/util").templates;
+var templates = require("../lib/babel/util").templates;
 fs.writeFileSync("templates.json", JSON.stringify(templates));