diff --git a/_config.yml b/_config.yml
index 71a91b24..fc5987f5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -27,7 +27,7 @@ markdown: kramdown
theme: minima
header_pages:
-- documentation.md
+- specification.md
- examples.md
- implementations.md
@@ -36,5 +36,6 @@ exclude:
- Gemfile
- node_modules
-gems:
+plugins:
- jekyll-relative-links
+ - jekyll-redirect-from
diff --git a/draft-zyp-json-schema-01.html b/draft-01/draft-zyp-json-schema-01.html
similarity index 99%
rename from draft-zyp-json-schema-01.html
rename to draft-01/draft-zyp-json-schema-01.html
index 246fdda2..ea922af5 100644
--- a/draft-zyp-json-schema-01.html
+++ b/draft-01/draft-zyp-json-schema-01.html
@@ -1,4 +1,6 @@
---
+redirect_from: "/draft-zyp-json-schema-01.html"
+permalink: "/draft-01/draft-zyp-json-schema-01.html"
---
A JSON Media Type for Describing the Structure and Meaning of JSON Documents
diff --git a/implementations.md b/implementations.md
index 2a7e1bc0..ce242c00 100644
--- a/implementations.md
+++ b/implementations.md
@@ -1,6 +1,6 @@
---
layout: page
-title: Software
+title: Implementations
permalink: /implementations.html
---
diff --git a/index.md b/index.md
index f220d257..0160e069 100644
--- a/index.md
+++ b/index.md
@@ -4,7 +4,7 @@ title: JSON Schema
permalink: /
---
-***Draft-07 has been [published](documentation.md)!***
+***Draft-07 has been [published](specification.html)!***
{: style="color:gray; font-size: 150%; text-align: center;"}
**JSON Schema** is a vocabulary that allows you to **annotate** and **validate** JSON documents.
@@ -86,9 +86,9 @@ More
Interested? Check out:
-- the [specification](documentation.md)
+- the [specification](specification.html)
- some [examples](examples.md)
-- the growing list of [JSON (Hyper-)Schema software](implementations.md)
+- the growing list of [JSON (Hyper-)Schema software](implementations.html)
We encourage updating to the latest specification, as described by the draft-07 meta-schemas. However, if you are still using draft-04, you may be interested in:
- this [excellent guide](http://spacetelescope.github.io/understanding-json-schema/) for schema authors, from the [Space Telescope Science Institute](http://www.stsci.edu/)
diff --git a/specification-links.md b/specification-links.md
index 11ff71d0..bf2387eb 100644
--- a/specification-links.md
+++ b/specification-links.md
@@ -5,7 +5,7 @@ layout: page
-You can find the latest released draft on the [Specification](/documentation.md) page. Older drafts are expired, but may be of historical interest.
+You can find the latest released draft on the [Specification](/specification.html) page. Older drafts are expired, but may be of historical interest.
**A note on draft naming and numbering:**
IETF Internet-Drafts (I-Ds) are named with the editor's name and a sequential number which resets with each new editor. Meta-schemas are numbered sequentially. Additionally, drafts 00-03 used one document for all three current specs. Most people find it easier to remember the sequential meta-schema numbers, so those are used throughout the site.
diff --git a/documentation.md b/specification.md
similarity index 97%
rename from documentation.md
rename to specification.md
index 98b2ea13..ba2f0cf3 100644
--- a/documentation.md
+++ b/specification.md
@@ -1,5 +1,7 @@
---
layout: page
+redirect_from: "/documentation.html"
+permalink: /specification.html
title: Specification
---