diff --git a/examples/source-maps/test.sh b/examples/source-maps/test.sh
new file mode 100644
index 0000000..f79113e
--- /dev/null
+++ b/examples/source-maps/test.sh
@@ -0,0 +1 @@
+diff ./happy/main.js.map ./vanilla/main.js.map
\ No newline at end of file
diff --git a/examples/source-maps/versions/1/happy/webpack.config.js b/examples/source-maps/versions/1/happy/webpack.config.js
new file mode 100644
index 0000000..a1377fa
--- /dev/null
+++ b/examples/source-maps/versions/1/happy/webpack.config.js
@@ -0,0 +1,33 @@
+const path = require('path');
+const e = require('@happypack/example-utils');
+const { HappyPack } = e;
+
+module.exports = ({
+  context: path.resolve(__dirname),
+  entry: e.resolve(module, 'lib/a.js'),
+  devtool: 'source-map',
+
+  output: {
+    path: e.outputDir(module),
+    filename: '[name].js'
+  },
+
+  plugins: [
+    new HappyPack({
+      loaders: [
+        e.resolve(module, 'identity-loader.js'),
+        'babel',
+      ],
+      threads: 2
+    })
+  ],
+
+  module: {
+    loaders: [
+      {
+        test: /\.js$/,
+        loaders: [ e.happyLoader ]
+      }
+    ]
+  }
+});
\ No newline at end of file
diff --git a/examples/source-maps/package.json b/examples/source-maps/versions/1/package.json
similarity index 71%
rename from examples/source-maps/package.json
rename to examples/source-maps/versions/1/package.json
index b79e778..a8e29d6 100644
--- a/examples/source-maps/package.json
+++ b/examples/source-maps/versions/1/package.json
@@ -1,5 +1,6 @@
 {
-  "name": "happypack-examples__source-maps",
+  "name": "@happypack-examples/source-maps--webpack-1",
+  "private": true,
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/examples/source-maps/versions/1/vanilla/webpack.config.js b/examples/source-maps/versions/1/vanilla/webpack.config.js
new file mode 100644
index 0000000..b7c93ba
--- /dev/null
+++ b/examples/source-maps/versions/1/vanilla/webpack.config.js
@@ -0,0 +1,25 @@
+const path = require('path');
+const e = require('@happypack/example-utils');
+
+module.exports = ({
+  context: path.resolve(__dirname),
+  entry: e.resolve(module, 'lib/a.js'),
+  devtool: 'source-map',
+
+  output: {
+    path: e.outputDir(module),
+    filename: '[name].js'
+  },
+
+  module: {
+    loaders: [
+      {
+        test: /\.js$/,
+        loaders: [
+          e.resolve(module, 'identity-loader.js'),
+          'babel'
+        ]
+      }
+    ]
+  }
+});
\ No newline at end of file
diff --git a/examples/source-maps/versions/4/happy/webpack.config.js b/examples/source-maps/versions/4/happy/webpack.config.js
new file mode 100644
index 0000000..478a2e8
--- /dev/null
+++ b/examples/source-maps/versions/4/happy/webpack.config.js
@@ -0,0 +1,34 @@
+const path = require('path');
+const e = require('@happypack/example-utils');
+const { HappyPack } = e;
+
+module.exports = ({
+  context: path.resolve(__dirname),
+  entry: e.resolve(module, 'lib/a.js'),
+  mode: 'development',
+  devtool: 'source-map',
+
+  output: {
+    path: e.outputDir(module),
+    filename: '[name].js'
+  },
+
+  plugins: [
+    new HappyPack({
+      rules: [
+        e.resolve(module, 'identity-loader.js'),
+        'babel-loader',
+      ],
+      threads: 2
+    })
+  ],
+
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: [ e.happyLoader ]
+      }
+    ]
+  }
+});
\ No newline at end of file
diff --git a/examples/source-maps/versions/4/package.json b/examples/source-maps/versions/4/package.json
new file mode 100644
index 0000000..a13e910
--- /dev/null
+++ b/examples/source-maps/versions/4/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@happypack-examples/source-maps--webpack-4",
+  "private": true,
+  "dependencies": {
+    "babel-core": "6.26.0",
+    "babel-loader": "7.1.3"
+  }
+}
diff --git a/examples/source-maps/versions/4/vanilla/webpack.config.js b/examples/source-maps/versions/4/vanilla/webpack.config.js
new file mode 100644
index 0000000..efb0a99
--- /dev/null
+++ b/examples/source-maps/versions/4/vanilla/webpack.config.js
@@ -0,0 +1,26 @@
+const path = require('path');
+const e = require('@happypack/example-utils');
+
+module.exports = ({
+  context: path.resolve(__dirname),
+  entry: e.resolve(module, 'lib/a.js'),
+  devtool: 'source-map',
+  mode: 'development',
+
+  output: {
+    path: e.outputDir(module),
+    filename: '[name].js'
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        use: [
+          e.resolve(module, 'identity-loader.js'),
+          'babel-loader'
+        ]
+      }
+    ]
+  }
+});
\ No newline at end of file
diff --git a/examples/source-maps/webpack.config--raw.js b/examples/source-maps/webpack.config--raw.js
deleted file mode 100644
index f2f89c5..0000000
--- a/examples/source-maps/webpack.config--raw.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var path = require('path');
-var composeWebpackConfig = require('../composeWebpackConfig');
-
-module.exports = composeWebpackConfig({
-  context: path.resolve(__dirname),
-  entry: path.resolve(__dirname, 'lib/a.js'),
-  devtool: 'source-map',
-
-  output: {
-    path: path.resolve(__dirname, 'dist--raw'),
-    filename: '[name].js'
-  },
-
-  module: {
-    loaders: [
-      {
-        test: /\.js$/,
-        loaders: [
-          require.resolve('./identity-loader.js'),
-          'babel'
-        ]
-      }
-    ]
-  }
-});
\ No newline at end of file
diff --git a/examples/source-maps/webpack.config.js b/examples/source-maps/webpack.config.js
deleted file mode 100644
index 09c9798..0000000
--- a/examples/source-maps/webpack.config.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var path = require('path');
-var HappyPack = require('../../');
-var composeWebpackConfig = require('../composeWebpackConfig');
-
-module.exports = composeWebpackConfig({
-  context: path.resolve(__dirname),
-  entry: require.resolve('./lib/a.js'),
-  devtool: 'source-map',
-
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: '[name].js'
-  },
-
-  plugins: [
-    new HappyPack({
-      loaders: [
-        require.resolve('./identity-loader.js'),
-        'babel',
-      ],
-      threads: 2
-    })
-  ],
-
-  module: {
-    loaders: [
-      {
-        test: /\.js$/,
-        loaders: [ path.resolve(__dirname, '../../loader') ]
-      }
-    ]
-  }
-});
\ No newline at end of file