diff --git a/source/_partials/availability.html.twig b/source/_partials/about/availability.html.twig
similarity index 77%
rename from source/_partials/availability.html.twig
rename to source/_partials/about/availability.html.twig
index f376bdc0..b65db64d 100644
--- a/source/_partials/availability.html.twig
+++ b/source/_partials/about/availability.html.twig
@@ -4,7 +4,7 @@
     <ul class="pl-5">
         {% for type, value in site.availability %}
             <li>
-                {% include 'availability/' ~ value %}
+                {% include 'about/availability/' ~ value %}
             </li>
         {% endfor %}
     </ul>
diff --git a/source/_partials/availability/limited.html.twig b/source/_partials/about/availability/limited.html.twig
similarity index 100%
rename from source/_partials/availability/limited.html.twig
rename to source/_partials/about/availability/limited.html.twig
diff --git a/source/_partials/availability/no.html.twig b/source/_partials/about/availability/no.html.twig
similarity index 100%
rename from source/_partials/availability/no.html.twig
rename to source/_partials/about/availability/no.html.twig
diff --git a/source/_partials/availability/yes.html.twig b/source/_partials/about/availability/yes.html.twig
similarity index 100%
rename from source/_partials/availability/yes.html.twig
rename to source/_partials/about/availability/yes.html.twig
diff --git a/source/_partials/badges.html.twig b/source/_partials/about/badges.html.twig
similarity index 88%
rename from source/_partials/badges.html.twig
rename to source/_partials/about/badges.html.twig
index d0436059..60b6b5b4 100644
--- a/source/_partials/badges.html.twig
+++ b/source/_partials/about/badges.html.twig
@@ -14,7 +14,7 @@
             <div class="markup -mb-3">
                 <h2 class="visuallyhidden">Certifications</h2>
 
-                {% include 'certification' with {
+                {% include 'about/certification' with {
                     title: 'Acquia certified Grand Master - Drupal 8',
                     url: 'http://certification.acquia.com/user/1647756',
                     image: {
@@ -23,7 +23,7 @@
                     },
                 } %}
 
-                {% include 'certification' with {
+                {% include 'about/certification' with {
                     title: 'Acquia certified Developer - Drupal 8',
                     image: {
                         filename: 'acquia-d8-developer.png',
@@ -31,7 +31,7 @@
                     },
                 } %}
 
-                {% include 'certification' with {
+                {% include 'about/certification' with {
                     title: 'Acquia certified Back End Specialist - Drupal 8',
                     image: {
                         filename: 'acquia-d8-back-end.png',
@@ -39,7 +39,7 @@
                     },
                 } %}
 
-                {% include 'certification' with {
+                {% include 'about/certification' with {
                     title: 'Acquia certified Front End Specialist - Drupal 8',
                     image: {
                         filename: 'acquia-d8-front-end.png',
@@ -47,7 +47,7 @@
                     },
                 } %}
 
-                {% include 'certification' with {
+                {% include 'about/certification' with {
                     title: 'Acquia certified Cloud Pro',
                     image: {
                         filename: 'acquia-cloud-pro.png',
diff --git a/source/_partials/certification.html.twig b/source/_partials/about/certification.html.twig
similarity index 100%
rename from source/_partials/certification.html.twig
rename to source/_partials/about/certification.html.twig
diff --git a/source/_partials/meetup.html.twig b/source/_partials/meetup.html.twig
deleted file mode 100644
index b1b00fd2..00000000
--- a/source/_partials/meetup.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-<li class="mr-2">
-    <a href="{{ url }}">
-        <img
-            class="h-16"
-            src="/images/meetups/{{ logo }}"
-            title="{{ name }}"
-            alt="{{ name }} logo"
-        >
-    </a>
-</li>
diff --git a/source/_partials/meetups.html.twig b/source/_partials/meetups.html.twig
deleted file mode 100644
index 09ee9a52..00000000
--- a/source/_partials/meetups.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="mt-2">
-    <h2 class="mb-2">Things that I organise</h2>
-
-    <ul class="list-reset inline-flex">
-        {% include 'meetup' with {
-            name: 'Drupal Bristol',
-            logo: 'drupal-bristol.jpeg',
-            url: 'http://www.drupalbristol.org.uk',
-        } %}
-
-        {% include 'meetup' with {
-            name: 'DrupalCamp Bristol',
-            logo: 'drupalcamp-bristol.png',
-            url: 'http://www.drupalcampbristol.co.uk',
-        } %}
-
-        {% include 'meetup' with {
-            name: 'PHPSW',
-            logo: 'phpsw.jpeg',
-            url: 'http://phpsw.uk',
-        } %}
-    </ul>
-</div>
diff --git a/source/_partials/talks-table.html.twig b/source/_partials/talks/table.html.twig
similarity index 100%
rename from source/_partials/talks-table.html.twig
rename to source/_partials/talks/table.html.twig
diff --git a/source/about.html.twig b/source/about.html.twig
index d135b7a0..e280d601 100644
--- a/source/about.html.twig
+++ b/source/about.html.twig
@@ -27,12 +27,12 @@ permalink: /
             <p>You can find me on <a href="https://twitter.com/opdavies">Twitter</a>, and see my open source work on <a href="https://www.drupal.org/u/opdavies">Drupal.org</a> and <a href="http://github.com/opdavies">GitHub</a> as well as on <a href="https://packagist.org/users/opdavies">Packagist</a>, <a href="https://www.npmjs.com/~opdavies">npm</a> and <a href="https://galaxy.ansible.com/opdavies">Ansible Galaxy</a>.</p>
         </div>
 
-        {% include 'availability' %}
+        {% include 'about/availability' %}
         {% include 'posts/latest' %}
     </div>
 
     <div class="w-full md:w-2/5 lg:w-1/3 px-6">
-        {% include 'badges' %}
+        {% include 'about/badges' %}
     </div>
 </div>
 {% endblock %}
diff --git a/source/talks.html.twig b/source/talks.html.twig
index a226078a..35d539c3 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -43,7 +43,7 @@ talks:
 
         {% set upcoming_talks = getUpcomingTalks(data.talks|merge(page.talks), site.events) %}
         {% if not upcoming_talks.empty %}
-            {% include "talks-table" with {
+            {% include "talks/table" with {
                 talks: upcoming_talks,
                 upcoming: true,
             } %}
@@ -55,7 +55,7 @@ talks:
     <div>
         <h2 class="mb-2">Previous Talks</h2>
 
-        {% include "talks-table" with {
+        {% include "talks/table" with {
             talks: getPastTalks(data.talks|merge(page.talks), site.events)
         } %}
     </div>