diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 40cf6579..00000000
--- a/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "./node_modules/@eightshift/frontend-libs/babel/babel.config.js"
-}
diff --git a/.gitignore b/.gitignore
index 1c4964ff..3b0831c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /public
 /vendor
 /node_modules
+/storybook
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70f089e0..84708490 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,15 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 ## [Unreleased]
 
-*No documentation available about unreleased changes as of yet.*
-
 ### Removed
 - Removed `Config` dependency from enqueue classes
+- Removed .babelrc file.
+
+### Added
+- Added babel.config.js
+
+**BRAKING CHANGES:**
+- Please replace you old .babelrc file with the new one babel.config.js and convert it from .json to .js format.
 
 ## [4.1.0] - 2020-03-05
 
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 00000000..5579815d
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: './node_modules/@eightshift/frontend-libs/babel/babel.config.js',
+};
diff --git a/package.json b/package.json
index e2617350..897ee4b9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,9 @@
     "precommit": "npm run lint",
     "start": "webpack --progress --watch --display-error-details --display-reasons --mode development",
     "build": "webpack --progress --mode production",
-    "blocksExample": "cp -R ./node_modules/@eightshift/frontend-libs/blocks/init/src/blocks/custom/example ./src/blocks/custom/ && composer dump-autoload"
+    "blocksExample": "cp -R ./node_modules/@eightshift/frontend-libs/blocks/init/src/blocks/custom/example ./src/blocks/custom/ && composer dump-autoload",
+    "storybookBuild": "build-storybook -s public -o storybook",
+    "storybook": "start-storybook -s public"
   },
   "devDependencies": {
     "husky": "^3.0.9",
diff --git a/webpack.config.js b/webpack.config.js
index 733f665d..4ba6f52c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,7 @@
  * This is a main entrypoint for Webpack config.
  * All the settings are pulled from node_modules/@eightshift/frontend-libs/webpack.
  * We are loading mostly used configuration but you can always override or turn off the default setup and provide your own.
- * Please refere to Eigthshift-libs wiki for details.
+ * Please referer to Eightshift-libs wiki for details.
  *
  * @since 4.0.0 Moved to eightshift-libs.
  * @since 1.0.0
@@ -14,15 +14,11 @@ module.exports = (env, argv) => {
   const projectConfig = {
     config: {
       projectDir: __dirname, // Current project directory absolute path.
-      projectUrl: 'dev.boilerplate.com', // Used for providing browsersync functionality.
+      projectUrl: 'dev.eightshift-internal.com', // Used for providing browsersync functionality.
       projectPath: 'wp-content/themes/eightshift-boilerplate', // Project path relative to project root.
     },
   };
 
   // Generate webpack config for this project using options object.
-  const project = require('./node_modules/@eightshift/frontend-libs/webpack')(argv.mode, projectConfig);
-
-  return {
-    ...project,
-  };
+  return require('./node_modules/@eightshift/frontend-libs/webpack')(argv.mode, projectConfig);
 };