diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79e298a30..5e1afa51e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ environment.config.merge({ devtool: 'none' })
 module.exports = environment.toWebpackConfig()
 ```
 
+- Reintroduced `context` to the file loader. Reverting the simpler paths change
+
 
 ## [4.0.0.rc.7] - 2019-01-25
 
diff --git a/package/environments/__tests__/base.js b/package/environments/__tests__/base.js
index 8d4f7e207..c336b03e5 100644
--- a/package/environments/__tests__/base.js
+++ b/package/environments/__tests__/base.js
@@ -31,8 +31,8 @@ describe('Environment', () => {
 
     test('should return output', () => {
       const config = environment.toWebpackConfig()
-      expect(config.output.filename).toEqual('js/[name]-[chunkhash].js')
-      expect(config.output.chunkFilename).toEqual('js/[name]-[chunkhash].chunk.js')
+      expect(config.output.filename).toEqual('[name]-[chunkhash].js')
+      expect(config.output.chunkFilename).toEqual('[name]-[chunkhash].chunk.js')
     })
 
     test('should return default loader rules for each file in config/loaders', () => {
diff --git a/package/environments/base.js b/package/environments/base.js
index ac2d26ba7..e130f2fe8 100644
--- a/package/environments/base.js
+++ b/package/environments/base.js
@@ -36,8 +36,8 @@ const getPluginList = () => {
   result.append(
     'MiniCssExtract',
     new MiniCssExtractPlugin({
-      filename: 'css/[name]-[contenthash:8].css',
-      chunkFilename: 'css/[name]-[contenthash:8].chunk.css'
+      filename: '[name]-[contenthash:8].css',
+      chunkFilename: '[name]-[contenthash:8].chunk.css'
     })
   )
   result.append(
@@ -83,9 +83,9 @@ const getModulePaths = () => {
 const getBaseConfig = () => new ConfigObject({
   mode: 'production',
   output: {
-    filename: 'js/[name]-[chunkhash].js',
-    chunkFilename: 'js/[name]-[chunkhash].chunk.js',
-    hotUpdateChunkFilename: 'js/[id]-[hash].hot-update.js',
+    filename: '[name]-[chunkhash].js',
+    chunkFilename: '[name]-[chunkhash].chunk.js',
+    hotUpdateChunkFilename: '[id]-[hash].hot-update.js',
     path: config.outputPath,
     publicPath: config.publicPath
   },
diff --git a/package/rules/file.js b/package/rules/file.js
index d886e80e5..3347ff1ad 100644
--- a/package/rules/file.js
+++ b/package/rules/file.js
@@ -1,4 +1,5 @@
-const { static_assets_extensions: fileExtensions } = require('../config')
+const { join } = require('path')
+const { source_path: sourcePath, static_assets_extensions: fileExtensions } = require('../config')
 
 module.exports = {
   test: new RegExp(`(${fileExtensions.join('|')})$`, 'i'),
@@ -6,7 +7,8 @@ module.exports = {
     {
       loader: 'file-loader',
       options: {
-        name: 'media/[name]-[hash:8].[ext]'
+        name: '[path][name]-[hash].[ext]',
+        context: join(sourcePath)
       }
     }
   ]