diff --git a/README.md b/README.md
index b1bde64..251ce96 100644
--- a/README.md
+++ b/README.md
@@ -379,9 +379,9 @@ The theme will autodetect them and add the needed code.
 
 ### Head and footer partials
 
-If you create partials named `head.html` and/or `footer.html` they will be used. They do not exist in the theme but are supported as a convenience.
+If you create partials named `head/extra.html` and/or `footer.html` they will be used. They do not exist or are empty in the theme but are supported as a convenience.
 
-Content in the "head" partial will be added to the end of the "head" tag, perhaps some extra css or javascript.
+Content in the "head/extra" partial will be added to the end of the "head" tag, perhaps some extra css or javascript.
 
 Content in the "footer" partial will replace all the default content in the "footer" tag.
 
diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html
new file mode 100644
index 0000000..0609fa3
--- /dev/null
+++ b/layouts/_partials/footer.html
@@ -0,0 +1,4 @@
+{{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}
+<p>{{ with site.Copyright }}{{ . | site.Home.RenderString }}{{ else }}<span>© {{ site.Title }}</span>{{ end }}</p>
+{{ with $.Param "footer" }}<p>{{ . | site.Home.RenderString }}</p>{{ end }}
+{{ if $.Param "poweredby" }}<p>Powered by <a href="https://gohugo.io/">Hugo</a> and the <a href="https://github.com/frjo/hugo-theme-zen">Zen theme</a>.</p>{{ end }}
diff --git a/layouts/_partials/head/extra.html b/layouts/_partials/head/extra.html
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layouts/_partials/head/extra.html
@@ -0,0 +1 @@
+
diff --git a/layouts/_partials/favicons.html b/layouts/_partials/head/favicons.html
similarity index 100%
rename from layouts/_partials/favicons.html
rename to layouts/_partials/head/favicons.html
diff --git a/layouts/_partials/math.html b/layouts/_partials/head/math.html
similarity index 100%
rename from layouts/_partials/math.html
rename to layouts/_partials/head/math.html
diff --git a/layouts/_partials/meta-breadcrumb-json-ld.html b/layouts/_partials/head/meta-breadcrumb-json-ld.html
similarity index 100%
rename from layouts/_partials/meta-breadcrumb-json-ld.html
rename to layouts/_partials/head/meta-breadcrumb-json-ld.html
diff --git a/layouts/_partials/meta-json-ld.html b/layouts/_partials/head/meta-json-ld.html
similarity index 92%
rename from layouts/_partials/meta-json-ld.html
rename to layouts/_partials/head/meta-json-ld.html
index a4987fe..862b47a 100644
--- a/layouts/_partials/meta-json-ld.html
+++ b/layouts/_partials/head/meta-json-ld.html
@@ -6,7 +6,7 @@
     {{ if .IsPage -}}
     "@type": {{ if in $blogSections .Section }}"BlogPosting",{{ else }}"WebPage",
     {{ if in $breadcrumbSections .Section -}}
-    "breadcrumb": {{ partial "meta-breadcrumb-json-ld.html" . }},
+    "breadcrumb": {{ partial "head/meta-breadcrumb-json-ld.html" . }},
     {{ end -}}
     {{ end -}}
     "headline": {{ .Title }},
@@ -24,7 +24,7 @@
     {{ else -}}
     "@type": "WebPage",
     {{ if in $breadcrumbSections .Section -}}
-    "breadcrumb": {{ partial "meta-breadcrumb-json-ld.html" . }},
+    "breadcrumb": {{ partial "head/meta-breadcrumb-json-ld.html" . }},
     {{ end -}}
     "url" : {{ .Permalink }},
     "name": {{ .Title }},
diff --git a/layouts/_partials/meta.html b/layouts/_partials/head/meta.html
similarity index 100%
rename from layouts/_partials/meta.html
rename to layouts/_partials/head/meta.html
diff --git a/layouts/_partials/scripts.html b/layouts/_partials/head/scripts.html
similarity index 100%
rename from layouts/_partials/scripts.html
rename to layouts/_partials/head/scripts.html
diff --git a/layouts/_partials/styles.html b/layouts/_partials/head/styles.html
similarity index 100%
rename from layouts/_partials/styles.html
rename to layouts/_partials/head/styles.html
diff --git a/layouts/_partials/tracking.html b/layouts/_partials/head/tracking.html
similarity index 100%
rename from layouts/_partials/tracking.html
rename to layouts/_partials/head/tracking.html
diff --git a/layouts/baseof.html b/layouts/baseof.html
index 7294327..de18335 100644
--- a/layouts/baseof.html
+++ b/layouts/baseof.html
@@ -4,16 +4,14 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
 <title>{{ block "title" . }}{{ .Title }} – {{ site.Title }}{{ end }}</title>
-{{ partial "meta.html" . }}
-{{ partialCached "favicons.html" . }}
-{{ partialCached "styles.html" . }}
-{{ partial "meta-json-ld.html" . }}
-{{ partial "scripts.html" . }}
-{{ partial "math.html" . }}
-{{ partialCached "tracking.html" . }}
-{{ if templates.Exists "partials/head.html" -}}
-{{ partial "head.html" . }}
-{{ end -}}
+{{ partial "head/meta.html" . }}
+{{ partialCached "head/favicons.html" . }}
+{{ partialCached "head/styles.html" . }}
+{{ partial "head/meta-json-ld.html" . }}
+{{ partial "head/scripts.html" . }}
+{{ partial "head/math.html" . }}
+{{ partialCached "head/tracking.html" . }}
+{{ partial "head/extra.html" . }}
 {{ block "head" . }}{{ end }}
 </head>
 
@@ -42,14 +40,7 @@
 {{ if $.Param "sidebar" }}{{ partial "sidebar.html" . }}{{ end -}}
 
 <footer class="footer layout__footer mt--l">
-{{ if templates.Exists "partials/footer.html" -}}
 {{ partial "footer.html" . }}
-{{ else -}}
-{{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}
-<p>{{ with site.Copyright }}{{ . | site.Home.RenderString }}{{ else }}<span>© {{ site.Title }}</span>{{ end }}</p>
-{{ with $.Param "footer" }}<p>{{ . | site.Home.RenderString }}</p>{{ end }}
-{{ if $.Param "poweredby" }}<p>Powered by <a href="https://gohugo.io/">Hugo</a> and the <a href="https://github.com/frjo/hugo-theme-zen">Zen theme</a>.</p>{{ end }}
-{{ end -}}
 </footer>
 
 {{ if $.Param "cookieconsent" }}{{ partialCached "cookieconsent.html" . }}{{ end -}}