diff --git a/bin/6to5/index.js b/bin/6to5/index.js
index 48c3d0f8f9..a126afa14f 100755
--- a/bin/6to5/index.js
+++ b/bin/6to5/index.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 var commander = require("commander");
-var transform = require("../../lib/6to5/transformation/transform");
+var transform = require("../../lib/6to5/transformation");
 var util      = require("../../lib/6to5/util");
 var fs        = require("fs");
 var each      = require("lodash/collection/each");
diff --git a/lib/6to5/browser.js b/lib/6to5/browser.js
index 18a7fd0f28..9f0d32b425 100644
--- a/lib/6to5/browser.js
+++ b/lib/6to5/browser.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var transform = module.exports = require("./transformation/transform");
+var transform = module.exports = require("./transformation");
 
 transform.version = require("../../package").version;
 
diff --git a/lib/6to5/detection/detect.js b/lib/6to5/detection/index.js
similarity index 89%
rename from lib/6to5/detection/detect.js
rename to lib/6to5/detection/index.js
index b6e9596c7c..990882457c 100644
--- a/lib/6to5/detection/detect.js
+++ b/lib/6to5/detection/index.js
@@ -4,7 +4,7 @@ var useragent = require("useragent");
 var traverse  = require("../traverse");
 
 var SYNTAX_KEYS = require("./syntax-keys");
-var visitors    = traverse.explode(require("./detect-visitors"));
+var visitors    = traverse.explode(require("./visitors"));
 
 function detect(ast) {
   var stats = {
diff --git a/lib/6to5/detection/detect-visitors.js b/lib/6to5/detection/visitors.js
similarity index 100%
rename from lib/6to5/detection/detect-visitors.js
rename to lib/6to5/detection/visitors.js
diff --git a/lib/6to5/file.js b/lib/6to5/file.js
index a9d5fa4953..54109ad026 100644
--- a/lib/6to5/file.js
+++ b/lib/6to5/file.js
@@ -4,8 +4,8 @@ module.exports = File;
 
 var SHEBANG_REGEX = /^\#\!.*/;
 
-var transform  = require("./transformation/transform");
-var generate   = require("./generation/generator");
+var transform  = require("./transformation");
+var generate   = require("./generation");
 var clone      = require("./helpers/clone");
 var Scope      = require("./traverse/scope");
 var util       = require("./util");
diff --git a/lib/6to5/generation/generator.js b/lib/6to5/generation/index.js
similarity index 100%
rename from lib/6to5/generation/generator.js
rename to lib/6to5/generation/index.js
diff --git a/lib/6to5/index.js b/lib/6to5/index.js
index fb1c9c7ebd..fb97f47c42 100644
--- a/lib/6to5/index.js
+++ b/lib/6to5/index.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var transform  = require("./transformation/transform");
+var transform  = require("./transformation");
 var util       = require("./util");
 var fs         = require("fs");
 var isFunction = require("lodash/lang/isFunction");
diff --git a/lib/6to5/transformation/transform.js b/lib/6to5/transformation/index.js
similarity index 100%
rename from lib/6to5/transformation/transform.js
rename to lib/6to5/transformation/index.js
diff --git a/packages/build-runtime.js b/packages/build-runtime.js
index 84005256a4..1970e593b6 100644
--- a/packages/build-runtime.js
+++ b/packages/build-runtime.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var transform = require("../lib/6to5/transformation/transform");
+var transform = require("../lib/6to5/transformation");
 var File      = require("../lib/6to5/file");
 var util      = require("../lib/6to5/util");
 var fs        = require("fs");
diff --git a/test/_transformation-helper.js b/test/_transformation-helper.js
index 1683e71b23..d35fa20c4e 100644
--- a/test/_transformation-helper.js
+++ b/test/_transformation-helper.js
@@ -1,5 +1,5 @@
 var genHelpers = require("./_generator-helpers");
-var transform  = require("../lib/6to5/transformation/transform");
+var transform  = require("../lib/6to5/transformation");
 var sourceMap  = require("source-map");
 var codeFrame  = require("../lib/6to5/helpers/code-frame");
 var esvalid    = require("esvalid");
diff --git a/test/api.js b/test/api.js
index 5559760643..1d5e33638b 100644
--- a/test/api.js
+++ b/test/api.js
@@ -1,4 +1,4 @@
-var transform = require("../lib/6to5/transformation/transform");
+var transform = require("../lib/6to5/transformation");
 var assert    = require("assert");
 var File      = require("../lib/6to5/file");
 
diff --git a/test/detection.js b/test/detection.js
index 53af975992..781b17caeb 100644
--- a/test/detection.js
+++ b/test/detection.js
@@ -1,4 +1,4 @@
-var detect = require("../lib/6to5/detection/detect");
+var detect = require("../lib/6to5/detection");
 var assert = require("assert");
 var util   = require("../lib/6to5/util");
 
diff --git a/test/generation.js b/test/generation.js
index a10acee4be..ba7c22efa9 100644
--- a/test/generation.js
+++ b/test/generation.js
@@ -1,4 +1,4 @@
-var generate = require("../lib/6to5/generation/generator");
+var generate = require("../lib/6to5/generation");
 var assert   = require("assert");
 var helper   = require("./_helper");
 var util     = require("../lib/6to5/util");
diff --git a/test/kangax.js b/test/kangax.js
index 8a6b408f47..89496c1ee4 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/transform");
+var transform = require("../lib/6to5/transformation");
 var assert    = require("assert");
 var data      = require("../vendor/compat-table/data-es6");
 var _         = require("lodash");
diff --git a/test/regenerator.js b/test/regenerator.js
index a3b0b66610..1221046e4b 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/transform");
+var transform = require("../lib/6to5/transformation");
 var fs        = require("fs");
 var _         = require("lodash");
 
diff --git a/test/test262.js b/test/test262.js
index ae5b2e5f2a..5a0be6f844 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/transform");
+var transform = require("../lib/6to5/transformation");
 var readdir   = require("fs-readdir-recursive");
 var path      = require("path");
 var fs        = require("fs");