diff --git a/packages/babel-core/src/transformation/file/options/build-config-chain.js b/packages/babel-core/src/config/build-config-chain.js
similarity index 98%
rename from packages/babel-core/src/transformation/file/options/build-config-chain.js
rename to packages/babel-core/src/config/build-config-chain.js
index fee82d03c1..2516184410 100644
--- a/packages/babel-core/src/transformation/file/options/build-config-chain.js
+++ b/packages/babel-core/src/config/build-config-chain.js
@@ -1,5 +1,5 @@
-import * as babel from "../../../index";
-import resolve from "../../../helpers/resolve";
+import * as babel from "../index";
+import resolve from "../helpers/resolve";
 import json5 from "json5";
 import path from "path";
 import fs from "fs";
diff --git a/packages/babel-core/src/transformation/file/options/option-manager.js b/packages/babel-core/src/config/option-manager.js
similarity index 97%
rename from packages/babel-core/src/transformation/file/options/option-manager.js
rename to packages/babel-core/src/config/option-manager.js
index bf7ace2d22..6cd3845f57 100644
--- a/packages/babel-core/src/transformation/file/options/option-manager.js
+++ b/packages/babel-core/src/config/option-manager.js
@@ -1,15 +1,15 @@
-import * as context from "../../../index";
+import * as context from "../index";
 import Plugin from "./plugin";
 import * as messages from "babel-messages";
-import resolvePlugin from "../../../helpers/resolve-plugin";
-import resolvePreset from "../../../helpers/resolve-preset";
+import resolvePlugin from "../helpers/resolve-plugin";
+import resolvePreset from "../helpers/resolve-preset";
 import defaults from "lodash/defaults";
 import cloneDeepWith from "lodash/cloneDeepWith";
-import merge from "../../../helpers/merge";
+import merge from "../helpers/merge";
 import removed from "./removed";
 import buildConfigChain from "./build-config-chain";
 import path from "path";
-import * as util from "../../../util";
+import * as util from "../util";
 
 type PluginObject = {
   pre?: Function;
diff --git a/packages/babel-core/src/transformation/file/options/plugin.js b/packages/babel-core/src/config/plugin.js
similarity index 100%
rename from packages/babel-core/src/transformation/file/options/plugin.js
rename to packages/babel-core/src/config/plugin.js
diff --git a/packages/babel-core/src/transformation/file/options/removed.js b/packages/babel-core/src/config/removed.js
similarity index 100%
rename from packages/babel-core/src/transformation/file/options/removed.js
rename to packages/babel-core/src/config/removed.js
diff --git a/packages/babel-core/src/index.js b/packages/babel-core/src/index.js
index f3fa340eb5..1cf098c66e 100644
--- a/packages/babel-core/src/index.js
+++ b/packages/babel-core/src/index.js
@@ -11,7 +11,7 @@ export * as types from "babel-types";
 export traverse from "babel-traverse";
 export template from "babel-template";
 
-export OptionManager from "./transformation/file/options/option-manager";
+export OptionManager from "./config/option-manager";
 
 export function Plugin(alias) {
   throw new Error(`The (${alias}) Babel 5 plugin is being run with Babel 6.`);
diff --git a/packages/babel-core/src/transformation/file/index.js b/packages/babel-core/src/transformation/file/index.js
index d7270d45bc..69897e7632 100644
--- a/packages/babel-core/src/transformation/file/index.js
+++ b/packages/babel-core/src/transformation/file/index.js
@@ -16,7 +16,7 @@ import path from "path";
 import * as t from "babel-types";
 
 import resolve from "../../helpers/resolve";
-import OptionManager from "./options/option-manager";
+import OptionManager from "../../config/option-manager";
 
 import blockHoistPlugin from "../internal-plugins/block-hoist";
 import shadowFunctionsPlugin from "../internal-plugins/shadow-functions";
diff --git a/packages/babel-core/src/transformation/pipeline.js b/packages/babel-core/src/transformation/pipeline.js
index 73c2645ec1..8f0815e6f8 100644
--- a/packages/babel-core/src/transformation/pipeline.js
+++ b/packages/babel-core/src/transformation/pipeline.js
@@ -3,7 +3,7 @@ import fs from "fs";
 
 import normalizeAst from "../helpers/normalize-ast";
 import File from "./file";
-import OptionManager from "./file/options/option-manager";
+import OptionManager from "../config/option-manager";
 
 export function analyse(code: string, opts: Object = {}, visitor?: Object): ?BabelFileMetadata {
   opts.code = false;
diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js
index cb2e991bf1..85c8d9eeaa 100644
--- a/packages/babel-core/test/api.js
+++ b/packages/babel-core/test/api.js
@@ -2,7 +2,7 @@ import * as babel from "../lib/index";
 import buildExternalHelpers from "../lib/tools/build-external-helpers";
 import sourceMap from "source-map";
 import assert from "assert";
-import Plugin from "../lib/transformation/file/options/plugin";
+import Plugin from "../lib/config/plugin";
 import generator from "babel-generator";
 
 function assertIgnored(result) {
diff --git a/packages/babel-core/test/config-chain.js b/packages/babel-core/test/config-chain.js
index d43e57142c..c50046ff1d 100644
--- a/packages/babel-core/test/config-chain.js
+++ b/packages/babel-core/test/config-chain.js
@@ -1,6 +1,6 @@
 import assert from "assert";
 import path from "path";
-import buildConfigChain from "../lib/transformation/file/options/build-config-chain";
+import buildConfigChain from "../lib/config/build-config-chain";
 
 function fixture() {
   const args = [__dirname, "fixtures", "config"];
diff --git a/packages/babel-core/test/option-manager.js b/packages/babel-core/test/option-manager.js
index 126ed83c27..a2cfd86faf 100644
--- a/packages/babel-core/test/option-manager.js
+++ b/packages/babel-core/test/option-manager.js
@@ -1,5 +1,5 @@
 import assert from "assert";
-import OptionManager from "../lib/transformation/file/options/option-manager";
+import OptionManager from "../lib/config/option-manager";
 import path from "path";
 
 describe("option-manager", () => {
diff --git a/packages/babel-core/test/path.js b/packages/babel-core/test/path.js
index 76270ca3ed..dbc30827c5 100644
--- a/packages/babel-core/test/path.js
+++ b/packages/babel-core/test/path.js
@@ -1,5 +1,5 @@
 import { transform } from "../lib/index";
-import Plugin from "../lib/transformation/file/options/plugin";
+import Plugin from "../lib/config/plugin";
 import chai from "chai";
 
 describe("traversal path", function () {