diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 0bef2856..4d15a3a5 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -242,7 +242,7 @@
 <div class="block" id="reviews">
     {% for review in reviews %}
     <div class="block">
-        {% include 'snippets/status.html' with status=review hide_book=True depth=1 %}
+        {% include 'snippets/status/status.html' with status=review hide_book=True depth=1 %}
     </div>
     {% endfor %}
 
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 8c53cbeb..f3102ee7 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -16,7 +16,7 @@
     {% endif %}
     {% for activity in activities %}
     <div class="block">
-    {% include 'snippets/status.html' with status=activity %}
+    {% include 'snippets/status/status.html' with status=activity %}
     </div>
     {% endfor %}
 
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 8d6152e2..7029fd69 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -32,7 +32,7 @@
 {% endif %}
 {% for activity in activities %}
 <div class="block">
-{% include 'snippets/status.html' with status=activity %}
+{% include 'snippets/status/status.html' with status=activity %}
 </div>
 {% endfor %}
 
diff --git a/bookwyrm/templates/feed/thread.html b/bookwyrm/templates/feed/thread.html
index aa67d5bb..18ab6ea3 100644
--- a/bookwyrm/templates/feed/thread.html
+++ b/bookwyrm/templates/feed/thread.html
@@ -8,7 +8,7 @@
         {% endwith %}
     {% endif %}
 
-{% include 'snippets/status.html' with status=status main=is_root %}
+{% include 'snippets/status/status.html' with status=status main=is_root %}
 
 {% if depth <= max_depth and direction >= 0 %}
     {% for reply in status|replies  %}
diff --git a/bookwyrm/templates/snippets/status.html b/bookwyrm/templates/snippets/status/status.html
similarity index 63%
rename from bookwyrm/templates/snippets/status.html
rename to bookwyrm/templates/snippets/status/status.html
index 13d5ee7c..162fad97 100644
--- a/bookwyrm/templates/snippets/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -4,8 +4,8 @@
         {% include 'snippets/avatar.html' with user=status.user %}
         {% include 'snippets/username.html' with user=status.user %}
         boosted
-        {% include 'snippets/status_body.html' with status=status|boosted_status %}
+        {% include 'snippets/status/status_body.html' with status=status|boosted_status %}
     {% else %}
-        {% include 'snippets/status_body.html' with status=status %}
+        {% include 'snippets/status/status_body.html' with status=status %}
     {% endif %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
similarity index 89%
rename from bookwyrm/templates/snippets/status_body.html
rename to bookwyrm/templates/snippets/status/status_body.html
index 00ae5460..dfc0ac68 100644
--- a/bookwyrm/templates/snippets/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -5,13 +5,13 @@
 
 {% block card-header %}
     <h3 class="card-header-title has-background-white-ter is-block">
-        {% include 'snippets/status_header.html' with status=status %}
+        {% include 'snippets/status/status_header.html' with status=status %}
     </h3>
 {% endblock %}
 
 
 {% block card-content %}
-    {% include 'snippets/status_content.html' with status=status %}
+    {% include 'snippets/status/status_content.html' with status=status %}
 {% endblock %}
 
 
@@ -55,7 +55,7 @@
     <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
 </div>
 <div class="card-footer-item">
-    {% include 'snippets/status_options.html' with class="is-small" right=True %}
+    {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
similarity index 100%
rename from bookwyrm/templates/snippets/status_content.html
rename to bookwyrm/templates/snippets/status/status_content.html
diff --git a/bookwyrm/templates/snippets/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
similarity index 100%
rename from bookwyrm/templates/snippets/status_header.html
rename to bookwyrm/templates/snippets/status/status_header.html
diff --git a/bookwyrm/templates/snippets/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
similarity index 100%
rename from bookwyrm/templates/snippets/status_options.html
rename to bookwyrm/templates/snippets/status/status_options.html
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index c7f6d3b5..e1c19e53 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -64,7 +64,7 @@
     </div>
     {% for activity in activities %}
     <div class="block" id="feed">
-        {% include 'snippets/status.html' with status=activity %}
+        {% include 'snippets/status/status.html' with status=activity %}
     </div>
     {% endfor %}
     {% if not activities %}