diff --git a/.gitignore b/.gitignore
index c6585f52..3c3629e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-.cache
-.env
-public
-node_modules
\ No newline at end of file
+node_modules
diff --git a/.gitmodules b/.gitmodules
index 1f354735..18662f31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ui"]
-	path = ui
+	path = packages/gatsby-theme-apollo/ui
 	url = https://github.com/apollographql/ui
diff --git a/lerna.json b/lerna.json
new file mode 100644
index 00000000..a2bb50ba
--- /dev/null
+++ b/lerna.json
@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "independent"
+}
diff --git a/package.json b/package.json
index 39466e53..3ee74dfa 100644
--- a/package.json
+++ b/package.json
@@ -1,45 +1,7 @@
 {
-  "name": "gatsby-theme-apollo",
-  "version": "0.0.48",
-  "main": "index.js",
-  "scripts": {
-    "develop": "gatsby develop",
-    "start": "npm run develop",
-    "build": "gatsby build",
-    "serve": "gatsby serve"
-  },
-  "dependencies": {
-    "@emotion/core": "^10.0.6",
-    "@emotion/styled": "^10.0.6",
-    "@svgr/webpack": "^4.1.0",
-    "detab": "^2.0.1",
-    "emotion": "^10.0.2",
-    "gatsby": "^2.0.91",
-    "gatsby-plugin-emotion": "^4.0.1",
-    "gatsby-plugin-react-helmet": "^3.0.2",
-    "gatsby-plugin-svgr": "^2.0.1",
-    "gatsby-plugin-typography": "^2.2.2",
-    "gray-matter": "^4.0.1",
-    "js-yaml": "^3.12.1",
-    "polished": "^2.3.3",
-    "prismjs": "^1.15.0",
-    "prop-types": "^15.6.2",
-    "react": "^16.6.3",
-    "react-dom": "^16.6.3",
-    "react-helmet": "^5.2.0",
-    "react-icons": "^3.3.0",
-    "react-typography": "^0.16.13",
-    "recompose": "^0.30.0",
-    "remark": "^10.0.1",
-    "remark-react": "^5.0.1",
-    "remark-slug": "^5.1.1",
-    "simple-git": "^1.107.0",
-    "typography": "^0.16.17",
-    "unist-builder": "^1.0.3"
-  },
+  "name": "root",
+  "private": true,
   "devDependencies": {
-    "@trevorblades/eslint-config": "^6.19.2",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^5.9.0"
+    "lerna": "^3.10.7"
   }
 }
diff --git a/gatsby-config.js b/packages/gatsby-theme-apollo/gatsby-config.js
similarity index 100%
rename from gatsby-config.js
rename to packages/gatsby-theme-apollo/gatsby-config.js
diff --git a/gatsby-node.js b/packages/gatsby-theme-apollo/gatsby-node.js
similarity index 100%
rename from gatsby-node.js
rename to packages/gatsby-theme-apollo/gatsby-node.js
diff --git a/gatsby-ssr.js b/packages/gatsby-theme-apollo/gatsby-ssr.js
similarity index 100%
rename from gatsby-ssr.js
rename to packages/gatsby-theme-apollo/gatsby-ssr.js
diff --git a/index.js b/packages/gatsby-theme-apollo/index.js
similarity index 100%
rename from index.js
rename to packages/gatsby-theme-apollo/index.js
diff --git a/package-lock.json b/packages/gatsby-theme-apollo/package-lock.json
similarity index 100%
rename from package-lock.json
rename to packages/gatsby-theme-apollo/package-lock.json
diff --git a/packages/gatsby-theme-apollo/package.json b/packages/gatsby-theme-apollo/package.json
new file mode 100644
index 00000000..39466e53
--- /dev/null
+++ b/packages/gatsby-theme-apollo/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "gatsby-theme-apollo",
+  "version": "0.0.48",
+  "main": "index.js",
+  "scripts": {
+    "develop": "gatsby develop",
+    "start": "npm run develop",
+    "build": "gatsby build",
+    "serve": "gatsby serve"
+  },
+  "dependencies": {
+    "@emotion/core": "^10.0.6",
+    "@emotion/styled": "^10.0.6",
+    "@svgr/webpack": "^4.1.0",
+    "detab": "^2.0.1",
+    "emotion": "^10.0.2",
+    "gatsby": "^2.0.91",
+    "gatsby-plugin-emotion": "^4.0.1",
+    "gatsby-plugin-react-helmet": "^3.0.2",
+    "gatsby-plugin-svgr": "^2.0.1",
+    "gatsby-plugin-typography": "^2.2.2",
+    "gray-matter": "^4.0.1",
+    "js-yaml": "^3.12.1",
+    "polished": "^2.3.3",
+    "prismjs": "^1.15.0",
+    "prop-types": "^15.6.2",
+    "react": "^16.6.3",
+    "react-dom": "^16.6.3",
+    "react-helmet": "^5.2.0",
+    "react-icons": "^3.3.0",
+    "react-typography": "^0.16.13",
+    "recompose": "^0.30.0",
+    "remark": "^10.0.1",
+    "remark-react": "^5.0.1",
+    "remark-slug": "^5.1.1",
+    "simple-git": "^1.107.0",
+    "typography": "^0.16.17",
+    "unist-builder": "^1.0.3"
+  },
+  "devDependencies": {
+    "@trevorblades/eslint-config": "^6.19.2",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.9.0"
+  }
+}
diff --git a/src/components/header.js b/packages/gatsby-theme-apollo/src/components/header.js
similarity index 100%
rename from src/components/header.js
rename to packages/gatsby-theme-apollo/src/components/header.js
diff --git a/src/components/layout.js b/packages/gatsby-theme-apollo/src/components/layout.js
similarity index 100%
rename from src/components/layout.js
rename to packages/gatsby-theme-apollo/src/components/layout.js
diff --git a/src/components/sidebar.js b/packages/gatsby-theme-apollo/src/components/sidebar.js
similarity index 100%
rename from src/components/sidebar.js
rename to packages/gatsby-theme-apollo/src/components/sidebar.js
diff --git a/src/pages/404.js b/packages/gatsby-theme-apollo/src/pages/404.js
similarity index 100%
rename from src/pages/404.js
rename to packages/gatsby-theme-apollo/src/pages/404.js
diff --git a/src/templates/docs/index.js b/packages/gatsby-theme-apollo/src/templates/docs/index.js
similarity index 100%
rename from src/templates/docs/index.js
rename to packages/gatsby-theme-apollo/src/templates/docs/index.js
diff --git a/src/templates/docs/page-content.js b/packages/gatsby-theme-apollo/src/templates/docs/page-content.js
similarity index 100%
rename from src/templates/docs/page-content.js
rename to packages/gatsby-theme-apollo/src/templates/docs/page-content.js
diff --git a/src/templates/docs/search.js b/packages/gatsby-theme-apollo/src/templates/docs/search.js
similarity index 100%
rename from src/templates/docs/search.js
rename to packages/gatsby-theme-apollo/src/templates/docs/search.js
diff --git a/src/templates/docs/sidebar-nav/directory.js b/packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/directory.js
similarity index 100%
rename from src/templates/docs/sidebar-nav/directory.js
rename to packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/directory.js
diff --git a/src/templates/docs/sidebar-nav/index.js b/packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/index.js
similarity index 100%
rename from src/templates/docs/sidebar-nav/index.js
rename to packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/index.js
diff --git a/src/templates/docs/version-select.js b/packages/gatsby-theme-apollo/src/templates/docs/version-select.js
similarity index 100%
rename from src/templates/docs/version-select.js
rename to packages/gatsby-theme-apollo/src/templates/docs/version-select.js
diff --git a/src/util/code-to-hast.js b/packages/gatsby-theme-apollo/src/util/code-to-hast.js
similarity index 100%
rename from src/util/code-to-hast.js
rename to packages/gatsby-theme-apollo/src/util/code-to-hast.js
diff --git a/src/util/colors.js b/packages/gatsby-theme-apollo/src/util/colors.js
similarity index 100%
rename from src/util/colors.js
rename to packages/gatsby-theme-apollo/src/util/colors.js
diff --git a/src/util/find-headings.js b/packages/gatsby-theme-apollo/src/util/find-headings.js
similarity index 100%
rename from src/util/find-headings.js
rename to packages/gatsby-theme-apollo/src/util/find-headings.js
diff --git a/src/util/typography.js b/packages/gatsby-theme-apollo/src/util/typography.js
similarity index 100%
rename from src/util/typography.js
rename to packages/gatsby-theme-apollo/src/util/typography.js
diff --git a/static/favicon.ico b/packages/gatsby-theme-apollo/static/favicon.ico
similarity index 100%
rename from static/favicon.ico
rename to packages/gatsby-theme-apollo/static/favicon.ico
diff --git a/packages/gatsby-theme-apollo/ui/logo-small.svg b/packages/gatsby-theme-apollo/ui/logo-small.svg
new file mode 100644
index 00000000..5aee8f11
--- /dev/null
+++ b/packages/gatsby-theme-apollo/ui/logo-small.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <polygon points="112.246 49 88.003 49 53 139.848 74.927 139.848 80.648 124.455 113.724 124.455 107.735 107.431 85.961 107.431 100.125 68.34 125.324 139.848 147.252 139.848"></polygon>
+  <path d="M196.313,73.038 C196.254,72.728 196.17,72.428 196.057,72.141 C196.03,72.041 195.937,71.856 195.937,71.856 C195.148,70.138 193.414,68.942 191.399,68.942 C188.637,68.942 186.399,71.181 186.399,73.942 C186.399,74.504 186.497,75.042 186.667,75.545 L186.653,75.55 C188.859,83.407 189.999,91.615 189.999,100.001 C189.999,124.04 180.637,146.642 163.64,163.641 C146.641,180.641 124.04,190.001 100,190.001 C75.961,190.001 53.358,180.639 36.361,163.641 C19.36,146.642 10,124.04 10,100.001 C10,75.961 19.362,53.36 36.361,36.361 C53.358,19.361 75.961,10.001 100,10.001 C121.466,10.001 141.781,17.471 157.987,31.174 C157.443,32.56 157.139,34.068 157.139,35.648 C157.139,42.399 162.611,47.869 169.363,47.869 C176.113,47.869 181.586,42.399 181.586,35.648 C181.586,28.897 176.113,23.424 169.363,23.424 C167.89,23.424 166.479,23.684 165.171,24.161 C147.666,9.107 124.9,0 100,0 C44.771,0 0,44.772 0,100.001 C0,155.23 44.771,200.002 100,200.002 C155.229,200.002 200,155.231 200,100.001 C200,90.659 198.709,81.617 196.313,73.038 Z"></path>
+</svg>
\ No newline at end of file
diff --git a/packages/gatsby-theme-apollo/ui/logo.svg b/packages/gatsby-theme-apollo/ui/logo.svg
new file mode 100644
index 00000000..0ccc2f68
--- /dev/null
+++ b/packages/gatsby-theme-apollo/ui/logo.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 816 240" xmlns="http://www.w3.org/2000/svg">
+  <path d="M166.22 158.36h-22l-25.27-71.7-14.19 39.22h21.84l6 17.07H99.43l-5.74 15.43h-22l35.1-91.1h24.31zm392.25 0v-17.07h-38.52v-74h-19.53v91.1zm112.57 0v-17.07h-38.5v-74h-19.56v91.1zM392.25 83.59a29.29 29.29 0 1 0 29.29 29.29 29.32 29.32 0 0 0-29.29-29.29m0-17.83a47.12 47.12 0 1 1-47.11 47.12 47.12 47.12 0 0 1 47.12-47.12zm368.57 17.83a29.29 29.29 0 1 0 29.29 29.29 29.32 29.32 0 0 0-29.29-29.29m0-17.83a47.12 47.12 0 1 1-47.12 47.12 47.12 47.12 0 0 1 47.12-47.12zm-466 31.38c0 16.19-13.12 29.87-29.32 29.87h-23.06v31.35h-19.4v-91.1h42.5c16.17 0 29.29 13.68 29.29 29.87zm-17.83 0c0-6.33-5.15-12-11.49-12h-23.06v24.04h23.1c6.31 0 11.47-5.71 11.47-12.05zm-70.71 88.87a5 5 0 0 0-4.09 2.12s-4.37 5-6.73 7.35a108.71 108.71 0 1 1-8.49-161.28 12.25 12.25 0 1 0 6.87-7.32 118.67 118.67 0 1 0 16 167.71 5 5 0 0 0-3.55-8.56z"></path>
+</svg>
\ No newline at end of file
diff --git a/ui b/ui
deleted file mode 160000
index 5083537e..00000000
--- a/ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5083537e45d44a23bb3edfe4373f95f2c7262df3