diff --git a/components/footer/footer.jsx b/components/footer/footer.jsx
index 0b019d677e09..883cb48d9912 100644
--- a/components/footer/footer.jsx
+++ b/components/footer/footer.jsx
@@ -10,7 +10,7 @@ export default (props) => {
     <footer className="footer">
       <Container className="footer__inner">
         <section className="footer__left">
-          <Link className="footer__link" to="/guides/get-started">Get Started</Link>
+          <Link className="footer__link" to="/guides/getting-started">Get Started</Link>
           <Link className="footer__link" to="/organization">Organization</Link>
           <Link className="footer__link" to="/support">Support</Link>
           <Link className="footer__link" to="/guides/why-webpack#comparison">Comparison</Link>
diff --git a/content/api/cli.md b/content/api/cli.md
index e4fb311d8fdf..48b36d118ecd 100644
--- a/content/api/cli.md
+++ b/content/api/cli.md
@@ -279,7 +279,7 @@ These options allow webpack to display various [stats](/configuration/stats/) an
 | Shortcut | Replaces                                                         |
 |----------|------------------------------------------------------------------|
 | -d       | --debug --devtool eval-cheap-module-source-map --output-pathinfo |
-| -p       | --optimize-minimize --define process.env.NODE_ENV="production", see [building for production](/guides/production-build)   |
+| -p       | --optimize-minimize --define process.env.NODE_ENV="production", see [building for production](/guides/production) |
 
 
 ### Profiling
diff --git a/content/concepts/entry-points.md b/content/concepts/entry-points.md
index 85fcad04179b..2e75db1a89e2 100644
--- a/content/concepts/entry-points.md
+++ b/content/concepts/entry-points.md
@@ -6,7 +6,7 @@ contributors:
   - chrisVillanueva
 ---
 
-Like we mentioned in the [introduction](/guides/get-started/#using-webpack-with-a-config), there are multiple ways to define the `entry` property in your webpack configuration. We will show you the ways you **can** configure the `entry` property, in addition to explaining why it may be useful to you.
+As mentioned in [Getting Started](/guides/getting-started/#using-a-configuration), there are multiple ways to define the `entry` property in your webpack configuration. We will show you the ways you **can** configure the `entry` property, in addition to explaining why it may be useful to you.
 
 
 ## Single Entry (Shorthand) Syntax
diff --git a/content/configuration/configuration-types.md b/content/configuration/configuration-types.md
index 0f18ad472e40..10211b0dbb71 100644
--- a/content/configuration/configuration-types.md
+++ b/content/configuration/configuration-types.md
@@ -13,7 +13,7 @@ Besides exporting a single config object, there are a few more ways that cover o
 
 ## Exporting a function to use `--env`
 
-Eventually you will find the need to disambiguate in your `webpack.config.js` between [development](/guides/development) and [production builds](/guides/production-build). You have (at least) two options:
+Eventually you will find the need to disambiguate in your `webpack.config.js` between [development](/guides/development) and [production builds](/guides/production). You have (at least) two options:
 
 Instead of exporting a configuration object, you may return a function which accepts an environment as argument. When running webpack, you may specify build environment keys via `--env`, such as `--env.production` or `--env.platform=web`.
 
diff --git a/content/glossary.md b/content/glossary.md
index 932647f00cb4..b6a881eb3fc1 100644
--- a/content/glossary.md
+++ b/content/glossary.md
@@ -16,7 +16,7 @@ This index lists common terms used throughout the webpack ecosystem.
 
 ## B
 
-- [**Bundle**](/guides/get-started/#creating-a-bundle): Produced from a number of distinct modules, bundles contain the final versions of source files that have already undergone the loading and compilation process.
+- [**Bundle**](/guides/getting-started/#creating-a-bundle): Produced from a number of distinct modules, bundles contain the final versions of source files that have already undergone the loading and compilation process.
 - [**Bundle Splitting**](/guides/code-splitting): This process offers one way of optimizing a build, allowing webpack to generate multiple bundles for a single application. As a result, each bundle can be isolated from changes effecting others, reducing the amount of code that needs to be republished and therefore re-downloaded by the client and taking advantage of browser caching.
 
 
diff --git a/content/guides/asset-management.md b/content/guides/asset-management.md
index 7edea24729ad..f7d51e94f250 100644
--- a/content/guides/asset-management.md
+++ b/content/guides/asset-management.md
@@ -1,5 +1,6 @@
 ---
 title: Asset Management
+sort: 3
 contributors:
   - skipjack
   - michael-ciniawsky
diff --git a/content/guides/author-libraries.md b/content/guides/author-libraries.md
index bc1b7a698fd1..85b2885a1c0f 100644
--- a/content/guides/author-libraries.md
+++ b/content/guides/author-libraries.md
@@ -1,5 +1,6 @@
 ---
 title: Authoring Libraries
+sort: 12
 contributors:
   - pksjce
   - johnstew
@@ -207,7 +208,7 @@ If `library` is set and `libraryTarget` is not, `libraryTarget` defaults to `var
 
 ### Final Steps
 
-[Tweak your production build using webpack](/guides/production-build).
+[Tweak your production build using webpack](/guides/production).
 
 Add the path to your generated bundle as the package's main file in `package.json`
 
diff --git a/content/guides/build-performance.md b/content/guides/build-performance.md
index 50c9beb2b95b..23c2fd3ba764 100644
--- a/content/guides/build-performance.md
+++ b/content/guides/build-performance.md
@@ -1,5 +1,6 @@
 ---
-title: Improving Build Performance
+title: Build Performance
+sort: 25
 ---
 
 ?> incremental builds
diff --git a/content/guides/caching.md b/content/guides/caching.md
index 08997b5ffc40..329a707613ca 100644
--- a/content/guides/caching.md
+++ b/content/guides/caching.md
@@ -1,9 +1,12 @@
 ---
 title: Caching
-sort: 41
+sort: 9
 contributors:
   - okonet
   - jouni-kantola
+related:
+  - title: Predictable Long Term Caching
+    url: https://medium.com/webpack/predictable-long-term-caching-with-webpack-d3eee1d3fa31
 ---
 
 To enable long-term caching of static resources produced by webpack:
diff --git a/content/guides/code-splitting-async.md b/content/guides/code-splitting-async.md
index 7a5aa082a879..34ee960d68a2 100644
--- a/content/guides/code-splitting-async.md
+++ b/content/guides/code-splitting-async.md
@@ -1,6 +1,6 @@
 ---
 title: Code Splitting - Async
-sort: 33
+sort: 17
 contributors:
   - simon04
   - levy9527
diff --git a/content/guides/code-splitting-css.md b/content/guides/code-splitting-css.md
index 9b699fbefa08..d629e21c0c90 100644
--- a/content/guides/code-splitting-css.md
+++ b/content/guides/code-splitting-css.md
@@ -1,6 +1,6 @@
 ---
 title: Code Splitting - CSS
-sort: 31
+sort: 15
 contributors:
   - pksjce
   - jonwheeler
diff --git a/content/guides/code-splitting-libraries.md b/content/guides/code-splitting-libraries.md
index 7bc0f657aadc..3b2cd6bd1466 100644
--- a/content/guides/code-splitting-libraries.md
+++ b/content/guides/code-splitting-libraries.md
@@ -1,6 +1,6 @@
 ---
 title: Code Splitting - Libraries
-sort: 32
+sort: 16
 contributors:
   - pksjce
   - chrisVillanueva
@@ -186,7 +186,7 @@ module.exports = function(env) {
 };
 ```
 
-With the above webpack config, we see three bundles being generated. `vendor`, `main` and `manifest` bundles. 
+With the above webpack config, we see three bundles being generated: `vendor`, `main` and `manifest`.
 
 Using what we have learned so far, we could also achieve the same result with an implicit common vendor chunk.
 
@@ -214,7 +214,7 @@ module.exports = function() {
                 }
             }),
             //CommonChunksPlugin will now extract all the common modules from vendor and main bundles
-            new webpack.optimize.CommonsChunkPlugin({ 
+            new webpack.optimize.CommonsChunkPlugin({
                 name: 'manifest' //But since there are no more common modules between them we end up with just the runtime code included in the manifest file
             })
         ]
diff --git a/content/guides/code-splitting.md b/content/guides/code-splitting.md
index ea0d4dfdd781..3f63fbb25b68 100644
--- a/content/guides/code-splitting.md
+++ b/content/guides/code-splitting.md
@@ -1,6 +1,6 @@
 ---
 title: Code Splitting
-sort: 30
+sort: 14
 contributors:
   - pksjce
   - pastelsky
diff --git a/content/guides/comparison.md b/content/guides/comparison.md
index f06880349e56..3ee055d6a447 100644
--- a/content/guides/comparison.md
+++ b/content/guides/comparison.md
@@ -1,5 +1,6 @@
 ---
-title: Comparison with other bundlers
+title: Bundler Comparison
+sort: 25
 contributors:
   - pksjce
   - bebraw
diff --git a/content/guides/compatibility.md b/content/guides/compatibility.md
index c9bdcfaa43b8..00e7a7f477f1 100644
--- a/content/guides/compatibility.md
+++ b/content/guides/compatibility.md
@@ -1,5 +1,6 @@
 ---
 title: Handling Compatibility
+sort: 25
 ---
 
 ?> require.main
diff --git a/content/guides/dependency-management.md b/content/guides/dependency-management.md
index 06b39a5fa993..7a367cc45a36 100644
--- a/content/guides/dependency-management.md
+++ b/content/guides/dependency-management.md
@@ -1,6 +1,6 @@
 ---
 title: Dependency Management
-sort: 60
+sort: 20
 contributors:
   - ndelangen
   - chrisVillanueva
diff --git a/content/guides/development-vagrant.md b/content/guides/development-vagrant.md
index 5ab7e2a2ec78..7520e4210d32 100644
--- a/content/guides/development-vagrant.md
+++ b/content/guides/development-vagrant.md
@@ -1,6 +1,6 @@
 ---
 title: Development - Vagrant
-sort: 51
+sort: 19
 contributors:
   - SpaceK33z
   - chrisVillanueva
diff --git a/content/guides/development.md b/content/guides/development.md
index 92739cab2d3c..03c42156870b 100644
--- a/content/guides/development.md
+++ b/content/guides/development.md
@@ -1,6 +1,6 @@
 ---
 title: Development
-sort: 50
+sort: 5
 contributors:
   - SpaceK33z
   - rafde
diff --git a/content/guides/environment-variables.md b/content/guides/environment-variables.md
index 14d8c56e729f..6980b4dc317b 100644
--- a/content/guides/environment-variables.md
+++ b/content/guides/environment-variables.md
@@ -1,10 +1,11 @@
 ---
-title: Using environment variables
+title: Environment Variables
+sort: 11
 contributors:
   - simon04
 ---
 
-To disambiguate in your `webpack.config.js` between [development](/guides/development) and [production builds](/guides/production-build), you may use environment variables.
+To disambiguate in your `webpack.config.js` between [development](/guides/development) and [production builds](/guides/production), you may use environment variables.
 
 The standard approach in Node.js modules can be applied: Set an environment variable when running webpack and refer to the variables using Node's [`process.env`](https://nodejs.org/api/process.html#process_process_env). The variable `NODE_ENV` is commonly used as de-facto standard (see [here](https://dzone.com/articles/what-you-should-know-about-node-env)).
 
diff --git a/content/guides/get-started.md b/content/guides/get-started.md
deleted file mode 100644
index bc5f2dec7d68..000000000000
--- a/content/guides/get-started.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-title: Getting Started
-sort: 0
-contributors:
-  - bebraw
-  - varunjayaraman
-  - cntanglijun
-  - chrisVillanueva
-  - johnstew
-  - simon04
-  - aaronang
-  - 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 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).
-
-
-## Creating a bundle
-
-Create a demo directory to try out webpack. [Install webpack](/guides/installation).
-
-```bash
-mkdir webpack-demo && cd webpack-demo
-npm init -y
-npm install --save-dev webpack
-```
-
-```bash
-./node_modules/.bin/webpack --help # Shows a list of valid cli commands
-.\node_modules\.bin\webpack --help # For windows users
-webpack --help # If you installed webpack globally
-```
-
-Now create a subdirectory `app` with an `index.js` file.
-
-__app/index.js__
-
-```javascript
-function component () {
-  var element = document.createElement('div');
-
-  /* lodash is required for the next line to work */
-  element.innerHTML = _.join(['Hello','webpack'], ' ');
-
-  return element;
-}
-
-document.body.appendChild(component());
-```
-
-To run this piece of code, create an `index.html` file in the project's root.
-
-__index.html__
-
-```html
-<html>
-  <head>
-    <title>webpack 2 demo</title>
-    <script src="https://unpkg.com/lodash@4.16.6"></script>
-  </head>
-  <body>
-    <script src="app/index.js"></script>
-  </body>
-</html>
-```
-
-In this example, there are implicit dependencies between the `<script>` tags.
-
-`index.js` depends on `lodash` being included in the page before it runs. It is implicit because `index.js` never declared a need for `lodash`; it just assumes that a global variable `_` exists.
-
-There are problems with managing JavaScript projects this way:
-
-- If a dependency is missing, or is included in the wrong order, the application will not function at all.
-- If a dependency is included but is not used, then there is a lot of unnecessary code that the browser has to download.
-
-To bundle the `lodash` dependency with `index.js`, we need to first install `lodash`
-
-```bash
-npm install --save lodash
-```
-
-and then import it.
-
-__app/index.js__
-
-```diff
-+ import _ from 'lodash';
-
-function component () {
-  ...
-```
-
-We also need to change `index.html` to expect a single bundled js file.
-
-```diff
- <html>
-   <head>
-     <title>webpack 2 demo</title>
--    <script src="https://unpkg.com/lodash@4.16.6"></script>
-   </head>
-   <body>
--    <script src="app/index.js"></script>
-+    <script src="dist/bundle.js"></script>
-   </body>
- </html>
-```
-
-Here, `index.js` explicitly requires `lodash` to be present, and binds it as `_` (no global scope pollution).
-
-By stating what dependencies a module needs, webpack can use this information to build a dependency graph. It then uses the graph to generate an optimized bundle where scripts will be executed in the correct order. Also unused dependencies will not be included in the bundle.
-
-Now run `webpack` on this folder with `index.js` as the entry file and `bundle.js` as the output file in which all code required for the page is bundled.
-
-```bash
-./node_modules/.bin/webpack app/index.js dist/bundle.js
-
-Hash: ff6c1d39b26f89b3b7bb
-Version: webpack 2.2.0
-Time: 385ms
-    Asset    Size  Chunks                    Chunk Names
-bundle.js  544 kB       0  [emitted]  [big]  main
-   [0] ./~/lodash/lodash.js 540 kB {0} [built]
-   [1] (webpack)/buildin/global.js 509 bytes {0} [built]
-   [2] (webpack)/buildin/module.js 517 bytes {0} [built]
-   [3] ./app/index.js 278 bytes {0} [built]
-```
-
-T> Output may vary. If the build is successful then you are good to go.
-
-Open `index.html` in your browser to see the result of a successful bundle.
-You should see a page with the following text: 'Hello webpack'.
-
-
-## Using ES2015 modules with webpack
-
-Noticed the use of [ES2015 module import](https://developer.mozilla.org//en-US/docs/Web/JavaScript/Reference/Statements/import) (alias ES2015, *harmony*) in `app/index.js`? Although `import`/`export` statements are not supported in browsers (yet), using them is fine since webpack will replace those instructions with an ES5 compatible wrapper code. Inspect `dist/bundle.js` to convince yourself.
-
-Note that webpack will not touch your code other than `import`/`export`. In case you are using other [ES2015 features](http://es6-features.org/), make sure to use a transpiler such as [Babel](https://babeljs.io/) or [Bublé](https://buble.surge.sh/guide/).
-
-
-## Using webpack with a config
-
-For a more complex configuration, we can use a configuration file that webpack can reference to bundle your code. After you create a `webpack.config.js` file, you can represent the CLI command above
-with the following config settings.
-
-__webpack.config.js__
-
-```javascript
-var path = require('path');
-
-module.exports = {
-  entry: './app/index.js',
-  output: {
-    filename: 'bundle.js',
-    path: path.resolve(__dirname, 'dist')
-  }
-};
-```
-
-This file can be run by webpack as follows.
-
-```bash
-./node_modules/.bin/webpack --config webpack.config.js
-
-Hash: ff6c1d39b26f89b3b7bb
-Version: webpack 2.2.0
-Time: 390ms
-    Asset    Size  Chunks                    Chunk Names
-bundle.js  544 kB       0  [emitted]  [big]  main
-   [0] ./~/lodash/lodash.js 540 kB {0} [built]
-   [1] (webpack)/buildin/global.js 509 bytes {0} [built]
-   [2] (webpack)/buildin/module.js 517 bytes {0} [built]
-   [3] ./app/index.js 278 bytes {0} [built]
-```
-
-T> If a `webpack.config.js` is present, `webpack` command picks it up by default.
-
-T> If you created a successful `dist/bundle.js` file using the 'Creating a bundle' section, delete the `dist` subdirectory to validate output from your `webpack.config.js` file settings.
-
-The config file allows for all the flexibility in using webpack. We can add loader rules, plugins, resolve options and many other enhancements to our bundles using this configuration file.
-
-
-## Using webpack with npm
-
-Given it's not particularly fun to run webpack from the CLI this way, we can set up a little shortcut. Adjust *package.json* like this:
-
-```json
-{
-  ...
-  "scripts": {
-    "build": "webpack"
-  },
-  ...
-}
-```
-
-You can now achieve the same as above by using `npm run build` command. npm picks up the scripts through it and patches the environment temporarily so that it contains the bin commands. You will see this convention in a lot of projects out there.
-
-T> You can pass custom parameters to webpack by adding two dashes to the `npm run build` command, e.g. `npm run build -- --colors`.
-
-
-## 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.
diff --git a/content/guides/getting-started.md b/content/guides/getting-started.md
new file mode 100644
index 000000000000..6bdae88f7c90
--- /dev/null
+++ b/content/guides/getting-started.md
@@ -0,0 +1,234 @@
+---
+title: Getting Started
+sort: 2
+contributors:
+  - bebraw
+  - varunjayaraman
+  - cntanglijun
+  - chrisVillanueva
+  - johnstew
+  - simon04
+  - aaronang
+  - jecoopr
+---
+
+As you may already know, webpack is used to compile JavaScript modules. Once [installed](/guides/installation), you can interface with webpack either from its [CLI](/api/cli) or [API](/api/node). If you're still new to webpack, please read through the [core concepts](/concepts) and [this comparison](/guides/comparison) to learn why you might use it over the other tools that are out in the community.
+
+
+## Basic Setup
+
+First let's create a directory, initialize npm, and [install webpack locally](/guides/installation#local-installation):
+
+``` bash
+mkdir webpack-demo && cd webpack-demo
+npm init -y
+npm install --save-dev webpack
+```
+
+Now we'll create the following directory structure and contents:
+
+``` diff
+webpack-demo
+|- package.json
++ |- index.html
++ |- /src
++   |- index.js
+```
+
+__src/index.js__
+
+```javascript
+function component () {
+  var element = document.createElement('div');
+
+  // Lodash, currently included via a script, is required for this line to work
+  element.innerHTML = _.join(['Hello', 'webpack'], ' ');
+
+  return element;
+}
+
+document.body.appendChild(component());
+```
+
+__index.html__
+
+```html
+<html>
+  <head>
+    <title>webpack 2 demo</title>
+    <script src="https://unpkg.com/lodash@4.16.6"></script>
+  </head>
+  <body>
+    <script src="/src/index.js"></script>
+  </body>
+</html>
+```
+
+In this example, there are implicit dependencies between the `<script>` tags. Our `index.js` file depends on `lodash` being included in the page before it runs. This is because `index.js` never declared a need for `lodash`; it just assumes that the global variable `_` exists.
+
+There are problems with managing JavaScript projects this way:
+
+- It is not immediately apparent that the script depends on an external library.
+- If a dependency is missing, or included in the wrong order, the application will not function properly.
+- If a dependency is included but not used, the browser will be forced to download unnecessary code.
+
+Let's use webpack to manage these scripts instead...
+
+
+## Creating a Bundle
+
+First we'll tweak our directory structure slightly, separating the "source" code (`/src`) from our "distribution" code (`/dist`). The  "source" code is the what we'll write and edit. The "distribution" code is the minimized and optimized `output` of our build process that will eventually be loaded in the browser:
+
+``` diff
+webpack-demo
+|- package.json
++ |- dist
++   |- index.html
+- |- index.html
+|- /src
+  |- index.js
+```
+
+To bundle the `lodash` dependency with `index.js`, we'll need to install the library locally...
+
+```bash
+npm install --save lodash
+```
+
+and then import it in our script...
+
+__src/index.js__
+
+```diff
++ import _ from 'lodash';
+
+function component () {
+// ...
+```
+
+Now, since we'll be bundling our scripts, we have to update our `index.html` file. Let's remove the lodash `<script>`, as we now `import` it, and modify the other `<script>` tag to load the bundle, instead of the raw `/src` file:
+
+__dist/index.html__
+
+```diff
+ <html>
+  <head>
+    <title>webpack 2 demo</title>
+-   <script src="https://unpkg.com/lodash@4.16.6"></script>
+  </head>
+  <body>
+-   <script src="src/index.js"></script>
++   <script src="dist/bundle.js"></script>
+  </body>
+ </html>
+```
+
+In this setup, `index.js` explicitly requires `lodash` to be present, and binds it as `_` (no global scope pollution). By stating what dependencies a module needs, webpack can use this information to build a dependency graph. It then uses the graph to generate an optimized bundle where scripts will be executed in the correct order.
+
+With that said, let's run `webpack` with our script as the [entry point](/concepts/entry-points) and `bundle.js` as the [output](/concepts/output):
+
+```bash
+./node_modules/.bin/webpack src/index.js dist/bundle.js
+
+Hash: ff6c1d39b26f89b3b7bb
+Version: webpack 2.2.0
+Time: 385ms
+    Asset    Size  Chunks                    Chunk Names
+bundle.js  544 kB       0  [emitted]  [big]  main
+   [0] ./~/lodash/lodash.js 540 kB {0} [built]
+   [1] (webpack)/buildin/global.js 509 bytes {0} [built]
+   [2] (webpack)/buildin/module.js 517 bytes {0} [built]
+   [3] ./src/index.js 278 bytes {0} [built]
+```
+
+T> Output may vary. If the build is successful then you are good to go.
+
+Open `index.html` in your browser and, if everything went right, you should see the following text: 'Hello webpack'.
+
+
+## ES2015 Modules
+
+Although `import` and `export` statements are not supported in most browsers (yet), webpack does support them. Behind the scenes, webpack actually "transpiles" the code so that older browsers can also run it. If you inspect `dist/bundle.js`, you might be able to see how webpack does this, it's quite ingenious!
+
+Note that webpack will not alter any code other than `import` and `export` statements. If you are using other [ES2015 features](http://es6-features.org/), make sure to use a transpiler such as [Babel](https://babeljs.io/) or [Bublé](https://buble.surge.sh/guide/). See our [Module API](/api/module-methods) documentation for information on the various module syntaxes supported by webpack.
+
+
+## Using a Configuration
+
+Most projects will need a more complex setup, which is why webpack supports a [configuration file](/concepts/configuration). This is much more efficient than having to type in a lot of commands in the terminal, so let's create one to replace the CLI options used above:
+
+``` diff
+|- package.json
++ |- webpack.config.js
+|- dist
+  |- index.html
+|- /src
+  |- index.js
+```
+
+__webpack.config.js__
+
+```javascript
+var path = require('path');
+
+module.exports = {
+  entry: './src/index.js',
+  output: {
+    filename: 'bundle.js',
+    path: path.resolve(__dirname, 'dist')
+  }
+};
+```
+
+Now, let's run the build again but instead using our new configuration:
+
+```bash
+./node_modules/.bin/webpack --config webpack.config.js
+
+Hash: ff6c1d39b26f89b3b7bb
+Version: webpack 2.2.0
+Time: 390ms
+    Asset    Size  Chunks                    Chunk Names
+bundle.js  544 kB       0  [emitted]  [big]  main
+   [0] ./~/lodash/lodash.js 540 kB {0} [built]
+   [1] (webpack)/buildin/global.js 509 bytes {0} [built]
+   [2] (webpack)/buildin/module.js 517 bytes {0} [built]
+   [3] ./src/index.js 278 bytes {0} [built]
+```
+
+T> If a `webpack.config.js` is present, `webpack` command picks it up by default. We use the `--config` option here only to show that you can pass a config of any name. This will come in useful for more complex configurations that need to be split into multiple files.
+
+A configuration file allows far more flexibility than simple CLI usage. We can specify loader rules, plugins, resolve options and many other enhancements this way. See the [configuration documentation](/configuration) to learn more.
+
+
+## NPM Scripts
+
+Given it's not particularly fun to run a local copy of webpack from the CLI, we can set up a little shortcut. Let's adjust our _package.json_ by adding an [npm script](https://docs.npmjs.com/misc/scripts):
+
+```json
+{
+  ...
+  "scripts": {
+    "build": "webpack"
+  },
+  ...
+}
+```
+
+Now the `npm run build` command can be used in place of the longer commands we used earlier. Note that within `scripts` we can reference locally installed npm packages by name instead of writing out the entire path. This convention is the standard in most npm-based projects and allows us to directly call `webpack`, instead of `node_modules/webpack/bin/webpack.js`
+
+T> Custom parameters can be passed to webpack by adding two dashes between the `npm run build` command and your parameters, e.g. `npm run build -- --colors`.
+
+
+## Conclusion
+
+Now that you have a basic build together, you should dig into the [basic concepts](/concepts) and [configuration](/configuration) to better understand webpack's design. The [API](/api) section digs into the various interfaces webpack offers. Or, if you'd prefer learning by example, select the next guide from the list and continue building out this little demo we've been working on which, if you've been paying attention, should now look like this:
+
+``` diff
+|- package.json
+|- webpack.config.js
+|- dist
+  |- index.html
+|- /src
+  |- index.js
+```
diff --git a/content/guides/hot-module-replacement.md b/content/guides/hot-module-replacement.md
index 90ddfcb63b4c..ccba2e1cdb65 100644
--- a/content/guides/hot-module-replacement.md
+++ b/content/guides/hot-module-replacement.md
@@ -1,5 +1,6 @@
 ---
 title: Hot Module Replacement
+sort: 6
 contributors:
   - jmreidy
   - jhnns
@@ -18,7 +19,7 @@ related:
 
 Hot Module Replacement (or HMR) is one of the most useful features offered by webpack. It allows all kinds of modules to be updated at runtime without the need for a full refresh. This page focuses on __implementation__ while the [concepts page](/concepts/hot-module-replacement) gives more details on how it works and why it's useful.
 
-W> __HMR__ is not intended for use in production, meaning it should only be used in development. See the [building for production guide](/guides/production-build) for more information.
+W> __HMR__ is not intended for use in production, meaning it should only be used in development. See the [building for production guide](/guides/production) for more information.
 
 
 ## Enabling HMR
diff --git a/content/guides/index.md b/content/guides/index.md
index 47d37a47d2c7..a1065969f5c2 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 more and 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).
diff --git a/content/guides/installation.md b/content/guides/installation.md
index 2233fd306c3c..1a8856348d40 100644
--- a/content/guides/installation.md
+++ b/content/guides/installation.md
@@ -1,56 +1,62 @@
 ---
 title: Installation
+sort: 1
 contributors:
   - pksjce
   - bebraw
   - simon04
-sort: 10
 ---
 
-### Pre-requisites
+This guide goes through the various methods used to install webpack.
 
-Before getting started, make sure you have a fresh version of [Node.js](https://nodejs.org/en/) installed. The current LTS is an ideal starting point. You may run into a variety of issues with the older versions as they may be missing functionality webpack or related packages might need.
 
-The next section tells you how to install webpack locally in a project.
+## Pre-requisites
 
-### Local Installation
+Before we begin, make sure you have a fresh version of [Node.js](https://nodejs.org/en/) installed. The current Long Term Support (LTS) release is an ideal starting point. You may run into a variety of issues with the older versions as they may be missing functionality webpack and/or its related packages require.
 
-The latest webpack release is: [![GitHub release](https://img.shields.io/github/release/webpack/webpack.svg?style=flat-square)](https://github.com/webpack/webpack/releases)
+
+## Local Installation
+
+The latest webpack release is:
+
+[![GitHub release](https://img.shields.io/github/release/webpack/webpack.svg?style=flat-square)](https://github.com/webpack/webpack/releases)
+
+To install the latest release or a specific version, run one of the following commands:
 
 ``` bash
 npm install --save-dev webpack
-
 npm install --save-dev webpack@<version>
 ```
 
-If you are using npm scripts in your project, npm will try to look for webpack installation in your local modules for which this installation technique is useful.
+Installing locally is what we recommend for most projects. This makes it easier to upgrade projects individually when breaking changes are introduced. Typically webpack is run via one or more [NPM scripts]() which will look for a webpack installation in your local `node_modules` directory:
 
 ```json
 "scripts": {
-	"start": "webpack --config mywebpack.config.js"
+	"start": "webpack --config webpack.config.js"
 }
 ```
 
-This is standard and recommended practice.
-
-T> To run the local installation of webpack you can access its bin version as `node_modules/.bin/webpack`
+T> To run the local installation of webpack you can access its bin version as `node_modules/.bin/webpack`.
 
 
-### Global Installation
+## Global Installation
 
-W> Note that a global webpack installation is not a recommended practice. This locks you down to a specific version of webpack and might fail in projects that use a different version.
+The following NPM installation will make `webpack` available globally:
 
 ``` bash
 npm install --global webpack
 ```
 
-The `webpack` command is now available globally.
+W> Note that this is __not a recommended practice__. Installing globally locks you down to a specific version of webpack and could fail in projects that use a different version.
 
 
-### Bleeding Edge
+## Bleeding Edge
 
-If you are enthusiastic about using the latest that webpack has to offer (beware - may be unstable), you can install directly from the webpack repository using
+If you are enthusiastic about using the latest that webpack has to offer, you can install beta versions or even directly from the webpack repository using the following commands:
 
 ``` bash
+npm install webpack@beta
 npm install webpack/webpack#<tagname/branchname>
 ```
+
+W> Take caution when installing these bleeding edge releases! They may still contain bugs and therefore should not be used in production.
diff --git a/content/guides/task-test-runner.md b/content/guides/integrations.md
similarity index 97%
rename from content/guides/task-test-runner.md
rename to content/guides/integrations.md
index 7162d0b2896c..b82a0718dcc6 100644
--- a/content/guides/task-test-runner.md
+++ b/content/guides/integrations.md
@@ -1,5 +1,6 @@
 ---
-title: Integration with task/test runners
+title: Integrations
+sort: 25
 contributors:
   - pksjce
   - bebraw
diff --git a/content/guides/lazy-load-react.md b/content/guides/lazy-load-react.md
index 23af476e5c28..2a7b1878f914 100644
--- a/content/guides/lazy-load-react.md
+++ b/content/guides/lazy-load-react.md
@@ -1,5 +1,6 @@
 ---
 title: Lazy Loading - React
+sort: 13
 contributors:
   - iammerrick
   - chrisVillanueva
diff --git a/content/guides/migrating.md b/content/guides/migrating.md
index 83caa758d7f6..0039a998dfe1 100644
--- a/content/guides/migrating.md
+++ b/content/guides/migrating.md
@@ -1,6 +1,6 @@
 ---
 title: Migrating from v1 to v2
-sort: 20
+sort: 23
 contributors:
   - sokra
   - jhnns
diff --git a/content/guides/output-management.md b/content/guides/output-management.md
index 9376624ab4e1..858ac2a52ba2 100644
--- a/content/guides/output-management.md
+++ b/content/guides/output-management.md
@@ -1,5 +1,6 @@
 ---
-title: Managing Built Files
+title: Output Management
+sort: 4
 contributors:
   - skipjack
 ---
diff --git a/content/guides/production-build.md b/content/guides/production.md
similarity index 99%
rename from content/guides/production-build.md
rename to content/guides/production.md
index b531120b446d..3a4876571f5f 100644
--- a/content/guides/production-build.md
+++ b/content/guides/production.md
@@ -1,6 +1,6 @@
 ---
-title: Building for Production
-sort: 40
+title: Production
+sort: 7
 contributors:
   - henriquea
   - rajagopal4890
diff --git a/content/guides/public-path.md b/content/guides/public-path.md
index 90459b8d2d55..9d39c333f887 100644
--- a/content/guides/public-path.md
+++ b/content/guides/public-path.md
@@ -1,5 +1,6 @@
 ---
 title: Public Path
+sort: 24
 contributors:
   - rafaelrinaldi
   - chrisVillanueva
diff --git a/content/guides/shimming.md b/content/guides/shimming.md
index 4f1b249b4647..2a3a797bec26 100644
--- a/content/guides/shimming.md
+++ b/content/guides/shimming.md
@@ -1,6 +1,6 @@
 ---
 title: Shimming
-sort: 61
+sort: 10
 contributors:
   - pksjce
   - jhnns
diff --git a/content/guides/tree-shaking.md b/content/guides/tree-shaking.md
index fd15e6d2c499..d34a2cd1a857 100644
--- a/content/guides/tree-shaking.md
+++ b/content/guides/tree-shaking.md
@@ -1,5 +1,6 @@
 ---
 title: Tree Shaking
+sort: 8
 contributors:
   - simon04
   - zacanger
@@ -75,7 +76,7 @@ console.log(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__maths_js__["a" /*
 /***/ })
 ```
 
-When running a [production build](/guides/production-build), `node_modules/.bin/webpack --optimize-minimize main.js dist.min.js`, only the minimized version of `cube` but not `square` remains in the build:
+When running a [production build](/guides/production), `node_modules/.bin/webpack --optimize-minimize main.js dist.min.js`, only the minimized version of `cube` but not `square` remains in the build:
 
 ```javascript
 /* ... */
diff --git a/content/guides/typescript.md b/content/guides/typescript.md
index 2d35ad8c57cf..08bce56dcef3 100644
--- a/content/guides/typescript.md
+++ b/content/guides/typescript.md
@@ -1,5 +1,6 @@
 ---
 title: Typescript
+sort: 18
 contributors:
   - morsdyce
   - kkamali
@@ -21,7 +22,7 @@ To start using webpack with Typescript you need a couple of things:
 
 You can install the TypeScript compiler and loader by running:
 
- ``` bash 
+ ``` bash
  npm install --save-dev typescript ts-loader
  ```
 
@@ -96,7 +97,7 @@ Now we need to tell webpack to extract these source maps and into our final bund
 __webpack.config.js__
 
 ```js
-module.exports = { 
+module.exports = {
  devtool: 'inline-source-map',
  // Remaining configuration...
 };
diff --git a/content/index.md b/content/index.md
index 33dfdc24d05a..2d3b4773beaf 100644
--- a/content/index.md
+++ b/content/index.md
@@ -68,4 +68,4 @@ Then run `webpack` on the command-line to create `bundle.js`.
 
 ## It's that simple
 
-## [Get Started](/guides/get-started)
+## [Get Started](/guides/getting-started)
diff --git a/content/plugins/normal-module-replacement-plugin.md b/content/plugins/normal-module-replacement-plugin.md
index f49f25af413d..5a52d728bcec 100644
--- a/content/plugins/normal-module-replacement-plugin.md
+++ b/content/plugins/normal-module-replacement-plugin.md
@@ -18,7 +18,7 @@ new webpack.NormalModuleReplacementPlugin(
 
 ## Basic Example
 
-Replace a specific module when building for a [development environment](/guides/production-build).
+Replace a specific module when building for a [development environment](/guides/production).
 
 Say you have a config file `some/path/config.development.module.js` and a special version for production in `some/path/config.production.module.js`