diff --git a/.gitignore b/.gitignore
index 0c27466276cbe..6f6a4bb3d9dfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,4 @@ test/**/public
 .DS_Store
 public/
 node_modules/
-.intermediate-representation/
+.cache/
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000..ab9ba0dfe8a6d
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+// Place your settings in this file to overwrite the default settings
+{
+  "prettier.semi": false,
+  "prettier.trailingComma": "es5",
+  "editor.formatOnSave": true
+}
\ No newline at end of file
diff --git a/docs/docs/gatsby-on-windows.md b/docs/docs/gatsby-on-windows.md
index 29c6e3e8cb1a4..59832e4051475 100644
--- a/docs/docs/gatsby-on-windows.md
+++ b/docs/docs/gatsby-on-windows.md
@@ -16,3 +16,7 @@ powershell console. On installing this package, it downloads and installs the
 Visual C++ Build Tools 2015, provided free of charge by Microsoft. These tools
 are required to compile popular native modules. It will also install Python
 2.7, configuring your machine and npm appropriately.
+
+## Installing dependencies without troubles.
+
+Run `yarn` or `npm i` in **a powershell console** to have a correct build (some issues with sharp and sqlite3 with a bash console)
\ No newline at end of file
diff --git a/examples/gatsbygram/.gitignore b/examples/gatsbygram/.gitignore
index 272c9e484faa8..8f5b35a4a9cbc 100644
--- a/examples/gatsbygram/.gitignore
+++ b/examples/gatsbygram/.gitignore
@@ -1,3 +1,3 @@
 public
-.intermediate-representation
+.cache
 node_modules
diff --git a/examples/gatsbygram/gatsby-node.js b/examples/gatsbygram/gatsby-node.js
index bf01d7d06563e..d9548cf0b6389 100644
--- a/examples/gatsbygram/gatsby-node.js
+++ b/examples/gatsbygram/gatsby-node.js
@@ -41,7 +41,7 @@ exports.createPages = ({ graphql, actionCreators }) => {
       }
 
       // Create image post pages.
-      const postTemplate = path.resolve(`templates/post-page.js`)
+      const postTemplate = path.resolve(`src/templates/post-page.js`)
       // We want to create a detailed page for each
       // Instagram post. Since the scrapped Instagram data
       // already includes an ID field, we just use that for
diff --git a/examples/gatsbygram/components/modal.js b/examples/gatsbygram/src/components/modal.js
similarity index 100%
rename from examples/gatsbygram/components/modal.js
rename to examples/gatsbygram/src/components/modal.js
diff --git a/examples/gatsbygram/components/post-detail.js b/examples/gatsbygram/src/components/post-detail.js
similarity index 100%
rename from examples/gatsbygram/components/post-detail.js
rename to examples/gatsbygram/src/components/post-detail.js
diff --git a/examples/gatsbygram/components/post.js b/examples/gatsbygram/src/components/post.js
similarity index 100%
rename from examples/gatsbygram/components/post.js
rename to examples/gatsbygram/src/components/post.js
diff --git a/examples/gatsbygram/html.js b/examples/gatsbygram/src/html.js
similarity index 93%
rename from examples/gatsbygram/html.js
rename to examples/gatsbygram/src/html.js
index 5134c92af0cf4..717b326adc20c 100644
--- a/examples/gatsbygram/html.js
+++ b/examples/gatsbygram/src/html.js
@@ -4,12 +4,12 @@ import DocumentTitle from "react-document-title"
 //import { prefixLink } from 'gatsby-helpers'
 import { GoogleFont, TypographyStyle } from "react-typography"
 import typography from "./utils/typography"
-import logo from "!file-loader!./images/logo.png"
+import logo from "!file-loader!../static/images/logo.png"
 
 let stylesStr
 if (process.env.NODE_ENV === `production`) {
   try {
-    stylesStr = require("!raw-loader!./public/styles.css")
+    stylesStr = require("!raw-loader!../public/styles.css")
   } catch (e) {
     console.log(e)
   }
diff --git a/examples/gatsbygram/layouts/default.js b/examples/gatsbygram/src/layouts/default.js
similarity index 100%
rename from examples/gatsbygram/layouts/default.js
rename to examples/gatsbygram/src/layouts/default.js
diff --git a/examples/gatsbygram/pages/about.js b/examples/gatsbygram/src/pages/about.js
similarity index 100%
rename from examples/gatsbygram/pages/about.js
rename to examples/gatsbygram/src/pages/about.js
diff --git a/examples/gatsbygram/pages/index.js b/examples/gatsbygram/src/pages/index.js
similarity index 100%
rename from examples/gatsbygram/pages/index.js
rename to examples/gatsbygram/src/pages/index.js
diff --git a/examples/gatsbygram/templates/post-page.js b/examples/gatsbygram/src/templates/post-page.js
similarity index 100%
rename from examples/gatsbygram/templates/post-page.js
rename to examples/gatsbygram/src/templates/post-page.js
diff --git a/examples/gatsbygram/utils/presets.js b/examples/gatsbygram/src/utils/presets.js
similarity index 100%
rename from examples/gatsbygram/utils/presets.js
rename to examples/gatsbygram/src/utils/presets.js
diff --git a/examples/gatsbygram/utils/typography.js b/examples/gatsbygram/src/utils/typography.js
similarity index 100%
rename from examples/gatsbygram/utils/typography.js
rename to examples/gatsbygram/src/utils/typography.js
diff --git a/examples/gatsbygram/images/logo.png b/examples/gatsbygram/static/images/logo.png
similarity index 100%
rename from examples/gatsbygram/images/logo.png
rename to examples/gatsbygram/static/images/logo.png
diff --git a/packages/gatsby-dev-cli/README.md b/packages/gatsby-dev-cli/README.md
index d8d1951e9f21d..5a731efad7f10 100644
--- a/packages/gatsby-dev-cli/README.md
+++ b/packages/gatsby-dev-cli/README.md
@@ -9,7 +9,7 @@ It's a simple cli tool for have easily a functionnal development environment for
 Fork gatsby repo and clone it.
 
 ```bash
-$ npm install -g gatsby-cli-tools@canary
+$ npm install -g gatsby-dev-cli@canary
 $ gatsby-dev --set-path-to-repo /path/to/my/cloned/version/gatsby
 ```
 
diff --git a/packages/gatsby-link/README.md b/packages/gatsby-link/README.md
index 151102582e994..55c6f4e0b057f 100644
--- a/packages/gatsby-link/README.md
+++ b/packages/gatsby-link/README.md
@@ -21,8 +21,9 @@ Edge), this component will also preload code chunks on these browsers.
 
 ## How to use
 
+In javascript:
 ```jsx
-const Link = require('gatsby-link')
+import Link from "gatsby-link"
 
 render () {
   <div>
@@ -31,6 +32,9 @@ render () {
       activeStyle={{
         color: 'red'
       }}
+    >
+    Another page
+    </Link>
   </div>
 }
 ```
diff --git a/packages/gatsby-link/index.d.ts b/packages/gatsby-link/index.d.ts
new file mode 100644
index 0000000000000..ae25bb66da1de
--- /dev/null
+++ b/packages/gatsby-link/index.d.ts
@@ -0,0 +1,7 @@
+import { ClassicComponentClass } from "react";
+import { LinkProps } from "react-router";
+
+type GatsbyLink = ClassicComponentClass<LinkProps>;
+declare const GatsbyLink: GatsbyLink;
+
+export = GatsbyLink;
\ No newline at end of file
diff --git a/packages/gatsby-link/package.json b/packages/gatsby-link/package.json
index 19080e3508cc9..7e4f4851b444e 100644
--- a/packages/gatsby-link/package.json
+++ b/packages/gatsby-link/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.0-alpha12",
   "description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
   "main": "index.js",
+  "types": "index.d.ts",
   "scripts": {
     "build": "babel src --out-dir .",
     "watch": "babel -w src --out-dir ."
@@ -15,5 +16,8 @@
   "license": "MIT",
   "devDependencies": {
     "babel-cli": "^6.18.0"
+  },
+  "dependencies": {
+    "@types/react-router": "^2.0.49"
   }
 }
diff --git a/packages/gatsby-plugin-typescript/README.md b/packages/gatsby-plugin-typescript/README.md
index 4097f06ff68c6..00cce0c5e1e9e 100644
--- a/packages/gatsby-plugin-typescript/README.md
+++ b/packages/gatsby-plugin-typescript/README.md
@@ -2,7 +2,7 @@
 Provides drop-in support for TypeScript and TSX.
 
 ## Install
-`yarn add gatsby-plugin-typescript`
+`yarn add gatsby-plugin-typescript ts-loader typescript`
 
 ## How to use
 1. Include the plugin in your `gatsby-config.js` file.
diff --git a/packages/gatsby-plugin-typescript/tsconfig.json b/packages/gatsby-plugin-typescript/tsconfig.json
deleted file mode 100644
index ee1eeb25cd004..0000000000000
--- a/packages/gatsby-plugin-typescript/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "rootDir": "src",
-    "outDir": "./"
-  },
-  "files": [
-    "src/gatsby-node.ts",
-    "src/index.ts"
-  ]
-}
\ No newline at end of file
diff --git a/packages/gatsby-source-filesystem/src/gatsby-node.js b/packages/gatsby-source-filesystem/src/gatsby-node.js
index 2d5e76455a939..2e5a2a7edcf11 100644
--- a/packages/gatsby-source-filesystem/src/gatsby-node.js
+++ b/packages/gatsby-source-filesystem/src/gatsby-node.js
@@ -1,14 +1,8 @@
-import Promise from "bluebird"
-import mapLimit from "async/mapLimit"
-
 const path = require("path")
 const md5File = require("md5-file")
-const recursive = require("recursive-readdir")
 const fs = require("fs")
 const prettyBytes = require("pretty-bytes")
-const u = require("unist-builder")
 const slash = require("slash")
-const _ = require("lodash")
 const chokidar = require("chokidar")
 
 function readFile(file, pluginOptions, cb) {
@@ -27,7 +21,7 @@ function readFile(file, pluginOptions, cb) {
           sourceName: pluginOptions.name,
           children: [],
           relativePath: slash(
-            path.posix.relative(pluginOptions.path, slashedFile.absolutePath)
+            path.relative(pluginOptions.path, slashedFile.absolutePath)
           ),
           extension: slashedFile.ext.slice(1).toLowerCase(),
           size: stats.size,
@@ -52,7 +46,6 @@ exports.sourceNodes = ({ actionCreators }, pluginOptions) => {
     plugin: `source-filesystem --- ${pluginOptions.name}`,
     ready: false,
   })
-  let testNode
   const watcher = chokidar.watch(pluginOptions.path, {
     ignored: [
       `**/*.un~`,
diff --git a/packages/gatsby/lib/bootstrap/index.js b/packages/gatsby/lib/bootstrap/index.js
index 49584002da48d..c52c99b897c4d 100644
--- a/packages/gatsby/lib/bootstrap/index.js
+++ b/packages/gatsby/lib/bootstrap/index.js
@@ -7,11 +7,8 @@ import _ from "lodash"
 import slash from "slash"
 import createPath from "./create-path"
 import fs from "fs-extra"
-import Joi from "joi"
-import chalk from "chalk"
 import apiRunnerNode from "../utils/api-runner-node"
 import { graphql } from "graphql"
-import { layoutComponentChunkName } from "../utils/js-chunk-names"
 import { store } from "../redux"
 const { boundActionCreators } = require("../redux/actions")
 
@@ -33,7 +30,6 @@ const preferDefault = m => (m && m.default) || m
 
 const mkdirs = Promise.promisify(fs.mkdirs)
 const copy = Promise.promisify(fs.copy)
-const removeDir = Promise.promisify(fs.remove)
 const glob = Promise.promisify(globCB)
 
 // Path creator.
@@ -41,8 +37,9 @@ const glob = Promise.promisify(globCB)
 // algorithm is glob /pages directory for js/jsx/cjsx files *not*
 // underscored. Then create url w/ our path algorithm *unless* user
 // takes control of that page component in gatsby-node.
-const autoPathCreator = async (program: any) => {
-  const pagesDirectory = path.posix.join(program.directory, `pages`)
+const autoPathCreator = async () => {
+  const { program } = store.getState()
+  const pagesDirectory = path.posix.join(program.directory, `/src/pages`)
   const exts = program.extensions.map(e => `*${e}`).join("|")
   // The promisified version wasn't working for some reason
   // so we'll use sync for now.
@@ -92,15 +89,13 @@ module.exports = async (program: any) => {
   console.time(`open and validate gatsby-config.js`)
   let config = {}
   try {
-    config = require(`${program.directory}/gatsby-config`)
+    config = preferDefault(require(`${program.directory}/gatsby-config`))
   } catch (e) {
     console.log(`Couldn't open your gatsby-config.js file`)
     console.log(e)
     process.exit()
   }
 
-  config = preferDefault(config)
-
   store.dispatch({
     type: "SET_SITE_CONFIG",
     payload: config,
@@ -115,7 +110,7 @@ module.exports = async (program: any) => {
   // Also test adding to redux store.
   const processPlugin = plugin => {
     if (_.isString(plugin)) {
-      const resolvedPath = path.dirname(require.resolve(plugin))
+      const resolvedPath = slash(path.dirname(require.resolve(plugin)))
       const packageJSON = JSON.parse(
         fs.readFileSync(`${resolvedPath}/package.json`, `utf-8`)
       )
@@ -137,7 +132,7 @@ module.exports = async (program: any) => {
       }
       plugin.options.plugins = subplugins
 
-      const resolvedPath = path.dirname(require.resolve(plugin.resolve))
+      const resolvedPath = slash(path.dirname(require.resolve(plugin.resolve)))
       const packageJSON = JSON.parse(
         fs.readFileSync(`${resolvedPath}/package.json`, `utf-8`)
       )
@@ -158,7 +153,7 @@ module.exports = async (program: any) => {
 
   // Add the site's default "plugin" i.e. gatsby-x files in root of site.
   plugins.push({
-    resolve: process.cwd(),
+    resolve: slash(process.cwd()),
     name: `defaultSitePlugin`,
     version: `n/a`,
     pluginOptions: {
@@ -196,14 +191,14 @@ module.exports = async (program: any) => {
 
   // Copy our site files to the root of the site.
   console.time(`copy gatsby files`)
-  const srcDir = `${__dirname}/../intermediate-representation-dir`
-  const siteDir = `${program.directory}/.intermediate-representation`
+  const srcDir = `${__dirname}/../cache-dir`
+  const siteDir = `${program.directory}/.cache`
   try {
     // await removeDir(siteDir)
     await copy(srcDir, siteDir, { clobber: true })
-    await mkdirs(`${program.directory}/.intermediate-representation/json`)
+    await mkdirs(`${program.directory}/.cache/json`)
   } catch (e) {
-    console.log(`Unable to copy site files to .intermediate-representation`)
+    console.log(`Unable to copy site files to .cache`)
     console.log(e)
   }
 
@@ -272,10 +267,13 @@ module.exports = async (program: any) => {
   }
 
   // Collect resolvable extensions and attach to program.
-  // TODO refactor this to use Redux.
   const extensions = [`.js`, `.jsx`]
   const apiResults = await apiRunnerNode("resolvableExtensions")
-  program.extensions = apiResults.reduce((a, b) => a.concat(b), extensions)
+
+  store.dispatch({
+    type: "SET_PROGRAM_EXTENSIONS",
+    payload: _.flattenDeep([extensions, apiResults]),
+  })
 
   // Collect pages.
   await apiRunnerNode(`createPages`, {
@@ -285,7 +283,7 @@ module.exports = async (program: any) => {
   // TODO move this to own source plugin per component type
   // (js/cjsx/typescript, etc.). Only do after there's themes
   // so can cement default /pages setup in default core theme.
-  autoPathCreator(program)
+  autoPathCreator()
 
   // Copy /404/ to /404.html as many static site hosting companies expect
   // site 404 pages to be named this.
diff --git a/packages/gatsby/lib/intermediate-representation-dir/api-runner-browser.js b/packages/gatsby/lib/cache-dir/api-runner-browser.js
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/api-runner-browser.js
rename to packages/gatsby/lib/cache-dir/api-runner-browser.js
diff --git a/packages/gatsby/lib/intermediate-representation-dir/api-runner-ssr.js b/packages/gatsby/lib/cache-dir/api-runner-ssr.js
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/api-runner-ssr.js
rename to packages/gatsby/lib/cache-dir/api-runner-ssr.js
diff --git a/packages/gatsby/lib/intermediate-representation-dir/app.js b/packages/gatsby/lib/cache-dir/app.js
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/app.js
rename to packages/gatsby/lib/cache-dir/app.js
diff --git a/packages/gatsby/lib/intermediate-representation-dir/json/.gitignore b/packages/gatsby/lib/cache-dir/json/.gitignore
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/json/.gitignore
rename to packages/gatsby/lib/cache-dir/json/.gitignore
diff --git a/packages/gatsby/lib/intermediate-representation-dir/json/nothing b/packages/gatsby/lib/cache-dir/json/nothing
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/json/nothing
rename to packages/gatsby/lib/cache-dir/json/nothing
diff --git a/packages/gatsby/lib/intermediate-representation-dir/production-app.js b/packages/gatsby/lib/cache-dir/production-app.js
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/production-app.js
rename to packages/gatsby/lib/cache-dir/production-app.js
diff --git a/packages/gatsby/lib/intermediate-representation-dir/root.js b/packages/gatsby/lib/cache-dir/root.js
similarity index 100%
rename from packages/gatsby/lib/intermediate-representation-dir/root.js
rename to packages/gatsby/lib/cache-dir/root.js
diff --git a/packages/gatsby/lib/intermediate-representation-dir/static-entry.js b/packages/gatsby/lib/cache-dir/static-entry.js
similarity index 84%
rename from packages/gatsby/lib/intermediate-representation-dir/static-entry.js
rename to packages/gatsby/lib/cache-dir/static-entry.js
index 21e3b2a77f9e9..b9b983133ffc5 100644
--- a/packages/gatsby/lib/intermediate-representation-dir/static-entry.js
+++ b/packages/gatsby/lib/cache-dir/static-entry.js
@@ -2,15 +2,13 @@ import React from "react"
 import { renderToString, renderToStaticMarkup } from "react-dom/server"
 import { match, RouterContext } from "react-router"
 import Html from "html"
-import _ from "lodash"
-//import { prefixLink } from '../isomorphic/gatsby-helpers'
-import rootRoute from ".intermediate-representation/child-routes.js"
-import pages from "public/tmp-pages.json"
-//import { pathChunkName } from './js-chunk-names'
-import apiRunner from ".intermediate-representation/api-runner-ssr"
+import { kebabCase, get, merge } from "lodash"
+import rootRoute from "./child-routes"
+import apiRunner from "./api-runner-ssr"
+import pages from "../public/tmp-pages.json"
 
 const pathChunkName = path => {
-  const name = path === `/` ? `index` : _.kebabCase(path)
+  const name = path === `/` ? `index` : kebabCase(path)
   return `path---${name}`
 }
 
@@ -59,7 +57,7 @@ module.exports = (locals, callback) => {
         }
 
         // Add the chunk-manifest as a head component.
-        const chunkManifest = require("!raw!public/chunk-manifest.json")
+        const chunkManifest = require("!raw!../public/chunk-manifest.json")
 
         postBodyComponents.unshift(
           <script
@@ -76,7 +74,7 @@ module.exports = (locals, callback) => {
 
         let stats
         try {
-          stats = require("public/stats.json")
+          stats = require("../public/stats.json")
         } catch (e) {
           // ignore
         }
@@ -88,7 +86,7 @@ module.exports = (locals, callback) => {
         ]
         dascripts.forEach(script => {
           const fetchKey = `assetsByChunkName[${script}][0]`
-          const prefixedScript = `${linkPrefix}${_.get(stats, fetchKey, ``)}`
+          const prefixedScript = `${linkPrefix}${get(stats, fetchKey, ``)}`
 
           // Add preload <link>s for scripts.
           headComponents.unshift(
@@ -121,7 +119,7 @@ module.exports = (locals, callback) => {
           { bodyRenderProps },
           {}
         )
-        bodyRenderProps = _.merge(bodyRenderProps, pluginBodyRenderProps)
+        bodyRenderProps = merge(bodyRenderProps, pluginBodyRenderProps)
 
         const html = `<!DOCTYPE html>\n ${renderToStaticMarkup(<Html {...bodyRenderProps} headComponents={headComponents} postBodyComponents={postBodyComponents} body={body} {...renderProps} />)}`
         callback(null, html)
diff --git a/packages/gatsby/lib/redux/__tests__/__snapshots__/site-config.js.snap b/packages/gatsby/lib/redux/__tests__/__snapshots__/site-config.js.snap
index c344ca1cbc8a2..cf090bda032d3 100644
--- a/packages/gatsby/lib/redux/__tests__/__snapshots__/site-config.js.snap
+++ b/packages/gatsby/lib/redux/__tests__/__snapshots__/site-config.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`add site config Validates configs with unsupported options 1`] = `"The site's gatsby-config.js failed validation"`;
+exports[`add site config Validates configs with unsupported options 1`] = `"config is not defined"`;
 
 exports[`add site config allow you to add basic site config 1`] = `
 Object {
diff --git a/packages/gatsby/lib/redux/__tests__/nodes.js b/packages/gatsby/lib/redux/__tests__/nodes.js
index 1bc5656e0351c..e70ff8110cf35 100644
--- a/packages/gatsby/lib/redux/__tests__/nodes.js
+++ b/packages/gatsby/lib/redux/__tests__/nodes.js
@@ -1,5 +1,5 @@
-const { actions, boundActions } = require("../actions");
-const nodeReducer = require("../reducers/nodes");
+const { actions, boundActions } = require("../actions")
+const nodeReducer = require("../reducers/nodes")
 
 describe(`Create and update nodes`, () => {
   // TODO add these back when we stop directly consoleing errors.
@@ -23,24 +23,24 @@ describe(`Create and update nodes`, () => {
       id: `hi`,
       type: `Test`,
       pickle: true,
-    });
-    expect(action).toMatchSnapshot();
-    expect(nodeReducer(undefined, action)).toMatchSnapshot();
-  });
+    })
+    expect(action).toMatchSnapshot()
+    expect(nodeReducer(undefined, action)).toMatchSnapshot()
+  })
 
   it(`allows updating nodes`, () => {
     const action = actions.createNode({
       id: `hi`,
       type: `Test`,
       pickle: true,
-    });
+    })
     const updateAction = actions.createNode({
       id: `hi`,
       type: `Test`,
       pickle: false,
-    });
-    let state = nodeReducer(undefined, action);
-    state = nodeReducer(state, updateAction);
-    expect(state["hi"].pickle).toEqual(false);
-  });
-});
+    })
+    let state = nodeReducer(undefined, action)
+    state = nodeReducer(state, updateAction)
+    expect(state["hi"].pickle).toEqual(false)
+  })
+})
diff --git a/packages/gatsby/lib/redux/reducers/__tests__/page-data-dependencies.js b/packages/gatsby/lib/redux/reducers/__tests__/page-data-dependencies.js
index cab5b1b01e04d..56a0a83435244 100644
--- a/packages/gatsby/lib/redux/reducers/__tests__/page-data-dependencies.js
+++ b/packages/gatsby/lib/redux/reducers/__tests__/page-data-dependencies.js
@@ -1,4 +1,4 @@
-const reducer = require("../page-data-dependencies");
+const reducer = require("../page-data-dependencies")
 
 describe(`add page data dependency`, () => {
   it(`lets you add a node dependency`, () => {
@@ -8,15 +8,15 @@ describe(`add page data dependency`, () => {
         path: `/hi/`,
         nodeId: `123`,
       },
-    };
+    }
 
     expect(reducer(undefined, action)).toEqual({
       connections: {},
       nodes: {
         "123": [`/hi/`],
       },
-    });
-  });
+    })
+  })
   it(`lets you add a connection dependency`, () => {
     const action = {
       type: `ADD_PAGE_DEPENDENCY`,
@@ -24,15 +24,15 @@ describe(`add page data dependency`, () => {
         path: `/hi/`,
         connection: `MarkdownRemark`,
       },
-    };
+    }
 
     expect(reducer(undefined, action)).toEqual({
       connections: {
         MarkdownRemark: ["/hi/"],
       },
       nodes: {},
-    });
-  });
+    })
+  })
   it(`removes duplicate paths`, () => {
     const action = {
       type: `ADD_PAGE_DEPENDENCY`,
@@ -41,7 +41,7 @@ describe(`add page data dependency`, () => {
         nodeId: 1,
         connection: `MarkdownRemark`,
       },
-    };
+    }
     const action2 = {
       type: `ADD_PAGE_DEPENDENCY`,
       payload: {
@@ -49,17 +49,17 @@ describe(`add page data dependency`, () => {
         nodeId: 1,
         connection: `MarkdownRemark`,
       },
-    };
+    }
 
-    let state = reducer(undefined, action);
+    let state = reducer(undefined, action)
     // Do it again
-    state = reducer(state, action);
+    state = reducer(state, action)
     // Add different action
-    state = reducer(state, action2);
+    state = reducer(state, action2)
 
-    expect(state.connections["MarkdownRemark"].length).toEqual(2);
-    expect(state.nodes[1].length).toEqual(2);
-  });
+    expect(state.connections["MarkdownRemark"].length).toEqual(2)
+    expect(state.nodes[1].length).toEqual(2)
+  })
   it(`lets you add both a node and connection in one action`, () => {
     const action = {
       type: `ADD_PAGE_DEPENDENCY`,
@@ -68,10 +68,10 @@ describe(`add page data dependency`, () => {
         connection: `MarkdownRemark`,
         nodeId: `SuperCoolNode`,
       },
-    };
+    }
 
-    let state = reducer(undefined, action);
+    let state = reducer(undefined, action)
 
-    expect(state).toMatchSnapshot();
-  });
-});
+    expect(state).toMatchSnapshot()
+  })
+})
diff --git a/packages/gatsby/lib/redux/reducers/config.js b/packages/gatsby/lib/redux/reducers/config.js
index 6dbf8f60b6133..9984d9de2d1a5 100644
--- a/packages/gatsby/lib/redux/reducers/config.js
+++ b/packages/gatsby/lib/redux/reducers/config.js
@@ -16,7 +16,7 @@ module.exports = (state = {}, action) => {
           chalk.blue.bgYellow(`The site's gatsby-config.js failed validation`)
         )
         console.log(chalk.bold.red(result.error))
-        console.log(action.payload)
+        console.log(config)
         throw new Error(`The site's gatsby-config.js failed validation`)
         return
       }
diff --git a/packages/gatsby/lib/redux/reducers/flattened-plugins.js b/packages/gatsby/lib/redux/reducers/flattened-plugins.js
index 8efa943a7d9b7..66ca3f181e392 100644
--- a/packages/gatsby/lib/redux/reducers/flattened-plugins.js
+++ b/packages/gatsby/lib/redux/reducers/flattened-plugins.js
@@ -1,8 +1,8 @@
 module.exports = (state = [], action) => {
   switch (action.type) {
     case "SET_SITE_FLATTENED_PLUGINS":
-      return [...action.payload];
+      return [...action.payload]
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/index.js b/packages/gatsby/lib/redux/reducers/index.js
index 920170c56e374..a966d3e7de607 100644
--- a/packages/gatsby/lib/redux/reducers/index.js
+++ b/packages/gatsby/lib/redux/reducers/index.js
@@ -9,4 +9,4 @@ module.exports = {
   schema: require("./schema"),
   status: require("./status"),
   pageDataDependencies: require("./page-data-dependencies"),
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/last-action.js b/packages/gatsby/lib/redux/reducers/last-action.js
index 13fac38578428..409c38e5ea16a 100644
--- a/packages/gatsby/lib/redux/reducers/last-action.js
+++ b/packages/gatsby/lib/redux/reducers/last-action.js
@@ -1,3 +1,3 @@
 module.exports = (state = null, action) => {
-  return action;
-};
+  return action
+}
diff --git a/packages/gatsby/lib/redux/reducers/nodes.js b/packages/gatsby/lib/redux/reducers/nodes.js
index 40d94c78f68f4..13b80f13f2c20 100644
--- a/packages/gatsby/lib/redux/reducers/nodes.js
+++ b/packages/gatsby/lib/redux/reducers/nodes.js
@@ -4,13 +4,13 @@ module.exports = (state = {}, action) => {
       return {
         ...state,
         [action.payload.id]: action.payload,
-      };
+      }
     case "UPDATE_NODE":
       return {
         ...state,
         [action.payload.id]: action.payload,
-      };
+      }
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/page-data-dependencies.js b/packages/gatsby/lib/redux/reducers/page-data-dependencies.js
index 79d76388d3a8f..a0ac827f61f66 100644
--- a/packages/gatsby/lib/redux/reducers/page-data-dependencies.js
+++ b/packages/gatsby/lib/redux/reducers/page-data-dependencies.js
@@ -1,23 +1,23 @@
-const _ = require("lodash");
+const _ = require("lodash")
 
 module.exports = (state = { nodes: {}, connections: {} }, action) => {
   switch (action.type) {
     case "ADD_PAGE_DEPENDENCY":
       if (action.payload.path === "") {
-        return state;
+        return state
       }
 
       // If this nodeId not set yet.
       if (action.payload.nodeId) {
         if (!_.has(state, `nodes.${action.payload.nodeId}`)) {
-          state.nodes[action.payload.nodeId] = [action.payload.path];
+          state.nodes[action.payload.nodeId] = [action.payload.path]
         } else {
           if (
             _.includes(state.nodes[action.payload.nodeId], action.payload.path)
           ) {
             state.nodes[action.payload.nodeId] = state.nodes[
               action.payload.nodeId
-            ].concat([action.payload.path]);
+            ].concat([action.payload.path])
           }
         }
       }
@@ -25,7 +25,7 @@ module.exports = (state = { nodes: {}, connections: {} }, action) => {
       // If this connection not set yet.
       if (action.payload.connection) {
         if (!_.has(state, `connections.${action.payload.connection}`)) {
-          state.connections[action.payload.connection] = [action.payload.path];
+          state.connections[action.payload.connection] = [action.payload.path]
         } else {
           if (
             !_.includes(
@@ -35,13 +35,13 @@ module.exports = (state = { nodes: {}, connections: {} }, action) => {
           ) {
             state.connections[action.payload.connection] = state.connections[
               action.payload.connection
-            ].concat([action.payload.path]);
+            ].concat([action.payload.path])
           }
         }
       }
 
-      return state;
+      return state
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/pages.js b/packages/gatsby/lib/redux/reducers/pages.js
index 927357485874b..51198d6878288 100644
--- a/packages/gatsby/lib/redux/reducers/pages.js
+++ b/packages/gatsby/lib/redux/reducers/pages.js
@@ -1,11 +1,11 @@
-const _ = require("lodash");
+const _ = require("lodash")
 
 module.exports = (state = [], action) => {
   switch (action.type) {
     case "UPSERT_PAGE":
       const index = _.findIndex(state, p => {
-        return p.path === action.payload.path;
-      });
+        return p.path === action.payload.path
+      })
       // If the path already exists, overwrite it.
       // Otherwise, add it to the end.
       if (index !== -1) {
@@ -14,11 +14,11 @@ module.exports = (state = [], action) => {
             .slice(0, index)
             .concat(action.payload)
             .concat(state.slice(index + 1)),
-        ];
+        ]
       } else {
-        return [...state.concat(action.payload)];
+        return [...state.concat(action.payload)]
       }
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/plugins.js b/packages/gatsby/lib/redux/reducers/plugins.js
index f19db8c6a762e..78e0eacd456f6 100644
--- a/packages/gatsby/lib/redux/reducers/plugins.js
+++ b/packages/gatsby/lib/redux/reducers/plugins.js
@@ -1,8 +1,8 @@
 module.exports = (state = [], action) => {
   switch (action.type) {
     case "SET_SITE_PLUGINS":
-      return [...action.payload];
+      return [...action.payload]
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/program.js b/packages/gatsby/lib/redux/reducers/program.js
index fec90c169957b..0d1cee2b19d81 100644
--- a/packages/gatsby/lib/redux/reducers/program.js
+++ b/packages/gatsby/lib/redux/reducers/program.js
@@ -3,9 +3,15 @@ module.exports = (state = { directory: `/` }, action) => {
     case "SET_PROGRAM":
       return {
         ...action.payload,
-      };
+      }
+
+    case "SET_PROGRAM_EXTENSIONS":
+      return {
+        ...state,
+        extensions: action.payload,
+      }
 
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/schema.js b/packages/gatsby/lib/redux/reducers/schema.js
index f72ef3e3770ef..cce0b5f6795db 100644
--- a/packages/gatsby/lib/redux/reducers/schema.js
+++ b/packages/gatsby/lib/redux/reducers/schema.js
@@ -1,8 +1,8 @@
 module.exports = (state = {}, action) => {
   switch (action.type) {
     case "SET_SCHEMA":
-      return action.payload;
+      return action.payload
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/redux/reducers/status.js b/packages/gatsby/lib/redux/reducers/status.js
index d169773034dff..c126055099c87 100644
--- a/packages/gatsby/lib/redux/reducers/status.js
+++ b/packages/gatsby/lib/redux/reducers/status.js
@@ -4,8 +4,8 @@ module.exports = (state = {}, action) => {
       return {
         ...state,
         [action.payload.plugin]: action.payload.ready,
-      };
+      }
     default:
-      return state;
+      return state
   }
-};
+}
diff --git a/packages/gatsby/lib/schema/__tests__/data-tree-utils-test.js b/packages/gatsby/lib/schema/__tests__/data-tree-utils-test.js
index 58a5a95716d8f..d4aed27222c4a 100644
--- a/packages/gatsby/lib/schema/__tests__/data-tree-utils-test.js
+++ b/packages/gatsby/lib/schema/__tests__/data-tree-utils-test.js
@@ -1,7 +1,7 @@
 const {
   extractFieldExamples,
   buildFieldEnumValues,
-} = require("../data-tree-utils");
+} = require("../data-tree-utils")
 
 describe(`Gatsby data tree utils`, () => {
   const nodes = [
@@ -29,17 +29,17 @@ describe(`Gatsby data tree utils`, () => {
         circle: `happy`,
       },
     },
-  ];
+  ]
 
   it(`builds field examples from an array of nodes`, () => {
-    expect(extractFieldExamples({ nodes })).toMatchSnapshot();
-  });
+    expect(extractFieldExamples({ nodes })).toMatchSnapshot()
+  })
 
   it(`ignores fields that have a null value`, () => {
-    expect(extractFieldExamples({ nodes }).iAmNull).not.toBeDefined();
-  });
+    expect(extractFieldExamples({ nodes }).iAmNull).not.toBeDefined()
+  })
 
   it(`build enum values for fields from array on nodes`, () => {
-    expect(buildFieldEnumValues(nodes)).toMatchSnapshot();
-  });
-});
+    expect(buildFieldEnumValues(nodes)).toMatchSnapshot()
+  })
+})
diff --git a/packages/gatsby/lib/schema/index.js b/packages/gatsby/lib/schema/index.js
index f6823709d0312..5823de8c8dc0c 100644
--- a/packages/gatsby/lib/schema/index.js
+++ b/packages/gatsby/lib/schema/index.js
@@ -42,6 +42,7 @@ async function buildSchema() {
 // an explicit API for them to let Gatsby core know that a sync is complete.
 const debounceNodeCreation = cb => {
   const updateNode = _.debounce(cb, 250)
+  updateNode() // Ensure schema is created even if the project hasn't got any source plugin
   store.subscribe(() => {
     const state = store.getState()
     if (
diff --git a/packages/gatsby/lib/utils/api-runner-node.js b/packages/gatsby/lib/utils/api-runner-node.js
index 87dc9d937ad05..e98b5f51b092c 100644
--- a/packages/gatsby/lib/utils/api-runner-node.js
+++ b/packages/gatsby/lib/utils/api-runner-node.js
@@ -51,13 +51,10 @@ module.exports = async (api, args = {}) => {
     if (!filteredPlugins) {
       filteredPlugins = plugins.filter(plugin => hasAPIFile(plugin))
     }
-
     mapSeries(
       filteredPlugins,
       (plugin, callback) => {
-        Promise.resolve(runAPI(plugin, api, args)).then(result => {
-          callback(null, result)
-        })
+        Promise.resolve(runAPI(plugin, api, args)).asCallback(callback)
       },
       (err, results) => {
         // Filter out empty responses and return
diff --git a/packages/gatsby/lib/utils/build.js b/packages/gatsby/lib/utils/build.js
index 9518a14f65e5b..ef4b5318e3b30 100644
--- a/packages/gatsby/lib/utils/build.js
+++ b/packages/gatsby/lib/utils/build.js
@@ -1,19 +1,14 @@
 /* @flow */
-import toml from "toml"
 import fs from "fs"
-import os from "os"
-import _ from "lodash"
 
 import buildCSS from "./build-css"
 import buildHTML from "./build-html"
 import buildProductionBundle from "./build-javascript"
-import postBuild from "./post-build"
 import bootstrap from "../bootstrap"
 import apiRunnerNode from "./api-runner-node"
 const { store } = require("../redux")
 
 async function html(program: any) {
-  const directory = program.directory
   const { graphqlRunner } = await bootstrap(program)
 
   console.log(`Generating CSS`)
diff --git a/packages/gatsby/lib/utils/develop.js b/packages/gatsby/lib/utils/develop.js
index a3e60c2fec925..2f96bf7707f2e 100644
--- a/packages/gatsby/lib/utils/develop.js
+++ b/packages/gatsby/lib/utils/develop.js
@@ -40,10 +40,10 @@ async function startServer(program) {
   const devConfig = compilerConfig.resolve()
   const compiler = webpack(devConfig)
 
-  const HTMLPath = glob.sync(`${directory}/html.*`)[0]
+  const HTMLPath = glob.sync(`${directory}/src/html.*`)[0]
   // Check if we can't find an html component in root of site.
   if (!HTMLPath) {
-    throw new Error(`Couldn't find an html.js at the root of your site`)
+    throw new Error(`Couldn't find an /src/html.* file`)
   }
 
   // We use the program port not the webpack-dev-server port as if you import
@@ -94,7 +94,7 @@ async function startServer(program) {
           return res.send(htmlStr)
         } else {
           try {
-            const apiRunner = require(`${directory}/.intermediate-representation/api-runner-ssr`)
+            const apiRunner = require(`${directory}/.cache/api-runner-ssr`)
             const htmlElement = React.createElement(HTML, {
               body: ``,
               headComponents: _.flattenDeep(
diff --git a/packages/gatsby/lib/utils/query-runner.js b/packages/gatsby/lib/utils/query-runner.js
index 8d80cb90da354..b85ccf8ca553c 100644
--- a/packages/gatsby/lib/utils/query-runner.js
+++ b/packages/gatsby/lib/utils/query-runner.js
@@ -14,7 +14,6 @@ import slash from "slash"
 import { layoutComponentChunkName, pathChunkName } from "./js-chunk-names"
 import { graphql as graphqlFunction } from "graphql"
 
-let initialQueriesDone = false
 let invalidPages = []
 
 store.subscribe(() => {
@@ -47,7 +46,7 @@ const pascalCase = _.flow(_.camelCase, _.upperFirst)
 // Write out routes file.
 // Loop through all paths and write them out to child-routes.js
 const writeChildRoutes = () => {
-  const directory = store.getState().program.directory
+  const { program, config, pages } = store.getState()
   let childRoutes = ``
   let splitChildRoutes = ``
 
@@ -67,13 +66,13 @@ const writeChildRoutes = () => {
   const genSplitChildRoute = (page, noPath = false) => {
     const pathName = pathChunkName(page.path)
     const layoutName = layoutComponentChunkName(
-      store.getState().program.directory,
+      program.directory,
       page.component
     )
     let pathStr = ``
     if (!noPath) {
-      if (store.getState().program.prefixLinks) {
-        pathStr = `path:'${_.get(store.getState().config, `linkPrefix`, ``)}${page.path}',`
+      if (program.prefixLinks) {
+        pathStr = `path:'${_.get(config, `linkPrefix`, ``)}${page.path}',`
       } else {
         pathStr = `path:'${page.path}',`
       }
@@ -97,13 +96,10 @@ const writeChildRoutes = () => {
 
   // Group pages under their layout component (if any).
   let defaultLayoutExists = true
-  if (
-    glob.sync(`${store.getState().program.directory}/layouts/default.*`)
-      .length === 0
-  ) {
+  if (glob.sync(`${program.directory}/src/layouts/default.*`).length === 0) {
     defaultLayoutExists = false
   }
-  const groupedPages = _.groupBy(store.getState().pages, page => {
+  const groupedPages = _.groupBy(pages, page => {
     // If is a string we'll assume it's a working layout component.
     if (_.isString(page.layout)) {
       return page.layout
@@ -137,9 +133,10 @@ const writeChildRoutes = () => {
       splitRootRoute += splitRoute
     } else {
       let indexPage
-      indexPage = _.first(
-        _.filter(pages, page => parseFilepath(page.component).name === `index`)
+      indexPage = pages.find(
+        page => parseFilepath(page.component).name === `index`
       )
+
       // If there's not an index page, just pick the one with the shortest path.
       // Probably a bad heuristic.
       if (!indexPage) {
@@ -148,20 +145,20 @@ const writeChildRoutes = () => {
       let route = `
       {
         path: '${indexPage.path}',
-        component: preferDefault(require('${store.getState().program.directory}/layouts/${layout}')),
+        component: preferDefault(require('${program.directory}/src/layouts/${layout}')),
         indexRoute: ${genChildRoute(indexPage, true)}
         childRoutes: [
       `
       let pathStr
-      if (store.getState().program.prefixLinks) {
-        pathStr = `path:'${_.get(store.getState().config, `linkPrefix`, ``)}${indexPage.path}',`
+      if (program.prefixLinks) {
+        pathStr = `path:'${_.get(config, `linkPrefix`, ``)}${indexPage.path}',`
       } else {
         pathStr = `path:'${indexPage.path}',`
       }
       let splitRoute = `
       {
         ${pathStr}
-        component: preferDefault(require('${store.getState().program.directory}/layouts/${layout}')),
+        component: preferDefault(require('${program.directory}/src/layouts/${layout}')),
         indexRoute: ${genSplitChildRoute(indexPage, true)}
         childRoutes: [
       `
@@ -178,16 +175,14 @@ const writeChildRoutes = () => {
   })
 
   // Add a fallback 404 route if one is defined.
-  const notFoundPage = _.find(
-    store.getState().pages,
-    page => page.path.indexOf("/404") !== -1
-  )
+  const notFoundPage = pages.find(page => page.path.indexOf("/404") !== -1)
 
   if (notFoundPage) {
+    const defaultLayout = `preferDefault(require('${program.directory}/src/layouts/default'))`
     const notFoundPageStr = `
       {
         path: "*",
-        component: preferDefault(require('${store.getState().program.directory}/layouts/default')),
+        component: ${defaultLayout},
         indexRoute: {
           component: preferDefault(require('${notFoundPage.component}')),
         },
@@ -195,13 +190,13 @@ const writeChildRoutes = () => {
     `
     const pathName = pathChunkName(notFoundPage.path)
     const layoutName = layoutComponentChunkName(
-      store.getState().program.directory,
+      program.directory,
       notFoundPage.component
     )
     const notFoundPageSplitStr = `
       {
         path: "*",
-        component: preferDefault(require('${store.getState().program.directory}/layouts/default')),
+        component: ${defaultLayout},
         indexRoute: {
           getComponent (nextState, cb) {
             require.ensure([], (require) => {
@@ -223,9 +218,8 @@ const writeChildRoutes = () => {
   // Close out object.
   rootRoute += `]}`
   splitRootRoute += `]}`
-  const componentsStr = store
-    .getState()
-    .pages.map(page => {
+  const componentsStr = pages
+    .map(page => {
       return `class ${page.internalComponentName} extends React.Component {
           render () {
             const Component = preferDefault(require('${page.component}'))
@@ -272,12 +266,9 @@ const writeChildRoutes = () => {
     const preferDefault = m => m && m.default || m
     const rootRoute = ${splitRootRoute}
     module.exports = rootRoute`
+  fs.writeFileSync(`${program.directory}/.cache/child-routes.js`, childRoutes)
   fs.writeFileSync(
-    `${directory}/.intermediate-representation/child-routes.js`,
-    childRoutes
-  )
-  fs.writeFileSync(
-    `${directory}/.intermediate-representation/split-child-routes.js`,
+    `${program.directory}/.cache/split-child-routes.js`,
     splitChildRoutes
   )
 }
@@ -378,12 +369,6 @@ const q = queue(async ({ file, graphql, directory }, callback) => {
   })
 
   console.log(`running queries for ${paths.length} paths for ${file}`)
-  const pathsInfo = {
-    componentPath: absolutePath,
-    directory,
-    paths,
-    graphql,
-  }
 
   // Handle the result of the GraphQL query.
   const handleResult = (pathInfo, result = {}) => {
@@ -406,10 +391,7 @@ const q = queue(async ({ file, graphql, directory }, callback) => {
 
     // Save result to file.
     const resultJSON = JSON.stringify(clonedResult, null, 4)
-    fs.writeFileSync(
-      `${directory}/.intermediate-representation/json/${jsonName}`,
-      resultJSON
-    )
+    fs.writeFileSync(`${directory}/.cache/json/${jsonName}`, resultJSON)
 
     return null
   }
@@ -435,7 +417,7 @@ const q = queue(async ({ file, graphql, directory }, callback) => {
   ).then(() => {
     console.log(`rewrote JSON for queries for ${absolutePath}`)
     console.timeEnd(`graphql query time`)
-    // Write out new child-routes.js in the .intermediate-representation directory
+    // Write out new child-routes.js in the .cache directory
     // in the root of your site.
     debouncedWriteChildRoutes()
     callback()
@@ -448,15 +430,15 @@ module.exports = async drainCb => {
   if (_.isFunction(drainCb)) {
     realDrainCB = drainCb
   }
-  const schema = store.getState().schema
+  const { schema, program, pages } = store.getState()
+
   const graphql = (query, context) => {
     return graphqlFunction(schema, query, context, context, context)
   }
-  const { program } = store.getState()
 
   // Get unique array of component paths and then watch them.
   // When a component is updated, rerun queries.
-  const components = _.uniq(store.getState().pages.map(page => page.component))
+  const components = _.uniq(pages.map(page => page.component))
 
   // If there's no components yet, return
   if (components.length === 0) {
diff --git a/packages/gatsby/lib/utils/webpack.config.js b/packages/gatsby/lib/utils/webpack.config.js
index 7a7cd3a2b4743..9efef616fc080 100644
--- a/packages/gatsby/lib/utils/webpack.config.js
+++ b/packages/gatsby/lib/utils/webpack.config.js
@@ -1,4 +1,4 @@
-import _ from "lodash"
+import { uniq, some } from "lodash"
 import fs from "fs"
 import path from "path"
 import webpack from "webpack"
@@ -7,7 +7,7 @@ import ExtractTextPlugin from "extract-text-webpack-plugin"
 import StaticSiteGeneratorPlugin from "static-site-generator-webpack-plugin"
 import { StatsWriterPlugin } from "webpack-stats-plugin"
 // This isn't working right it seems.
-//import WebpackStableModuleIdAndHash from 'webpack-stable-module-id-and-hash'
+// import WebpackStableModuleIdAndHash from 'webpack-stable-module-id-and-hash'
 
 import webpackModifyValidate from "./webpack-modify-validate"
 
@@ -71,7 +71,6 @@ module.exports = async (
         }
       case `build-javascript`:
         return {
-          //filename: '[name].js',
           filename: `[name]-[chunkhash].js`,
           chunkFilename: `[name]-[chunkhash].js`,
           path: `${directory}/public`,
@@ -91,21 +90,20 @@ module.exports = async (
           commons: [
             require.resolve(`react-hot-loader/patch`),
             `${require.resolve(`webpack-hot-middleware/client`)}?path=http://${program.host}:${webpackPort}/__webpack_hmr`,
-            `${directory}/.intermediate-representation/app`,
+            `${directory}/.cache/app`,
           ],
         }
       case `build-css`:
         return {
-          main: `${directory}/.intermediate-representation/app`,
+          main: `${directory}/.cache/app`,
         }
       case `build-html`:
         return {
-          //main: `${__dirname}/static-entry`,
-          main: `${directory}/.intermediate-representation/static-entry`,
+          main: `${directory}/.cache/static-entry`,
         }
       case `build-javascript`:
         return {
-          app: `${directory}/.intermediate-representation/production-app`,
+          app: `${directory}/.cache/production-app`,
         }
       default:
         throw new Error(`The state requested ${stage} doesn't exist.`)
@@ -170,7 +168,7 @@ module.exports = async (
         components = components.map(component =>
           layoutComponentChunkName(program.directory, component)
         )
-        components = _.uniq(components)
+        components = uniq(components)
         return [
           // Moment.js includes 100s of KBs of extra localization data
           // by default in Webpack that most sites don't want.
@@ -180,7 +178,7 @@ module.exports = async (
           // common webpack tweaks e.g. lodash?
           new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
           new WebpackMD5Hash(),
-          //new webpack.optimize.DedupePlugin(),
+          // new webpack.optimize.DedupePlugin(),
           // Extract "commons" chunk from the app entry and all
           // page components.
           new webpack.optimize.CommonsChunkPlugin({
@@ -205,17 +203,13 @@ module.exports = async (
                 `scroll-behavior`,
                 `history`,
               ]
-              const isFramework = _.some(
+              const isFramework = some(
                 vendorModuleList.map(vendor => {
                   const regex = new RegExp(`\/node_modules\/${vendor}\/`, `i`)
                   return regex.test(module.resource)
                 })
               )
-              if (isFramework) {
-                return isFramework
-              } else {
-                return count > 3
-              }
+              return isFramework || count > 3
             },
           }),
           // Add a few global variables. Set NODE_ENV to production (enables
@@ -259,7 +253,7 @@ module.exports = async (
           }),
           // Ensure module order stays the same. Supposibly fixed in webpack 2.0.
           new webpack.optimize.OccurenceOrderPlugin(),
-          //new WebpackStableModuleIdAndHash({ seed: 9, hashSize: 47 }),
+          // new WebpackStableModuleIdAndHash({ seed: 9, hashSize: 47 }),
           new webpack.NamedModulesPlugin(),
         ]
       }
@@ -269,13 +263,21 @@ module.exports = async (
   }
 
   function resolve() {
+    const { program } = store.getState()
     return {
       // use the program's extension list (generated via the 'resolvableExtensions' API hook)
       extensions: [``, ...program.extensions],
       // Hierarchy of directories for Webpack to look for module.
-      // First is the site directory.
+      // First is the site root directory.
+      // Then all directories needed for building static site.
       // Then in the special directory of isomorphic modules Gatsby ships with.
-      root: [directory, path.resolve(__dirname, `..`, `isomorphic`)],
+      root: [
+        path.join(directory, `src`),
+        path.join(directory, `.cache`),
+        path.join(directory, `public`),
+        path.join(directory, `static`),
+        path.resolve(__dirname, `..`, `isomorphic`),
+      ],
       modulesDirectories: [`${directory}/node_modules`, `node_modules`],
     }
   }
@@ -417,7 +419,7 @@ module.exports = async (
         config.loader(`css`, {
           test: /\.css$/,
           exclude: /\.module\.css$/,
-          //loader: `null`,
+          // loader: `null`,
           loader: ExtractTextPlugin.extract([`css`]),
         })
 
diff --git a/www/gatsby-node.js b/www/gatsby-node.js
index 065ba5f3f3225..d8df00e684e72 100644
--- a/www/gatsby-node.js
+++ b/www/gatsby-node.js
@@ -1,7 +1,6 @@
 const _ = require("lodash")
 const Promise = require("bluebird")
 const path = require("path")
-const select = require("unist-util-select")
 const parseFilepath = require("parse-filepath")
 const fs = require("fs-extra")
 const slash = require("slash")
@@ -9,10 +8,11 @@ const slash = require("slash")
 exports.createPages = ({ graphql, actionCreators }) => {
   const { upsertPage } = actionCreators
   return new Promise((resolve, reject) => {
-    const pages = []
-    const docsTemplate = path.resolve(`templates/template-docs-markdown.js`)
-    const blogPostTemplate = path.resolve(`templates/template-blog-post.js`)
-    const packageTemplate = path.resolve(`templates/template-docs-packages.js`)
+    const docsTemplate = path.resolve(`src/templates/template-docs-markdown.js`)
+    const blogPostTemplate = path.resolve(`src/templates/template-blog-post.js`)
+    const packageTemplate = path.resolve(
+      `src/templates/template-docs-packages.js`
+    )
     graphql(
       `
       {
diff --git a/www/components/sidebar-body.js b/www/src/components/sidebar-body.js
similarity index 100%
rename from www/components/sidebar-body.js
rename to www/src/components/sidebar-body.js
diff --git a/www/css/prism-coy.css b/www/src/css/prism-coy.css
similarity index 100%
rename from www/css/prism-coy.css
rename to www/src/css/prism-coy.css
diff --git a/www/html.js b/www/src/html.js
similarity index 84%
rename from www/html.js
rename to www/src/html.js
index 35f8e23b60aba..551a579bdbab0 100644
--- a/www/html.js
+++ b/www/src/html.js
@@ -8,7 +8,7 @@ import Helmet from "react-helmet"
 let stylesStr
 if (process.env.NODE_ENV === `production`) {
   try {
-    stylesStr = require("!raw-loader!./public/styles.css")
+    stylesStr = require("!raw-loader!../public/styles.css")
   } catch (e) {
     console.log(e)
   }
@@ -60,25 +60,25 @@ module.exports = React.createClass({
             rel="icon"
             type="image/png"
             sizes="192x192"
-            href={require(`file-loader!images/favicons/android-icon-192x192.png`)}
+            href={require(`file-loader!../static/images/favicons/android-icon-192x192.png`)}
           />
           <link
             rel="icon"
             type="image/png"
             sizes="32x32"
-            href={require(`file-loader!images/favicons/favicon-32x32.png`)}
+            href={require(`file-loader!../static/images/favicons/favicon-32x32.png`)}
           />
           <link
             rel="icon"
             type="image/png"
             sizes="96x96"
-            href={require(`file-loader!images/favicons/favicon-96x96.png`)}
+            href={require(`file-loader!../static/images/favicons/favicon-96x96.png`)}
           />
           <link
             rel="icon"
             type="image/png"
             sizes="16x16"
-            href={require(`file-loader!images/favicons/favicon-16x16.png`)}
+            href={require(`file-loader!../static/images/favicons/favicon-16x16.png`)}
           />
           {head.title.toComponent()}
           {head.meta.toComponent()}
diff --git a/www/layouts/default.js b/www/src/layouts/default.js
similarity index 100%
rename from www/layouts/default.js
rename to www/src/layouts/default.js
diff --git a/www/pages/404.js b/www/src/pages/404.js
similarity index 100%
rename from www/pages/404.js
rename to www/src/pages/404.js
diff --git a/www/pages/blog/index.js b/www/src/pages/blog/index.js
similarity index 100%
rename from www/pages/blog/index.js
rename to www/src/pages/blog/index.js
diff --git a/www/pages/docs/doc-links.yaml b/www/src/pages/docs/doc-links.yaml
similarity index 100%
rename from www/pages/docs/doc-links.yaml
rename to www/src/pages/docs/doc-links.yaml
diff --git a/www/pages/docs/index.js b/www/src/pages/docs/index.js
similarity index 100%
rename from www/pages/docs/index.js
rename to www/src/pages/docs/index.js
diff --git a/www/pages/index.js b/www/src/pages/index.js
similarity index 100%
rename from www/pages/index.js
rename to www/src/pages/index.js
diff --git a/www/templates/template-blog-post.js b/www/src/templates/template-blog-post.js
similarity index 100%
rename from www/templates/template-blog-post.js
rename to www/src/templates/template-blog-post.js
diff --git a/www/templates/template-docs-markdown.js b/www/src/templates/template-docs-markdown.js
similarity index 100%
rename from www/templates/template-docs-markdown.js
rename to www/src/templates/template-docs-markdown.js
diff --git a/www/templates/template-docs-packages.js b/www/src/templates/template-docs-packages.js
similarity index 100%
rename from www/templates/template-docs-packages.js
rename to www/src/templates/template-docs-packages.js
diff --git a/www/utils/presets.js b/www/src/utils/presets.js
similarity index 100%
rename from www/utils/presets.js
rename to www/src/utils/presets.js
diff --git a/www/utils/typography.js b/www/src/utils/typography.js
similarity index 100%
rename from www/utils/typography.js
rename to www/src/utils/typography.js
diff --git a/www/fonts/Licenses/Webfont EULA 1.6.txt b/www/static/fonts/Licenses/Webfont EULA 1.6.txt
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Licenses/Webfont EULA 1.6.txt
rename to www/static/fonts/Licenses/Webfont EULA 1.6.txt
diff --git a/www/fonts/Reference/How_to_use_webfonts.html b/www/static/fonts/Reference/How_to_use_webfonts.html
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Reference/How_to_use_webfonts.html
rename to www/static/fonts/Reference/How_to_use_webfonts.html
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/ftn45-demo.html b/www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-demo.html
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/ftn45-demo.html
rename to www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-demo.html
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.eot b/www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.eot
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.eot
rename to www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.eot
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.svg b/www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.svg
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.svg
rename to www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.svg
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.ttf b/www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.ttf
rename to www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.ttf
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff b/www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff
rename to www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff2 b/www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff2
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff2
rename to www/static/fonts/Webfonts/futurapt_book_macroman/ftn45-webfont.woff2
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/specimen_files/grid_12-825-55-15.css b/www/static/fonts/Webfonts/futurapt_book_macroman/specimen_files/grid_12-825-55-15.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/specimen_files/grid_12-825-55-15.css
rename to www/static/fonts/Webfonts/futurapt_book_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/specimen_files/specimen_stylesheet.css b/www/static/fonts/Webfonts/futurapt_book_macroman/specimen_files/specimen_stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/specimen_files/specimen_stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_book_macroman/specimen_files/specimen_stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_book_macroman/stylesheet.css b/www/static/fonts/Webfonts/futurapt_book_macroman/stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_book_macroman/stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_book_macroman/stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-demo.html b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-demo.html
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-demo.html
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-demo.html
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.eot b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.eot
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.eot
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.eot
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.svg b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.svg
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.svg
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.svg
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.ttf b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.ttf
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.ttf
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff2 b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff2
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff2
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/ftn46-webfont.woff2
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/grid_12-825-55-15.css b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/grid_12-825-55-15.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/grid_12-825-55-15.css
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/specimen_stylesheet.css b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/specimen_stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/specimen_stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/specimen_files/specimen_stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_bookitalic_macroman/stylesheet.css b/www/static/fonts/Webfonts/futurapt_bookitalic_macroman/stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_bookitalic_macroman/stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_bookitalic_macroman/stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/ftn65-demo.html b/www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-demo.html
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/ftn65-demo.html
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-demo.html
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.eot b/www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.eot
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.eot
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.eot
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.svg b/www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.svg
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.svg
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.svg
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.ttf b/www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.ttf
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.ttf
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff b/www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff2 b/www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff2
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff2
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/ftn65-webfont.woff2
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/specimen_files/grid_12-825-55-15.css b/www/static/fonts/Webfonts/futurapt_demi_macroman/specimen_files/grid_12-825-55-15.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/specimen_files/grid_12-825-55-15.css
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/specimen_files/specimen_stylesheet.css b/www/static/fonts/Webfonts/futurapt_demi_macroman/specimen_files/specimen_stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/specimen_files/specimen_stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/specimen_files/specimen_stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_demi_macroman/stylesheet.css b/www/static/fonts/Webfonts/futurapt_demi_macroman/stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demi_macroman/stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_demi_macroman/stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-demo.html b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-demo.html
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-demo.html
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-demo.html
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.eot b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.eot
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.eot
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.eot
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.svg b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.svg
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.svg
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.svg
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.ttf b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.ttf
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.ttf
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff2 b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff2
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff2
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/ftn66-webfont.woff2
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/grid_12-825-55-15.css b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/grid_12-825-55-15.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/grid_12-825-55-15.css
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/specimen_stylesheet.css b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/specimen_stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/specimen_stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/specimen_files/specimen_stylesheet.css
diff --git a/www/fonts/Webfonts/futurapt_demiitalic_macroman/stylesheet.css b/www/static/fonts/Webfonts/futurapt_demiitalic_macroman/stylesheet.css
old mode 100755
new mode 100644
similarity index 100%
rename from www/fonts/Webfonts/futurapt_demiitalic_macroman/stylesheet.css
rename to www/static/fonts/Webfonts/futurapt_demiitalic_macroman/stylesheet.css
diff --git a/www/images/favicons/android-icon-144x144.png b/www/static/images/favicons/android-icon-144x144.png
similarity index 100%
rename from www/images/favicons/android-icon-144x144.png
rename to www/static/images/favicons/android-icon-144x144.png
diff --git a/www/images/favicons/android-icon-192x192.png b/www/static/images/favicons/android-icon-192x192.png
similarity index 100%
rename from www/images/favicons/android-icon-192x192.png
rename to www/static/images/favicons/android-icon-192x192.png
diff --git a/www/images/favicons/android-icon-36x36.png b/www/static/images/favicons/android-icon-36x36.png
similarity index 100%
rename from www/images/favicons/android-icon-36x36.png
rename to www/static/images/favicons/android-icon-36x36.png
diff --git a/www/images/favicons/android-icon-48x48.png b/www/static/images/favicons/android-icon-48x48.png
similarity index 100%
rename from www/images/favicons/android-icon-48x48.png
rename to www/static/images/favicons/android-icon-48x48.png
diff --git a/www/images/favicons/android-icon-72x72.png b/www/static/images/favicons/android-icon-72x72.png
similarity index 100%
rename from www/images/favicons/android-icon-72x72.png
rename to www/static/images/favicons/android-icon-72x72.png
diff --git a/www/images/favicons/android-icon-96x96.png b/www/static/images/favicons/android-icon-96x96.png
similarity index 100%
rename from www/images/favicons/android-icon-96x96.png
rename to www/static/images/favicons/android-icon-96x96.png
diff --git a/www/images/favicons/apple-icon-114x114.png b/www/static/images/favicons/apple-icon-114x114.png
similarity index 100%
rename from www/images/favicons/apple-icon-114x114.png
rename to www/static/images/favicons/apple-icon-114x114.png
diff --git a/www/images/favicons/apple-icon-120x120.png b/www/static/images/favicons/apple-icon-120x120.png
similarity index 100%
rename from www/images/favicons/apple-icon-120x120.png
rename to www/static/images/favicons/apple-icon-120x120.png
diff --git a/www/images/favicons/apple-icon-144x144.png b/www/static/images/favicons/apple-icon-144x144.png
similarity index 100%
rename from www/images/favicons/apple-icon-144x144.png
rename to www/static/images/favicons/apple-icon-144x144.png
diff --git a/www/images/favicons/apple-icon-152x152.png b/www/static/images/favicons/apple-icon-152x152.png
similarity index 100%
rename from www/images/favicons/apple-icon-152x152.png
rename to www/static/images/favicons/apple-icon-152x152.png
diff --git a/www/images/favicons/apple-icon-180x180.png b/www/static/images/favicons/apple-icon-180x180.png
similarity index 100%
rename from www/images/favicons/apple-icon-180x180.png
rename to www/static/images/favicons/apple-icon-180x180.png
diff --git a/www/images/favicons/apple-icon-57x57.png b/www/static/images/favicons/apple-icon-57x57.png
similarity index 100%
rename from www/images/favicons/apple-icon-57x57.png
rename to www/static/images/favicons/apple-icon-57x57.png
diff --git a/www/images/favicons/apple-icon-60x60.png b/www/static/images/favicons/apple-icon-60x60.png
similarity index 100%
rename from www/images/favicons/apple-icon-60x60.png
rename to www/static/images/favicons/apple-icon-60x60.png
diff --git a/www/images/favicons/apple-icon-72x72.png b/www/static/images/favicons/apple-icon-72x72.png
similarity index 100%
rename from www/images/favicons/apple-icon-72x72.png
rename to www/static/images/favicons/apple-icon-72x72.png
diff --git a/www/images/favicons/apple-icon-76x76.png b/www/static/images/favicons/apple-icon-76x76.png
similarity index 100%
rename from www/images/favicons/apple-icon-76x76.png
rename to www/static/images/favicons/apple-icon-76x76.png
diff --git a/www/images/favicons/apple-icon-precomposed.png b/www/static/images/favicons/apple-icon-precomposed.png
similarity index 100%
rename from www/images/favicons/apple-icon-precomposed.png
rename to www/static/images/favicons/apple-icon-precomposed.png
diff --git a/www/images/favicons/apple-icon.png b/www/static/images/favicons/apple-icon.png
similarity index 100%
rename from www/images/favicons/apple-icon.png
rename to www/static/images/favicons/apple-icon.png
diff --git a/www/images/favicons/browserconfig.xml b/www/static/images/favicons/browserconfig.xml
similarity index 100%
rename from www/images/favicons/browserconfig.xml
rename to www/static/images/favicons/browserconfig.xml
diff --git a/www/images/favicons/favicon-16x16.png b/www/static/images/favicons/favicon-16x16.png
similarity index 100%
rename from www/images/favicons/favicon-16x16.png
rename to www/static/images/favicons/favicon-16x16.png
diff --git a/www/images/favicons/favicon-32x32.png b/www/static/images/favicons/favicon-32x32.png
similarity index 100%
rename from www/images/favicons/favicon-32x32.png
rename to www/static/images/favicons/favicon-32x32.png
diff --git a/www/images/favicons/favicon-96x96.png b/www/static/images/favicons/favicon-96x96.png
similarity index 100%
rename from www/images/favicons/favicon-96x96.png
rename to www/static/images/favicons/favicon-96x96.png
diff --git a/www/images/favicons/favicon.ico b/www/static/images/favicons/favicon.ico
similarity index 100%
rename from www/images/favicons/favicon.ico
rename to www/static/images/favicons/favicon.ico
diff --git a/www/images/favicons/manifest.json b/www/static/images/favicons/manifest.json
similarity index 100%
rename from www/images/favicons/manifest.json
rename to www/static/images/favicons/manifest.json
diff --git a/www/images/favicons/ms-icon-144x144.png b/www/static/images/favicons/ms-icon-144x144.png
similarity index 100%
rename from www/images/favicons/ms-icon-144x144.png
rename to www/static/images/favicons/ms-icon-144x144.png
diff --git a/www/images/favicons/ms-icon-150x150.png b/www/static/images/favicons/ms-icon-150x150.png
similarity index 100%
rename from www/images/favicons/ms-icon-150x150.png
rename to www/static/images/favicons/ms-icon-150x150.png
diff --git a/www/images/favicons/ms-icon-310x310.png b/www/static/images/favicons/ms-icon-310x310.png
similarity index 100%
rename from www/images/favicons/ms-icon-310x310.png
rename to www/static/images/favicons/ms-icon-310x310.png
diff --git a/www/images/favicons/ms-icon-70x70.png b/www/static/images/favicons/ms-icon-70x70.png
similarity index 100%
rename from www/images/favicons/ms-icon-70x70.png
rename to www/static/images/favicons/ms-icon-70x70.png
diff --git a/www/images/gatsby-monogram.jpg b/www/static/images/gatsby-monogram.jpg
similarity index 100%
rename from www/images/gatsby-monogram.jpg
rename to www/static/images/gatsby-monogram.jpg