diff --git a/Gemfile b/Gemfile
deleted file mode 100755
index 37f5eaa..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 752d14e..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,218 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
-    colorator (1.1.0)
-    ethon (0.10.1)
-      ffi (>= 1.3.0)
-    execjs (2.7.0)
-    faraday (0.13.1)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
-    forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    github-pages (162)
-      activesupport (= 4.2.9)
-      github-pages-health-check (= 1.3.5)
-      jekyll (= 3.5.2)
-      jekyll-avatar (= 0.5.0)
-      jekyll-coffeescript (= 1.0.2)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.9.2)
-      jekyll-gist (= 1.4.1)
-      jekyll-github-metadata (= 2.9.3)
-      jekyll-mentions (= 1.2.0)
-      jekyll-optional-front-matter (= 0.2.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.1.0)
-      jekyll-redirect-from (= 0.12.1)
-      jekyll-relative-links (= 0.4.1)
-      jekyll-sass-converter (= 1.5.0)
-      jekyll-seo-tag (= 2.3.0)
-      jekyll-sitemap (= 1.1.1)
-      jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.1.0)
-      jekyll-theme-cayman (= 0.1.0)
-      jekyll-theme-dinky (= 0.1.0)
-      jekyll-theme-hacker (= 0.1.0)
-      jekyll-theme-leap-day (= 0.1.0)
-      jekyll-theme-merlot (= 0.1.0)
-      jekyll-theme-midnight (= 0.1.0)
-      jekyll-theme-minimal (= 0.1.0)
-      jekyll-theme-modernist (= 0.1.0)
-      jekyll-theme-primer (= 0.5.2)
-      jekyll-theme-slate (= 0.1.0)
-      jekyll-theme-tactile (= 0.1.0)
-      jekyll-theme-time-machine (= 0.1.0)
-      jekyll-titles-from-headings (= 0.4.0)
-      jemoji (= 0.8.1)
-      kramdown (= 1.13.2)
-      liquid (= 4.0.0)
-      listen (= 3.0.6)
-      mercenary (~> 0.3)
-      minima (= 2.1.1)
-      rouge (= 1.11.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.3.5)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      octokit (~> 4.0)
-      public_suffix (~> 2.0)
-      typhoeus (~> 0.7)
-    html-pipeline (2.7.1)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    i18n (0.8.6)
-    jekyll (3.5.2)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (~> 1.7)
-      safe_yaml (~> 1.0)
-    jekyll-avatar (0.5.0)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.0.2)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.9.2)
-      jekyll (~> 3.3)
-    jekyll-gist (1.4.1)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.9.3)
-      jekyll (~> 3.1)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.2.0)
-      activesupport (~> 4.0)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.1.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.12.1)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.4.1)
-      jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.0)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.3.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.1.1)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.2)
-      jekyll (~> 3.5)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.2)
-    jekyll-theme-slate (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.0)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.4.0)
-      jekyll (~> 3.3)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    jemoji (0.8.1)
-      activesupport (~> 4.0, >= 4.2.9)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0)
-    kramdown (1.13.2)
-    liquid (4.0.0)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
-    mercenary (0.3.6)
-    mini_portile2 (2.3.0)
-    minima (2.1.1)
-      jekyll (~> 3.3)
-    minitest (5.10.3)
-    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    octokit (4.7.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.14.0)
-      forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (1.11.1)
-    safe_yaml (1.0.4)
-    sass (3.5.1)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  github-pages
-
-BUNDLED WITH
-   1.15.4
diff --git a/foo.md b/foo.md
deleted file mode 100644
index e7001aa..0000000
--- a/foo.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Hello world
-
-This is a test.
diff --git a/googlebdbd14417c92a607.html b/googlebdbd14417c92a607.html
deleted file mode 100755
index af9afeb..0000000
--- a/googlebdbd14417c92a607.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: googlebdbd14417c92a607.html
\ No newline at end of file
diff --git a/images/access.png b/images/access.png
deleted file mode 100644
index cd93b2d..0000000
--- a/images/access.png
+++ /dev/null
Binary files differ
diff --git a/images/branches.png b/images/branches.png
deleted file mode 100644
index e6778ac..0000000
--- a/images/branches.png
+++ /dev/null
Binary files differ
diff --git a/images/diffy100.png b/images/diffy100.png
deleted file mode 100644
index 6129963..0000000
--- a/images/diffy100.png
+++ /dev/null
Binary files differ
diff --git a/images/diffy200.png b/images/diffy200.png
deleted file mode 100644
index 7d709dd..0000000
--- a/images/diffy200.png
+++ /dev/null
Binary files differ
diff --git a/images/diffy45.png b/images/diffy45.png
deleted file mode 100644
index cfe2101..0000000
--- a/images/diffy45.png
+++ /dev/null
Binary files differ
diff --git a/images/project-list.png b/images/project-list.png
deleted file mode 100644
index 7853d27..0000000
--- a/images/project-list.png
+++ /dev/null
Binary files differ
diff --git a/images/sbs.png b/images/sbs.png
deleted file mode 100644
index 7d97332..0000000
--- a/images/sbs.png
+++ /dev/null
Binary files differ
diff --git a/index.md b/index.md
deleted file mode 100644
index 023b1b9..0000000
--- a/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
-## Code Review for Git
-
-Gerrit provides web based code review and repository management for
-the [Git][git] version control system.
-
-[git]: http://git-scm.com/
-
-|||---||| 2,2,2,3,:1,2
-![diffy the kung fu review cuckoo](images/diffy100.png)
-
-### Discuss code
-
-and boost your team's code fu by talking about specifics.
-
-### Serve Git
-
-as an integrated experience within the larger code review flow.
-
-### Manage workflows
-
-with deeply integrated and delegatable access controls.
-
-*** promo
-
-## Download
-
-[Gerrit 2.14.3][download]
-
-***
-
-|||---|||
-
-## Discuss code
-
-Read old and new versions of files with syntax highlighting and
-colored differences.  Discuss specific sections with others to make
-the right changes.
-
-![side-by-side compare](images/sbs.png)
-
-## Manage and serve Git repositories
-
-Gerrit includes Git-enabled SSH and HTTPS servers compatible with all
-Git clients.  Simplify management by hosting many Git repositories
-together.
-
-|||---||| 6,2,4
-
-#### Navigate projects
-
-![project list](images/project-list.png)
-
-#### Control access
-
-![access panel](images/access.png)
-
-#### Update branches
-
-![branch list](images/branches.png)
-|||---|||
-
-Schedule [git gc] over all managed repositories and [replicate] to
-geographical mirrors for latency reduction and backup servers for hot
-spare redundancy.
-
-## Extensible through plugins
-
-Gerrit Code Review can be extended and further customized by installing
-[server-side plugins][plugins]. Source code for additional plugins
-can be found through the [project listing](https://gerrit.googlesource.com/plugins/).
-
-## Get in touch
-
-|||---||| 2,2,2,:4,2
-
-### Mailing list
-
-[repo-discuss](https://groups.google.com/group/repo-discuss)
-
-### Social media
-
-[![Google+](https://ssl.gstatic.com/images/icons/gplus-32.png)](https://plus.google.com/communities/111271594706618791655)
-
-[![Twitter](https://www.gerritforge.com/images/Twitter_Logo_Blue.png)](https://twitter.com/gerritreview)
-
-### IRC
-
-[freenode](https://freenode.net/) #gerrit
-
-[Channel log](http://echelog.com/logs/browse/gerrit/)
-
-|||---|||
-
-[download]: /releases/2.14.md
-[git gc]: https://gerrit-documentation.storage.googleapis.com/Documentation/2.14.3/config-gerrit.html#gc
-[plugins]: https://gerrit-documentation.storage.googleapis.com/Documentation/2.14.3/config-plugins.html
-[replicate]: https://gerrit.googlesource.com/plugins/replication/+doc/master/src/main/resources/Documentation/config.md
diff --git a/jekyll-source/.gitignore b/jekyll-source/.gitignore
index 67cb5ca..f4f7421 100644
--- a/jekyll-source/.gitignore
+++ b/jekyll-source/.gitignore
@@ -1,6 +1,8 @@
 _site/
+firebase-debug.log
 .sass-cache/
 .jekyll-metadata
 _pdf
 .DS_Store
 .idea
+vendor/
diff --git a/jekyll-source/_data/sidebars/gerritdoc_sidebar.yml b/jekyll-source/_data/sidebars/gerritdoc_sidebar.yml
index 2a64824..e79d344 100644
--- a/jekyll-source/_data/sidebars/gerritdoc_sidebar.yml
+++ b/jekyll-source/_data/sidebars/gerritdoc_sidebar.yml
@@ -42,6 +42,10 @@
       url: /intro-gerrit-walkthrough.html
       output: web
 
+    - title: Gerrit's History
+      url: /about.html
+      output: web
+
   - title: "Tutorials"
     output: web
     folderitems:
diff --git a/jekyll-source/_data/topnav.yml b/jekyll-source/_data/topnav.yml
index 6c9fb35..f4ecb0a 100644
--- a/jekyll-source/_data/topnav.yml
+++ b/jekyll-source/_data/topnav.yml
@@ -4,7 +4,9 @@
 - title: Topnav
   items:
     - title: About
-      external_url: https://www.gerritcodereview.com/about.md
+      url: /about.html
+    - title: Issues
+      url: /issues.html
 #Topnav dropdowns
 topnav_dropdowns:
 - title: Topnav dropdowns
diff --git a/firebase.json b/jekyll-source/firebase.json
similarity index 100%
rename from firebase.json
rename to jekyll-source/firebase.json
diff --git a/about.md b/jekyll-source/pages/site/about.md
similarity index 96%
rename from about.md
rename to jekyll-source/pages/site/about.md
index c7ce2fb..e3ff6c9 100644
--- a/about.md
+++ b/jekyll-source/pages/site/about.md
@@ -1,4 +1,8 @@
-# Origin Story
+---
+title: "Gerrit's History"
+sidebar: gerritdoc_sidebar
+permalink: about.html
+---
 
 ## Google Mondrian
 
diff --git a/docs/MultiMaster.md b/jekyll-source/pages/site/docs/MultiMaster.md
similarity index 91%
rename from docs/MultiMaster.md
rename to jekyll-source/pages/site/docs/MultiMaster.md
index 239d0e3..2354d71 100644
--- a/docs/MultiMaster.md
+++ b/jekyll-source/pages/site/docs/MultiMaster.md
@@ -1,10 +1,16 @@
+---
+title: "MultiMaster"
+permalink: multimaster.html
+---
+
+
 We spent some time at the May 2012 Hackathon outlining an incremental approach
 to making open source Gerrit clusterable (the version running for android-review
 and gerrit-review is already clustered but uses much of Google's proprietary
 technologies such as GFS and BigTable). Several incremental steps were outlined
 on how to move Gerrit in that direction.
 
-# Shared Git Repo - Shared DB
+## Shared Git Repo - Shared DB
 
 This is the simplest case for Gerrit multi master, so it is likely the first
 step which is needed by most other ideas is to support a very simple
@@ -26,9 +32,9 @@
 eviction (a plugin is up for [review]
 (https://gerrit-review.googlesource.com/#/c/37460/1) which does this using UDP).
 
-# 2 could be easily solved by manually determining a submit master and later
+## 2 could be easily solved by manually determining a submit master and later
 
-upgrading to some sort of voting mechanism among peer masters to choose a submit
+Upgrading to some sort of voting mechanism among peer masters to choose a submit
 master, these would be incremental approaches. The issue is that each server
 runs a plugin queue and can therefor can attempt to merge changes to the same
 branches at the same time resulting in "failed to lock" errors which will leave
@@ -37,7 +43,7 @@
 peer goes down, might its queue be the only holder of certain changes which then
 will be missed until a restart of some server?
 
-# 3 can be solved similarly to #2
+## 3 can be solved similarly to #2
 
 Select a replication master. The replication master is responsible to rerun full
 replication on startup and anytime a master goes down (since it may have currently
@@ -62,7 +68,7 @@
 (https://groups.google.com/d/msg/repo-discuss/ZIIuBaCz9Jc/ZTQGpuy_Y1MJ) about
 some what is required for this setup to work well.
 
-# Multi Site Masters with Separate Backends
+## Multi Site Masters with Separate Backends
 
 The main additional problem with separate backends is: resolving ref updates in
 a globally safe way. In Google’s implementation, this is solved by placing the
@@ -74,7 +80,7 @@
 A plugin for ZooKeeper ref-db is up for [review]
 (https://gerrit-review.googlesource.com/#/c/37460/1).
 
-# Distributed FS
+## Distributed FS
 
 Finally, it was felt that once multi sites were conquered, that a distributed
 filesystem may eventually be needed to scale the git repos effectively, Hadoop
diff --git a/docs/Notedb.md b/jekyll-source/pages/site/docs/Notedb.md
similarity index 98%
rename from docs/Notedb.md
rename to jekyll-source/pages/site/docs/Notedb.md
index 493d74d..34d4b4d 100644
--- a/docs/Notedb.md
+++ b/jekyll-source/pages/site/docs/Notedb.md
@@ -1,4 +1,10 @@
-### What is notedb?
+---
+title: "Notedb"
+permalink: notedb.html
+---
+
+
+## What is notedb?
 
 Notedb is the successor to ReviewDb: a replacement database backend for Gerrit.
 The goal is to read code review metadata from the same set of repositories that
diff --git a/docs/OutstandingTopics.md b/jekyll-source/pages/site/docs/OutstandingTopics.md
similarity index 97%
rename from docs/OutstandingTopics.md
rename to jekyll-source/pages/site/docs/OutstandingTopics.md
index 215cfee..f28cdd2 100644
--- a/docs/OutstandingTopics.md
+++ b/jekyll-source/pages/site/docs/OutstandingTopics.md
@@ -1,4 +1,7 @@
-# Overview
+---
+title: "Outstanding Topics"
+permalink: outstandingtopics.html
+---
 
 Following a [discussion on the mailing list]
 (https://groups.google.com/forum/#!topic/repo-discuss/qKz7AtZDlC4) we decided to
diff --git a/docs/ReviewKungFu.md b/jekyll-source/pages/site/docs/ReviewKungFu.md
similarity index 94%
rename from docs/ReviewKungFu.md
rename to jekyll-source/pages/site/docs/ReviewKungFu.md
index b080ee4..4b57359 100644
--- a/docs/ReviewKungFu.md
+++ b/jekyll-source/pages/site/docs/ReviewKungFu.md
@@ -1,4 +1,9 @@
-# Review Kung Fu
+---
+title: "Review Kung Fu"
+permalink: ReviewKungFu.html
+---
+
+## Review Kung Fu
 
 As you progress on your path of Review Kung Fu your skill may take you to new
 levels. Your objective is to spot potential problems and help others find
@@ -16,7 +21,7 @@
 your arrogance, but because Diffy wants those seeking to improve their Kung Fu
 to easily recognize those whose skill may help them deliver.
 
-# Diffy's Badges
+## Diffy's Badges
 
 ### Toes
 
diff --git a/docs/RoadMap.md b/jekyll-source/pages/site/docs/RoadMap.md
similarity index 96%
rename from docs/RoadMap.md
rename to jekyll-source/pages/site/docs/RoadMap.md
index 0998c25..86cfbfc 100644
--- a/docs/RoadMap.md
+++ b/jekyll-source/pages/site/docs/RoadMap.md
@@ -1,4 +1,9 @@
-# Introduction
+---
+title: "RoadMap"
+permalink: roadmap.html
+---
+
+## Introduction
 
 There are many ideas suggested, and discussions which lead to decisions about
 the future direction and designs of Gerrit which happen in many forums: on IRC,
@@ -13,7 +18,7 @@
 coming down the pike. So we will attempt to illustrate some of these decisions
 here.
 
-# Architecture
+## Architecture
 
 *   The REST API is viewed as the longterm stable approach for RPCs with the
     Gerrit Server. At this point new UI elements and new ssh commands should be
diff --git a/docs/Scaling.md b/jekyll-source/pages/site/docs/Scaling.md
similarity index 96%
rename from docs/Scaling.md
rename to jekyll-source/pages/site/docs/Scaling.md
index 596c64b..d048d41 100644
--- a/docs/Scaling.md
+++ b/jekyll-source/pages/site/docs/Scaling.md
@@ -1,4 +1,9 @@
-# Scaling Dimensions
+---
+title: "Scaling Dimensions"
+permalink: scaling.html
+---
+
+## Scaling Dimensions
 
 As you scale, you will always run into some issues. Depending on your specific
 setup those issues may be very different from what other people are running
@@ -28,9 +33,9 @@
 
 --------------------------------------------------------------------------------
 
-# Servers
+## Servers
 
-## Master
+### Master
 
 The first step to scaling is to scale your master server. Some easy, but pricey
 ways to scale your master are:
@@ -42,7 +47,7 @@
     repos are not well repacked (seeks can be crippling here).
 *   Network, I suspect that most large installs use 10Gb Ethernet
 
-## Mirrors/Slaves
+### Mirrors/Slaves
 
 Once you have a decent master, it is probably worth adding either some git
 mirrors (if you do not need ACLs on your repos), or Gerrit slaves to help
@@ -51,7 +56,7 @@
 particularly useful for remote sites. Some of the larger installations have at
 least 25 of these.
 
-### Shared Storage and Replication Entries For Slaves
+#### Shared Storage and Replication Entries For Slaves
 
 A common practice is to use site local shared storage (NFS...) on remote slaves
 when there is more than one slave at the remote site. One major advantage of
@@ -65,7 +70,7 @@
 to a different slave (since the back-end storage is the same, they all will
 still see every update).
 
-### DB Slaves
+#### DB Slaves
 
 DB slaves are being used on remote sites so that remote slaves do not have to
 traverse the WAN to talk to the master DB. Both PostGreSQL and MYSQL are being
@@ -74,7 +79,7 @@
 (https://gerrit-review.googlesource.com/#/c/35220) was also designed to help
 with this.)
 
-## Multi - Master
+### Multi - Master
 
 The Gerrit MultiMaster plug-in describes how to setup a single site multi-master
 with a shared storage back-end for git repository data. However, there are
@@ -84,7 +89,7 @@
 
 --------------------------------------------------------------------------------
 
-# Jetty
+## Jetty
 
 The default built in web container which Gerrit uses is Jetty. Some
 installations have had serious "Failed to dispatch" errors which lead to 100%CPU
@@ -97,7 +102,7 @@
 
 --------------------------------------------------------------------------------
 
-# Repo Syncs
+## Repo Syncs
 
 With beefier servers, many people have [seen]
 (http://groups.google.com/group/repo-discuss/browse_thread/thread/c8f003f2247d7157/ad6915f5558df8f5?lnk=gst&q=repo+sync+error#ad6915f5558df8f5)
@@ -112,7 +117,7 @@
 
 --------------------------------------------------------------------------------
 
-# Java HEAP and GC
+## Java HEAP and GC
 
 Operations on git repositories can consume lots of memory. If you consume more
 memory than your java heap, your server may either run out of memory and fail,
@@ -145,14 +150,14 @@
 
 --------------------------------------------------------------------------------
 
-# Replication
+## Replication
 
 There are many scalability issues which can plague replication, most are related
 to high ref counts, those are not specifically mentioned here, so you will
 likely need to first be familiar with the "High Ref Counts" section to make
 replication run smoothly.
 
-## JSch
+### JSch
 
 Jsch has threading issues which seem to serialize replication even across worker
 groups. This has lead some teams to perform replication without using ssh (Jsch
@@ -162,7 +167,7 @@
 particularly useful if you have sites which replicate to at very different
 speeds.
 
-## Failed To Lock
+### Failed To Lock
 
 With older versions of the replication plug-in, your replication can start
 running into contention and failing with "Failed to Lock" errors in your logs.
@@ -178,20 +183,20 @@
 
 --------------------------------------------------------------------------------
 
-# High Ref Counts
+## High Ref Counts
 
 High ref counts can have impacts in many places in the git/jgit/Gerrit stacks.
 There are many ongoing fixes and tweaks to alleviated many of these problems,
 but some of them still remain. Some can be "unofficially" worked around.
 
-## git daemon mirrors
+### git daemon mirrors
 
 Current versions (prior to git 1.7.11) will use an [excessive amount of CPU]
 (http://marc.info/?l=git&m=133310001303068&w=2) when receiving pushes on sites
 with high ref counts. Upgrading git there can help drastically reduce your
 replication time in these cases.
 
-## git
+### git
 
 Suggest to your users that they use the latest git possible, many of the older
 versions (which are still the defaults on many distros) have severe problems
@@ -200,7 +205,7 @@
 1.7.7. Git 1.8.1 seems to have some speed-ups in fetches of high ref counts
 compared to even 1.7.8.
 
-## jgit
+### jgit
 
 jGit still has a [performance problem]
 (http://groups.google.com/group/repo-discuss/browse_thread/thread/d0914922dc565516)
@@ -212,7 +217,7 @@
 
 There are some very high performance patches which make jgit extremely fast.
 
-## Tags
+### Tags
 
 If you have android repositories, you likely use around 400-600 of them. Cross
 project tagging can be [problematic]
@@ -221,7 +226,7 @@
 
 --------------------------------------------------------------------------------
 
-## ACLS
+### ACLS
 
 On servers with little or no anonymous access, and large change counts, it can
 be disastrous when non-logged-in users access a change-list page. A change-list
@@ -241,7 +246,7 @@
 
 --------------------------------------------------------------------------------
 
-# Disk Space / File Cleanup
+## Disk Space / File Cleanup
 
 Installations which do not have enough spare disk space for their repos can run
 into problems easily. Be aware that git repos contain highly compressed data and
@@ -252,7 +257,7 @@
 This is particularly important for those using SSDs where they might be more
 likely to skimp on space.
 
-## Git GC Repo Explosions
+### Git GC Repo Explosions
 
 Under certain conditions git gc can cause a repo explosion (jgit gc does not
 suffer from this problem because it puts unreachable objects in a packfile),
@@ -267,7 +272,7 @@
 *   Tags are [deleted](http://marc.info/?l=git&m=131829057610072&w=2) from the
     linux repo
 
-## Git GC
+### Git GC
 
 Running GC regularly is important, particularly on sites with heavy uploads.
 Older versions of jgit do not have built in gc and require using git gc. Setting
@@ -280,7 +285,7 @@
 Pack file churn can lead to several issues, RAM utilization, Disk utilization
 and excessive WAN utilization for file-system mirroring scripts (such as rysnc).
 
-## Keep and Noz files
+### Keep and Noz files
 
 Currently, Gerrit may leave behind some temporary files in your git repos when
 it shuts down (particularly if ungraceful). There are some temporary files which
@@ -290,14 +295,14 @@
 repacking the packfile they are associated with which can lead to poor disk
 space utilization and performance issues.
 
-## ~/.gerritcodereview
+### ~/.gerritcodereview
 
 The temporary unjared war files in here can build up. (This has been move to
 review\_site/tmp in Gerrit 2.5+)
 
 --------------------------------------------------------------------------------
 
-# hooks
+## hooks
 
 Servers with lots of RAM are susceptible to slow forks which can delay each hook
 invocation quite a bit. When java uses over 10G of memory, it may add at least a
diff --git a/docs/ShowCases.md b/jekyll-source/pages/site/docs/ShowCases.md
similarity index 92%
rename from docs/ShowCases.md
rename to jekyll-source/pages/site/docs/ShowCases.md
index d3bc57a..fe10eaf 100644
--- a/docs/ShowCases.md
+++ b/jekyll-source/pages/site/docs/ShowCases.md
@@ -1,4 +1,9 @@
-# Gerrit Installations in the Wild
+---
+title: "Showcases"
+permalink: showcases.html
+---
+
+## Gerrit Installations in the Wild
 
 ## Open Source Projects
 
diff --git a/docs/SqlMergeUserAccounts.md b/jekyll-source/pages/site/docs/SqlMergeUserAccounts.md
similarity index 97%
rename from docs/SqlMergeUserAccounts.md
rename to jekyll-source/pages/site/docs/SqlMergeUserAccounts.md
index 7513711..ad69d2b 100644
--- a/docs/SqlMergeUserAccounts.md
+++ b/jekyll-source/pages/site/docs/SqlMergeUserAccounts.md
@@ -1,4 +1,9 @@
-# Introduction
+---
+title: "SQL Merge User Accounts"
+permalink: sqlmergeuseraccounts.html
+---
+
+## Introduction
 
 Sometimes users wind up with two accounts on a Gerrit server, this is especially
 common with OpenID installations when the user forgets which OpenID provider he
@@ -18,7 +23,7 @@
 commit it at the end. This allows the administrator to double check any records
 by query before committing the merge result for good.
 
-# load\_merge.sql
+## load\_merge.sql
 
 ```
 CREATE TEMP TABLE links
@@ -79,7 +84,7 @@
 ORDER BY t.preferred_email;
 ```
 
-# merge\_accounts.sql
+## merge\_accounts.sql
 
 ```
 DROP TABLE to_del;
diff --git a/issues.md b/jekyll-source/pages/site/issues.md
similarity index 97%
rename from issues.md
rename to jekyll-source/pages/site/issues.md
index f7f695e..b64d1aa 100644
--- a/issues.md
+++ b/jekyll-source/pages/site/issues.md
@@ -1,11 +1,13 @@
-# Issue Tracking
+---
+title: "Issue Tracking"
+sidebar: gerritdoc_sidebar
+permalink: issues.html
+---
 
 [Issues][list] are tracked at bugs.chromium.org.
 
 [list]: https://bugs.chromium.org/p/gerrit/issues/list?can=2
 
-[TOC]
-
 ## Status
 
 Issues that do not have a contributor actively working on them may be
diff --git a/releases/2.12.md b/jekyll-source/pages/site/releases/2.12.md
similarity index 99%
rename from releases/2.12.md
rename to jekyll-source/pages/site/releases/2.12.md
index dcad1cc..c5bce9e 100644
--- a/releases/2.12.md
+++ b/jekyll-source/pages/site/releases/2.12.md
@@ -1,4 +1,7 @@
-# Gerrit 2.12
+---
+title: "Gerrit 2.12 Release"
+permalink: 2.12.html
+---
 
 Download: **[2.12.7](https://gerrit-releases.storage.googleapis.com/gerrit-2.12.7.war)**
 | [2.12.6](https://gerrit-releases.storage.googleapis.com/gerrit-2.12.6.war)
diff --git a/releases/2.13.md b/jekyll-source/pages/site/releases/2.13.md
similarity index 99%
rename from releases/2.13.md
rename to jekyll-source/pages/site/releases/2.13.md
index dd2bdca..9faabd4 100644
--- a/releases/2.13.md
+++ b/jekyll-source/pages/site/releases/2.13.md
@@ -1,4 +1,7 @@
-# Gerrit 2.13
+---
+title: "Gerrit 2.13 Release"
+permalink: 2.13.html
+---
 
 Download: **[2.13.9](https://gerrit-releases.storage.googleapis.com/gerrit-2.13.9.war)**
 | [2.13.8](https://gerrit-releases.storage.googleapis.com/gerrit-2.13.8.war)
diff --git a/releases/2.14.md b/jekyll-source/pages/site/releases/2.14.md
similarity index 99%
rename from releases/2.14.md
rename to jekyll-source/pages/site/releases/2.14.md
index 17960a4..57cb234 100644
--- a/releases/2.14.md
+++ b/jekyll-source/pages/site/releases/2.14.md
@@ -1,4 +1,7 @@
-# Gerrit 2.14
+---
+title: "Gerrit 2.14 Release"
+permalink: 2.14.html
+---
 
 Download: **[2.14.3](https://gerrit-releases.storage.googleapis.com/gerrit-2.14.3.war)**
 | [2.14.2](https://gerrit-releases.storage.googleapis.com/gerrit-2.14.2.war)
diff --git a/releases/2.15.md b/jekyll-source/pages/site/releases/2.15.md
similarity index 95%
rename from releases/2.15.md
rename to jekyll-source/pages/site/releases/2.15.md
index 2a50d4c..53c9795 100644
--- a/releases/2.15.md
+++ b/jekyll-source/pages/site/releases/2.15.md
@@ -1,6 +1,7 @@
-# Gerrit 2.15 *(In development)*
-
-[TOC]
+---
+title: "Gerrit 2.15 Release (In Development)"
+permalink: 2.15.html
+---
 
 ## Release Highlights
 
diff --git a/releases/README.md b/jekyll-source/pages/site/releases/README.md
similarity index 82%
rename from releases/README.md
rename to jekyll-source/pages/site/releases/README.md
index fb54bcb..977c4e8 100644
--- a/releases/README.md
+++ b/jekyll-source/pages/site/releases/README.md
@@ -7,7 +7,7 @@
 (.war files and API artifacts, version 2.9 and later).
 
 Artifacts deployed to Maven Central are signed with the maintainer's key.
-Please refer to the [list of maintainers' keys](public-keys.md).
+Please refer to the [list of maintainers' keys](public-keys.html).
 
 Latest release: **[2.14.3](/releases/2.14.md)**.
 
@@ -17,7 +17,7 @@
 
 * Private Changes
 
-[Release notes for Gerrit 2.15](/releases/2.15.md)
+[Release notes for Gerrit 2.15](/releases/2.15.html)
 
 ## 2.14 {#2.14}
 
@@ -35,7 +35,7 @@
 
 * Secondary index with Elastic Search (experimental)
 
-[Release notes for Gerrit 2.14](/releases/2.14.md)
+[Release notes for Gerrit 2.14](/releases/2.14.html)
 
 ## 2.13 {#2.13}
 
@@ -47,7 +47,7 @@
 
 * Access control for git submodule subscriptions
 
-[Release notes for Gerrit 2.13](/releases/2.13.md).
+[Release notes for Gerrit 2.13](/releases/2.13.html).
 
 ## 2.12 {#2.12}
 
@@ -55,7 +55,7 @@
 
 * Support for GPG Keys and signed pushes.
 
-[Release notes for Gerrit 2.12](/releases/2.12.md).
+[Release notes for Gerrit 2.12](/releases/2.12.html).
 
 ## Older Releases {#older}
 
diff --git a/releases/public-keys.md b/jekyll-source/pages/site/releases/public-keys.md
similarity index 96%
rename from releases/public-keys.md
rename to jekyll-source/pages/site/releases/public-keys.md
index 2d09e15..2621009 100644
--- a/releases/public-keys.md
+++ b/jekyll-source/pages/site/releases/public-keys.md
@@ -1,4 +1,7 @@
-# Gerrit Code Review - Public Keys
+---
+title: "Public Keys"
+permalink: public-keys.html
+---
 
 The following public keys are are available on the
 [Ubuntu Public Key Server](https://keyserver.ubuntu.com/), and are used to sign:
diff --git a/navbar.md b/navbar.md
deleted file mode 100644
index 9ff5dc5..0000000
--- a/navbar.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Gerrit Code Review
-
-* [About](/about.md)
-* [Releases](/releases/README.md)
-* [Documentation](https://gerrit-documentation.storage.googleapis.com/Documentation/2.14.3/index.html)
-* [Issues](/issues.md)
-* [Wiki](https://gerrit.googlesource.com/homepage/+/md-pages/docs/)
-* [Source](https://gerrit.googlesource.com/gerrit/)
-* [Reviews](https://gerrit-review.googlesource.com/#/q/status:open+project:gerrit)
-* [Builds](https://gerrit-ci.gerritforge.com)
-
-[home]: /index.md
-[logo]: /images/diffy45.png