diff --git a/bookwyrm/templates/user/shelf/create_shelf_form.html b/bookwyrm/templates/shelf/create_shelf_form.html
similarity index 100%
rename from bookwyrm/templates/user/shelf/create_shelf_form.html
rename to bookwyrm/templates/shelf/create_shelf_form.html
diff --git a/bookwyrm/templates/user/shelf/edit_shelf_form.html b/bookwyrm/templates/shelf/edit_shelf_form.html
similarity index 100%
rename from bookwyrm/templates/user/shelf/edit_shelf_form.html
rename to bookwyrm/templates/shelf/edit_shelf_form.html
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
similarity index 100%
rename from bookwyrm/templates/user/shelf/shelf.html
rename to bookwyrm/templates/shelf/shelf.html
diff --git a/bookwyrm/templates/user/shelf/books_header.html b/bookwyrm/templates/user/books_header.html
similarity index 100%
rename from bookwyrm/templates/user/shelf/books_header.html
rename to bookwyrm/templates/user/books_header.html
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/user/goal.html
similarity index 100%
rename from bookwyrm/templates/goal.html
rename to bookwyrm/templates/user/goal.html
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index f360a30a..36e646aa 100755
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -24,7 +24,7 @@
 {% if user.bookwyrm_user %}
 <div class="block">
     <h2 class="title">
-        {% include 'user/shelf/books_header.html' %}
+        {% include 'user/books_header.html' %}
     </h2>
     <div class="columns is-mobile scroll-x">
         {% for shelf in shelves %}