diff --git a/webpack.base.config.js b/client/webpack/base.config.js
similarity index 95%
rename from webpack.base.config.js
rename to client/webpack/base.config.js
index 98e5fa4533..5c81a82a81 100644
--- a/webpack.base.config.js
+++ b/client/webpack/base.config.js
@@ -30,7 +30,7 @@ function entryPoints(paths) {
 
 
 module.exports = function exports() {
-  var CLIENT_DIR = path.resolve(__dirname, 'client', 'src');
+  var CLIENT_DIR = path.resolve(__dirname, '..', 'src');
 
   return {
     entry: entryPoints('./wagtail/**/static_src/**/app/*.entry.js'),
diff --git a/webpack.dev.config.js b/client/webpack/dev.config.js
similarity index 90%
rename from webpack.dev.config.js
rename to client/webpack/dev.config.js
index 7ab8d963c8..d3329b9ed6 100644
--- a/webpack.dev.config.js
+++ b/client/webpack/dev.config.js
@@ -1,5 +1,5 @@
 var webpack = require('webpack');
-var base = require('./webpack.base.config');
+var base = require('./base.config');
 var config = base('development');
 
 
diff --git a/webpack.prd.config.js b/client/webpack/prod.config.js
similarity index 92%
rename from webpack.prd.config.js
rename to client/webpack/prod.config.js
index f2fb833268..ec164462a6 100644
--- a/webpack.prd.config.js
+++ b/client/webpack/prod.config.js
@@ -1,5 +1,5 @@
 var webpack = require('webpack');
-var base = require('./webpack.base.config');
+var base = require('./base.config');
 var config = base('production');
 
 
diff --git a/package.json b/package.json
index c4984225a9..fb3e2e30b6 100644
--- a/package.json
+++ b/package.json
@@ -47,10 +47,10 @@
   },
   "scripts": {
     "postinstall": "cd ./client; npm install; cd ..",
-    "build": "gulp build; webpack --progress --colors --config webpack.prd.config.js",
-    "watch": "webpack --progress --colors --config webpack.dev.config.js & gulp watch",
+    "build": "gulp build; webpack --progress --colors --config ./client/webpack/prod.config.js",
+    "watch": "webpack --progress --colors --config ./client/webpack/dev.config.js & gulp watch",
     "start": "npm run watch",
-    "lint:js": "eslint --max-warnings 16 webpack.*.config.js ./client/src",
+    "lint:js": "eslint --max-warnings 16 ./client",
     "lint": "npm run lint:js",
     "test": "npm run test:unit",
     "test:unit": "env NODE_PATH=$NODE_PATH:$PWD/client/src mocha --compilers js:babel-core/register client/tests/**/*.test.js",