diff --git a/source/_partials/post-header.html.twig b/source/_partials/post/header.html.twig
similarity index 100%
rename from source/_partials/post-header.html.twig
rename to source/_partials/post/header.html.twig
diff --git a/source/_partials/latest-posts.html.twig b/source/_partials/posts/latest.html.twig
similarity index 100%
rename from source/_partials/latest-posts.html.twig
rename to source/_partials/posts/latest.html.twig
diff --git a/source/_partials/sidebar.html.twig b/source/_partials/sidebar.html.twig
index 74ca6f9c..3e18d9b2 100644
--- a/source/_partials/sidebar.html.twig
+++ b/source/_partials/sidebar.html.twig
@@ -14,7 +14,7 @@
             {% include('availability') %}
 
             {% if page.url == '/.' %}
-                {% include ('latest-posts') %}
+                {% include ('posts/latest') %}
             {% endif %}
         {% endblock %}
     </div>
diff --git a/source/_partials/speakerdeck.html.twig b/source/_partials/speakerdeck.html.twig
deleted file mode 100644
index 9fd51d7d..00000000
--- a/source/_partials/speakerdeck.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<script async class="speakerdeck-embed" data-id="{{ data_id }}" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_partials/talk-listing-item.html.twig b/source/_partials/talks/listing-item.html.twig
similarity index 100%
rename from source/_partials/talk-listing-item.html.twig
rename to source/_partials/talks/listing-item.html.twig
diff --git a/source/_partials/tweet.twig b/source/_partials/tweet.twig
deleted file mode 100644
index a6fd2b0d..00000000
--- a/source/_partials/tweet.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-    <blockquote class="twitter-tweet" data-cards="hidden" lang="en">
-        {{ content|raw }}
-    </blockquote>
-</p>
diff --git a/source/_views/post.html.twig b/source/_views/post.html.twig
index d1762642..9b7b66a3 100644
--- a/source/_views/post.html.twig
+++ b/source/_views/post.html.twig
@@ -1,7 +1,7 @@
 {% extends 'default' %}
 
 {% block content_wrapper %}
-    {% include('post-header') %}
+    {% include('post/header') %}
 
     {% block content %}{% endblock %}
 
diff --git a/source/talks.html.twig b/source/talks.html.twig
index 5e04f78e..c8deedd2 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -31,7 +31,7 @@ use:
         <ul>
     {% endif %}
 
-    {{ include('talk-listing-item') }}
+    {{ include('talks/listing-item') }}
 {% endfor %}
 
 {% if found %}
@@ -56,7 +56,7 @@ use:
         <ul>
     {% endif %}
 
-    {{ include('talk-listing-item') }}
+    {{ include('talks/listing-item') }}
 {% endfor %}
 
 {% if found %}