diff --git a/package.json b/package.json
index c193cfa..6e4a340 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "file-saver": "^1.3.8",
-    "gatsby": "^2.0.0-beta.43",
+    "gatsby": "^2.0.0-beta.46",
     "gatsby-image": "^2.0.0-beta.6",
     "gatsby-plugin-favicon": "github:TuckerWhitehouse/gatsby-plugin-favicon#gatsby-v2",
     "gatsby-plugin-matomo": "^0.4.1",
@@ -30,7 +30,7 @@
     "gatsby-plugin-sass": "next",
     "gatsby-plugin-sharp": "^2.0.0-beta.5",
     "gatsby-plugin-sitemap": "next",
-    "gatsby-source-filesystem": "^2.0.1-beta.5",
+    "gatsby-source-filesystem": "^2.0.1-beta.6",
     "gatsby-transformer-json": "next",
     "gatsby-transformer-sharp": "^2.1.1-beta.5",
     "gatsby-transformer-yaml": "next",
diff --git a/src/components/Layout.jsx b/src/components/Layout.jsx
index 875c51d..135ff75 100644
--- a/src/components/Layout.jsx
+++ b/src/components/Layout.jsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react'
 import PropTypes from 'prop-types'
 import { StaticQuery, graphql } from 'gatsby'
-import Head from './atoms/Head'
+import Head from './molecules/Head'
 import Header from './organisms/Header'
 import Footer from './organisms/Footer'
 import styles from './Layout.module.scss'
diff --git a/src/components/atoms/Typekit.js b/src/components/atoms/Typekit.js
index 6e1d794..768d764 100644
--- a/src/components/atoms/Typekit.js
+++ b/src/components/atoms/Typekit.js
@@ -1,5 +1,4 @@
 import React from 'react'
-import PropTypes from 'prop-types'
 import { StaticQuery, graphql } from 'gatsby'
 import Helmet from 'react-helmet'
 
@@ -45,7 +44,3 @@ const Typekit = () => (
 )
 
 export default Typekit
-
-TypekitScript.propTypes = {
-  id: PropTypes.string.isRequired
-}
diff --git a/src/components/atoms/Head.jsx b/src/components/molecules/Head.jsx
similarity index 90%
rename from src/components/atoms/Head.jsx
rename to src/components/molecules/Head.jsx
index 9e49fe9..a822e08 100644
--- a/src/components/atoms/Head.jsx
+++ b/src/components/molecules/Head.jsx
@@ -1,8 +1,8 @@
 import React, { Fragment } from 'react'
 import PropTypes from 'prop-types'
 import Helmet from 'react-helmet'
-import SEO from './SEO'
-import Typekit from './Typekit'
+import SEO from '../atoms/SEO'
+import Typekit from '../atoms/Typekit'
 
 const Head = ({ meta }) => {
   const { title, tagline } = meta