diff --git a/wowchemy/layouts/partials/book_layout.html b/wowchemy/layouts/partials/book_layout.html
index fa60c6fc..6a14c92e 100644
--- a/wowchemy/layouts/partials/book_layout.html
+++ b/wowchemy/layouts/partials/book_layout.html
@@ -31,7 +31,7 @@
 
         <div class="docs-article-container">
           {{ if $show_breadcrumb }}
-            {{ partial "breadcrumb" $current_page }}
+            {{ partial "components/breadcrumb" $current_page }}
           {{ end }}
 
           <h1>{{ .Title }}</h1>
diff --git a/wowchemy/layouts/partials/breadcrumb.html b/wowchemy/layouts/partials/components/breadcrumb.html
similarity index 82%
rename from wowchemy/layouts/partials/breadcrumb.html
rename to wowchemy/layouts/partials/components/breadcrumb.html
index 2a8625e2..13fdcc30 100644
--- a/wowchemy/layouts/partials/breadcrumb.html
+++ b/wowchemy/layouts/partials/components/breadcrumb.html
@@ -1,7 +1,7 @@
 {{ if not .IsHome }}
   <nav class="d-none d-md-flex" aria-label="breadcrumb">
     <ol class="breadcrumb">
-      {{ partial "breadcrumb_helper" . }}
+      {{ partial "components/breadcrumb_child" . }}
       <li class="breadcrumb-item active" aria-current="page">
         {{ .LinkTitle | emojify }}
       </li>
diff --git a/wowchemy/layouts/partials/breadcrumb_helper.html b/wowchemy/layouts/partials/components/breadcrumb_child.html
similarity index 84%
rename from wowchemy/layouts/partials/breadcrumb_helper.html
rename to wowchemy/layouts/partials/components/breadcrumb_child.html
index 073a9724..742057c4 100644
--- a/wowchemy/layouts/partials/breadcrumb_helper.html
+++ b/wowchemy/layouts/partials/components/breadcrumb_child.html
@@ -1,5 +1,5 @@
 {{ with .Parent }}
-  {{ partial "breadcrumb_helper" . }}
+  {{ partial "components/breadcrumb_child" . }}
   <li class="breadcrumb-item">
     <a href="{{ .RelPermalink }}">
       {{ if .IsHome }}
diff --git a/wowchemy/layouts/partials/share.html b/wowchemy/layouts/partials/components/page_sharer.html
similarity index 100%
rename from wowchemy/layouts/partials/share.html
rename to wowchemy/layouts/partials/components/page_sharer.html
diff --git a/wowchemy/layouts/partials/page_footer.html b/wowchemy/layouts/partials/page_footer.html
index 46691373..d97f9533 100644
--- a/wowchemy/layouts/partials/page_footer.html
+++ b/wowchemy/layouts/partials/page_footer.html
@@ -1,6 +1,6 @@
 {{ partial "page_edit" . }}
 {{ partial "tags" . }}
-{{ partial "share" . }}
+{{ partial "components/page_sharer" . }}
 {{ partial "page_author" . }}
 {{ partial "comments" . }}