diff --git a/antwar.config.js b/antwar.config.js
index 14d66547209e..00e806cf11e9 100644
--- a/antwar.config.js
+++ b/antwar.config.js
@@ -13,6 +13,7 @@ module.exports = {
   output: 'build',
   title: 'webpack',
   keywords: ['webpack', 'javascript', 'web development', 'programming'],
+
   pageTitle: function(config, pageTitle) {
     var siteName = config.name;
 
@@ -22,12 +23,15 @@ module.exports = {
 
     return siteName + ' - ' + pageTitle;
   },
+
   plugins: [
     prevnextPlugin()
   ],
+
   layout: function() {
     return require('./components/site/site.jsx').default
   },
+
   paths: {
     '/': root(
       function() {
@@ -39,14 +43,6 @@ module.exports = {
       }
     ),
 
-    'get-started': {
-      redirects: {
-        '': '/guides/get-started',
-        'install-webpack': '/guides/installation',
-        'why-webpack': '/guides/why-webpack',
-      }
-    },
-
     concepts: section(
       'Concepts',
       function() {
@@ -73,67 +69,61 @@ module.exports = {
       }
     ),
 
-    development: section(
-      'Development',
+    documentation: section(
+      'Documentation',
       function() {
         return require.context(
-          'json-loader!yaml-frontmatter-loader!./content/development',
-          true,
+          'json-loader!yaml-frontmatter-loader!./content/documentation',
+          false,
           /^\.\/.*\.md$/
         );
       }
     ),
 
-    configuration: section(
-      'Configuration',
+    'documentation/api': section(
+      'API',
       function() {
         return require.context(
-          'json-loader!yaml-frontmatter-loader!./content/configuration',
+          'json-loader!yaml-frontmatter-loader!./content/documentation/api',
           false,
           /^\.\/.*\.md$/
         );
       }, {
-        'external-configs': 'javascript-alternatives'
+        'passing-a-config': 'configuration-types'
       }
     ),
 
-    api: section(
-      'API',
+    // This would be better as a nested (third level) directory
+    // Consider fixing somehow and moving to redirects?
+    'documentation/api/plugins': section(
+      'API | Plugins',
       function() {
         return require.context(
-          'json-loader!yaml-frontmatter-loader!./content/api',
+          'json-loader!yaml-frontmatter-loader!./content/documentation/api/plugins',
           false,
           /^\.\/.*\.md$/
         );
-      }, {
-        'passing-a-config': 'configuration-types'
       }
     ),
 
-    'api/plugins': section(
-      'API',
+    'documentation/configuration': section(
+      'Configuration',
       function() {
         return require.context(
-          'json-loader!yaml-frontmatter-loader!./content/api/plugins',
+          'json-loader!yaml-frontmatter-loader!./content/documentation/configuration',
           false,
           /^\.\/.*\.md$/
         );
+      }, {
+        'external-configs': 'javascript-alternatives'
       }
     ),
 
-    pluginsapi: {
-      redirects: {
-        '': '/api/plugins',
-        'compiler': '/api/plugins/compiler',
-        'template': '/api/plugins/template'
-      }
-    },
-
-    loaders: section(
+    'documentation/loaders': section(
       'Loaders',
       function() {
         const content = require.context(
-          'json-loader!yaml-frontmatter-loader!./content/loaders',
+          'json-loader!yaml-frontmatter-loader!./content/documentation/loaders',
           false,
           /^\.\/.*\.md$/
         );
@@ -146,11 +136,11 @@ module.exports = {
       }
     ),
 
-    plugins: section(
+    'documentation/plugins': section(
       'Plugins',
       function() {
         const content = require.context(
-          'json-loader!yaml-frontmatter-loader!./content/plugins',
+          'json-loader!yaml-frontmatter-loader!./content/documentation/plugins',
           false,
           /^\.\/.*\.md$/
         );
@@ -163,6 +153,18 @@ module.exports = {
       }
     ),
 
+    // Maybe move to support/development?
+    'documentation/development': section(
+      'Development',
+      function() {
+        return require.context(
+          'json-loader!yaml-frontmatter-loader!./content/documentation/development',
+          true,
+          /^\.\/.*\.md$/
+        );
+      }
+    ),
+
     support: section(
       'Support',
       function() {
@@ -180,23 +182,30 @@ module.exports = {
       }
     },
 
-    'vote/feedback': {
+    organization: {
       path() {
-        return require('./components/vote/list.jsx').default
+        return require('./components/organization/organization.jsx').default
       }
     },
 
-    'vote/moneyDistribution': {
-      path() {
-        return require('./components/vote/list.jsx').default
+
+    // Redirects: Everything below is just redirects from old sections
+
+    'get-started': {
+      redirects: {
+        '': '/guides/get-started',
+        'install-webpack': '/guides/installation',
+        'why-webpack': '/guides/why-webpack',
       }
     },
 
-    organization: {
-      path() {
-        return require('./components/organization/organization.jsx').default
+    pluginsapi: {
+      redirects: {
+        '': '/api/plugins',
+        'compiler': '/api/plugins/compiler',
+        'template': '/api/plugins/template'
       }
-    }
+    },
   }
 };
 
diff --git a/components/navigation/navigation-links.json b/components/navigation/navigation-links.json
new file mode 100644
index 000000000000..4fd46c6cc7bb
--- /dev/null
+++ b/components/navigation/navigation-links.json
@@ -0,0 +1,33 @@
+[
+  {
+    "title": "Concepts",
+    "url": "concepts"
+  },
+  {
+    "title": "Guides",
+    "url": "guides"
+  },
+  {
+    "title": "Documentation",
+    "url": "documentation/configuration",
+    "children": [
+      { "title": "API", "url": "documentation/api" },
+      { "title": "Configuration", "url": "documentation/configuration" },
+      { "title": "Loaders", "url": "documentation/loaders" },
+      { "title": "Plugins", "url": "documentation/plugins" },
+      { "title": "Development", "url": "documentation/development" }
+    ]
+  },
+  {
+    "title": "Support",
+    "url": "support"
+  },
+  {
+    "title": "Blog",
+    "url": "//medium.com/webpack"
+  },
+  {
+    "title": "Donate",
+    "url": "//opencollective.com/webpack"
+  }
+]
diff --git a/components/navigation/navigation.jsx b/components/navigation/navigation.jsx
index d62b846819eb..8dea707d70ef 100644
--- a/components/navigation/navigation.jsx
+++ b/components/navigation/navigation.jsx
@@ -7,42 +7,9 @@ import USFlag from '../../assets/language/english.png';
 import ChineseFlag from '../../assets/language/chinese.png';
 
 // TODO: Maybe by updating the routing scheme later on we can avoid hardcoding this?
-let Sections = [
-  {
-    title: 'Concepts',
-    url: 'concepts'
-  },
-  {
-    title: 'Guides',
-    url: 'guides'
-  },
-  {
-    title: 'Documentation',
-    url: 'configuration',
-    children: [
-      { title: 'CLI', url: 'api/cli' },
-      { title: 'API', url: 'api' },
-      { title: 'Configuration', url: 'configuration' },
-      { title: 'Loaders', url: 'loaders' },
-      { title: 'Plugins', url: 'plugins' },
-      { title: 'Development', url: 'development' }
-    ]
-  },
-  {
-    title: 'Donate',
-    url: '//opencollective.com/webpack'
-  },
-  {
-    title: 'Blog',
-    url: '//medium.com/webpack'
-  },
-  {
-    title: 'Support',
-    url: 'support'
-  }
-];
+import Links from './navigation-links.json';
 
-// TODO: Move back to using state once we can handle algolia on our own
+// TODO: Migrate to react-banner
 export default class Navigation extends React.Component {
   render() {
     let { pageUrl = '' } = this.props;
@@ -60,16 +27,16 @@ export default class Navigation extends React.Component {
 
           <nav className="navigation__links">
             {
-              Sections.map(section => {
-                let active = this._isActive(section);
+              Links.map(link => {
+                let active = this._isActive(link);
                 let activeMod = active ? 'navigation__link--active' : '';
 
                 return (
                   <Link
-                    key={ `navigation__link-${section.title}` }
+                    key={ `navigation__link-${link.title}` }
                     className={ `navigation__link ${activeMod}` }
-                    to={ `/${section.url}` }>
-                    { section.title }
+                    to={ `/${link.url}` }>
+                    { link.title }
                   </Link>
                 );
               })
@@ -113,28 +80,26 @@ export default class Navigation extends React.Component {
         </Container>
 
         {
-          Sections.filter(section => this._isActive(section) && section.children).map(section => {
-            return (
-              <div className="navigation__bottom" key={ section.title }>
-                <Container className="navigation__inner">
-                  {
-                    section.children.map(child => {
-                      let activeMod = this._isActive(child) ? 'navigation__child--active' : '';
-
-                      return (
-                        <Link
-                          key={ `navigation__child-${child.title}` }
-                          className={ `navigation__child ${activeMod}` }
-                          to={ `/${child.url}` }>
-                          { child.title }
-                        </Link>
-                      );
-                    })
-                  }
-                </Container>
-              </div>
-            );
-          })
+          Links.filter(link => this._isActive(link) && link.children).map(link => (
+            <div className="navigation__bottom" key={ link.title }>
+              <Container className="navigation__inner">
+                {
+                  link.children.map(child => {
+                    let activeMod = this._isActive(child) ? 'navigation__child--active' : '';
+
+                    return (
+                      <Link
+                        key={ `navigation__child-${child.title}` }
+                        className={ `navigation__child ${activeMod}` }
+                        to={ `/${child.url}` }>
+                        { child.title }
+                      </Link>
+                    );
+                  })
+                }
+              </Container>
+            </div>
+          ))
         }
       </header>
     );
@@ -164,18 +129,18 @@ export default class Navigation extends React.Component {
   }
 
   /**
-   * Check if section is active
+   * Check if link is active
    *
-   * @param {object} section - An object describing the section
-   * @return {bool} - Whether or not the given section is active
+   * @param {object} link - An object describing the link
+   * @return {bool} - Whether or not the given link is active
    */
-  _isActive(section) {
+  _isActive(link) {
     let { pageUrl = '' } = this.props;
 
-    if (section.children) {
-      return section.children.some(child => pageUrl.includes(`${child.url}/`));
+    if (link.children) {
+      return link.children.some(child => pageUrl.includes(`${child.url}/`));
 
-    } else return pageUrl.includes(`${section.url}/`);
+    } else return pageUrl.includes(`${link.url}/`);
   }
 
   /**
diff --git a/components/sidebar/sidebar.jsx b/components/sidebar/sidebar.jsx
index e080e4b50cca..b59605ab8019 100644
--- a/components/sidebar/sidebar.jsx
+++ b/components/sidebar/sidebar.jsx
@@ -1,8 +1,8 @@
-import React, { Component } from 'react';
+import React from 'react';
 import SidebarItem from '../sidebar-item/sidebar-item';
 import Sponsors from '../sponsors/sponsors';
 
-export default class Sidebar extends Component {
+export default class Sidebar extends React.Component {
   constructor(props) {
     super(props);
 
@@ -20,8 +20,8 @@ export default class Sidebar extends Component {
     let isGuides = sectionName === 'guides';
 
     return (
-      <nav 
-        className="sidebar" 
+      <nav
+        className="sidebar"
         ref={ ref => this._container = ref }
         style={{
           position: fixed ? 'fixed' : null,
@@ -57,7 +57,7 @@ export default class Sidebar extends Component {
             )
           }
         </div>
-        
+
       </nav>
     );
   }
@@ -67,23 +67,23 @@ export default class Sidebar extends Component {
       this._recalculate.bind(this),
       250
     );
-    
+
     document.addEventListener(
-      'scroll', 
+      'scroll',
       this._recalculate.bind(this)
     );
   }
 
   componentWillUnmount() {
     document.removeEventListener(
-      'scroll', 
+      'scroll',
       this._recalculate.bind(this)
     );
   }
 
   /**
    * Re-calculate fixed state and position
-   * 
+   *
    */
   _recalculate() {
     let { scrollY, innerHeight } = window;
@@ -98,7 +98,7 @@ export default class Sidebar extends Component {
     let headerSpace = scrollY > headerHeight ? 0 : headerHeight - scrollY;
     let footerSpace = distToBottom > footerHeight ? 0 : footerHeight - distToBottom;
 
-    this.setState({ 
+    this.setState({
       fixed: scrollY >= headerHeight && sidebarHeight < parentHeight,
       availableHeight: innerHeight - headerSpace - footerSpace,
       maxWidth: parentWidth,
diff --git a/components/site/site.jsx b/components/site/site.jsx
index 1c30115c5cc1..8fc05bc64e4b 100644
--- a/components/site/site.jsx
+++ b/components/site/site.jsx
@@ -20,29 +20,26 @@ import '../logo/logo-style';
 import '../dropdown/dropdown-style.scss';
 
 export default props => {
-  // Retrieve section data
-  let sections = props.children.props.section.all()
-    .map(({ title, url, pages }) => ({
-      title,
-      url,
-      pages: pages.map(({ title, url }) => ({
-        title: title || url, // XXX: Title shouldn't be coming in as undefined
-        url
+  // Retrieve and clean up section data
+  let sections = (
+    props.children.props.section.all()
+      .filter(section => section.pages.length !== 0)
+      .map(({ title, url, pages }) => ({
+        title,
+        url,
+        pages: pages.map(({ title, url }) => ({
+          title: title || url, // XXX: Title shouldn't be coming in as undefined
+          url
+        }))
       }))
-    }));
-  
-  // Rename the root section ("webpack" => "Other") and push it to the end
-  let rootIndex = sections.findIndex(section => section.title === 'webpack');
-  let rootSection = sections.splice(rootIndex, 1)[0];
-  rootSection.title = 'Other';
-  sections.push(rootSection);
+  );
 
   return (
     <div id="site" className="site">
       <Interactive
         id="components/notification-bar/notification-bar.jsx"
         component={ NotificationBar } />
-        
+
       <Interactive
         id="components/navigation/navigation.jsx"
         component={ Navigation }
@@ -55,6 +52,7 @@ export default props => {
         sections={ sections } />
 
       { props.children }
+
       <Footer />
 
       <GoogleAnalytics analyticsId="UA-46921629-2" />
diff --git a/content/api/index.md b/content/api/index.md
deleted file mode 100644
index ebe1b0710756..000000000000
--- a/content/api/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: API
-sort: 1
----
-
-* [CLI](/api/cli)
-* [Node](/api/node)
-* [Loaders](/api/loaders)
-* [Plugins](/api/plugins)
diff --git a/content/concepts/hot-module-replacement.md b/content/concepts/hot-module-replacement.md
index 2d14fc7c0f07..8aff161df25c 100644
--- a/content/concepts/hot-module-replacement.md
+++ b/content/concepts/hot-module-replacement.md
@@ -43,7 +43,7 @@ Each update chunk contains code for all updated modules in the respective chunk
 
 The compiler makes sure that module IDs and chunk IDs are consistent
 between these builds. It typically stores these IDs in memory (for example, when
-using [webpack-dev-server](/configuration/dev-server/)), but it's also possible to
+using [webpack-dev-server](/documentation/configuration/dev-server/)), but it's also possible to
 store them in a JSON file.
 
 
@@ -89,7 +89,7 @@ switches back to the `idle` state and everything continues as normal.
 ## What It Can Be Used For
 
 You can use it in development as a LiveReload replacement.
-[webpack-dev-server](/configuration/dev-server/) supports a
+[webpack-dev-server](/documentation/configuration/dev-server/) supports a
 hot mode in which it tries to update with HMR before trying to reload the whole page. See how
 to implement [HMR with React](/guides/hmr-react) as an example.
 
diff --git a/content/concepts/index.md b/content/concepts/index.md
index 2bbd8da0166a..5934e0fa59d9 100644
--- a/content/concepts/index.md
+++ b/content/concepts/index.md
@@ -10,7 +10,7 @@ contributors:
 
 *webpack* is a _module bundler_ for modern JavaScript applications. When webpack processes your application, it recursively builds a _dependency graph_ that includes every module your application needs, then packages all of those modules into a small number of _bundles_ - often only one - to be loaded by the browser.
 
-It is [incredibly configurable](/configuration), but to get started you only need to understand **Four Core Concepts**: entry, output, loaders, and plugins.
+It is [incredibly configurable](/documentation/configuration), but to get started you only need to understand **Four Core Concepts**: entry, output, loaders, and plugins.
 
 This document is intended to give a **high-level** overview of these concepts, while providing links to detailed concept specific use-cases.
 
@@ -18,7 +18,7 @@ This document is intended to give a **high-level** overview of these concepts, w
 
 webpack creates a graph of all of your application's dependencies. The starting point of this graph is known as an _entry point_. The _entry point_ tells webpack _where to start_ and follows the graph of dependencies to know _what to bundle_. You can think of your application's _entry point_ as the **contextual root** or **the first file to kick off your app**.
 
-In webpack we define _entry points_ using the `entry` property in our [webpack configuration object](/configuration).
+In webpack we define _entry points_ using the `entry` property in our [webpack configuration object](/documentation/configuration).
 
 The simplest example is seen below:
 
@@ -52,11 +52,11 @@ module.exports = {
 };
 ```
 
-In the example above, we use the `output.filename` and the `output.path` properties to tell webpack the name of our bundle and where we want it to be emitted to. 
+In the example above, we use the `output.filename` and the `output.path` properties to tell webpack the name of our bundle and where we want it to be emitted to.
 
-T> You may see the term **emitted** or **emit** used throughout our documentation and [plugin API](/api/plugins). This is a fancy term for "produced or discharged".
+T> You may see the term **emitted** or **emit** used throughout our documentation and [plugin API](/documentation/api/plugins). This is a fancy term for "produced or discharged".
 
-The `output` property has [many more configurable features](/configuration/output), but let's spend some time understanding some of the most common use cases for the `output` property.
+The `output` property has [many more configurable features](/documentation/configuration/output), but let's spend some time understanding some of the most common use cases for the `output` property.
 
 [Learn more!](/concepts/output)
 
@@ -105,7 +105,7 @@ There are more specific properties to define on loaders that we haven't yet cove
 
 ## Plugins
 
-Since Loaders only execute transforms on a per-file basis, `plugins` are most commonly used (but not limited to) performing actions and custom functionality on "compilations" or "chunks" of your bundled modules [(and so much more)](/concepts/plugins). The webpack Plugin system is [extremely powerful and customizable](/api/plugins).
+Since Loaders only execute transforms on a per-file basis, `plugins` are most commonly used (but not limited to) performing actions and custom functionality on "compilations" or "chunks" of your bundled modules [(and so much more)](/concepts/plugins). The webpack Plugin system is [extremely powerful and customizable](/documentation/api/plugins).
 
 In order to use a plugin, you just need to `require()` it and add it to the `plugins` array. Most plugins are customizable via options. Since you can use a plugin multiple times in a config for different purposes, you need to create an instance of it by calling it with `new`.
 
@@ -136,7 +136,7 @@ const config = {
 module.exports = config;
 ```
 
-There are many plugins that webpack provides out of the box! Check out our [list of plugins](/plugins) for more information.
+There are many plugins that webpack provides out of the box! Check out our [list of plugins](/documentation/plugins) for more information.
 
 Using plugins in your webpack config is straight-forward, however there are many use-cases that are worth discussing further.
 
diff --git a/content/concepts/loaders.md b/content/concepts/loaders.md
index b0e9c3b9699e..5c582cb25254 100644
--- a/content/concepts/loaders.md
+++ b/content/concepts/loaders.md
@@ -22,7 +22,7 @@ npm install --save-dev css-loader
 npm install --save-dev ts-loader
 ```
 
-Secondly, configure in your `webpack.config.js` that for every `.css` file the [`css-loader`](/loaders/css-loader) should be used and analogously for `.ts` files and the `ts-loader`:
+Secondly, configure in your `webpack.config.js` that for every `.css` file the [`css-loader`](/documentation/loaders/css-loader) should be used and analogously for `.ts` files and the `ts-loader`:
 
 **webpack.config.js**
 
@@ -30,21 +30,21 @@ Secondly, configure in your `webpack.config.js` that for every `.css` file the [
 module.exports = {
   module: {
     rules: [
-      {test: /\.css$/, use: ['css-loader'](/loaders/css-loader)},
+      {test: /\.css$/, use: ['css-loader'](/documentation/loaders/css-loader)},
       {test: /\.ts$/, use: ['ts-loader'](https://github.com/TypeStrong/ts-loader)}
     ]
   }
 };
 ```
 
-Note that according to the [configuration options](/configuration#options), the following specifications define the identical loader usage:
+Note that according to the [configuration options](/documentation/configuration#options), the following specifications define the identical loader usage:
 
 ```js-with-links-with-details
-{test: /\.css$/, [loader](/configuration/module#rule-loader): 'css-loader'}
+{test: /\.css$/, [loader](/documentation/configuration/module#rule-loader): 'css-loader'}
 // or equivalently
-{test: /\.css$/, [use](/configuration/module#rule-use): 'css-loader'}
+{test: /\.css$/, [use](/documentation/configuration/module#rule-use): 'css-loader'}
 // or equivalently
-{test: /\.css$/, [use](/configuration/module#rule-use): {
+{test: /\.css$/, [use](/documentation/configuration/module#rule-use): {
   loader: 'css-loader',
   options: {}
 }}
@@ -60,7 +60,7 @@ There are three ways to use loaders in your application:
 
 ### Via `webpack.config.js`
 
-[`module.rules`](/configuration/module/#module-rules) allows you to specify several loaders within your webpack configuration.
+[`module.rules`](/documentation/configuration/module/#module-rules) allows you to specify several loaders within your webpack configuration.
 This is a concise way to display loaders, and helps to maintain clean code. It also offers you a full overview of each respective loader.
 
 ```js-with-links-with-details
@@ -69,9 +69,9 @@ This is a concise way to display loaders, and helps to maintain clean code. It a
       {
         test: /\.css$/,
         use: [
-          { loader: ['style-loader'](/loaders/style-loader)},
+          { loader: ['style-loader'](/documentation/loaders/style-loader)},
           {
-            loader: ['css-loader'](/loaders/css-loader),
+            loader: ['css-loader'](/documentation/loaders/css-loader),
             options: {
               modules: true
             }
@@ -104,7 +104,7 @@ Optionally, you could also use loaders through the CLI:
 webpack --module-bind jade-loader --module-bind 'css=style-loader!css-loader'
 ```
 
-This uses the `jade-loader` for `.jade` files, and the [`style-loader`](/loaders/style-loader) and [`css-loader`](/loaders/css-loader) for `.css` files.
+This uses the `jade-loader` for `.jade` files, and the [`style-loader`](/documentation/loaders/style-loader) and [`css-loader`](/documentation/loaders/css-loader) for `.css` files.
 
 ## Loader Features
 
@@ -118,14 +118,14 @@ This uses the `jade-loader` for `.jade` files, and the [`style-loader`](/loaders
 * Loaders can emit additional arbitrary files.
 
 Loaders allow more power in the JavaScript ecosystem through preprocessing
-functions (loaders). Users now have more flexibility to include fine-grained logic such as compression, packaging, language translations and [more](/loaders).
+functions (loaders). Users now have more flexibility to include fine-grained logic such as compression, packaging, language translations and [more](/documentation/loaders).
 
 ## Resolving Loaders
 
 Loaders follow the standard [module resolution](/concepts/module-resolution/). In most cases it will be loaders from the [module path](/concepts/module-resolution/#module-paths) (think `npm install`, `node_modules`).
 
-[How to write a loader?](/development/how-to-write-a-loader) A loader module is expected to export a function and to be written in Node.js compatible JavaScript. In the common case you manage loaders with npm, but you can also have loaders as files in your app.
+[How to write a loader?](/documentation/development/how-to-write-a-loader) A loader module is expected to export a function and to be written in Node.js compatible JavaScript. In the common case you manage loaders with npm, but you can also have loaders as files in your app.
 
 By convention, loaders are usually named as `XXX-loader`, where `XXX` is the context name. For example, `json-loader`.
 
-The loader name convention and precedence search order is defined by [`resolveLoader.moduleTemplates`](/configuration/resolve#resolveloader) within the webpack configuration API.
+The loader name convention and precedence search order is defined by [`resolveLoader.moduleTemplates`](/documentation/configuration/resolve#resolveloader) within the webpack configuration API.
diff --git a/content/concepts/module-resolution.md b/content/concepts/module-resolution.md
index d646ef4db466..ecb0a45741e1 100644
--- a/content/concepts/module-resolution.md
+++ b/content/concepts/module-resolution.md
@@ -53,31 +53,31 @@ import "module";
 import "module/lib/file";
 ```
 
-Modules are searched for inside all directories specified in [`resolve.modules`](/configuration/resolve/#resolve-modules).
-You can replace the original module path by an alternate path by creating an alias for it using [`resolve.alias`](/configuration/resolve/#resolve-alias) configuration option.
+Modules are searched for inside all directories specified in [`resolve.modules`](/documentation/configuration/resolve/#resolve-modules).
+You can replace the original module path by an alternate path by creating an alias for it using [`resolve.alias`](/documentation/configuration/resolve/#resolve-alias) configuration option.
 
 Once the path is resolved based on the above rule, the resolver checks to see if the path points to a file or a directory. If the path points to a file:
 
 * If the path has a file extension, then the file is bundled straightaway.
-* Otherwise, the file extension is resolved using the [`resolve.extensions`](/configuration/resolve/#resolve-extensions) option, which tells the resolver which extensions (eg - `.js`, `.jsx`) are acceptable for resolution.
+* Otherwise, the file extension is resolved using the [`resolve.extensions`](/documentation/configuration/resolve/#resolve-extensions) option, which tells the resolver which extensions (eg - `.js`, `.jsx`) are acceptable for resolution.
 
 If the path points to a folder, then the following steps are taken to find the right file with the right extension:
 
-* If the folder contains a `package.json` file, then fields specified in [`resolve.mainFields`](/configuration/resolve/#resolve-mainfields) configuration option are looked up in order, and the first such field in `package.json` determines the file path. 
-* If there is no `package.json` or if the main fields do not return a valid path, file names specified in the [`resolve.mainFiles`](/configuration/resolve/#resolve-mainfiles) configuration option are looked for in order, to see if a matching filename exists in the imported/required directory .
+* If the folder contains a `package.json` file, then fields specified in [`resolve.mainFields`](/documentation/configuration/resolve/#resolve-mainfields) configuration option are looked up in order, and the first such field in `package.json` determines the file path. 
+* If there is no `package.json` or if the main fields do not return a valid path, file names specified in the [`resolve.mainFiles`](/documentation/configuration/resolve/#resolve-mainfiles) configuration option are looked for in order, to see if a matching filename exists in the imported/required directory .
 * The file extension is then resolved in a similar way using the `resolve.extensions` option.
 
-webpack provides reasonable [defaults](/configuration/resolve) for these options depending on your build target.
+webpack provides reasonable [defaults](/documentation/configuration/resolve) for these options depending on your build target.
 
 
 ## Resolving Loaders
 
-This follows the same rules as those specified for file resolution. But the [`resolveLoader`](/configuration/resolve/#resolveloader) configuration option can be used to have separate resolution rules for loaders.
+This follows the same rules as those specified for file resolution. But the [`resolveLoader`](/documentation/configuration/resolve/#resolveloader) configuration option can be used to have separate resolution rules for loaders.
 
 
 ## Caching
 
-Every filesystem access is cached, so that multiple parallel or serial requests to the same file occur faster. In [watch mode](/configuration/watch/#watch), only modified files are evicted from the cache. If watch mode is off, then the cache gets purged before every compilation.
+Every filesystem access is cached, so that multiple parallel or serial requests to the same file occur faster. In [watch mode](/documentation/configuration/watch/#watch), only modified files are evicted from the cache. If watch mode is off, then the cache gets purged before every compilation.
 
 
-See [Resolve API](/configuration/resolve) to learn more on the configuration options mentioned above.
+See [Resolve API](/documentation/configuration/resolve) to learn more on the configuration options mentioned above.
diff --git a/content/concepts/modules.md b/content/concepts/modules.md
index 070686209dbe..c83062ef66d4 100644
--- a/content/concepts/modules.md
+++ b/content/concepts/modules.md
@@ -43,4 +43,4 @@ The webpack community has built _loaders_ for a wide variety of popular language
 
 And many others! Overall, webpack provides a powerful and rich API for customization that allows one to use webpack for **any stack**, while staying **non-opinionated** about your development, testing, and production workflows.
 
-For a full list, see [**the list of loaders**](/loaders) or [**write your own**](/api/loaders).
+For a full list, see [**the list of loaders**](/documentation/loaders) or [**write your own**](/documentation/api/loaders).
diff --git a/content/concepts/targets.md b/content/concepts/targets.md
index 279d45292926..d7263d5baba1 100644
--- a/content/concepts/targets.md
+++ b/content/concepts/targets.md
@@ -7,7 +7,7 @@ contributors:
   - johnstew
 ---
 
-Because JavaScript can be written for both server and browser, webpack offers multiple deployment _targets_ that you can set in your webpack [configuration](/configuration).
+Because JavaScript can be written for both server and browser, webpack offers multiple deployment _targets_ that you can set in your webpack [configuration](/documentation/configuration).
 
 W> The webpack `target` property is not to be confused with the `output.libraryTarget` property. For more information see [our guide](/concepts/output) on the `output` property.
 
@@ -25,7 +25,7 @@ module.exports = {
 
 In the example above, using `node` webpack will compile for usage in a Node.js-like environment (uses Node.js `require` to load chunks and not touch any built in modules like `fs` or `path`).
 
-Each _target_ has a variety of deployment/environment specific additions, support to fit its needs. See what [targets are available](/configuration/target).
+Each _target_ has a variety of deployment/environment specific additions, support to fit its needs. See what [targets are available](/documentation/configuration/target).
 
 ?>Further expansion for other popular target values
 
diff --git a/content/configuration/index.md b/content/configuration/index.md
deleted file mode 100644
index fd5b0363d6c9..000000000000
--- a/content/configuration/index.md
+++ /dev/null
@@ -1,429 +0,0 @@
----
-title: Configuration
-sort: 1
-contributors:
-  - sokra
-  - skipjack
-  - grgur
-  - bondz
-  - sricc
-  - terinjokes
-  - mattce
-  - kbariotis
----
-
-webpack is fed via a configuration object. It is passed in one of two ways depending on how you are using webpack: through the terminal or via Node.js. All the available configuration options are specified below.
-
-T> New to webpack? Check out our guide to some of webpack's [core concepts](/concepts) to get started!
-
-T> Notice that throughout the configuration we use Node's built-in [path module](https://nodejs.org/api/path.html) and prefix it with the [__dirname](https://nodejs.org/docs/latest/api/globals.html#globals_dirname) global. This prevents file path issues between operating systems and allows relative paths to work as expected. See [this section](https://nodejs.org/api/path.html#path_windows_vs_posix) for more info on POSIX vs. Windows paths.
-
-## Options
-
-``` js-with-links-with-details
-const path = require('path');
-
-module.exports = {
-  // click on the name of the option to get to the detailed documentation
-  // click on the items with arrows to show more examples / advanced options
-
-  <details><summary>[entry](/configuration/entry-context#entry): "./app/entry", // string | object | array</summary>
-  [entry](/configuration/entry-context#entry): ["./app/entry1", "./app/entry2"],
-  [entry](/configuration/entry-context#entry): {
-    a: "./app/entry-a",
-    b: ["./app/entry-b1", "./app/entry-b2"]
-  },
-  </details>
-  // Here the application starts executing
-  // and webpack starts bundling
-
-  [output](/configuration/output): {
-    // options related to how webpack emits results
-
-    [path](/configuration/output#output-path): path.resolve(__dirname, "dist"), // string
-    // the target directory for all output files
-    // must be an absolute path (use the Node.js path module)
-
-    <details><summary>[filename](/configuration/output#output-filename): "bundle.js", // string</summary>
-    [filename](/configuration/output#output-filename): "[name].js", // for multiple entry points
-    [filename](/configuration/output#output-filename): "[chunkhash].js", // for [long term caching](/guides/caching)
-    </details>
-    // the filename template for entry chunks
-
-    <details><summary>[publicPath](/configuration/output#output-publicpath): "/assets/", // string</summary>
-    [publicPath](/configuration/output#output-publicpath): "",
-    [publicPath](/configuration/output#output-publicpath): "https://cdn.example.com/",
-    </details>
-    // the url to the output directory resolved relative to the HTML page
-
-    [library](/configuration/output#output-library): "MyLibrary", // string,
-    // the name of the exported library
-
-    <details><summary>[libraryTarget](/configuration/output#output-librarytarget): "umd", // universal module definition</summary>
-        [libraryTarget](/configuration/output#output-librarytarget): "umd2", // universal module definition
-        [libraryTarget](/configuration/output#output-librarytarget): "commonjs2", // exported with module.exports
-        [libraryTarget](/configuration/output#output-librarytarget): "commonjs-module", // exports with module.exports
-        [libraryTarget](/configuration/output#output-librarytarget): "commonjs", // exported as properties to exports
-        [libraryTarget](/configuration/output#output-librarytarget): "amd", // defined with AMD defined method
-        [libraryTarget](/configuration/output#output-librarytarget): "this", // property set on this
-        [libraryTarget](/configuration/output#output-librarytarget): "var", // variable defined in root scope
-        [libraryTarget](/configuration/output#output-librarytarget): "assign", // blind assignment
-        [libraryTarget](/configuration/output#output-librarytarget): "window", // property set to window object
-        [libraryTarget](/configuration/output#output-librarytarget): "global", // property set to global object
-        [libraryTarget](/configuration/output#output-librarytarget): "jsonp", // jsonp wrapper
-    </details>
-    // the type of the exported library
-
-    <details><summary>/* Advanced output configuration (click to show) */</summary>
-
-    [pathinfo](/configuration/output#output-pathinfo): true, // boolean
-    // include useful path info about modules, exports, requests, etc. into the generated code
-
-    [chunkFilename](/configuration/output#output-chunkfilename): "[id].js",
-    [chunkFilename](/configuration/output#output-chunkfilename): "[chunkhash].js", // for [long term caching](/guides/caching)
-    // the filename template for additional chunks
-
-    [jsonpFunction](/configuration/output#output-jsonpfunction): "myWebpackJsonp", // string
-    // name of the JSONP function used to load chunks
-
-    [sourceMapFilename](/configuration/output#output-sourcemapfilename): "[file].map", // string
-    [sourceMapFilename](/configuration/output#output-sourcemapfilename): "sourcemaps/[file].map", // string
-    // the filename template of the source map location
-
-    [devtoolModuleFilenameTemplate](/configuration/output#output-devtoolmodulefilenametemplate): "webpack:///[resource-path]", // string
-    // the name template for modules in a devtool
-
-    [devtoolFallbackModuleFilenameTemplate](/configuration/output#output-devtoolfallbackmodulefilenametemplate): "webpack:///[resource-path]?[hash]", // string
-    // the name template for modules in a devtool (used for conflicts)
-
-    [umdNamedDefine](/configuration/output#output-umdnameddefine): true, // boolean
-    // use a named AMD module in UMD library
-
-    [crossOriginLoading](/configuration/output#output-crossoriginloading): "use-credentials", // enum
-    [crossOriginLoading](/configuration/output#output-crossoriginloading): "anonymous",
-    [crossOriginLoading](/configuration/output#output-crossoriginloading): false,
-    // specifies how cross origin request are issued by the runtime
-
-    <details><summary>/* Expert output configuration (on own risk) */</summary>
-
-    [devtoolLineToLine](/configuration/output#output-devtoollinetoline): {
-      test: /\.jsx$/
-    },
-    // use a simple 1:1 mapped SourceMaps for these modules (faster)
-
-    [hotUpdateMainFilename](/configuration/output#output-hotupdatemainfilename): "[hash].hot-update.json", // string
-    // filename template for HMR manifest
-
-    [hotUpdateChunkFilename](/configuration/output#output-hotupdatechunkfilename): "[id].[hash].hot-update.js", // string
-    // filename template for HMR chunks
-
-    [sourcePrefix](/configuration/output#output-sourceprefix): "\t", // string
-    // prefix module sources in bundle for better readablitity
-    </details>
-    </details>
-  },
-
-  [module](/configuration/module): {
-    // configuration regarding modules
-
-    [rules](/configuration/module#module-rules): [
-      // rules for modules (configure loaders, parser options, etc.)
-
-      {
-        [test](/configuration/module#rule-test): /\.jsx?$/,
-        [include](/configuration/module#rule-include): [
-          path.resolve(__dirname, "app")
-        ],
-        [exclude](/configuration/module#rule-exclude): [
-          path.resolve(__dirname, "app/demo-files")
-        ],
-        // these are matching conditions, each accepting a regular expression or string
-        // test and include have the same behavior, both must be matched
-        // exclude must not be matched (takes preferrence over test and include)
-        // Best practices:
-        // - Use RegExp only in test and for filename matching
-        // - Use arrays of absolute paths in include and exclude
-        // - Try to avoid exclude and prefer include
-
-        [issuer](/configuration/module#rule-issuer): { test, include, exclude },
-        // conditions for the issuer (the origin of the import)
-
-        [enforce](/configuration/module#rule-enforce): "pre",
-        [enforce](/configuration/module#rule-enforce): "post",
-        // flags to apply these rules, even if they are overridden (advanced option)
-
-        [loader](/configuration/module#rule-loader): "babel-loader",
-        // the loader which should be applied, it'll be resolved relative to the context
-        // -loader suffix is no longer optional in webpack2 for clarity reasons
-        // see [webpack 1 upgrade guide](/guides/migrating)
-
-        [options](/configuration/module#rule-options-rule-query): {
-          presets: ["es2015"]
-        },
-        // options for the loader
-      },
-
-      {
-        [test](/configuration/module#rule-test): "\.html$",
-
-        [use](/configuration/module#rule-use): [
-          // apply multiple loaders and options
-          "htmllint-loader",
-          {
-            loader: "html-loader",
-            options: {
-              /* ... */
-            }
-          }
-        ]
-      },
-
-      { [oneOf](/configuration/module#rule-oneof): [ /* rules */ ] },
-      // only use one of these nested rules
-
-      { [rules](/configuration/module#rule-rules): [ /* rules */ ] },
-      // use all of these nested rules (combine with conditions to be useful)
-
-      { [resource](/configuration/module#rule-resource): { [and](/configuration/module#condition): [ /* conditions */ ] } },
-      // matches only if all conditions are matched
-
-      { [resource](/configuration/module#rule-resource): { [or](/configuration/module#condition): [ /* conditions */ ] } },
-      { [resource](/configuration/module#rule-resource): [ /* conditions */ ] },
-      // matches if any condition is matched (default for arrays)
-
-      { [resource](/configuration/module#rule-resource): { [not](/configuration/module#condition): /* condition */ } }
-      // matches if the condition is not matched
-    ],
-
-    <details><summary>/* Advanced module configuration (click to show) */</summary>
-
-    [noParse](/configuration/module#module-noparse): [
-      /special-library\.js$/
-    ],
-    // do not parse this module
-
-    unknownContextRequest: ".",
-    unknownContextRecursive: true,
-    unknownContextRegExp: /^\.\/.*$/,
-    unknownContextCritical: true,
-    exprContextRequest: ".",
-    exprContextRegExp: /^\.\/.*$/,
-    exprContextRecursive: true,
-    exprContextCritical: true,
-    wrappedContextRegExp: /.*/,
-    wrappedContextRecursive: true,
-    wrappedContextCritical: false,
-    // specifies default behavior for dynamic requests
-    </details>
-  },
-
-  [resolve](/configuration/resolve): {
-    // options for resolving module requests
-    // (does not apply to resolving to loaders)
-
-    [modules](/configuration/resolve#resolve-modules): [
-      "node_modules",
-      path.resolve(__dirname, "app")
-    ],
-    // directories where to look for modules
-
-    [extensions](/configuration/resolve#resolve-extensions): [".js", ".json", ".jsx", ".css"],
-    // extensions that are used
-
-    [alias](/configuration/resolve#resolve-alias): {
-      // a list of module name aliases
-
-      "module": "new-module",
-      // alias "module" -> "new-module" and "module/path/file" -> "new-module/path/file"
-
-      "only-module$": "new-module",
-      // alias "only-module" -> "new-module", but not "module/path/file" -> "new-module/path/file"
-
-      "module": path.resolve(__dirname, "app/third/module.js"),
-      // alias "module" -> "./app/third/module.js" and "module/file" results in error
-      // modules aliases are imported relative to the current context
-    },
-    <details><summary>/* alternative alias syntax (click to show) */</summary>
-    [alias](/configuration/resolve#resolve-alias): [
-      {
-        name: "module",
-        // the old request
-
-        alias: "new-module",
-        // the new request
-
-        onlyModule: true
-        // if true only "module" is aliased
-        // if false "module/inner/path" is also aliased
-      }
-    ],
-    </details>
-
-    <details><summary>/* Advanced resolve configuration (click to show) */</summary>
-
-    [symlinks](/configuration/resolve#resolve-symlinks): true,
-    // follow symlinks to new location
-
-    [descriptionFiles](/configuration/resolve#resolve-descriptionfiles): ["package.json"],
-    // files that are read for package description
-
-    [mainFields](/configuration/resolve#resolve-mainfields): ["main"],
-    // properties that are read from description file
-    // when a folder is requested
-
-    [aliasFields](/configuration/resolve#resolve-aliasfields): ["browser"],
-    // properites that are read from description file
-    // to alias requests in this package
-
-    [enforceExtension](/configuration/resolve#resolve-enforceextension): false,
-    // if true request must not include an extensions
-    // if false request may already include an extension
-
-    [moduleExtensions](/configuration/resolve#resolveloader-moduleextensions): ["-module"],
-    [enforceModuleExtension](/configuration/resolve#resolve-enforcemoduleextension): false,
-    // like extensions/enforceExtension but for module names instead of files
-
-    [unsafeCache](/configuration/resolve#resolve-unsafecache): true,
-    [unsafeCache](/configuration/resolve#resolve-unsafecache): {},
-    // enables caching for resolved requests
-    // this is unsafe as folder structure may change
-    // but performance improvement is really big
-
-    [cachePredicate](/configuration/resolve#resolve-cachepredicate): (path, request) => true,
-    // predicate function which selects requests for caching
-
-    [plugins](/configuration/resolve#resolve-plugins): [
-      // ...
-    ]
-    // additional plugins applied to the resolver
-    </details>
-  },
-
-  [performance](/configuration/performance): {
-    <details><summary>[hints](/configuration/performance#performance-hints): "warning", // enum </summary>
-    [hints](/configuration/performance#performance-hints): "error", // emit errors for perf hints
-    [hints](/configuration/performance#performance-hints): false, // turn off perf hints
-    </details>
-    [maxAssetSize](/configuration/performance#performance-maxassetsize): 200000, // int (in bytes),
-    [maxEntrypointSize](/configuration/performance#performance-maxentrypointsize): 400000, // int (in bytes)
-    [assetFilter](/configuration/performance#performance-assetfilter): function(assetFilename) { 
-      // Function predicate that provides asset filenames
-      return assetFilename.endsWith('.css') || assetFilename.endsWith('.js');
-    }
-  },
-
-  <details><summary>[devtool](/configuration/devtool): "source-map", // enum </summary>
-  [devtool](/configuration/devtool): "inline-source-map", // inlines SourceMap into original file
-  [devtool](/configuration/devtool): "eval-source-map", // inlines SourceMap per module
-  [devtool](/configuration/devtool): "hidden-source-map", // SourceMap without reference in original file
-  [devtool](/configuration/devtool): "cheap-source-map", // cheap-variant of SourceMap without module mappings
-  [devtool](/configuration/devtool): "cheap-module-source-map", // cheap-variant of SourceMap with module mappings
-  [devtool](/configuration/devtool): "eval", // no SourceMap, but named modules. Fastest at the expense of detail. 
-  </details>
-  // enhance debugging by adding meta info for the browser devtools
-  // source-map most detailed at the expense of build speed.
-
-  [context](/configuration/entry-context#context): __dirname, // string (absolute path!)
-  // the home directory for webpack
-  // the [entry](/configuration/entry-context) and [module.rules.loader](/configuration/module#rule-loader) option
-  //   is resolved relative to this directory
-
-  <details><summary>[target](/configuration/target): "web", // enum</summary>
-  [target](/configuration/target): "webworker", // WebWorker
-  [target](/configuration/target): "node", // Node.js via require
-  [target](/configuration/target): "async-node", // Node.js via fs and vm
-  [target](/configuration/target): "node-webkit", // nw.js
-  [target](/configuration/target): "electron-main", // electron, main process
-  [target](/configuration/target): "electron-renderer", // electron, renderer process
-  [target](/configuration/target): (compiler) => { /* ... */ }, // custom
-  </details>
-  // the environment in which the bundle should run
-  // changes chunk loading behavior and available modules
-
-  <details><summary>[externals](/configuration/externals): ["react", /^@angular\//],</summary>
-  [externals](/configuration/externals): "react", // string (exact match)
-  [externals](/configuration/externals): /^[a-z\-]+($|\/)/, // Regex
-  [externals](/configuration/externals): { // object
-    angular: "this angular", // this["angular"]
-    react: { // UMD
-      commonjs: "react",
-      commonjs2: "react",
-      amd: "react",
-      root: "React"
-    }
-  },
-  [externals](/configuration/externals): (request) => { /* ... */ return "commonjs " + request }
-  </details>
-  // Don't follow/bundle these modules, but request them at runtime from the environment
-
-  <details><summary>[stats](/configuration/stats): "errors-only",</summary>
-  [stats](/configuration/stats): { //object
-    assets: true,
-    colors: true,
-    errors: true,
-    errorDetails: true,
-    hash: true,
-    // ...
-  },
-  </details>
-  // lets you precisely control what bundle information gets displayed
-
-  [devServer](/configuration/dev-server): {
-    proxy: { // proxy URLs to backend development server
-      '/api': 'http://localhost:3000'
-    },
-    contentBase: path.join(__dirname, 'public'), // boolean | string | array, static file location
-    compress: true, // enable gzip compression
-    historyApiFallback: true, // true for index.html upon 404, object for multiple paths
-    hot: true, // hot module replacement. Depends on HotModuleReplacementPlugin
-    https: false, // true for self-signed, object for cert authority
-    noInfo: true, // only errors & warns on hot reload
-    // ...
-  },
-
-  [plugins](plugins): [
-    // ...
-  ],
-  // list of additional plugins
-  
-  
-  <details><summary>/* Advanced configuration (click to show) */</summary>
-
-  [resolveLoader](/configuration/resolve#resolveloader): { /* same as resolve */ }
-  // separate resolve options for loaders
-
-  [profile](other-options#profile): true, // boolean
-  // capture timing information
-  
-  [bail](other-options#bail): true, //boolean
-  // fail out on the first error instead of tolerating it.
-  
-  [cache](other-options#cache): false, // boolean
-  // disable/enable caching
-
-  [watch](watch#watch): true, // boolean
-  // enables watching
-
-  [watchOptions](watch#watchoptions): {
-    [aggregateTimeout](watch#watchoptions-aggregatetimeout): 1000, // in ms
-    // aggregates multiple changes to a single rebuild
-
-    [poll](watch#watchoptions-poll): true,
-    [poll](watch#watchoptions-poll): 500, // intervall in ms
-    // enables polling mode for watching
-    // must be used on filesystems that doesn't notify on change
-    // i. e. nfs shares
-  },
-
-  [node](node): {
-    /* TODO */
-  },
-
-  [recordsPath](other-options#recordspath): path.resolve(__dirname, "build/records.json"),
-  [recordsInputPath](other-options#recordsinputpath): path.resolve(__dirname, "build/records.json"),
-  [recordsOutputPath](other-options#recordsoutputpath): path.resolve(__dirname, "build/records.json"),
-  // TODO
-
-  </details>
-}
-```
diff --git a/content/development/index.md b/content/development/index.md
deleted file mode 100644
index f245c10538ee..000000000000
--- a/content/development/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Development
-contributors:
-  - rouzbeh84
----
-
-These guides cover what you need to know in order to develop webpack.
-
-*   [Release Process](./release-process)
-*   [Plugin Patterns](./plugin-patterns)
-*   [How To Write A Plugin](./how-to-write-a-plugin)
-*   [How To Write A Loader](./how-to-write-a-loader)
diff --git a/content/api/cli.md b/content/documentation/api/cli.md
similarity index 84%
rename from content/api/cli.md
rename to content/documentation/api/cli.md
index ceed10e1ea84..da13b5468a52 100644
--- a/content/api/cli.md
+++ b/content/documentation/api/cli.md
@@ -21,7 +21,7 @@ T> The new CLI for webpack is under development. New features are being added su
 webpack [--config webpack.config.js]
 ```
 
-See [configuration](/configuration) for the options in the configuration file.
+See [configuration](/documentation/configuration) for the options in the configuration file.
 
 
 ## Usage without config file
@@ -59,11 +59,11 @@ webpack src/index.js dist/bundle.js
 This will bundle your source code with entry as `index.js` and the output bundle file will have a path of `dist` and the filename will be `bundle.js`
 
 ```bash
-	| Asset     | Size    | Chunks      | Chunk Names |
-	|-----------|---------|-------------|-------------|
-	| bundle.js | 1.54 kB | 0 [emitted] | index       |
-	[0] ./src/index.js 51 bytes {0} [built]
-	[1] ./src/others.js 29 bytes {0} [built]
+    | Asset     | Size    | Chunks      | Chunk Names |
+    |-----------|---------|-------------|-------------|
+    | bundle.js | 1.54 kB | 0 [emitted] | index       |
+    [0] ./src/index.js 51 bytes {0} [built]
+    [1] ./src/others.js 29 bytes {0} [built]
 ```
 
 ```bash
@@ -73,12 +73,12 @@ webpack index=./src/index.js entry2=./src/index2.js dist/bundle.js
 This will form the bundle with both the files as separate entry points.
 
 ```bash
-	| Asset     | Size    | Chunks        | Chunk Names   |
-	|-----------|---------|---------------|---------------|
-	| bundle.js | 1.55 kB | 0,1 [emitted] | index, entry2 |
-	[0] ./src/index.js 51 bytes {0} [built]
-	[0] ./src/index2.js 54 bytes {1} [built]
-	[1] ./src/others.js 29 bytes {0} {1} [built]
+    | Asset     | Size    | Chunks        | Chunk Names   |
+    |-----------|---------|---------------|---------------|
+    | bundle.js | 1.55 kB | 0,1 [emitted] | index, entry2 |
+    [0] ./src/index.js 51 bytes {0} [built]
+    [0] ./src/index2.js 54 bytes {1} [built]
+    [1] ./src/others.js 29 bytes {0} {1} [built]
 ```
 
 
@@ -93,7 +93,7 @@ webpack -h
 
 **Build source using a config file**
 
-Specifies a different [configuration](/configuration) file to pick up. Use this if you want to specify something different than `webpack.config.js`, which is the default.
+Specifies a different [configuration](/documentation/configuration) file to pick up. Use this if you want to specify something different than `webpack.config.js`, which is the default.
 
 ```bash
 webpack --config example.config.js
@@ -101,7 +101,7 @@ webpack --config example.config.js
 
 **Specify build environment**
 
-Send [environment](/configuration/configuration-types) variable to be used in webpack config file.
+Send [environment](/documentation/configuration/configuration-types) variable to be used in webpack config file.
 
 
 ```bash
@@ -131,7 +131,7 @@ The analyse tool will take in the JSON and provide all the details of the build
 
 ### Output Options
 
-This set of options allows you to manipulate certain [output](/configuration/output) parameters of your build.
+This set of options allows you to manipulate certain [output](/documentation/configuration/output) parameters of your build.
 
 | Parameter                    | Explanation                                                     | Input type | Default value                                         |
 |------------------------------|-----------------------------------------------------------------|------------|-------------------------------------------------------|
@@ -155,9 +155,9 @@ webpack index=./src/index.js index2=./src/index2.js --output-path='./dist' --out
 |--------------------------------------|---------|-------------|---------------|
 | index2740fdca26e9348bedbec.bundle.js |  2.6 kB | 0 [emitted] | index2        |
 | index740fdca26e9348bedbec.bundle.js  | 2.59 kB | 1 [emitted] | index         |
-	[0] ./src/others.js 29 bytes {0} {1} [built]
-	[1] ./src/index.js 51 bytes {1} [built]
-	[2] ./src/index2.js 54 bytes {0} [built]
+    [0] ./src/others.js 29 bytes {0} {1} [built]
+    [1] ./src/index.js 51 bytes {1} [built]
+    [2] ./src/index2.js 54 bytes {0} [built]
 ```
 
 ```bash
@@ -169,9 +169,9 @@ webpack.js index=./src/index.js index2=./src/index2.js --output-path='./dist' --
 |  index740fdca26e9348bedbec.bundle.js | 2.74 kB | 1 [emitted] | index         |
 |                        index2123.map | 2.95 kB | 0 [emitted] | index2        |
 |                         index123.map | 2.95 kB | 1 [emitted] | index         |
-	[0] ./src/others.js 29 bytes {0} {1} [built]
-	[1] ./src/index.js 51 bytes {1} [built]
-	[2] ./src/index2.js 54 bytes {0} [built]
+    [0] ./src/others.js 29 bytes {0} {1} [built]
+    [1] ./src/index.js 51 bytes {1} [built]
+    [2] ./src/index2.js 54 bytes {0} [built]
 ```
 
 
@@ -182,13 +182,13 @@ This set of options allows you to better debug the application containing assets
 | Parameter  | Explanation                                      | Input type | Default value |
 |------------|--------------------------------------------------|------------|---------------|
 | --debug    | Switch loaders to debug mode                     | boolean    | false         |
-| --devtool  | Define [source map type](/configuration/devtool/) for the bundled resources | string     | -             |
+| --devtool  | Define [source map type](/documentation/configuration/devtool/) for the bundled resources | string     | -             |
 | --progress | Print compilation progress in percentage         | boolean    | false         |
 
 
 ### Module Options
 
-These options allow you to bind [modules](/configuration/module/) as allowed by webpack
+These options allow you to bind [modules](/documentation/configuration/module/) as allowed by webpack
 
 | Parameter          | Explanation                        | Usage                       |
 |--------------------|------------------------------------|-----------------------------|
@@ -199,7 +199,7 @@ These options allow you to bind [modules](/configuration/module/) as allowed by
 
 ### Watch Options
 
-These options makes the build [watch](/configuration/watch/) for changes in files of the dependency graph and perform the build again.
+These options makes the build [watch](/documentation/configuration/watch/) for changes in files of the dependency graph and perform the build again.
 
 | Parameter                 | Explanation                                             |
 |---------------------------|---------------------------------------------------------|
@@ -216,14 +216,14 @@ These options allow you to manipulate optimisations for a production build using
 
 | Parameter                 | Explanation                                            | Plugin used                          |
 |---------------------------|--------------------------------------------------------|--------------------------------------|
-| --optimize-max-chunks     | Try to keep the chunk count below a limit              | [LimitChunkCountPlugin](/plugins/limit-chunk-count-plugin) |
-| --optimize-min-chunk-size | Try to keep the chunk size above a limit               | [MinChunkSizePlugin](/plugins/min-chunk-size-plugin) |
-| --optimize-minimize       | Minimize javascript and switches loaders to minimizing | [UglifyJsPlugin](/plugins/uglifyjs-webpack-plugin/) & [LoaderOptionsPlugin](/plugins/loader-options-plugin/) |
+| --optimize-max-chunks     | Try to keep the chunk count below a limit              | [LimitChunkCountPlugin](/documentation/plugins/limit-chunk-count-plugin) |
+| --optimize-min-chunk-size | Try to keep the chunk size above a limit               | [MinChunkSizePlugin](/documentation/plugins/min-chunk-size-plugin) |
+| --optimize-minimize       | Minimize javascript and switches loaders to minimizing | [UglifyJsPlugin](/documentation/plugins/uglifyjs-webpack-plugin/) & [LoaderOptionsPlugin](/documentation/plugins/loader-options-plugin/) |
 
 
 ### Resolve Options
 
-These allow you to configure the webpack [resolver](/configuration/resolve/) with aliases and extensions.
+These allow you to configure the webpack [resolver](/documentation/configuration/resolve/) with aliases and extensions.
 
 | Parameter              | Explanation                                             | Example                                     |
 |------------------------|---------------------------------------------------------|---------------------------------------------|
@@ -234,7 +234,7 @@ These allow you to configure the webpack [resolver](/configuration/resolve/) wit
 
 ### Stats Options
 
-These options allow webpack to display various [stats](/configuration/stats/) and style them differently in the console output.
+These options allow webpack to display various [stats](/documentation/configuration/stats/) and style them differently in the console output.
 
 | Parameter               | Explanation                                                        | Type    |
 |-------------------------|--------------------------------------------------------------------|---------|
@@ -265,13 +265,13 @@ These options allow webpack to display various [stats](/configuration/stats/) an
 | --define              | Define any free var in the bundle, see [shimming](/guides/shimming) | --define process.env.NODE_ENV='development' |
 | --hot                 | Enables [Hot Module Replacement](/concepts/hot-module-replacement) [Uses HotModuleReplacementPlugin] | --hot=true                                  |
 | --labeled-modules     | Enables labeled modules [Uses LabeledModulesPlugin]              |                                             |
-| --plugin              | Load this [plugin](/configuration/plugins/)                      |                                             |
+| --plugin              | Load this [plugin](/documentation/configuration/plugins/)                      |                                             |
 | --prefetch            | Prefetch the particular file                                     | --prefetch=./files.js                       |
 | --provide             | Provide these modules as free vars in all modules, see [shimming](/guides/shimming) | --provide jQuery=jquery                     |
 | --records-input-path  | Path to the records file (reading)                               |                                             |
 | --records-output-path | Path to the records file (writing)                               |                                             |
 | --records-path        | Path to the records file                                         |                                             |
-| --target              | The [targeted](/configuration/target/) execution environment     | --target='node'                             |
+| --target              | The [targeted](/documentation/configuration/target/) execution environment     | --target='node'                             |
 
 ### Shortcuts
 
diff --git a/content/documentation/api/index.md b/content/documentation/api/index.md
new file mode 100644
index 000000000000..8e7316ce469c
--- /dev/null
+++ b/content/documentation/api/index.md
@@ -0,0 +1,15 @@
+---
+title: API
+sort: 1
+contributors:
+  - skipjack
+---
+
+As webpack is such a versatile tool, it provides a variety of interfaces. Which interface you use depends on what your goal is. When using webpack to compile, bundle and analyze a project, you would most likely use the [CLI](/documentation/api/cli) or [NodeJS interface](/documentation/api/node) along with a configuration file. However, if the goal is to write a plugin or loader, you would be working with the [loader](/documentation/api/loaders) or [plugin](/documentation/api/plugins) interfaces.
+
+These are the various interfaces webpack exposes:
+
+* [CLI](/documentation/api/cli)
+* [Node](/documentation/api/node)
+* [Loaders](/documentation/api/loaders)
+* [Plugins](/documentation/api/plugins)
diff --git a/content/api/loaders.md b/content/documentation/api/loaders.md
similarity index 98%
rename from content/api/loaders.md
rename to content/documentation/api/loaders.md
index 3b54086c1c52..1e3bffc29f95 100644
--- a/content/api/loaders.md
+++ b/content/documentation/api/loaders.md
@@ -139,7 +139,7 @@ In the example: `"/abc/loader1.js?xyz!/abc/node_modules/loader2/index.js!/abc/re
 
 ### `this.query`
 
-1. In case the loader was configured with an [`options`](/configuration/module/#useentry) object, this will be a reference to the object.
+1. In case the loader was configured with an [`options`](/documentation/configuration/module/#useentry) object, this will be a reference to the object.
 2. If the loader has no `options`, but was invoked with a query string, this will be a string starting with `?`.
 
 T> Use the [`getOptions` method from the `loader-utils`](https://github.com/webpack/loader-utils#getoptions) to extract the given loader options.
diff --git a/content/api/node.md b/content/documentation/api/node.md
similarity index 82%
rename from content/api/node.md
rename to content/documentation/api/node.md
index 32dc7eb377ff..bf0b1ec58c9a 100644
--- a/content/api/node.md
+++ b/content/documentation/api/node.md
@@ -8,7 +8,7 @@ contributors:
 
 webpack provides a Node.js API which can be used directly in Node.js runtime.
 
-The Node.js API is useful in scenarios in which you need to customize the build or development process since all the reporting and error handling must be done manually and webpack only does the compiling part. For this reason the [`stats`](/configuration/stats) configuration options will not have any effect in the `webpack()` call.
+The Node.js API is useful in scenarios in which you need to customize the build or development process since all the reporting and error handling must be done manually and webpack only does the compiling part. For this reason the [`stats`](/documentation/configuration/stats) configuration options will not have any effect in the `webpack()` call.
 
 
 ## Installation
@@ -31,13 +31,13 @@ import webpack from "webpack";
 
 ## `webpack()`
 
-The imported `webpack` function is fed a webpack [Configuration Object](/configuration/) and runs the webpack compiler if a callback function is provided:
+The imported `webpack` function is fed a webpack [Configuration Object](/documentation/configuration/) and runs the webpack compiler if a callback function is provided:
 
 ``` js-with-links
 const webpack = require("webpack");
 
 webpack({
-  // [Configuration Object](/configuration/)
+  // [Configuration Object](/documentation/configuration/)
 }, (err, [stats](#stats-object)) => {
   if (err || stats.hasErrors()) {
     // [Handle errors here](#error-handling)
@@ -65,7 +65,7 @@ T> webpack will **not** run the multiple configurations in parallel. Each config
 
 ## Compiler Instance
 
-If you don’t pass the `webpack` runner function a callback, it will return a webpack `Compiler` instance. This instance can be used to manually trigger the webpack runner or have it build and watch for changes. Much like the [CLI](/api/cli/) Api. The `Compiler` instance provides the following methods:
+If you don’t pass the `webpack` runner function a callback, it will return a webpack `Compiler` instance. This instance can be used to manually trigger the webpack runner or have it build and watch for changes. Much like the [CLI](/documentation/api/cli/) Api. The `Compiler` instance provides the following methods:
 
 * `.run(callback)`
 * `.watch(watchOptions, handler)`
@@ -79,7 +79,7 @@ Calling the `run` method on the `Compiler` instance is much like the quick run m
 const webpack = require("webpack");
 
 const compiler = webpack({
-  // [Configuration Object](/configuration/)
+  // [Configuration Object](/documentation/configuration/)
 });
 
 compiler.run((err, [stats](#stats-object)) => {
@@ -100,11 +100,11 @@ watch(watchOptions, callback)
 const webpack = require("webpack");
 
 const compiler = webpack({
-  // [Configuration Object](/configuration/)
+  // [Configuration Object](/documentation/configuration/)
 });
 
 const watching = compiler.watch({
-  <details><summary>/* [watchOptions](/configuration/watch/#watchoptions) */</summary>
+  <details><summary>/* [watchOptions](/documentation/configuration/watch/#watchoptions) */</summary>
   aggregateTimeout: 300,
   poll: undefined
   </details>
@@ -114,7 +114,7 @@ const watching = compiler.watch({
 });
 ```
 
-`Watching` options are [covered in detail here](/configuration/watch/#watchoptions).
+`Watching` options are [covered in detail here](/documentation/configuration/watch/#watchoptions).
 
 
 ### Close `Watching`
@@ -147,7 +147,7 @@ The `stats` object that is passed as a second argument of the [`webpack()`](#web
 * Module and Chunk information
 * and much more...
 
-The [webpack CLI](/api/cli) uses this information to display a nicely formatted output in your console.
+The [webpack CLI](/documentation/api/cli) uses this information to display a nicely formatted output in your console.
 
 This object exposes these methods:
 
@@ -167,7 +167,7 @@ Can be used to check if there were warnings while compiling. Returns `true` or `
 Returns compilation information as a JSON object. `options` can be either a string (a preset) or an object for more granular control:
 
 ``` js-with-links
-stats.toJson("minimal"); // [more options: "verbose", etc](/configuration/stats).
+stats.toJson("minimal"); // [more options: "verbose", etc](/documentation/configuration/stats).
 ```
 
 ``` js
@@ -177,16 +177,16 @@ stats.toJson({
 });
 ```
 
-All available options and presets are described in [Stats documentation](/configuration/stats)
+All available options and presets are described in [Stats documentation](/documentation/configuration/stats)
 
 > Here’s [an example of this function’s output](https://github.com/webpack/analyse/blob/master/app/pages/upload/example.json)
 
 
 ### `stats.toString(options)`
 
-Returns a formatted string of the compilation information (similar to [CLI](/api/cli) output).
+Returns a formatted string of the compilation information (similar to [CLI](/documentation/api/cli) output).
 
-Options are the same as [`stats.toJson(options)`](/api/node#stats-tojson-options-) with one addition:
+Options are the same as [`stats.toJson(options)`](/documentation/api/node#stats-tojson-options-) with one addition:
 
 ``` js
 stats.toString({
@@ -202,7 +202,7 @@ Here’s an example of `stats.toString()` usage:
 const webpack = require("webpack");
 
 webpack({
-  // [Configuration Object](/configuration/)
+  // [Configuration Object](/documentation/configuration/)
 }, (err, stats) => {
   if (err) {
     console.error(err);
@@ -231,7 +231,7 @@ Here’s an example that does all that:
 const webpack = require("webpack");
 
 webpack({
-  // [Configuration Object](/configuration/)
+  // [Configuration Object](/documentation/configuration/)
 }, (err, stats) => {
   if (err) {
     console.error(err.stack || err);
diff --git a/content/api/plugins/compilation.md b/content/documentation/api/plugins/compilation.md
similarity index 100%
rename from content/api/plugins/compilation.md
rename to content/documentation/api/plugins/compilation.md
diff --git a/content/api/plugins/compiler.md b/content/documentation/api/plugins/compiler.md
similarity index 100%
rename from content/api/plugins/compiler.md
rename to content/documentation/api/plugins/compiler.md
diff --git a/content/api/plugins/dependency.md b/content/documentation/api/plugins/dependency.md
similarity index 100%
rename from content/api/plugins/dependency.md
rename to content/documentation/api/plugins/dependency.md
diff --git a/content/api/plugins/index.md b/content/documentation/api/plugins/index.md
similarity index 97%
rename from content/api/plugins/index.md
rename to content/documentation/api/plugins/index.md
index de21e720808d..af6192609794 100644
--- a/content/api/plugins/index.md
+++ b/content/documentation/api/plugins/index.md
@@ -3,7 +3,7 @@ title: Plugin API
 sort: 1
 ---
 
-T> For a high-level introduction to writing plugins, start with [How to write a plugin](/development/how-to-write-a-plugin).
+T> For a high-level introduction to writing plugins, start with [How to write a plugin](/documentation/development/how-to-write-a-plugin).
 
 webpack provides flexible and powerful customization api in the form of plugins. Using plugins, we can plug functionality into webpack. Additionally, webpack provides lifecycle hooks into which plugins can be registered. At each of these lifecycle points, webpack will run all of the registered plugins and provide them with the current state of the webpack compilation.
 
diff --git a/content/api/plugins/module-factories.md b/content/documentation/api/plugins/module-factories.md
similarity index 100%
rename from content/api/plugins/module-factories.md
rename to content/documentation/api/plugins/module-factories.md
diff --git a/content/api/plugins/parser.md b/content/documentation/api/plugins/parser.md
similarity index 100%
rename from content/api/plugins/parser.md
rename to content/documentation/api/plugins/parser.md
diff --git a/content/api/plugins/resolver.md b/content/documentation/api/plugins/resolver.md
similarity index 100%
rename from content/api/plugins/resolver.md
rename to content/documentation/api/plugins/resolver.md
diff --git a/content/api/plugins/tapable.md b/content/documentation/api/plugins/tapable.md
similarity index 100%
rename from content/api/plugins/tapable.md
rename to content/documentation/api/plugins/tapable.md
diff --git a/content/api/plugins/template.md b/content/documentation/api/plugins/template.md
similarity index 100%
rename from content/api/plugins/template.md
rename to content/documentation/api/plugins/template.md
diff --git a/content/configuration/configuration-languages.md b/content/documentation/configuration/configuration-languages.md
similarity index 100%
rename from content/configuration/configuration-languages.md
rename to content/documentation/configuration/configuration-languages.md
diff --git a/content/configuration/configuration-types.md b/content/documentation/configuration/configuration-types.md
similarity index 95%
rename from content/configuration/configuration-types.md
rename to content/documentation/configuration/configuration-types.md
index 0f18ad472e40..538d79490205 100644
--- a/content/configuration/configuration-types.md
+++ b/content/documentation/configuration/configuration-types.md
@@ -51,7 +51,7 @@ module.exports = () => {
 
 ## Exporting multiple configurations
 
-Instead of exporting a single configuration object/function, you may export multiple configurations. When running webpack, all configurations are built. For instance, this is useful for [bundling a library](/guides/author-libraries) for multiple [targets](/configuration/output#output-librarytarget) such as AMD and CommonJS:
+Instead of exporting a single configuration object/function, you may export multiple configurations. When running webpack, all configurations are built. For instance, this is useful for [bundling a library](/guides/author-libraries) for multiple [targets](/documentation/configuration/output#output-librarytarget) such as AMD and CommonJS:
 
 ```js
 module.exports = [{
diff --git a/content/configuration/dev-server.md b/content/documentation/configuration/dev-server.md
similarity index 96%
rename from content/configuration/dev-server.md
rename to content/documentation/configuration/dev-server.md
index 53ffed6b54fb..f7cb677d4f34 100644
--- a/content/configuration/dev-server.md
+++ b/content/documentation/configuration/dev-server.md
@@ -41,7 +41,7 @@ that will give some background on where the server is located and what it's serv
 
 If you're using dev-server through the Node.js API, the options in `devServer` will be ignored. Pass the options as a second parameter instead: `new WebpackDevServer(compiler, {...})`. [See here](https://github.com/webpack/webpack-dev-server/blob/master/examples/node-api-simple/server.js) for an example of how to use webpack-dev-server through the Node.js API.
 
-W> Be aware that when [exporting multiple configurations](/configuration/configuration-types/#exporting-multiple-configurations) only the `devServer` options for the first configuration will be taken into account and used for all the configurations in the array.
+W> Be aware that when [exporting multiple configurations](/documentation/configuration/configuration-types/#exporting-multiple-configurations) only the `devServer` options for the first configuration will be taken into account and used for all the configurations in the array.
 
 
 ## `devServer.clientLogLevel`
@@ -453,7 +453,7 @@ To show only errors in your bundle:
 stats: "errors-only"
 ```
 
-For more information, see the [**stats documentation**](/configuration/stats).
+For more information, see the [**stats documentation**](/documentation/configuration/stats).
 
 T> This option has no effect when used with `quiet` or `noInfo`.
 
@@ -487,4 +487,4 @@ watchOptions: {
 
 If this is too heavy on the file system, you can change this to an integer to set the interval in milliseconds.
 
-See [WatchOptions](/configuration/watch) for more options.
+See [WatchOptions](/documentation/configuration/watch) for more options.
diff --git a/content/configuration/devtool.md b/content/documentation/configuration/devtool.md
similarity index 96%
rename from content/configuration/devtool.md
rename to content/documentation/configuration/devtool.md
index acd53a8a5ca2..6e1b405bcdf7 100644
--- a/content/configuration/devtool.md
+++ b/content/documentation/configuration/devtool.md
@@ -59,7 +59,7 @@ W> There are some issues with Source Maps in Chrome. [We need your help!](https:
 
 `nosources-source-map` - A SourceMap is created without the `sourcesContent` in it. It can be used to map stack traces on the client without exposing all of the source code.
 
-T> See [`output.sourceMapFilename`](/configuration/output#output-sourcemapfilename) to customize the filenames of generated Source Maps.
+T> See [`output.sourceMapFilename`](/documentation/configuration/output#output-sourcemapfilename) to customize the filenames of generated Source Maps.
 
 ?> This page needs more information to make it easier for users to choose a good option.
 
diff --git a/content/configuration/entry-context.md b/content/documentation/configuration/entry-context.md
similarity index 90%
rename from content/configuration/entry-context.md
rename to content/documentation/configuration/entry-context.md
index 5ce627ff9893..6bdc6fc8e229 100644
--- a/content/configuration/entry-context.md
+++ b/content/documentation/configuration/entry-context.md
@@ -61,4 +61,4 @@ or
 entry: () => new Promise((resolve) => resolve(['./demo', './demo2']))
 ```
 
-When combining with the [`output.library`](/configuration/output#output-library) option: If an array is passed only the last item is exported.
+When combining with the [`output.library`](/documentation/configuration/output#output-library) option: If an array is passed only the last item is exported.
diff --git a/content/configuration/externals.md b/content/documentation/configuration/externals.md
similarity index 100%
rename from content/configuration/externals.md
rename to content/documentation/configuration/externals.md
diff --git a/content/documentation/configuration/index.md b/content/documentation/configuration/index.md
new file mode 100644
index 000000000000..f0e8d9d2f05f
--- /dev/null
+++ b/content/documentation/configuration/index.md
@@ -0,0 +1,430 @@
+---
+title: Configuration
+sort: 1
+contributors:
+  - sokra
+  - skipjack
+  - grgur
+  - bondz
+  - sricc
+  - terinjokes
+  - mattce
+  - kbariotis
+---
+
+webpack is fed via a configuration object. It is passed in one of two ways depending on how you are using webpack: through the terminal or via Node.js. All the available configuration options are specified below.
+
+T> New to webpack? Check out our guide to some of webpack's [core concepts](/concepts) to get started!
+
+T> Notice that throughout the configuration we use Node's built-in [path module](https://nodejs.org/api/path.html) and prefix it with the [__dirname](https://nodejs.org/docs/latest/api/globals.html#globals_dirname) global. This prevents file path issues between operating systems and allows relative paths to work as expected. See [this section](https://nodejs.org/api/path.html#path_windows_vs_posix) for more info on POSIX vs. Windows paths.
+
+## Options
+
+``` js-with-links-with-details
+const path = require('path');
+
+module.exports = {
+  // click on the name of the option to get to the detailed documentation
+  // click on the items with arrows to show more examples / advanced options
+
+  <details><summary>[entry](/documentation/configuration/entry-context#entry): "./app/entry", // string | object | array</summary>
+  [entry](/documentation/configuration/entry-context#entry): ["./app/entry1", "./app/entry2"],
+  [entry](/documentation/configuration/entry-context#entry): {
+    a: "./app/entry-a",
+    b: ["./app/entry-b1", "./app/entry-b2"]
+  },
+  </details>
+  // Here the application starts executing
+  // and webpack starts bundling
+
+  [output](/documentation/configuration/output): {
+    // options related to how webpack emits results
+
+    [path](/documentation/configuration/output#output-path): path.resolve(__dirname, "dist"), // string
+    // the target directory for all output files
+    // must be an absolute path (use the Node.js path module)
+
+    <details><summary>[filename](/documentation/configuration/output#output-filename): "bundle.js", // string</summary>
+    [filename](/documentation/configuration/output#output-filename): "[name].js", // for multiple entry points
+    [filename](/documentation/configuration/output#output-filename): "[chunkhash].js", // for [long term caching](/guides/caching)
+    </details>
+    // the filename template for entry chunks
+
+    <details><summary>[publicPath](/documentation/configuration/output#output-publicpath): "/assets/", // string</summary>
+    [publicPath](/documentation/configuration/output#output-publicpath): "",
+    [publicPath](/documentation/configuration/output#output-publicpath): "https://cdn.example.com/",
+    </details>
+    // the url to the output directory resolved relative to the HTML page
+
+    [library](/documentation/configuration/output#output-library): "MyLibrary", // string,
+    // the name of the exported library
+
+    <details><summary>[libraryTarget](/documentation/configuration/output#output-librarytarget): "umd", // universal module definition</summary>
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "umd2", // universal module definition
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "commonjs2", // exported with module.exports
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "commonjs-module", // exports with module.exports
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "commonjs", // exported as properties to exports
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "amd", // defined with AMD defined method
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "this", // property set on this
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "var", // variable defined in root scope
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "assign", // blind assignment
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "window", // property set to window object
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "global", // property set to global object
+        [libraryTarget](/documentation/configuration/output#output-librarytarget): "jsonp", // jsonp wrapper
+    </details>
+    // the type of the exported library
+
+    <details><summary>/* Advanced output configuration (click to show) */</summary>
+
+    [pathinfo](/documentation/configuration/output#output-pathinfo): true, // boolean
+    // include useful path info about modules, exports, requests, etc. into the generated code
+
+    [chunkFilename](/documentation/configuration/output#output-chunkfilename): "[id].js",
+    [chunkFilename](/documentation/configuration/output#output-chunkfilename): "[chunkhash].js", // for [long term caching](/guides/caching)
+    // the filename template for additional chunks
+
+    [jsonpFunction](/documentation/configuration/output#output-jsonpfunction): "myWebpackJsonp", // string
+    // name of the JSONP function used to load chunks
+
+    [sourceMapFilename](/documentation/configuration/output#output-sourcemapfilename): "[file].map", // string
+    [sourceMapFilename](/documentation/configuration/output#output-sourcemapfilename): "sourcemaps/[file].map", // string
+    // the filename template of the source map location
+
+    [devtoolModuleFilenameTemplate](/documentation/configuration/output#output-devtoolmodulefilenametemplate): "webpack:///[resource-path]", // string
+    // the name template for modules in a devtool
+
+    [devtoolFallbackModuleFilenameTemplate](/documentation/configuration/output#output-devtoolfallbackmodulefilenametemplate): "webpack:///[resource-path]?[hash]", // string
+    // the name template for modules in a devtool (used for conflicts)
+
+    [umdNamedDefine](/documentation/configuration/output#output-umdnameddefine): true, // boolean
+    // use a named AMD module in UMD library
+
+    [crossOriginLoading](/documentation/configuration/output#output-crossoriginloading): "use-credentials", // enum
+    [crossOriginLoading](/documentation/configuration/output#output-crossoriginloading): "anonymous",
+    [crossOriginLoading](/documentation/configuration/output#output-crossoriginloading): false,
+    // specifies how cross origin request are issued by the runtime
+
+    <details><summary>/* Expert output configuration (on own risk) */</summary>
+
+    [devtoolLineToLine](/documentation/configuration/output#output-devtoollinetoline): {
+      test: /\.jsx$/
+    },
+    // use a simple 1:1 mapped SourceMaps for these modules (faster)
+
+    [hotUpdateMainFilename](/documentation/configuration/output#output-hotupdatemainfilename): "[hash].hot-update.json", // string
+    // filename template for HMR manifest
+
+    [hotUpdateChunkFilename](/documentation/configuration/output#output-hotupdatechunkfilename): "[id].[hash].hot-update.js", // string
+    // filename template for HMR chunks
+
+    [sourcePrefix](/documentation/configuration/output#output-sourceprefix): "\t", // string
+    // prefix module sources in bundle for better readablitity
+    </details>
+    </details>
+  },
+
+  [module](/documentation/configuration/module): {
+    // configuration regarding modules
+
+    [rules](/documentation/configuration/module#module-rules): [
+      // rules for modules (configure loaders, parser options, etc.)
+
+      {
+        [test](/documentation/configuration/module#rule-test): /\.jsx?$/,
+        [include](/documentation/configuration/module#rule-include): [
+          path.resolve(__dirname, "app")
+        ],
+        [exclude](/documentation/configuration/module#rule-exclude): [
+          path.resolve(__dirname, "app/demo-files")
+        ],
+        // these are matching conditions, each accepting a regular expression or string
+        // test and include have the same behavior, both must be matched
+        // exclude must not be matched (takes preferrence over test and include)
+        // Best practices:
+        // - Use RegExp only in test and for filename matching
+        // - Use arrays of absolute paths in include and exclude
+        // - Try to avoid exclude and prefer include
+
+        [issuer](/documentation/configuration/module#rule-issuer): { test, include, exclude },
+        // conditions for the issuer (the origin of the import)
+
+        [enforce](/documentation/configuration/module#rule-enforce): "pre",
+        [enforce](/documentation/configuration/module#rule-enforce): "post",
+        // flags to apply these rules, even if they are overridden (advanced option)
+
+        [loader](/documentation/configuration/module#rule-loader): "babel-loader",
+        // the loader which should be applied, it'll be resolved relative to the context
+        // -loader suffix is no longer optional in webpack2 for clarity reasons
+        // see [webpack 1 upgrade guide](/guides/migrating)
+
+        [options](/documentation/configuration/module#rule-options-rule-query): {
+          presets: ["es2015"]
+        },
+        // options for the loader
+      },
+
+      {
+        [test](/documentation/configuration/module#rule-test): "\.html$",
+
+        [use](/documentation/configuration/module#rule-use): [
+          // apply multiple loaders and options
+          "htmllint-loader",
+          {
+            loader: "html-loader",
+            options: {
+              /* ... */
+            }
+          }
+        ]
+      },
+
+      { [oneOf](/documentation/configuration/module#rule-oneof): [ /* rules */ ] },
+      // only use one of these nested rules
+
+      { [rules](/documentation/configuration/module#rule-rules): [ /* rules */ ] },
+      // use all of these nested rules (combine with conditions to be useful)
+
+      { [resource](/documentation/configuration/module#rule-resource): { [and](/documentation/configuration/module#condition): [ /* conditions */ ] } },
+      // matches only if all conditions are matched
+
+      { [resource](/documentation/configuration/module#rule-resource): { [or](/documentation/configuration/module#condition): [ /* conditions */ ] } },
+      { [resource](/documentation/configuration/module#rule-resource): [ /* conditions */ ] },
+      // matches if any condition is matched (default for arrays)
+
+      { [resource](/documentation/configuration/module#rule-resource): { [not](/documentation/configuration/module#condition): /* condition */ } }
+      // matches if the condition is not matched
+    ],
+
+    <details><summary>/* Advanced module configuration (click to show) */</summary>
+
+    [noParse](/documentation/configuration/module#module-noparse): [
+      /special-library\.js$/
+    ],
+    // do not parse this module
+
+    unknownContextRequest: ".",
+    unknownContextRecursive: true,
+    unknownContextRegExp: /^\.\/.*$/,
+    unknownContextCritical: true,
+    exprContextRequest: ".",
+    exprContextRegExp: /^\.\/.*$/,
+    exprContextRecursive: true,
+    exprContextCritical: true,
+    wrappedContextRegExp: /.*/,
+    wrappedContextRecursive: true,
+    wrappedContextCritical: false,
+    // specifies default behavior for dynamic requests
+    </details>
+  },
+
+  [resolve](/documentation/configuration/resolve): {
+    // options for resolving module requests
+    // (does not apply to resolving to loaders)
+
+    [modules](/documentation/configuration/resolve#resolve-modules): [
+      "node_modules",
+      path.resolve(__dirname, "app")
+    ],
+    // directories where to look for modules
+
+    [extensions](/documentation/configuration/resolve#resolve-extensions): [".js", ".json", ".jsx", ".css"],
+    // extensions that are used
+
+    [alias](/documentation/configuration/resolve#resolve-alias): {
+      // a list of module name aliases
+
+      "module": "new-module",
+      // alias "module" -> "new-module" and "module/path/file" -> "new-module/path/file"
+
+      "only-module$": "new-module",
+      // alias "only-module" -> "new-module", but not "module/path/file" -> "new-module/path/file"
+
+      "module": path.resolve(__dirname, "app/third/module.js"),
+      // alias "module" -> "./app/third/module.js" and "module/file" results in error
+      // modules aliases are imported relative to the current context
+    },
+    <details><summary>/* alternative alias syntax (click to show) */</summary>
+    [alias](/documentation/configuration/resolve#resolve-alias): [
+      {
+        name: "module",
+        // the old request
+
+        alias: "new-module",
+        // the new request
+
+        onlyModule: true
+        // if true only "module" is aliased
+        // if false "module/inner/path" is also aliased
+      }
+    ],
+    </details>
+
+    <details><summary>/* Advanced resolve configuration (click to show) */</summary>
+
+    [symlinks](/documentation/configuration/resolve#resolve-symlinks): true,
+    // follow symlinks to new location
+
+    [descriptionFiles](/documentation/configuration/resolve#resolve-descriptionfiles): ["package.json"],
+    // files that are read for package description
+
+    [mainFields](/documentation/configuration/resolve#resolve-mainfields): ["main"],
+    // properties that are read from description file
+    // when a folder is requested
+
+    [aliasFields](/documentation/configuration/resolve#resolve-aliasfields): ["browser"],
+    // properites that are read from description file
+    // to alias requests in this package
+
+    [enforceExtension](/documentation/configuration/resolve#resolve-enforceextension): false,
+    // if true request must not include an extensions
+    // if false request may already include an extension
+
+    [moduleExtensions](/documentation/configuration/resolve#resolveloader-moduleextensions): ["-module"],
+    [enforceModuleExtension](/documentation/configuration/resolve#resolve-enforcemoduleextension): false,
+    // like extensions/enforceExtension but for module names instead of files
+
+    [unsafeCache](/documentation/configuration/resolve#resolve-unsafecache): true,
+    [unsafeCache](/documentation/configuration/resolve#resolve-unsafecache): {},
+    // enables caching for resolved requests
+    // this is unsafe as folder structure may change
+    // but performance improvement is really big
+
+    [cachePredicate](/documentation/configuration/resolve#resolve-cachepredicate): (path, request) => true,
+    // predicate function which selects requests for caching
+
+    [plugins](/documentation/configuration/resolve#resolve-plugins): [
+      // ...
+    ]
+    // additional plugins applied to the resolver
+    </details>
+  },
+
+  [performance](/documentation/configuration/performance): {
+    <details><summary>[hints](/documentation/configuration/performance#performance-hints): "warning", // enum </summary>
+    [hints](/documentation/configuration/performance#performance-hints): "error", // emit errors for perf hints
+    [hints](/documentation/configuration/performance#performance-hints): false, // turn off perf hints
+    </details>
+    [maxAssetSize](/documentation/configuration/performance#performance-maxassetsize): 200000, // int (in bytes),
+    [maxEntrypointSize](/documentation/configuration/performance#performance-maxentrypointsize): 400000, // int (in bytes)
+    [assetFilter](/documentation/configuration/performance#performance-assetfilter): function(assetFilename) {
+      // Function predicate that provides asset filenames
+      return assetFilename.endsWith('.css') || assetFilename.endsWith('.js');
+    }
+  },
+
+  <details>
+  <summary>[devtool](/documentation/configuration/devtool): "source-map", // enum </summary>
+  [devtool](/documentation/configuration/devtool): "inline-source-map", // inlines SourceMap into orginal file
+  [devtool](/documentation/configuration/devtool): "eval-source-map", // inlines SourceMap per module
+  [devtool](/documentation/configuration/devtool): "hidden-source-map", // SourceMap without reference in original file
+  [devtool](/documentation/configuration/devtool): "cheap-source-map", // cheap-variant of SourceMap without module mappings
+  [devtool](/documentation/configuration/devtool): "cheap-module-source-map", // cheap-variant of SourceMap with module mappings
+  [devtool](/documentation/configuration/devtool): "eval", // no SourceMap, but named modules. Fastest at the expense of detail.
+  </details>
+  // enhance debugging by adding meta info for the browser devtools
+  // source-map most detailed at the expense of build speed.
+
+  [context](/documentation/configuration/entry-context#context): __dirname, // string (absolute path!)
+  // the home directory for webpack
+  // the [entry](/documentation/configuration/entry-context) and [module.rules.loader](/documentation/configuration/module#rule-loader) option
+  //   is resolved relative to this directory
+
+  <details><summary>[target](/documentation/configuration/target): "web", // enum</summary>
+  [target](/documentation/configuration/target): "webworker", // WebWorker
+  [target](/documentation/configuration/target): "node", // Node.js via require
+  [target](/documentation/configuration/target): "async-node", // Node.js via fs and vm
+  [target](/documentation/configuration/target): "node-webkit", // nw.js
+  [target](/documentation/configuration/target): "electron-main", // electron, main process
+  [target](/documentation/configuration/target): "electron-renderer", // electron, renderer process
+  [target](/documentation/configuration/target): (compiler) => { /* ... */ }, // custom
+  </details>
+  // the environment in which the bundle should run
+  // changes chunk loading behavior and available modules
+
+  <details><summary>[externals](/documentation/configuration/externals): ["react", /^@angular\//],</summary>
+  [externals](/documentation/configuration/externals): "react", // string (exact match)
+  [externals](/documentation/configuration/externals): /^[a-z\-]+($|\/)/, // Regex
+  [externals](/documentation/configuration/externals): { // object
+    angular: "this angular", // this["angular"]
+    react: { // UMD
+      commonjs: "react",
+      commonjs2: "react",
+      amd: "react",
+      root: "React"
+    }
+  },
+  [externals](/documentation/configuration/externals): (request) => { /* ... */ return "commonjs " + request }
+  </details>
+  // Don't follow/bundle these modules, but request them at runtime from the environment
+
+  <details><summary>[stats](/documentation/configuration/stats): "errors-only",</summary>
+  [stats](/documentation/configuration/stats): { //object
+    assets: true,
+    colors: true,
+    errors: true,
+    errorDetails: true,
+    hash: true,
+    // ...
+  },
+  </details>
+  // lets you precisely control what bundle information gets displayed
+
+  [devServer](/documentation/configuration/dev-server): {
+    proxy: { // proxy URLs to backend development server
+      '/api': 'http://localhost:3000'
+    },
+    contentBase: path.join(__dirname, 'public'), // boolean | string | array, static file location
+    compress: true, // enable gzip compression
+    historyApiFallback: true, // true for index.html upon 404, object for multiple paths
+    hot: true, // hot module replacement. Depends on HotModuleReplacementPlugin
+    https: false, // true for self-signed, object for cert authority
+    noInfo: true, // only errors & warns on hot reload
+    // ...
+  },
+
+  [plugins](plugins): [
+    // ...
+  ],
+  // list of additional plugins
+
+
+  <details><summary>/* Advanced configuration (click to show) */</summary>
+
+  [resolveLoader](/documentation/configuration/resolve#resolveloader): { /* same as resolve */ }
+  // separate resolve options for loaders
+
+  [profile](other-options#profile): true, // boolean
+  // capture timing information
+
+  [bail](other-options#bail): true, //boolean
+  // fail out on the first error instead of tolerating it.
+
+  [cache](other-options#cache): false, // boolean
+  // disable/enable caching
+
+  [watch](watch#watch): true, // boolean
+  // enables watching
+
+  [watchOptions](watch#watchoptions): {
+    [aggregateTimeout](watch#watchoptions-aggregatetimeout): 1000, // in ms
+    // aggregates multiple changes to a single rebuild
+
+    [poll](watch#watchoptions-poll): true,
+    [poll](watch#watchoptions-poll): 500, // intervall in ms
+    // enables polling mode for watching
+    // must be used on filesystems that doesn't notify on change
+    // i. e. nfs shares
+  },
+
+  [node](node): {
+    /* TODO */
+  },
+
+  [recordsPath](other-options#recordspath): path.resolve(__dirname, "build/records.json"),
+  [recordsInputPath](other-options#recordsinputpath): path.resolve(__dirname, "build/records.json"),
+  [recordsOutputPath](other-options#recordsoutputpath): path.resolve(__dirname, "build/records.json"),
+  // TODO
+
+  </details>
+}
+```
diff --git a/content/configuration/module.md b/content/documentation/configuration/module.md
similarity index 95%
rename from content/configuration/module.md
rename to content/documentation/configuration/module.md
index 1f1b1a444102..453b120dd439 100644
--- a/content/configuration/module.md
+++ b/content/documentation/configuration/module.md
@@ -38,7 +38,7 @@ A Rule can be separated into three parts — Conditions, Results and nested Rule
 
 There are two input values for the conditions:
 
-1. The resource: An absolute path to the file requested. It's already resolved according to the [`resolve` rules](/configuration/resolve).
+1. The resource: An absolute path to the file requested. It's already resolved according to the [`resolve` rules](/documentation/configuration/resolve).
 
 2. The issuer: An absolute path to the file of the module which requested the resource. It's the location of the import.
 
@@ -71,7 +71,7 @@ The [`parser`](#rule-parser) property affects the parser options.
 
 ## Nested rules
 
-Nested rules can be specified under the properties [`rules`](#rule-rules) and [`oneOf`](#rule-oneof). 
+Nested rules can be specified under the properties [`rules`](#rule-rules) and [`oneOf`](#rule-oneof).
 
 These rules are evaluated when the Rule condition matches.
 
@@ -154,7 +154,7 @@ parser: {
   browserify: false, // disable special handling of Browserify bundles
   requireJs: false, // disable requirejs.*
   node: false, // disable __dirname, __filename, module, require.extensions, require.main, etc.
-  node: {...} // reconfigure [node](/configuration/node) layer on module level
+  node: {...} // reconfigure [node](/documentation/configuration/node) layer on module level
 }
 ```
 
@@ -249,7 +249,7 @@ Conditions can be one of these:
 
 `object`
 
-It must have a `loader` property being a string. It is resolved relative to the configuration [`context`](/configuration/entry-context#context) with the loader resolving options ([resolveLoader](/configuration/resolve#resolveloader)).
+It must have a `loader` property being a string. It is resolved relative to the configuration [`context`](/documentation/configuration/entry-context#context) with the loader resolving options ([resolveLoader](/documentation/configuration/resolve#resolveloader)).
 
 It can have a `options` property being a string or object. This value is passed to the loader, which should interpret it as loader options.
 
@@ -266,7 +266,7 @@ For compatibility a `query` property is also possible, which is an alias for the
 }
 ```
 
-Note that webpack needs to generate a unique module identifier from the resource and all loaders including options. It tries to do this with a `JSON.stringify` of the options object. This is fine in 99.9% of cases, but may be not unique if you apply the same loaders with different options to the resource and the options have some stringified values. 
+Note that webpack needs to generate a unique module identifier from the resource and all loaders including options. It tries to do this with a `JSON.stringify` of the options object. This is fine in 99.9% of cases, but may be not unique if you apply the same loaders with different options to the resource and the options have some stringified values.
 
 It also breaks if the options object cannot be stringified (i.e. circular JSON). Because of this you can have a `ident` property in the options object which is used as unique identifier.
 
diff --git a/content/configuration/node.md b/content/documentation/configuration/node.md
similarity index 100%
rename from content/configuration/node.md
rename to content/documentation/configuration/node.md
diff --git a/content/configuration/other-options.md b/content/documentation/configuration/other-options.md
similarity index 100%
rename from content/configuration/other-options.md
rename to content/documentation/configuration/other-options.md
diff --git a/content/configuration/output.md b/content/documentation/configuration/output.md
similarity index 92%
rename from content/configuration/output.md
rename to content/documentation/configuration/output.md
index ea666b6636c9..92bd2e795220 100644
--- a/content/configuration/output.md
+++ b/content/documentation/configuration/output.md
@@ -27,7 +27,7 @@ By default `[id].js` is used or a value inferred from [`output.filename`](#outpu
 
 `boolean` `string`
 
-Only used when [`target`](/configuration/target) is web, which uses JSONP for loading on-demand chunks, by adding script tags.
+Only used when [`target`](/documentation/configuration/target) is web, which uses JSONP for loading on-demand chunks, by adding script tags.
 
 Enable [cross-origin](https://developer.mozilla.org/en/docs/Web/HTML/Element/script#attr-crossorigin) loading of chunks. The following values are accepted...
 
@@ -66,7 +66,7 @@ devtoolLineToLine: { test: /\.js$/, include: 'src/utilities' }
 
 `string | function(info)`
 
-This option is only used when [`devtool`](/configuration/devtool) uses an options which requires module names.
+This option is only used when [`devtool`](/documentation/configuration/devtool) uses an options which requires module names.
 
 Customize the names used in each source map's `sources` array. This can be done by passing a template string or function. For example, when using `devtool: 'eval'`, this is the default:
 
@@ -103,7 +103,7 @@ If multiple modules would result in the same name, [`output.devtoolFallbackModul
 
 This option determines the name of each output bundle. The bundle is written to the directory specified by the [`output.path`](#output-path) option.
 
-For a single [`entry`](/configuration/entry-context#entry) point, this can be a static name.
+For a single [`entry`](/documentation/configuration/entry-context#entry) point, this can be a static name.
 
 ``` js
 filename: "bundle.js"
@@ -157,7 +157,7 @@ The following substitutions are available in template strings (via webpack's int
 
 The lengths of `[hash]` and `[chunkhash]` can be specified using `[hash:16]` (defaults to 20). Alternatively, specify [`output.hashDigestLength`](#output-hashdigestlength) to configure the length globally.
 
-T> When using the [`ExtractTextWebpackPlugin`](/plugins/extract-text-webpack-plugin), use `[contenthash]` to obtain a hash of the extracted file (neither `[hash]` nor `[chunkhash]` work).
+T> When using the [`ExtractTextWebpackPlugin`](/documentation/plugins/extract-text-webpack-plugin), use `[contenthash]` to obtain a hash of the extracted file (neither `[hash]` nor `[chunkhash]` work).
 
 
 ## `output.hashDigest`
@@ -199,7 +199,7 @@ Here is no need to change it.
 
 `function`
 
-Only used when [`target`](/configuration/target) is web, which uses JSONP for loading hot updates.
+Only used when [`target`](/documentation/configuration/target) is web, which uses JSONP for loading hot updates.
 
 A JSONP function used to asynchronously load hot-update chunks.
 
@@ -225,7 +225,7 @@ Here is no need to change it.
 
 `string`
 
-Only used when [`target`](/configuration/target) is web, which uses JSONP for loading on-demand chunks.
+Only used when [`target`](/documentation/configuration/target) is web, which uses JSONP for loading on-demand chunks.
 
 A JSONP function name used to asynchronously load chunks or join multiple initial chunks (CommonsChunkPlugin, AggressiveSplittingPlugin).
 
@@ -290,7 +290,7 @@ MyLibrary.doSomething(); //if this is window
 
 
 `libraryTarget: "window"` - When your library is loaded, **the return value of your entry point** will be part `window` object.
- 
+
  ```javascript
  window["MyLibrary"] = _entry_return_;
 
@@ -300,7 +300,7 @@ window.MyLibrary.doSomething();
 
 
 `libraryTarget: "global"` - When your library is loaded, **the return value of your entry point** will be part `global` object.
- 
+
  ```javascript
  global["MyLibrary"] = _entry_return_;
 
@@ -336,27 +336,27 @@ _Wondering the difference between CommonJS and CommonJS2? Check [this](https://g
 
 `libraryTarget: "amd"` - In this case webpack will make your library an AMD module.
 
-But there is a very important pre-requisite, your entry chunk must be defined with the define property, if not, webpack will create the AMD module, but without dependencies. 
+But there is a very important pre-requisite, your entry chunk must be defined with the define property, if not, webpack will create the AMD module, but without dependencies.
 The output will be something like this:
 
 ```javascript
 define([], function() {
-	//what this module returns is what your entry chunk returns
+    //what this module returns is what your entry chunk returns
 });
 ```
 
-But if you download this script, you may get an error: `define is not defined`, it’s ok! If you are distributing your library with AMD, then your users need to use RequireJS to load it. 
+But if you download this script, you may get an error: `define is not defined`, it’s ok! If you are distributing your library with AMD, then your users need to use RequireJS to load it.
 
 Now that you have RequireJS loaded, you can load your library.
 
-But, `require([ _what?_ ])`? 
+But, `require([ _what?_ ])`?
 
 `output.library`!
 
 ```javascript
 output: {
-	library: "MyLibrary",
-	libraryTarget: "amd"
+    library: "MyLibrary",
+    libraryTarget: "amd"
 }
 ```
 
@@ -364,7 +364,7 @@ So your module will be like:
 
 ```javascript
 define("MyLibrary", [], function() {
-	//what this module returns is what your entry chunk returns
+    //what this module returns is what your entry chunk returns
 });
 ```
 
@@ -373,19 +373,19 @@ And you can use it like this:
 ```javascript
 // And then your users will be able to do:
 require(["MyLibrary"], function(MyLibrary){
-	MyLibrary.doSomething();
+    MyLibrary.doSomething();
 });
 ```
 
-`libraryTarget: "umd"` - This is a way for your library to work with all the module definitions (and where aren't modules at all). 
-It will work with CommonJS, AMD and as global variable. You can check the [UMD Repository](https://github.com/umdjs/umd) to know more about it. 
+`libraryTarget: "umd"` - This is a way for your library to work with all the module definitions (and where aren't modules at all).
+It will work with CommonJS, AMD and as global variable. You can check the [UMD Repository](https://github.com/umdjs/umd) to know more about it.
 
 In this case, you need the `library` property to name your module:
 
 ```javascript
 output: {
-	library: "MyLibrary",
-	libraryTarget: "umd"
+    library: "MyLibrary",
+    libraryTarget: "umd"
 }
 ```
 
@@ -402,7 +402,7 @@ And finally the output is:
 	else
 		root["MyLibrary"] = factory();
 })(this, function() {
-	//what this module returns is what your entry chunk returns
+    //what this module returns is what your entry chunk returns
 });
 ```
 
@@ -410,7 +410,7 @@ Module proof library.
 
 
 `libraryTarget: "assign"` - Here webpack will blindly generate an implied global.
- 
+
  ```javascript
  MyLibrary = _entry_return_;
  ```
@@ -418,12 +418,12 @@ Be aware that if `MyLibrary` isn't defined earlier your library will be set in g
 
 
 `libraryTarget: "jsonp"` - This will wrap the return value of your entry point into a jsonp wrapper.
- 
+
  ```javascript
  MyLibrary(_entry_return_);
  ```
 
-The dependencies for your library will be defined by the [`externals`](/configuration/externals/) config.
+The dependencies for your library will be defined by the [`externals`](/documentation/configuration/externals/) config.
 
 
 ## `output.path`
@@ -507,7 +507,7 @@ publicPath: "../assets/", // relative to HTML page
 publicPath: "", // relative to HTML page (same directory)
 ```
 
-In cases where the `publicPath` of output files can't be known at compile time, it can be left blank and set dynamically at runtime in the entry file using the [free variable](http://stackoverflow.com/questions/12934929/what-are-free-variables) `__webpack_public_path__`. 
+In cases where the `publicPath` of output files can't be known at compile time, it can be left blank and set dynamically at runtime in the entry file using the [free variable](http://stackoverflow.com/questions/12934929/what-are-free-variables) `__webpack_public_path__`.
 
 E.g.:
 ```javascript
@@ -523,7 +523,7 @@ See [this discussion](https://github.com/webpack/webpack/issues/2776#issuecommen
 
 `string`
 
-This option is only used when [`devtool`](/configuration/devtool) uses a SourceMap option which writes an output file.
+This option is only used when [`devtool`](/documentation/configuration/devtool) uses a SourceMap option which writes an output file.
 
 Configure how source maps are named. By default `"[file].map"` is used.
 
diff --git a/content/configuration/performance.md b/content/documentation/configuration/performance.md
similarity index 100%
rename from content/configuration/performance.md
rename to content/documentation/configuration/performance.md
diff --git a/content/configuration/plugins.md b/content/documentation/configuration/plugins.md
similarity index 90%
rename from content/configuration/plugins.md
rename to content/documentation/configuration/plugins.md
index 79f377478b86..218415adb3d9 100644
--- a/content/configuration/plugins.md
+++ b/content/documentation/configuration/plugins.md
@@ -7,9 +7,9 @@ contributors:
   - yatharthk
 ---
 
-The `plugins` option is used to customize the webpack build process in a variety of ways. webpack comes with a variety built-in plugins available under `webpack.[plugin-name]`. See [this page](/plugins) for a list of plugins and documentation but note that there are a lot more out in the community.
+The `plugins` option is used to customize the webpack build process in a variety of ways. webpack comes with a variety built-in plugins available under `webpack.[plugin-name]`. See [this page](/documentation/plugins) for a list of plugins and documentation but note that there are a lot more out in the community.
 
-T> Note: This page only discusses using plugins, however if you are interested in writing your own please visit [Writing a Plugin](/development/how-to-write-a-plugin/).
+T> Note: This page only discusses using plugins, however if you are interested in writing your own please visit [Writing a Plugin](/documentation/development/how-to-write-a-plugin/).
 
 
 ## `plugins`
diff --git a/content/configuration/resolve.md b/content/documentation/configuration/resolve.md
similarity index 100%
rename from content/configuration/resolve.md
rename to content/documentation/configuration/resolve.md
diff --git a/content/configuration/stats.md b/content/documentation/configuration/stats.md
similarity index 100%
rename from content/configuration/stats.md
rename to content/documentation/configuration/stats.md
diff --git a/content/configuration/target.md b/content/documentation/configuration/target.md
similarity index 100%
rename from content/configuration/target.md
rename to content/documentation/configuration/target.md
diff --git a/content/configuration/watch.md b/content/documentation/configuration/watch.md
similarity index 100%
rename from content/configuration/watch.md
rename to content/documentation/configuration/watch.md
diff --git a/content/documentation/development/index.md b/content/documentation/development/index.md
new file mode 100644
index 000000000000..4a07c7be0717
--- /dev/null
+++ b/content/documentation/development/index.md
@@ -0,0 +1,13 @@
+---
+title: Development
+contributors:
+  - rouzbeh84
+  - skipjack
+---
+
+The tutorials in this section cover developing core webpack functionality as well as writing plugins and loaders. The following articles (along with the [API documentation](/documentation/api)) should give you all the tools needed for contributing to the webpack ecosystem.
+
+* [Release Process](./release-process)
+* [Plugin Patterns](./plugin-patterns)
+* [How To Write A Plugin](./how-to-write-a-plugin)
+* [How To Write A Loader](./how-to-write-a-loader)
diff --git a/content/development/plugin-patterns.md b/content/documentation/development/plugin-patterns.md
similarity index 100%
rename from content/development/plugin-patterns.md
rename to content/documentation/development/plugin-patterns.md
diff --git a/content/development/release-process.md b/content/documentation/development/release-process.md
similarity index 75%
rename from content/development/release-process.md
rename to content/documentation/development/release-process.md
index 2093d320724e..faa4ac40045a 100644
--- a/content/development/release-process.md
+++ b/content/documentation/development/release-process.md
@@ -1,14 +1,18 @@
 ---
-title: webpack merge, tag and release process
+title: Webpack Release Process
 contributors:
   - d3viant0ne
   - sokra
 ---
 
+The release process for deploying webpack is actually quite simple. Read through the following steps, so you have a clear understanding of how it's done.
+
+
 ## Pull requests into `master`
 
 When you land commits on your `master` branch, select the _Create Merge-Commit_ option.
 
+
 ## Cut a release
 
 ```sh
diff --git a/content/development/how-to-write-a-loader.md b/content/documentation/development/writing-a-loader.md
similarity index 97%
rename from content/development/how-to-write-a-loader.md
rename to content/documentation/development/writing-a-loader.md
index 897049c461bf..151a9b6afe21 100644
--- a/content/development/how-to-write-a-loader.md
+++ b/content/documentation/development/writing-a-loader.md
@@ -1,5 +1,5 @@
 ---
-title: How to write a loader?
+title: Writing a Loader
 sort: 3
 ---
 
@@ -9,7 +9,7 @@ This function is called when a resource should be transformed by this loader.
 
 In the simple case, when only a single loader is applied to the resource, the loader is called with one parameter: the content of the resource file as string.
 
-The loader can access the [loader API](/api/loaders/) on the `this` context in the function.
+The loader can access the [loader API](/documentation/api/loaders/) on the `this` context in the function.
 
 A sync loader that only wants to give a one value can simply `return` it. In every other case the loader can give back any number of values with the `this.callback(err, values...)` function. Errors are passed to the `this.callback` function or thrown in a sync loader.
 
diff --git a/content/development/how-to-write-a-plugin.md b/content/documentation/development/writing-a-plugin.md
similarity index 99%
rename from content/development/how-to-write-a-plugin.md
rename to content/documentation/development/writing-a-plugin.md
index 4fa6975eb2c3..53c2e26d3350 100644
--- a/content/development/how-to-write-a-plugin.md
+++ b/content/documentation/development/writing-a-plugin.md
@@ -1,5 +1,5 @@
 ---
-title: How to write a plugin?
+title: Writing a Plugin
 sort: 2
 ---
 
@@ -100,7 +100,7 @@ HelloCompilationPlugin.prototype.apply = function(compiler) {
 module.exports = HelloCompilationPlugin;
 ```
 
-For more information on what callbacks are available on the `compiler`, `compilation`, and other important objects, see the [plugins](/api/plugins/) doc.
+For more information on what callbacks are available on the `compiler`, `compilation`, and other important objects, see the [plugins](/documentation/api/plugins/) doc.
 
 ## Async compilation plugins
 
diff --git a/content/loaders/index.md b/content/documentation/loaders/index.md
similarity index 53%
rename from content/loaders/index.md
rename to content/documentation/loaders/index.md
index 7a1cc3e1ec8b..4c67eeb2d521 100644
--- a/content/loaders/index.md
+++ b/content/documentation/loaders/index.md
@@ -12,31 +12,31 @@ Loaders are activated by using `loadername!` prefixes in `require()` statements,
 
 ## Files
 
-* [`raw-loader`](/loaders/raw-loader) Loads raw content of a file (utf-8)
-* [`val-loader`](/loaders/val-loader) Executes code as module and consider exports as JS code
-* [`url-loader`](/loaders/url-loader) Works like the file loader, but can return a [data URL](https://tools.ietf.org/html/rfc2397) if the file is smaller than a limit
-* [`file-loader`](/loaders/file-loader) Emits the file into the output folder and returns the (relative) URL
+* [`raw-loader`](/documentation/loaders/raw-loader) Loads raw content of a file (utf-8)
+* [`val-loader`](/documentation/loaders/val-loader) Executes code as module and consider exports as JS code
+* [`url-loader`](/documentation/loaders/url-loader) Works like the file loader, but can return a [data URL](https://tools.ietf.org/html/rfc2397) if the file is smaller than a limit
+* [`file-loader`](/documentation/loaders/file-loader) Emits the file into the output folder and returns the (relative) URL
 
 
 ## JSON
 
-* [`json-loader`](/loaders/json-loader) Loads a [JSON](http://json.org/) file (included by default)
-* [`json5-loader`](/loaders/json5-loader) Loads and transpiles a [JSON 5](http://json5.org/) file
+* [`json-loader`](/documentation/loaders/json-loader) Loads a [JSON](http://json.org/) file (included by default)
+* [`json5-loader`](/documentation/loaders/json5-loader) Loads and transpiles a [JSON 5](http://json5.org/) file
 * `cson-loader` Loads and transpiles a [CSON](https://github.com/bevry/cson#what-is-cson) file
 
 
 ## Transpiling
 
-* [`script-loader`](/loaders/script-loader) Executes a JavaScript file once in global context (like in script tag), requires are not parsed
-* [`babel-loader`](/loaders/babel-loader) Loads ES2015+ code and transpiles to ES5 using [Babel](https://babeljs.io/)
+* [`script-loader`](/documentation/loaders/script-loader) Executes a JavaScript file once in global context (like in script tag), requires are not parsed
+* [`babel-loader`](/documentation/loaders/babel-loader) Loads ES2015+ code and transpiles to ES5 using [Babel](https://babeljs.io/)
 * `traceur-loader` Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler#readme)
 * [`ts-loader`](https://github.com/TypeStrong/ts-loader) or [`awesome-typescript-loader`](https://github.com/s-panferov/awesome-typescript-loader) Loads [TypeScript](https://www.typescriptlang.org/) 2.0+ like JavaScript
-* [`coffee-loader`](/loaders/coffee-loader) Loads [CoffeeScript](http://coffeescript.org/) like JavaScript
+* [`coffee-loader`](/documentation/loaders/coffee-loader) Loads [CoffeeScript](http://coffeescript.org/) like JavaScript
 
 
 ## Templating
 
-* [`html-loader`](/loaders/html-loader) Exports HTML as string, require references to static resources
+* [`html-loader`](/documentation/loaders/html-loader) Exports HTML as string, require references to static resources
 * `pug-loader` Loads Pug templates and returns a function
 * `jade-loader` Loads Jade templates and returns a function
 * `markdown-loader` Compiles Markdown to HTML
@@ -46,21 +46,21 @@ Loaders are activated by using `loadername!` prefixes in `require()` statements,
 
 ## Styling
 
-* [`style-loader`](/loaders/style-loader) Add exports of a module as style to DOM
-* [`css-loader`](/loaders/css-loader) Loads CSS file with resolved imports and returns CSS code
-* [`less-loader`](/loaders/less-loader) Loads and compiles a LESS file
-* [`sass-loader`](/loaders/sass-loader) Loads and compiles a SASS/SCSS file
+* [`style-loader`](/documentation/loaders/style-loader) Add exports of a module as style to DOM
+* [`css-loader`](/documentation/loaders/css-loader) Loads CSS file with resolved imports and returns CSS code
+* [`less-loader`](/documentation/loaders/less-loader) Loads and compiles a LESS file
+* [`sass-loader`](/documentation/loaders/sass-loader) Loads and compiles a SASS/SCSS file
 * `stylus-loader` Loads and compiles a Stylus file
 * `postcss-loader` Loads and transforms a CSS/SSS file using [PostCSS](http://postcss.org)
 
 
 ## Linting && Testing
 
-* [`mocha-loader`](/loaders/mocha-loader) Tests with [mocha](https://mochajs.org/) (Browser/NodeJS)
+* [`mocha-loader`](/documentation/loaders/mocha-loader) Tests with [mocha](https://mochajs.org/) (Browser/NodeJS)
 * `eslint-loader` PreLoader for linting code using [ESLint](http://eslint.org/)
-* [`jshint-loader`](/loaders/jshint-loader) PreLoader for linting code using [JSHint](http://jshint.com/about/)
+* [`jshint-loader`](/documentation/loaders/jshint-loader) PreLoader for linting code using [JSHint](http://jshint.com/about/)
 * `jscs-loader` PreLoader for code style checking using [JSCS](http://jscs.info/)
-* [`coverjs-loader`](/loaders/coverjs-loader) PreLoader to determine the testing coverage using [CoverJS](https://github.com/arian/CoverJS)
+* [`coverjs-loader`](/documentation/loaders/coverjs-loader) PreLoader to determine the testing coverage using [CoverJS](https://github.com/arian/CoverJS)
 
 
 ## Frameworks
diff --git a/content/plugins/banner-plugin.md b/content/documentation/plugins/banner-plugin.md
similarity index 100%
rename from content/plugins/banner-plugin.md
rename to content/documentation/plugins/banner-plugin.md
diff --git a/content/plugins/commons-chunk-plugin.md b/content/documentation/plugins/commons-chunk-plugin.md
similarity index 99%
rename from content/plugins/commons-chunk-plugin.md
rename to content/documentation/plugins/commons-chunk-plugin.md
index 3e33d16d0417..12ee5b345fad 100644
--- a/content/plugins/commons-chunk-plugin.md
+++ b/content/documentation/plugins/commons-chunk-plugin.md
@@ -194,7 +194,7 @@ new webpack.optimize.CommonsChunkPlugin({
 })
 ```
 
-In order to obtain a single CSS file containing your application and vendor CSS, use the following `minChunks` function together with [`ExtractTextPlugin`](/plugins/extract-text-webpack-plugin/):
+In order to obtain a single CSS file containing your application and vendor CSS, use the following `minChunks` function together with [`ExtractTextPlugin`](/documentation/plugins/extract-text-webpack-plugin/):
 
 ```javascript
 new webpack.optimize.CommonsChunkPlugin({
diff --git a/content/plugins/define-plugin.md b/content/documentation/plugins/define-plugin.md
similarity index 100%
rename from content/plugins/define-plugin.md
rename to content/documentation/plugins/define-plugin.md
diff --git a/content/plugins/environment-plugin.md b/content/documentation/plugins/environment-plugin.md
similarity index 90%
rename from content/plugins/environment-plugin.md
rename to content/documentation/plugins/environment-plugin.md
index 8e5c5001e5a2..3dc943c310f0 100644
--- a/content/plugins/environment-plugin.md
+++ b/content/documentation/plugins/environment-plugin.md
@@ -6,7 +6,7 @@ contributors:
   - rouzbeh84
 ---
 
-The `EnvironmentPlugin` is shorthand for using the [`DefinePlugin`](/plugins/define-plugin) on [`process.env`](https://nodejs.org/api/process.html#process_process_env) keys.
+The `EnvironmentPlugin` is shorthand for using the [`DefinePlugin`](/documentation/plugins/define-plugin) on [`process.env`](https://nodejs.org/api/process.html#process_process_env) keys.
 
 ## Usage
 
@@ -40,7 +40,7 @@ new webpack.EnvironmentPlugin({
 
 W> Variables coming from `process.env` are always strings.
 
-T> Unlike [`DefinePlugin`](/plugins/define-plugin), default values are applied to `JSON.stringify` by the `EnvironmentPlugin`.
+T> Unlike [`DefinePlugin`](/documentation/plugins/define-plugin), default values are applied to `JSON.stringify` by the `EnvironmentPlugin`.
 
 T> To specify an unset default value, use `null` instead of `undefined`.
 
diff --git a/content/plugins/html-webpack-plugin.md b/content/documentation/plugins/html-webpack-plugin.md
similarity index 92%
rename from content/plugins/html-webpack-plugin.md
rename to content/documentation/plugins/html-webpack-plugin.md
index 3d7d0c5a0861..5d801a5d65b9 100644
--- a/content/plugins/html-webpack-plugin.md
+++ b/content/documentation/plugins/html-webpack-plugin.md
@@ -8,7 +8,7 @@ contributors:
 The [`HtmlWebpackPlugin`](https://github.com/ampedandwired/html-webpack-plugin) simplifies creation of HTML files to serve your
 webpack bundles. This is especially useful for webpack bundles that include
 a hash in the filename which changes every compilation. You can either let the plugin generate an HTML file for you, supply
-your own template using [lodash templates](https://lodash.com/docs#template), or use your own [loader](/loaders).
+your own template using [lodash templates](https://lodash.com/docs#template), or use your own [loader](/documentation/loaders).
 
 
 ## Installation
@@ -56,7 +56,7 @@ If you have multiple webpack entry points, they will all be included with `scrip
 tags in the generated HTML.
 
 If you have any CSS assets in webpack's output (for example, CSS extracted
-with the [ExtractTextPlugin](/plugins/extract-text-webpack-plugin))
+with the [ExtractTextPlugin](/documentation/plugins/extract-text-webpack-plugin))
 then these will be included with `<link>` tags in the HTML head.
 
 
diff --git a/content/plugins/ignore-plugin.md b/content/documentation/plugins/ignore-plugin.md
similarity index 100%
rename from content/plugins/ignore-plugin.md
rename to content/documentation/plugins/ignore-plugin.md
diff --git a/content/documentation/plugins/index.md b/content/documentation/plugins/index.md
new file mode 100644
index 000000000000..159b07520243
--- /dev/null
+++ b/content/documentation/plugins/index.md
@@ -0,0 +1,27 @@
+---
+title: Plugins
+contributors:
+  - simon04
+  - gonzoyumo
+  - rouzbeh84
+  - aretecode
+---
+
+webpack has a rich plugin interface. Most of the features within webpack itself use this plugin interface. This makes webpack **flexible**.
+
+|Name|Description|
+|:--:|:----------|
+|[`CommonsChunkPlugin`](/documentation/plugins/commons-chunk-plugin)|Generates chunks of common modules shared between entry points and splits them into separate  bundles, e.g. `vendor.bundle.js` && `app.bundle.js`|
+|[`ComponentWebpackPlugin`](/documentation/plugins/component-webpack-plugin)|Use components with webpack|
+|[`CompressionWebpackPlugin`](/documentation/plugins/compression-webpack-plugin)|Prepare compressed versions of assets to serve them with Content-Encoding|
+|[`DefinePlugin`](/documentation/plugins/define-plugin)|Allows global constants configured at compile time, useful for allowing different behavior between dev/release builds|
+|[`EnvironmentPlugin`](/documentation/plugins/environment-plugin)|Shorthand for using the [`DefinePlugin`](./define-plugin) on `process.env` keys.|
+|[`DllPlugin`](/plugins/dll-plugin)|Provide means to split bundles in a way that can drastically improve build time performance.|
+|[`ExtractTextWebpackPlugin`](/documentation/plugins/extract-text-webpack-plugin)|Extracts Text (CSS) from your bundles into a separate file|
+|[`HtmlWebpackPlugin`](/documentation/plugins/html-webpack-plugin)| Simplifies creation of HTML files (`index.html`) to serve your bundles|
+|[`I18nWebpackPlugin`](/documentation/plugins/i18n-webpack-plugin)|Adds i18n support to your bundles|
+|[`LimitChunkCountPlugin`](/documentation/plugins/limit-chunk-count-plugin)| Set min/max limits for chunking to fine tune and control chunking|
+|[`NormalModuleReplacementPlugin`](/documentation/plugins/normal-module-replacement-plugin)|Replaces resource that matches a regexp|
+
+![Awesome](../assets/awesome-badge.svg)
+For more third-party plugins, see the list from [awesome-webpack](https://github.com/webpack-contrib/awesome-webpack#webpack-plugins).
diff --git a/content/plugins/limit-chunk-count-plugin.md b/content/documentation/plugins/limit-chunk-count-plugin.md
similarity index 100%
rename from content/plugins/limit-chunk-count-plugin.md
rename to content/documentation/plugins/limit-chunk-count-plugin.md
diff --git a/content/plugins/loader-options-plugin.md b/content/documentation/plugins/loader-options-plugin.md
similarity index 100%
rename from content/plugins/loader-options-plugin.md
rename to content/documentation/plugins/loader-options-plugin.md
diff --git a/content/plugins/min-chunk-size-plugin.md b/content/documentation/plugins/min-chunk-size-plugin.md
similarity index 100%
rename from content/plugins/min-chunk-size-plugin.md
rename to content/documentation/plugins/min-chunk-size-plugin.md
diff --git a/content/plugins/no-emit-on-errors-plugin.md b/content/documentation/plugins/no-emit-on-errors-plugin.md
similarity index 61%
rename from content/plugins/no-emit-on-errors-plugin.md
rename to content/documentation/plugins/no-emit-on-errors-plugin.md
index ded6a7826502..415f95fd9ce4 100644
--- a/content/plugins/no-emit-on-errors-plugin.md
+++ b/content/documentation/plugins/no-emit-on-errors-plugin.md
@@ -10,6 +10,6 @@ new webpack.NoEmitOnErrorsPlugin()
 
 Use the `NoEmitOnErrorsPlugin` to skip the emitting phase whenever there are errors while compiling. This ensures that no assets are emitted that include errors. The `emitted` flag in the stats is `false` for all assets.
 
-If you are using the [CLI](/api/cli/), the webpack process will not exit with an error code by enabling this plugin. If you want webpack to "fail" when using the CLI, please check out the [`bail` option](/api/cli/#advanced-options).
+If you are using the [CLI](/documentation/api/cli/), the webpack process will not exit with an error code by enabling this plugin. If you want webpack to "fail" when using the CLI, please check out the [`bail` option](/documentation/api/cli/#advanced-options).
 
 Note: This supersedes the (now deprecated) webpack 1 plugin `NoErrorsPlugin`.
diff --git a/content/plugins/normal-module-replacement-plugin.md b/content/documentation/plugins/normal-module-replacement-plugin.md
similarity index 95%
rename from content/plugins/normal-module-replacement-plugin.md
rename to content/documentation/plugins/normal-module-replacement-plugin.md
index 034276914ce7..11056ad0539f 100644
--- a/content/plugins/normal-module-replacement-plugin.md
+++ b/content/documentation/plugins/normal-module-replacement-plugin.md
@@ -38,7 +38,7 @@ new webpack.NormalModuleReplacementPlugin(
 
 ## Advanced example
 
-Conditional build depending on an [specified environment](/configuration/configuration-types).
+Conditional build depending on an [specified environment](/documentation/configuration/configuration-types).
 
 Say you want a configuration with specific values for different build targets.
 
diff --git a/content/plugins/provide-plugin.md b/content/documentation/plugins/provide-plugin.md
similarity index 100%
rename from content/plugins/provide-plugin.md
rename to content/documentation/plugins/provide-plugin.md
diff --git a/content/plugins/source-map-dev-tool-plugin.md b/content/documentation/plugins/source-map-dev-tool-plugin.md
similarity index 100%
rename from content/plugins/source-map-dev-tool-plugin.md
rename to content/documentation/plugins/source-map-dev-tool-plugin.md
diff --git a/content/guides/author-libraries.md b/content/guides/author-libraries.md
index 302b9b3139d9..9ffec269352e 100644
--- a/content/guides/author-libraries.md
+++ b/content/guides/author-libraries.md
@@ -166,7 +166,7 @@ module.exports = {
 };
 ```
 
-If `library` is set and `libraryTarget` is not, `libraryTarget` defaults to `var` as specified in the [config reference](/configuration/output).
+If `library` is set and `libraryTarget` is not, `libraryTarget` defaults to `var` as specified in the [config reference](/documentation/configuration/output).
 
 
 ### Final Steps
diff --git a/content/guides/caching.md b/content/guides/caching.md
index 3dec7a11ac2a..503d19d6f12c 100644
--- a/content/guides/caching.md
+++ b/content/guides/caching.md
@@ -161,7 +161,7 @@ To generate identifiers that are preserved over builds, webpack supplies the `Na
 
 The chunk manifest (along with bootstrapping/runtime code) is then placed into the entry chunk and it is crucial for webpack-packaged code to work.
 
-T> Separate your vendor and application code with [CommonsChunkPlugin](/plugins/commons-chunk-plugin) and create an explicit vendor chunk to prevent it from changing too often. When `CommonsChunkPlugin` is used, the runtime code is moved to the *last* common entry.
+T> Separate your vendor and application code with [CommonsChunkPlugin](/documentation/plugins/commons-chunk-plugin) and create an explicit vendor chunk to prevent it from changing too often. When `CommonsChunkPlugin` is used, the runtime code is moved to the *last* common entry.
 
 The problem with this, is the same as before: Whenever we change any part of the code it will, even if the rest of its contents wasn’t altered, update our entry chunk to include the new manifest. This in turn, will lead to a new hash and dismiss the long-term caching.
 
diff --git a/content/guides/code-splitting-async.md b/content/guides/code-splitting-async.md
index 045a7d178baf..9214eaf3c6e1 100644
--- a/content/guides/code-splitting-async.md
+++ b/content/guides/code-splitting-async.md
@@ -250,7 +250,7 @@ When you add `bundle.js` in your HTML file and open it in your browser, the `0.b
 
 ### publicPath
 
-`output.publicPath` is an important option when using code-splitting, it is used to tell webpack where to load your bundles on-demand, see the [configuration documentation](/configuration/output/#output-publicpath).
+`output.publicPath` is an important option when using code-splitting, it is used to tell webpack where to load your bundles on-demand, see the [configuration documentation](/documentation/configuration/output/#output-publicpath).
 
 
 ### Chunk name
diff --git a/content/guides/code-splitting-css.md b/content/guides/code-splitting-css.md
index 9b699fbefa08..8ef8cdf5634e 100644
--- a/content/guides/code-splitting-css.md
+++ b/content/guides/code-splitting-css.md
@@ -24,7 +24,7 @@ import 'bootstrap/dist/css/bootstrap.css';
 
 ## Using `css-loader` and `style-loader`
 
-Install the [`css-loader`](/loaders/css-loader) and [`style-loader`](/loaders/style-loader):
+Install the [`css-loader`](/documentation/loaders/css-loader) and [`style-loader`](/documentation/loaders/style-loader):
 
 ``` bash
 npm install --save-dev css-loader style-loader
@@ -52,7 +52,7 @@ webpack can help with this problem by bundling the CSS separately using the `Ext
 
 ## Using `ExtractTextWebpackPlugin`
 
-Install the [`ExtractTextWebpackPlugin`](/plugins/extract-text-webpack-plugin) plugin as follows
+Install the [`ExtractTextWebpackPlugin`](/documentation/plugins/extract-text-webpack-plugin) plugin as follows
 
 ``` bash
 npm install --save-dev extract-text-webpack-plugin
diff --git a/content/guides/code-splitting-libraries.md b/content/guides/code-splitting-libraries.md
index 796ffbcee478..29cc665f6417 100644
--- a/content/guides/code-splitting-libraries.md
+++ b/content/guides/code-splitting-libraries.md
@@ -81,7 +81,7 @@ module.exports = function(env) {
 
 On running `webpack` now, we see that two bundles have been created. If you inspect these though, you will find that the code for `moment` is present in both the files! The reason for that is `moment` is a dependency of the main application (e.g. index.js) and each entry point will bundle its own dependencies.
 
-It is for this reason, that we will need to use the [CommonsChunkPlugin](/plugins/commons-chunk-plugin).
+It is for this reason, that we will need to use the [CommonsChunkPlugin](/documentation/plugins/commons-chunk-plugin).
 
 
 ## `CommonsChunkPlugin`
diff --git a/content/guides/development.md b/content/guides/development.md
index 0d114f159dc2..fad9ce9b3731 100644
--- a/content/guides/development.md
+++ b/content/guides/development.md
@@ -28,7 +28,7 @@ Each editor has a different way of disabling this. For the most common ones:
 
 When a JavaScript exception occurs, you'll often want to know what file and line is generating this error. Since webpack outputs files into one or more bundles, it can be inconvenient to trace the file.
 
-**Source maps** intend to fix this problem. There are a lot of [different options](/configuration/devtool) - each with their own advantages and disadvantages. To get started, we'll use this one:
+**Source maps** intend to fix this problem. There are a lot of [different options](/documentation/configuration/devtool) - each with their own advantages and disadvantages. To get started, we'll use this one:
 
 ```js
 devtool: "cheap-eval-source-map"
@@ -121,13 +121,13 @@ T> If your console says it can't find the command, try running `node_modules/.bi
 
 The command above should automatically open your browser on `http://localhost:8080`.
 
-Make a change in one of your files and hit save. You should see that the console is recompiling. After that's done, the page should be refreshed. If nothing happens in the console, you may need to fiddle with [`watchOptions`](/configuration/dev-server#devserver-watchoptions-).
+Make a change in one of your files and hit save. You should see that the console is recompiling. After that's done, the page should be refreshed. If nothing happens in the console, you may need to fiddle with [`watchOptions`](/documentation/configuration/dev-server#devserver-watchoptions-).
 
 Now you have live reloading working, you can take it even a step further: Hot Module Replacement. This is an interface that makes it possible to swap modules **without a page refresh**. Find out how to [configure HMR](/guides/hmr-react).
 
 By default **inline mode** is used. This mode injects the client - needed for live reloading and showing build errors - in your bundle. With inline mode you will get build errors and warnings in your DevTools console.
 
-webpack-dev-server can do many more things such as proxying requests to your backend server. For more configuration options, see the [**devServer documentation**](/configuration/dev-server).
+webpack-dev-server can do many more things such as proxying requests to your backend server. For more configuration options, see the [**devServer documentation**](/documentation/configuration/dev-server).
 
 
 ### webpack-dev-middleware
@@ -177,7 +177,7 @@ app.use(webpackDevMiddleware(compiler, {
 }));
 ```
 
-There are many more options you can use. For all configuration options, see the [**devServer documentation**](/configuration/dev-server).
+There are many more options you can use. For all configuration options, see the [**devServer documentation**](/documentation/configuration/dev-server).
 
 
 ## References
diff --git a/content/guides/get-started.md b/content/guides/get-started.md
index bc5f2dec7d68..7e99c13d0ed9 100644
--- a/content/guides/get-started.md
+++ b/content/guides/get-started.md
@@ -12,7 +12,7 @@ contributors:
   - jecoopr
 ---
 
-webpack is a tool to build JavaScript modules in your application. To start using `webpack` from its [cli](/api/cli) or [api](/api/node), follow the [Installation instructions](/guides/installation).
+webpack is a tool to build JavaScript modules in your application. To start using `webpack` from its [cli](/documentation/api/cli) or [api](/documentation/api/node), follow the [Installation instructions](/guides/installation).
 webpack simplifies your workflow by quickly constructing a dependency graph of your application and bundling them in the right order. webpack can be configured to customise optimisations to your code, to split vendor/css/js code for production, run a development server that hot-reloads your code without page refresh and many such cool features. Learn more about [why you should use webpack](/guides/why-webpack).
 
 
@@ -202,4 +202,4 @@ T> You can pass custom parameters to webpack by adding two dashes to the `npm ru
 
 ## Conclusion
 
-Now that you have a basic build together, you should dig into the [basic concepts](/concepts) and [configuration](/configuration) of webpack to better understand its design. Also check out the [guides](/guides) to learn how to approach common problems. The [API](/api) section digs into the lower level features.
+Now that you have a basic build together, you should dig into the [basic concepts](/concepts) and [configuration](/documentation/configuration) of webpack to better understand its design. Also check out the [guides](/guides) to learn how to approach common problems. The [API](/documentation/api) section digs into the lower level features.
diff --git a/content/guides/hmr-react.md b/content/guides/hmr-react.md
index f355cbc1ee3b..4e7b74bde404 100644
--- a/content/guides/hmr-react.md
+++ b/content/guides/hmr-react.md
@@ -86,7 +86,7 @@ For this example, we will use a single webpack config file, with the following a
 * all app source code lives inside the `<root>/src` folder
 * the entry point to the app is at `/src/index.js`
 
-T> Please review the [webpack-dev-server options](/configuration/dev-server) and the [concept pages](/concepts) to familiarize yourself with the concepts below
+T> Please review the [webpack-dev-server options](/documentation/configuration/dev-server) and the [concept pages](/concepts) to familiarize yourself with the concepts below
 
 __webpack.config.js__
 
diff --git a/content/guides/index.md b/content/guides/index.md
index 47d37a47d2c7..66e19f4c6c41 100644
--- a/content/guides/index.md
+++ b/content/guides/index.md
@@ -4,4 +4,4 @@ title: Guides
 
 This section contains guides for understanding and mastering the wide variety of tools and features that webpack offers. The first is a simple guide that takes you through [installation](/guides/installation).
 
-The guides get progressively more advanced as you go on. Most serve as a starting point, and once completed you should feel more comfortable diving into the actual [documentation](/configuration).
+The guides get progressively more advanced as you go on. Most serve as a starting point, and once completed you should feel more comfortable diving into the actual [documentation](/documentation/configuration).
diff --git a/content/guides/migrating.md b/content/guides/migrating.md
index 83caa758d7f6..d52f1e23d8db 100644
--- a/content/guides/migrating.md
+++ b/content/guides/migrating.md
@@ -18,7 +18,7 @@ contributors:
 
 ## `resolve.root`, `resolve.fallback`, `resolve.modulesDirectories`
 
-These options were replaced by a single option `resolve.modules`. See [resolving](/configuration/resolve) for more usage.
+These options were replaced by a single option `resolve.modules`. See [resolving](/documentation/configuration/resolve) for more usage.
 
 ``` diff
   resolve: {
@@ -33,12 +33,12 @@ These options were replaced by a single option `resolve.modules`. See [resolving
 
 ## `resolve.extensions`
 
-This option no longer requires passing an empty string. This behavior was moved to `resolve.enforceExtension`. See [resolving](/configuration/resolve) for more usage.
+This option no longer requires passing an empty string. This behavior was moved to `resolve.enforceExtension`. See [resolving](/documentation/configuration/resolve) for more usage.
 
 
 ## `resolve.*`
 
-Several APIs were changed here. Not listed in detail as it's not commonly used. See [resolving](/configuration/resolve) for details.
+Several APIs were changed here. Not listed in detail as it's not commonly used. See [resolving](/documentation/configuration/resolve) for details.
 
 
 ## `module.loaders` is now `module.rules`
@@ -82,7 +82,7 @@ The new naming conventions are easier to understand and are a good reason to upg
 
 ## Chaining loaders
 
-Like in webpack 1, loaders can be chained to pass results from loader to loader. Using the [rule.use](/configuration/module#rule-use)
+Like in webpack 1, loaders can be chained to pass results from loader to loader. Using the [rule.use](/documentation/configuration/module#rule-use)
  configuration option, `use` can be set to an array of loaders.
 In webpack 1, loaders were commonly chained with `!`. This style is only supported using the legacy option `module.loaders`.
 
@@ -350,7 +350,7 @@ module.exports = function(env) {
 };
 ```
 
-See [CLI](/api/cli).
+See [CLI](/documentation/api/cli).
 
 
 ## `require.ensure` and AMD `require` are asynchronous
@@ -577,7 +577,7 @@ module: {
 
 There are some new CLI options for you to use:
 
-`--define process.env.NODE_ENV="production"` See [`DefinePlugin`](/plugins/define-plugin/).
+`--define process.env.NODE_ENV="production"` See [`DefinePlugin`](/documentation/plugins/define-plugin/).
 
 `--display-depth` displays the distance to the entry point for each module.
 
diff --git a/content/guides/production-build.md b/content/guides/production-build.md
index d0046e99c4c8..40d67c3fd05d 100644
--- a/content/guides/production-build.md
+++ b/content/guides/production-build.md
@@ -21,8 +21,8 @@ The following article describes the best practices and tools to use when using w
 
 Running `webpack -p` (or equivalently `webpack --optimize-minimize --define process.env.NODE_ENV="'production'"`). This performs the following steps:
 
-- Minification using `UglifyJsPlugin`
-- Runs the `LoaderOptionsPlugin` (see its [documentation](/plugins/loader-options-plugin))
+- Minification using [`UglifyJsPlugin`](/documentation/plugins/uglifyjs-webpack-plugin)
+- Runs the [`LoaderOptionsPlugin`](/documentation/plugins/loader-options-plugin)
 - Sets the NodeJS environment variable triggering certain packages to compile differently
 
 
@@ -44,19 +44,19 @@ module.exports = {
 };
 ```
 
-Thus, depending on the [devtool options](/configuration/devtool), Source Maps are generated.
+Thus, depending on the [devtool options](/documentation/configuration/devtool), Source Maps are generated.
 
 
 ### Source Maps
 
 We encourage you to have source maps enabled in production, as they are useful for debugging as well as running benchmark tests. webpack can generate inline source maps within bundles or as separate files.
 
-In your configuration, use the `devtool` object to set the Source Map type. We currently support seven types of source maps. You can find more information about them in our [configuration](/configuration/devtool) documentation page (`cheap-module-source-map` is one of the simpler options, using a single mapping per line).
+In your configuration, use the `devtool` object to set the Source Map type. We currently support seven types of source maps. You can find more information about them in our [configuration](/documentation/configuration/devtool) documentation page.
 
 
 ### Node Environment Variable
 
-Running `webpack -p` (or `--define process.env.NODE_ENV="'production'"`) invokes the [`DefinePlugin`](/plugins/define-plugin) in the following way:
+Running `webpack -p` (or `--define process.env.NODE_ENV="'production'"`) invokes the [`DefinePlugin`](/documentation/plugins/define-plugin) in the following way:
 
 ```js
 // webpack.config.js
diff --git a/content/guides/shimming.md b/content/guides/shimming.md
index 4f1b249b4647..ebbf94ba2380 100644
--- a/content/guides/shimming.md
+++ b/content/guides/shimming.md
@@ -30,7 +30,7 @@ module.exports = {
 
 ## `ProvidePlugin`
 
-The [`ProvidePlugin`](/plugins/provide-plugin) makes a module available as a variable in every other module required by `webpack`. The module is required only if you use the variable.
+The [`ProvidePlugin`](/documentation/plugins/provide-plugin) makes a module available as a variable in every other module required by `webpack`. The module is required only if you use the variable.
 Most legacy modules rely on the presence of specific globals, like jQuery plugins do on `$` or `jQuery`. In this scenario, you can configure webpack to prepend `var $ = require(“jquery”)` every time it encounters the global `$` identifier.
 
 ```javascript
@@ -62,7 +62,7 @@ module.exports = {
 
 ## `imports-loader`
 
-[`imports-loader`](/loaders/imports-loader/) inserts necessary globals into the required legacy module.
+[`imports-loader`](/documentation/loaders/imports-loader/) inserts necessary globals into the required legacy module.
 For example, Some legacy modules rely on `this` being the `window` object. This becomes a problem when the module is executed in a CommonJS context where `this` equals `module.exports`. In this case you can override `this` using the `imports-loader`.
 
 __webpack.config.js__
@@ -96,7 +96,7 @@ module.exports = {
 
 ## `exports-loader`
 
-Let's say a library creates a global variable that it expects its consumers to use; In this case, we can use [`exports-loader`](/loaders/exports-loader/), to export that global variable in CommonJS format. For instance, in order to export `file` as `file` and `helpers.parse` as `parse`:
+Let's say a library creates a global variable that it expects its consumers to use; In this case, we can use [`exports-loader`](/documentation/loaders/exports-loader/), to export that global variable in CommonJS format. For instance, in order to export `file` as `file` and `helpers.parse` as `parse`:
 
 __webpack.config.js__
 
@@ -117,7 +117,7 @@ module.exports = {
 
 ## `script-loader`
 
-The [`script-loader`](/loaders/script-loader/) evaluates code in the global context, just like you would add the code into a `script` tag. In this mode, every normal library should work. `require`, `module`, etc. are undefined.
+The [`script-loader`](/documentation/loaders/script-loader/) evaluates code in the global context, just like you would add the code into a `script` tag. In this mode, every normal library should work. `require`, `module`, etc. are undefined.
 
 W> The file is added as string to the bundle. It is not minimized by `webpack`, so use a minimized version. There is also no dev tool support for libraries added by this loader.
 
@@ -142,7 +142,7 @@ eval("GLOBAL_CONFIG = {};");
 
 ## `noParse` option
 
-When there is no AMD/CommonJS version of the module and you want to include the `dist`, you can flag this module as [`noParse`](/configuration/module/#module-noparse). Then `webpack` will just include the module without parsing it, which can be used to improve the build time.
+When there is no AMD/CommonJS version of the module and you want to include the `dist`, you can flag this module as [`noParse`](/documentation/configuration/module/#module-noparse). Then `webpack` will just include the module without parsing it, which can be used to improve the build time.
 
 W> Any feature requiring the AST, like the `ProvidePlugin`, will not work.
 
diff --git a/content/guides/webpack-and-typescript.md b/content/guides/webpack-and-typescript.md
index f8948bd5cc44..7abf9cc55e16 100644
--- a/content/guides/webpack-and-typescript.md
+++ b/content/guides/webpack-and-typescript.md
@@ -143,7 +143,7 @@ npm install --save-dev source-map-loader
 
 Once the loader is installed we need to tell webpack we want to run this loader before any other loaders by using the `enforce: 'pre'` configuration flag.
 Finally we need to enable source maps in webpack by specifying the `devtool` property.
-Currently we use the 'inline-source-map' setting, to read more about this setting and see other options check out the [devtool documentation](/configuration/devtool/).
+Currently we use the 'inline-source-map' setting, to read more about this setting and see other options check out the [devtool documentation](/documentation/configuration/devtool/).
 
 
 ## Using 3rd Party Libraries
diff --git a/content/plugins/index.md b/content/plugins/index.md
deleted file mode 100644
index 041b3c1d703c..000000000000
--- a/content/plugins/index.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Plugins
-contributors:
-  - simon04
-  - gonzoyumo
-  - rouzbeh84
-  - aretecode
----
-
-webpack has a rich plugin interface. Most of the features within webpack itself use this plugin interface. This makes webpack **flexible**.
-
-|Name|Description|
-|:--:|:----------|
-|[`CommonsChunkPlugin`](/plugins/commons-chunk-plugin)|Generates chunks of common modules shared between entry points and splits them into separate  bundles, e.g., `vendor.bundle.js` && `app.bundle.js`|
-|[`ComponentWebpackPlugin`](/plugins/component-webpack-plugin)|Use components with webpack|
-|[`CompressionWebpackPlugin`](/plugins/compression-webpack-plugin)|Prepare compressed versions of assets to serve them with Content-Encoding|
-|[`DefinePlugin`](/plugins/define-plugin)|Allows global constants configured at compile time, useful for allowing different behavior between dev/release builds|
-|[`EnvironmentPlugin`](/plugins/environment-plugin)|Shorthand for using the [`DefinePlugin`](./define-plugin) on `process.env` keys.|
-|[`DllPlugin`](/plugins/dll-plugin)|Provide means to split bundles in a way that can drastically improve build time performance.|
-|[`ExtractTextWebpackPlugin`](/plugins/extract-text-webpack-plugin)|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
-|[`HtmlWebpackPlugin`](/plugins/html-webpack-plugin)| Simplifies creation of HTML files (`index.html`) to serve your bundles|
-|[`I18nWebpackPlugin`](/plugins/i18n-webpack-plugin)|Adds i18n support to your bundles|
-|[`LimitChunkCountPlugin`](/plugins/limit-chunk-count-plugin)| Set min/max limits for chunking to fine tune and control chunking|
-|[`NormalModuleReplacementPlugin`](/plugins/normal-module-replacement-plugin)|Replaces resource that matches a regexp|
-
-![Awesome](../assets/awesome-badge.svg)
-For more third-party plugins, see the list from [awesome-webpack](https://github.com/webpack-contrib/awesome-webpack#webpack-plugins).
diff --git a/content/support/index.md b/content/support/index.md
index 25b3cf2b93bc..80c445dfd608 100644
--- a/content/support/index.md
+++ b/content/support/index.md
@@ -17,7 +17,7 @@ The biggest core feature that we want to give you is enjoyment of using webpack.
 Anybody can help by doing any of the following:
 
 *   Submit documentation corrections/enhancements to [webpack.js.org](https://github.com/webpack/webpack.js.org) (read the [Writer's guide](/writers-guide) beforehand)
-*   Contribute code to [webpack](https://github.com/webpack/webpack) (see this handy [Development guide](/development/) made for you)
+*   Contribute code to [webpack](https://github.com/webpack/webpack) (see this handy [Development guide](/documentation/development/) made for you)
 *   [Donate](https://opencollective.com/webpack/donate) to our [open collective](https://opencollective.com/webpack)
 *   [Sponsor webpack](https://opencollective.com/webpack#support)
 *   Ask your employer to use webpack in projects
diff --git a/content/writers-guide.md b/content/writers-guide.md
index 391b9f990712..7ddfc3059fed 100644
--- a/content/writers-guide.md
+++ b/content/writers-guide.md
@@ -65,7 +65,7 @@ Same goes for tables.
 
 ### Configuration Properties
 
-The [configuration](/configuration) properties should be ordered alphabetically as well:
+The [configuration](/documentation/configuration) properties should be ordered alphabetically as well:
 
 * `devServer.contentBase`
 * `devServer.compress`
diff --git a/scripts/fetch.sh b/scripts/fetch.sh
index 5cf368136216..52667fab536b 100755
--- a/scripts/fetch.sh
+++ b/scripts/fetch.sh
@@ -3,9 +3,9 @@ set -e # Exit with nonzero exit code if anything fails
 
 rm -rf ./generated
 mkdir -p ./generated/loaders
-cp -rf ./content/loaders/ ./generated/loaders
+cp -rf ./content/documentation/loaders/ ./generated/loaders
 mkdir -p ./generated/plugins
-cp -rf ./content/plugins/ ./generated/plugins
+cp -rf ./content/documentation/plugins/ ./generated/plugins
 
 # Fetch webpack-contrib (and various other) loader repositories
 ./scripts/fetch_package_names.js "webpack-contrib" "-loader" | ./scripts/fetch_package_files.js "README.md" "./generated/loaders"
diff --git a/utilities/markdown.js b/utilities/markdown.js
index 39907ee15780..7e958d8f1c66 100644
--- a/utilities/markdown.js
+++ b/utilities/markdown.js
@@ -109,7 +109,7 @@ module.exports = function() {
     },
 
     // Note that this should correspond with renderer.heading
-    getAnchors: function(content) {
+    getAnchors: function(content = '') {
       return marked.lexer(content)
         .filter(chunk => chunk.type === 'heading')
         .map(chunk => parseAnchor(chunk.text));