diff --git a/_extras/.gitkeep b/_extras/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/_extras/contributing.md b/_extras/contributing.md
deleted file mode 100644
index ac9b5286f8807f930a0781ef22609ea11409e7d7..0000000000000000000000000000000000000000
--- a/_extras/contributing.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-layout: page
-title: "Contributors' Guide"
-permalink: /contributing/
----
-[Software Carpentry]({{ site.swc_site }}) is an open source project,
-and we welcome contributions of all kinds:
-new lessons,
-fixes to existing material,
-bug reports,
-and reviews of proposed changes are all equally welcome.
-By contributing,
-you are agreeing that Software Carpentry may redistribute your work under
-[these licenses]({{ site.root }}/license/).
-You also agree to abide by our
-[contributor code of conduct]({{ site.root }}/conduct/).
-
-## Getting Started
-
-1. We use [GitHub flow][github-flow] to manage changes. In brief:
- 1. Create a new branch in your desktop copy of this repository for each significant change.
- 2. Commit the change in that branch.
- 3. Push that branch to your fork of this repository on GitHub.
- 4. Submit a pull request from that branch to the [master repository]({{ site.repo }}).
- 5. If you receive feedback,
- make changes on your desktop and push to your branch on GitHub:
- the pull request will update automatically.
-
-2. The published copy of the lesson is in the `gh-pages` branch of the repository
- (so that GitHub will regenerate it automatically).
- Please create all branches from that,
- and merge the [master repository]({{ site.repo }})'s `gh-pages` branch into your `gh-pages` branch
- before starting major work.
-
-3. Copy `_config_template.yml` to create `_config.yml`
- and then edit the settings in the top half.
-
-4. The layout of this repository is explained in the [example lesson]({{ site.example_repo }})
- (which is rendered at [this site]({{ site.example_site }})).
- 1. The source for pages that appear as direct items in the navigation bar
- are stored in the root directory.
- 2. Source files for lesson episodes are stored in `_episodes`
- so that we can make use of [Jekyll collections][collections];
- `_episodes/01-xyz.md` generates `/01-xyz/index.html`,
- which can be linked to using `/01-xyz/`.
- 3. Files that appear under the "extras" menu pulldown are stored in `_extras`.
- 4. Figures and other files are stored in the `files` directory,
- while data sets are stored in `data`
- and source code for examples in `code`.
-
-## Other Resources
-
-1. For a list of helpful commands run `make` in this directory.
-
-2. If you are looking for other things to work on,
- please see [the list of issues for this repository][issues],
- or the other [Data Carpentry]({{ site.dc_site }}/lessons/)
- and [Software Carpentry]({{ site.swc_site }}/lessons/) lessons.
- Comments on issues and reviews of pull requests are equally welcome.
-
-[collections]: https://jekyllrb.com/docs/collections/
-[github-flow]: https://guides.github.com/introduction/flow/
-[issues]: {{ site.repo }}/issues/
-[swc-lessons]: http://software-carpentry.org/lessons.html
diff --git a/_includes/navbar.html b/_includes/lesson_navbar.html
similarity index 100%
rename from _includes/navbar.html
rename to _includes/lesson_navbar.html
diff --git a/_layouts/base.html b/_layouts/base.html
index 2f37883e9e86e9e0bdee1bdfed9c78ae13fb1244..789c891b99abc80a28c08336d8bc9dd0e286aa47 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -20,7 +20,6 @@
</head>
<body>
<div class="container">
- {% include navbar.html %}
{{ content }}
{% include footer.html %}
</div>
diff --git a/_layouts/break.html b/_layouts/break.html
index 91e4532b1481523b3a367b727e17f47de8cac428..ef8ee441c1f2a31739643002b5c2da676ef3beb0 100644
--- a/_layouts/break.html
+++ b/_layouts/break.html
@@ -1,6 +1,7 @@
---
layout: base
---
+{% include lesson_navbar.html %}
{% include episode_title.html %}
{% include episode_break.html %}
{{content}}
diff --git a/_layouts/episode.html b/_layouts/episode.html
index 3776397a14ddb6b7a21f6253c538882a5f09964b..51d709f3be9d907bf5714dd34ff916cc58adb07b 100644
--- a/_layouts/episode.html
+++ b/_layouts/episode.html
@@ -1,6 +1,7 @@
---
layout: base
---
+{% include lesson_navbar.html %}
{% include episode_title.html %}
{% include episode_overview.html %}
{{content}}
diff --git a/_layouts/index.html b/_layouts/lesson_homepage.html
similarity index 66%
rename from _layouts/index.html
rename to _layouts/lesson_homepage.html
index e2ba2070ea9c6091f38a3d6766f9181180402fcc..2e6b7f1c41ed23bde9a12853e43d8a77e64928b6 100644
--- a/_layouts/index.html
+++ b/_layouts/lesson_homepage.html
@@ -1,5 +1,6 @@
---
layout: base
---
+{% include lesson_navbar.html %}
{% include main_title.html %}
{{ content }}
diff --git a/_layouts/page.html b/_layouts/lesson_page.html
similarity index 65%
rename from _layouts/page.html
rename to _layouts/lesson_page.html
index 3df0456613772c2122100902a8d7fd84f91693dc..409b08b6083884f83212920de6dd3e71808ebc6a 100644
--- a/_layouts/page.html
+++ b/_layouts/lesson_page.html
@@ -1,5 +1,6 @@
---
layout: base
---
+{% include lesson_navbar.html %}
{% include main_title.html %}
{{content}}
diff --git a/_layouts/reference.html b/_layouts/reference.html
index e470cf703f5e705ae3944a48bc43e3d419e7c112..6edf84ff0aae7eba8005e4cfeb24404d6067ef33 100644
--- a/_layouts/reference.html
+++ b/_layouts/reference.html
@@ -2,5 +2,6 @@
layout: page
permalink: /reference/
---
+{% include lesson_navbar.html %}
{% include all_keypoints.html %}
{{content}}
diff --git a/_layouts/workshop.html b/_layouts/workshop_homepage.html
similarity index 100%
rename from _layouts/workshop.html
rename to _layouts/workshop_homepage.html
diff --git a/_layouts/workshop_page.html b/_layouts/workshop_page.html
new file mode 100644
index 0000000000000000000000000000000000000000..0422807a1969cf363ea4992bd861c585cc9a5237
--- /dev/null
+++ b/_layouts/workshop_page.html
@@ -0,0 +1,6 @@
+---
+layout: base
+---
+{% include workshop_navbar.html %}
+{% include main_title.html %}
+{{content}}