diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6991061708..797c18ffbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+New Features:
+
+- [Rename and reorganise template pages to be easier to use](https://github.com/alphagov/govuk-prototype-kit/pull/578)
+
 Bug fixes:
 
 - [Update link from question page template to design system](https://github.com/alphagov/govuk-prototype-kit/pull/575)
diff --git a/docs/views/examples/blank-govuk.html b/docs/views/templates/blank-govuk.html
similarity index 100%
rename from docs/views/examples/blank-govuk.html
rename to docs/views/templates/blank-govuk.html
diff --git a/docs/views/examples/blank-unbranded.html b/docs/views/templates/blank-unbranded.html
similarity index 100%
rename from docs/views/examples/blank-unbranded.html
rename to docs/views/templates/blank-unbranded.html
diff --git a/docs/views/examples/check-your-answers-page.html b/docs/views/templates/check-your-answers.html
similarity index 100%
rename from docs/views/examples/check-your-answers-page.html
rename to docs/views/templates/check-your-answers.html
diff --git a/docs/views/examples/confirmation-page.html b/docs/views/templates/confirmation.html
similarity index 100%
rename from docs/views/examples/confirmation-page.html
rename to docs/views/templates/confirmation.html
diff --git a/docs/views/examples/template-content-page.html b/docs/views/templates/content.html
similarity index 100%
rename from docs/views/examples/template-content-page.html
rename to docs/views/templates/content.html
diff --git a/docs/views/examples/template-question-page-blank.html b/docs/views/templates/question.html
similarity index 100%
rename from docs/views/examples/template-question-page-blank.html
rename to docs/views/templates/question.html
diff --git a/docs/views/examples/start-page.html b/docs/views/templates/start.html
similarity index 100%
rename from docs/views/examples/start-page.html
rename to docs/views/templates/start.html
diff --git a/docs/views/examples/task-list-page.html b/docs/views/templates/task-list.html
similarity index 100%
rename from docs/views/examples/task-list-page.html
rename to docs/views/templates/task-list.html
diff --git a/docs/views/tutorials-and-examples.html b/docs/views/tutorials-and-examples.html
index 784ab19fe8..9ba5c5bf73 100644
--- a/docs/views/tutorials-and-examples.html
+++ b/docs/views/tutorials-and-examples.html
@@ -127,40 +127,40 @@ <h2 class="govuk-heading-m">Page templates</h2>
 
       <ul class="govuk-list govuk-list--bullet">
         <li>
-          <a href="/docs/examples/blank-govuk">
+          <a href="/docs/templates/blank-govuk">
             Blank
           </a> /
-          <a href="/docs/examples/blank-unbranded">
+          <a href="/docs/templates/blank-unbranded">
             Blank (non-GOV.UK)
           </a>
         </li>
         <li>
-          <a href="/docs/examples/start-page">
+          <a href="/docs/templates/start">
             Start page
           </a>
         </li>
         <li>
-          <a href="/docs/examples/template-question-page-blank">
+          <a href="/docs/templates/question">
             Question page
           </a>
         </li>
         <li>
-          <a href="/docs/examples/template-content-page">
+          <a href="/docs/templates/content">
             Content page
           </a>
         </li>
         <li>
-          <a href="/docs/examples/task-list-page">
+          <a href="/docs/templates/task-list">
             Task list
           </a>
         </li>
         <li>
-          <a href="/docs/examples/check-your-answers-page">
+          <a href="/docs/templates/check-your-answers">
             Check your answers
           </a>
         </li>
         <li>
-          <a href="/docs/examples/confirmation-page">
+          <a href="/docs/templates/confirmation">
             Confirmation
           </a>
         </li>