diff --git a/.gitignore b/.gitignore
index 506e98f..e29169c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .netlify
-dist
+build
 node_modules
\ No newline at end of file
diff --git a/package.json b/package.json
index 091b980..33fd782 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,12 @@
 {
     "name": "csslayout",
     "scripts": {
-        "copy": "cp client/index.html dist && cp robots.txt dist && cp sitemap.xml dist",
+        "copy": "rm -rf build && mkdir build && cp client/index.html build && cp robots.txt build && cp sitemap.xml build",
         "dev": "npm run copy && webpack --mode development",
         "dev-server": "npm run copy && webpack-dev-server",
-        "prebuild": "rm -rf dist/* && npm run copy",
-        "build": "webpack --mode production",
+        "build": "npm run copy && webpack --mode production && npm run export",
         "export": "react-snap",
-        "postbuild": "npm run export",
-        "deploy": "netlify deploy --dir=dist --prod"
+        "deploy": "npm run build && netlify deploy --dir=build --prod"
     },
     "dependencies": {
         "@loadable/component": "^5.10.3",
@@ -30,7 +28,7 @@
         "webpack-dev-server": "^3.9.0"
     },
     "reactSnap": {
-        "source": "dist",
+        "source": "build",
         "minifyHtml": {
             "collapseWhitespace": false,
             "removeComments": false
diff --git a/webpack.config.js b/webpack.config.js
index 950d446..0b9848e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,8 +3,13 @@ const path = require('path');
 module.exports = {
     entry: './client/index.jsx',
     output: {
-        path: path.join(__dirname, 'dist'),
+        path: path.join(__dirname, 'build'),
         filename: 'bundle.js',
+        // It's very important
+        // All the chunk generated by webpack then will be loaded such as
+        // <script charset="utf-8" src="/[chunk-name].bundle.js"></script>
+        // The script is accessible from any page that exported by a 3rd party such as react-snap
+        publicPath: '/',
     },
     module: {
         rules: [
@@ -24,7 +29,7 @@ module.exports = {
     },
     devtool: 'cheap-module-eavl-source-map',
     devServer: {
-        contentBase: path.join(__dirname, 'dist'),
+        contentBase: path.join(__dirname, 'build'),
         historyApiFallback: true,
     },
 };