diff --git a/.gitignore b/.gitignore
index 27970ef7b9647..582d5a38e6aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-
-.DS_Store
-
-_includes/.DS_Store
-
-docs.html
\ No newline at end of file
+**/.DS_Store
+.jekyll-metadata
+_site/**
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e070497b541f3..0000000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "kubernetes"]
-	path = kubernetes
-	url = https://github.com/kubernetes/kubernetes
diff --git a/README.md b/README.md
index cded680a08ebb..0f2bf9b57f437 100644
--- a/README.md
+++ b/README.md
@@ -45,10 +45,10 @@ Clone our site
 
 	git clone https://github.com/kubernetes/kubernetes.github.io.git
 
-Then, see it run locally:
+Then, to see it run locally:
 
 	cd kubernetes.github.io
-	jekyll serve .
+	jekyll serve
 
 Your copy of the site will then be viewable at: [http://0.0.0.0:4000](http://0.0.0.0:4000)
 (or wherever Ruby tells you).
diff --git a/_config.yml b/_config.yml
index 37696e9d151e1..326dbd852eb90 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,6 +6,7 @@ kramdown:
   hard_wrap: false
   enable_coderay: true
 baseurl: /
+destination: ../kubernetes.github.io-built/
 
 safe: false
 lsi: false
diff --git a/_includes/tree.html b/_includes/tree.html
index 80fc1be3c19cd..4914c13eef00f 100644
--- a/_includes/tree.html
+++ b/_includes/tree.html
@@ -2,5 +2,5 @@
 <div class="item" data-title="{{ item.title }}">
   <div class="container">{% assign tree = item.section %}{% include tree.html %}
   </div>
-</div>{% else %}
-    <a class="item" data-title="{{ item.title }}" href="{{ item.path }}" ></a>{% endif %}{% endfor %}
\ No newline at end of file
+</div>{% else %}{% assign prefix = item.path | slice: 0, 4 %}{% if prefix == "http" %}{% assign target=" target='_blank'" %}{% else %}{% assign target="" %}{% endif %}
+    <a class="item" data-title="{{ item.title }}" href="{{ item.path }}"{{ target }}></a>{% endif %}{% endfor %}
\ No newline at end of file
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index 029a0118d9c4a..bc4921e65cdf1 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -2,7 +2,7 @@
 layout: headerfooter
 ---
 <!--  HERO  -->
-{% for thistoc in site.data[page.versionfilesafe].globals.tocs %}{% assign tree = site.data[page.versionfilesafe][thistoc].toc %}{% include tocsearch.html %}{% endfor %}
+{% for thistoc in site.data[page.versionfilesafe].globals.tocs %}{% if foundTOC %}{% break %}{% else %}{% assign tree = site.data[page.versionfilesafe][thistoc].toc %}{% include tocsearch.html %}{% endif %}{% endfor %}
 <section id="hero" class="light-text">
 	<h1>{{ site.data[page.versionfilesafe][foundTOC].bigheader }}</h1>
 	<h5>{{ site.data[page.versionfilesafe][foundTOC].abstract }}</h5>
diff --git a/kubernetes b/kubernetes
deleted file mode 160000
index a68731b97ed1a..0000000000000
--- a/kubernetes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a68731b97ed1a366ee8dcf700d9c19a5efaf9f86