diff --git a/app/views/layouts/_footer.html.erb b/app/components/layout/footer_component.html.erb
similarity index 100%
rename from app/views/layouts/_footer.html.erb
rename to app/components/layout/footer_component.html.erb
diff --git a/app/components/layout/footer_component.rb b/app/components/layout/footer_component.rb
new file mode 100644
index 000000000..b9e0fe5de
--- /dev/null
+++ b/app/components/layout/footer_component.rb
@@ -0,0 +1,2 @@
+class Layout::FooterComponent < ApplicationComponent
+end
diff --git a/app/views/shared/_subnavigation.html.erb b/app/components/layout/subnavigation_component.html.erb
similarity index 100%
rename from app/views/shared/_subnavigation.html.erb
rename to app/components/layout/subnavigation_component.html.erb
diff --git a/app/components/layout/subnavigation_component.rb b/app/components/layout/subnavigation_component.rb
new file mode 100644
index 000000000..57f12a683
--- /dev/null
+++ b/app/components/layout/subnavigation_component.rb
@@ -0,0 +1,3 @@
+class Layout::SubnavigationComponent < ApplicationComponent
+  delegate :content_block, :layout_menu_link_to, to: :helpers
+end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 2351ddba8..bf1884f93 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -30,7 +30,7 @@
 
         <div class="show-for-small-only">
           <div class="subnavigation subnavigation-with-top-links">
-            <%= render "shared/subnavigation" %>
+            <%= render Layout::SubnavigationComponent.new %>
             <%= render "shared/top_links" %>
           </div>
         </div>
@@ -40,7 +40,7 @@
 
   <div id="navigation_bar" class="subnavigation">
     <div class="hide-for-small-only">
-      <%= render "shared/subnavigation" %>
+      <%= render Layout::SubnavigationComponent.new %>
     </div>
 
     <%= yield :header_addon %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 495a18838..1f7e0e617 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -43,7 +43,7 @@
       <%= yield %>
     </div>
     <div class="footer">
-      <%= render "layouts/footer" %>
+      <%= render Layout::FooterComponent.new %>
     </div>
   </body>
 </html>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index cc4db0fca..7ed3b55b1 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -32,7 +32,7 @@
     </div>
 
     <div class="footer">
-      <%= render "layouts/footer" %>
+      <%= render Layout::FooterComponent.new %>
     </div>
   </body>
 </html>