diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a794e95..f311767 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -35,7 +35,7 @@
     <div class="page-list">
         <ul>
             {{ range .Paginator.Pages }}
-            <li>{{ .Render "summary" }}</li>
+            <li>{{ .Render "summary/post" }}</li>
             {{ else }}
             <div>
                 {{ i18n "no_posts" }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d011c79..52b0385 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,7 +6,7 @@
     </h1>
 </div>
 
-{{ partial "post-metadata.html" . }}
+{{ partial "post-metadata/full.html" . }}
 
 
 {{ with (.GetTerms "series") }}
diff --git a/layouts/_default/author-summary.html b/layouts/_default/summary/author.html
similarity index 89%
rename from layouts/_default/author-summary.html
rename to layouts/_default/summary/author.html
index 1eb194b..dd45bd9 100644
--- a/layouts/_default/author-summary.html
+++ b/layouts/_default/summary/author.html
@@ -4,7 +4,7 @@
         {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
     </h2>
 
-    {{ partial "author-metadata.html" . }}
+    {{ partial "post-metadata/author.html" . }}
 
     <div class="post-description">
         {{ partial "description-or-summary.html" . }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary/post.html
similarity index 93%
rename from layouts/_default/summary.html
rename to layouts/_default/summary/post.html
index 4e0c20c..a6372ce 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary/post.html
@@ -5,7 +5,7 @@
         {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
     </h2>
 
-    {{ partial "post-metadata-short.html" . }}
+    {{ partial "post-metadata/short.html" . }}
 
     {{ with .Resources.GetMatch "feature" }}
     <div class="post-media">
diff --git a/layouts/_default/series-summary.html b/layouts/_default/summary/series.html
similarity index 84%
rename from layouts/_default/series-summary.html
rename to layouts/_default/summary/series.html
index 5cf9b03..95e2fe5 100644
--- a/layouts/_default/series-summary.html
+++ b/layouts/_default/summary/series.html
@@ -6,7 +6,7 @@
     </h2>
 
     <div class="post-metadata">
-        {{ partial "translations-meta-item.html" . }}
+        {{ partial "post-meta-item/translations.html" . }}
 
         {{ if ne .Site.Params.readingtime false }}
         <span class="post-meta-item">
@@ -19,7 +19,7 @@
         </span>
         {{ end }}
 
-        {{ partial "viewsource-meta-item.html" . }}
+        {{ partial "post-meta-item/viewsource.html" . }}
     </div>
 
     <div class="post-description">
@@ -29,7 +29,7 @@
     <div class="series-pages">
         <ul>
             {{ range .Data.Pages.Reverse }}
-            <li>{{ .Render "summary" }}</li>
+            <li>{{ .Render "summary/post" }}</li>
             {{ end }}
         </ul>
     </div>
diff --git a/layouts/authors/list.html b/layouts/authors/list.html
index 2b1d50d..33b6e1e 100644
--- a/layouts/authors/list.html
+++ b/layouts/authors/list.html
@@ -7,7 +7,7 @@
     <div class="page-list">
         <ul>
             {{ range .Paginator.Pages }}
-                <li>{{ .Render "author-summary" }}</li>
+                <li>{{ .Render "summary/author" }}</li>
             {{ end }}
         </ul>
     </div>
diff --git a/layouts/authors/term.html b/layouts/authors/term.html
index 97e96ef..d7f17e0 100644
--- a/layouts/authors/term.html
+++ b/layouts/authors/term.html
@@ -5,14 +5,14 @@
         {{ partial "rss-link.html" . }}
     </h1>
 
-    {{ partial "author-metadata.html" . }}
+    {{ partial "post-metadata/author.html" . }}
 
     {{ .Content }}
 
     <div class="page-list">
         <ul>
             {{ range .Paginator.Pages }}
-                <li>{{ .Render "summary" }}</li>
+                <li>{{ .Render "summary/post" }}</li>
             {{ else }}
                 <div>
                     {{ i18n "no_posts" }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 4714320..68fb2b6 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -26,11 +26,11 @@
     <title>{{ (print .Title " | " .Site.Title) | plainify }}</title>
     {{ end }}
 
-    {{ partial "opengraph.html" . }}
-    {{ partial "twitter_cards.html" . }}
-    {{ partial "schema.html" . }}
-    {{ partial "link_tags.html" . }}
-    {{ partial "author_meta_tags.html" . }}
+    {{ partial "seo-tags/opengraph.html" . }}
+    {{ partial "seo-tags/twitter-cards.html" . }}
+    {{ partial "seo-tags/schema.html" . }}
+    {{ partial "seo-tags/link.html" . }}
+    {{ partial "seo-tags/author.html" . }}
 
     <meta name="language" content="{{ .Language.Lang }}">
     <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage }}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
diff --git a/layouts/partials/authors-meta-item.html b/layouts/partials/post-meta-item/authors.html
similarity index 100%
rename from layouts/partials/authors-meta-item.html
rename to layouts/partials/post-meta-item/authors.html
diff --git a/layouts/partials/readingtime-meta-item.html b/layouts/partials/post-meta-item/readingtime.html
similarity index 100%
rename from layouts/partials/readingtime-meta-item.html
rename to layouts/partials/post-meta-item/readingtime.html
diff --git a/layouts/partials/series-meta-item.html b/layouts/partials/post-meta-item/series.html
similarity index 100%
rename from layouts/partials/series-meta-item.html
rename to layouts/partials/post-meta-item/series.html
diff --git a/layouts/partials/tags-meta-item.html b/layouts/partials/post-meta-item/tags.html
similarity index 100%
rename from layouts/partials/tags-meta-item.html
rename to layouts/partials/post-meta-item/tags.html
diff --git a/layouts/partials/translations-meta-item.html b/layouts/partials/post-meta-item/translations.html
similarity index 100%
rename from layouts/partials/translations-meta-item.html
rename to layouts/partials/post-meta-item/translations.html
diff --git a/layouts/partials/viewsource-meta-item.html b/layouts/partials/post-meta-item/viewsource.html
similarity index 100%
rename from layouts/partials/viewsource-meta-item.html
rename to layouts/partials/post-meta-item/viewsource.html
diff --git a/layouts/partials/author-metadata.html b/layouts/partials/post-metadata/author.html
similarity index 100%
rename from layouts/partials/author-metadata.html
rename to layouts/partials/post-metadata/author.html
diff --git a/layouts/partials/post-metadata.html b/layouts/partials/post-metadata/full.html
similarity index 75%
rename from layouts/partials/post-metadata.html
rename to layouts/partials/post-metadata/full.html
index 5a1ec93..2a0e158 100644
--- a/layouts/partials/post-metadata.html
+++ b/layouts/partials/post-metadata/full.html
@@ -19,10 +19,10 @@
     </span>
     {{ end }}
 
-    {{ partial "authors-meta-item.html" . }}
-    {{ partial "translations-meta-item.html" . }}
-    {{ partial "readingtime-meta-item.html" . }}
-    {{ partial "viewsource-meta-item.html" . }}
-    {{ partial "tags-meta-item.html" . }}
+    {{ partial "post-meta-item/authors.html" . }}
+    {{ partial "post-meta-item/translations.html" . }}
+    {{ partial "post-meta-item/readingtime.html" . }}
+    {{ partial "post-meta-item/viewsource.html" . }}
+    {{ partial "post-meta-item/tags.html" . }}
 </div>
 {{ end }}
diff --git a/layouts/partials/post-metadata-short.html b/layouts/partials/post-metadata/short.html
similarity index 60%
rename from layouts/partials/post-metadata-short.html
rename to layouts/partials/post-metadata/short.html
index c208da3..02a2342 100644
--- a/layouts/partials/post-metadata-short.html
+++ b/layouts/partials/post-metadata/short.html
@@ -9,10 +9,10 @@
     </span>
     {{ end }}
 
-    {{ partial "authors-meta-item.html" . }}
-    {{ partial "translations-meta-item.html" . }}
-    {{ partial "readingtime-meta-item.html" . }}
-    {{ partial "series-meta-item.html" . }}
-    {{ partial "tags-meta-item.html" . }}
+    {{ partial "post-meta-item/authors.html" . }}
+    {{ partial "post-meta-item/translations.html" . }}
+    {{ partial "post-meta-item/readingtime.html" . }}
+    {{ partial "post-meta-item/series.html" . }}
+    {{ partial "post-meta-item/tags.html" . }}
 </div>
 {{ end }}
diff --git a/layouts/partials/author_meta_tags.html b/layouts/partials/seo-tags/author.html
similarity index 100%
rename from layouts/partials/author_meta_tags.html
rename to layouts/partials/seo-tags/author.html
diff --git a/layouts/partials/link_tags.html b/layouts/partials/seo-tags/link.html
similarity index 100%
rename from layouts/partials/link_tags.html
rename to layouts/partials/seo-tags/link.html
diff --git a/layouts/partials/opengraph.html b/layouts/partials/seo-tags/opengraph.html
similarity index 100%
rename from layouts/partials/opengraph.html
rename to layouts/partials/seo-tags/opengraph.html
diff --git a/layouts/partials/schema.html b/layouts/partials/seo-tags/schema.html
similarity index 100%
rename from layouts/partials/schema.html
rename to layouts/partials/seo-tags/schema.html
diff --git a/layouts/partials/twitter_cards.html b/layouts/partials/seo-tags/twitter-cards.html
similarity index 100%
rename from layouts/partials/twitter_cards.html
rename to layouts/partials/seo-tags/twitter-cards.html
diff --git a/layouts/series/list.html b/layouts/series/list.html
index 4f1da7b..d4f1f09 100644
--- a/layouts/series/list.html
+++ b/layouts/series/list.html
@@ -7,7 +7,7 @@
     <div class="series-taxonomy">
         <ul>
             {{ range .Pages }}
-                <li>{{ .Render "series-summary" }}</li>
+                <li>{{ .Render "summary/series" }}</li>
             {{ end }}
         </ul>
     </div>
diff --git a/layouts/series/term.html b/layouts/series/term.html
index b292c1a..355d602 100644
--- a/layouts/series/term.html
+++ b/layouts/series/term.html
@@ -10,7 +10,7 @@
     <div class="page-list">
         <ul>
             {{ range .Paginator.Pages.Reverse }}
-                <li>{{ .Render "summary" }}</li>
+                <li>{{ .Render "summary/post" }}</li>
             {{ else }}
                 <div>
                     {{ i18n "no_posts" }}
diff --git a/layouts/taxonomy/term.html b/layouts/taxonomy/term.html
index ed7d275..256132d 100644
--- a/layouts/taxonomy/term.html
+++ b/layouts/taxonomy/term.html
@@ -14,7 +14,7 @@
     <div class="page-list">
         <ul>
             {{ range .Paginator.Pages }}
-                <li>{{ .Render "summary" }}</li>
+                <li>{{ .Render "summary/post" }}</li>
             {{ else }}
                 <div>
                     {{ i18n "no_posts" }}