diff --git a/files/templates/chat.html b/files/templates/chat.html
index 1d5c01141..8c635a517 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -10,8 +10,8 @@
 {{html_head.html_head(true, true, true, csp, "Chat", none, "", false)}}
 <body>
 	{% include "header.html" %}
-	{% include "expanded_image_modal.html" %}
-	{% include "emoji_modal.html" %}
+	{% include "modals/expanded_image.html" %}
+	{% include "modals/emoji.html" %}
 
 	<div
 		id="root"
diff --git a/files/templates/comments.html b/files/templates/comments.html
index d62e343ac..79f08797c 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -8,7 +8,7 @@
 	{% endif %}
 
 	{% if v %}
-		{% include "award_modal.html" %}
+		{% include "modals/award.html" %}
 	{% endif %}
 
 	{% include "popover.html" %}
@@ -745,10 +745,10 @@
 
 {% if not request.headers.get("xhr") %}
 	{% if v %}
-		{% include "gif_modal.html" %}
-		{% include "emoji_modal.html" %}
+		{% include "modals/gif.html" %}
+		{% include "modals/emoji.html" %}
 		{% if v.admin_level >= PERMS['USER_BAN'] %}
-			{% include "ban_modal.html" %}
+			{% include "modals/ban.html" %}
 		{% endif %}
 
 <div class="modal fade" id="deleteCommentModal" tabindex="-1" role="dialog" aria-labelledby="deleteCommentModalTitle" aria-hidden="true">
diff --git a/files/templates/contact.html b/files/templates/contact.html
index 567fce652..e4af44e79 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -37,7 +37,7 @@
 
 		<p class="my-3">Warrant Canary has been moved to <a href="/search/posts/?q=%22Monthly%20Website%20Stats%20Post%22&sort=new&t=all">Monthly Website Stats Posts</a>.</p>
 
-		{% include "emoji_modal.html" %}
+		{% include "modals/emoji.html" %}
 	{% else %}
 		<h4>by email: {{EMAIL}}</h4>
 	{% endif %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 3a12984aa..e3e66e570 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -27,7 +27,7 @@
  <body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" {% if SITE_NAME == 'rDrama' and v and (v.is_banned or v.agendaposter) %}style="overflow-x: hidden;background:url(/assets/images/backgrounds/anime/1.webp?v=3) center center fixed; background-color: var(--background)"{% elif v and v.background %}style="{% if path != '/formatting' %}overflow-x: hidden; {% endif %} background:url(/assets/images/backgrounds/{{v.background}}?v=3) center center fixed; background-color: var(--background){% if 'anime' not in v.background %};background-size: cover{% endif %}"{% endif %}>
 
 {% block Banner %}
-	{% include "expanded_image_modal.html" %}
+	{% include "modals/expanded_image.html" %}
 
 	{% if '@' not in request.path %}	
 		{% if sub and SITE_NAME != 'WPD' %}
diff --git a/files/templates/award_modal.html b/files/templates/modals/award.html
similarity index 100%
rename from files/templates/award_modal.html
rename to files/templates/modals/award.html
diff --git a/files/templates/ban_modal.html b/files/templates/modals/ban.html
similarity index 100%
rename from files/templates/ban_modal.html
rename to files/templates/modals/ban.html
diff --git a/files/templates/delete_post_modal.html b/files/templates/modals/delete_post.html
similarity index 100%
rename from files/templates/delete_post_modal.html
rename to files/templates/modals/delete_post.html
diff --git a/files/templates/emoji_modal.html b/files/templates/modals/emoji.html
similarity index 100%
rename from files/templates/emoji_modal.html
rename to files/templates/modals/emoji.html
diff --git a/files/templates/expanded_image_modal.html b/files/templates/modals/expanded_image.html
similarity index 100%
rename from files/templates/expanded_image_modal.html
rename to files/templates/modals/expanded_image.html
diff --git a/files/templates/gif_modal.html b/files/templates/modals/gif.html
similarity index 100%
rename from files/templates/gif_modal.html
rename to files/templates/modals/gif.html
diff --git a/files/templates/report_post_modal.html b/files/templates/modals/report_post.html
similarity index 100%
rename from files/templates/report_post_modal.html
rename to files/templates/modals/report_post.html
diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html
index 7fc99982a..02500537d 100644
--- a/files/templates/settings/personal.html
+++ b/files/templates/settings/personal.html
@@ -258,8 +258,8 @@
 		</div>
 	</div>
 </div>
-{% include "emoji_modal.html" %}
-{% include "gif_modal.html" %}
+{% include "modals/emoji.html" %}
+{% include "modals/gif.html" %}
 
 {% if v.flairchanged %}
 	<script>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index d61c89154..591506ec9 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -598,11 +598,11 @@
 </div>
 
 {% if v and v.id==p.author_id %}
-	{% include "delete_post_modal.html" %}
+	{% include "modals/delete_post.html" %}
 {% endif %}
 
 {% if v %}
-	{% include "report_post_modal.html" %}
+	{% include "modals/report_post.html" %}
 {% endif %}
 
 {% if v and (v.id == p.author_id or v.admin_level >= PERMS['POST_EDITING']) %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index cef4b8a7a..32c9ae662 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -1,7 +1,7 @@
 {%- import 'util/helpers.html' as help -%}
 
 {% if v %}
-	{% include "award_modal.html" %}
+	{% include "modals/award.html" %}
 {% endif %}
 
 {% if SITE == 'pcmemes.net' %}
@@ -415,10 +415,10 @@
 {% endfor %}
 
 {% if v %}
-	{% include "delete_post_modal.html" %}
-	{% include "report_post_modal.html" %}
+	{% include "modals/delete_post.html" %}
+	{% include "modals/report_post.html" %}
 	{% if v.admin_level >= PERMS['USER_BAN'] %}
-		{% include "ban_modal.html" %}
+		{% include "modals/ban.html" %}
 	{% endif %}
 {% endif %}
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 03bbea52e..5dd0f3223 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -154,8 +154,8 @@
 
 		<script defer src="{{'js/marked.js' | asset}}"></script>
 		<script defer src="{{'js/submit.js' | asset}}"></script>
-		{% include "emoji_modal.html" %}
-		{% include "gif_modal.html" %}
+		{% include "modals/emoji.html" %}
+		{% include "modals/gif.html" %}
 
 </body>
 
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index b4cc56027..0ddfe13fa 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -624,7 +624,7 @@
 {% endif %}
 
 {% if v and v.id != u.id and '/comments' not in request.path %}
-	{% include "emoji_modal.html" %}
+	{% include "modals/emoji.html" %}
 {% endif %}
 
 {% endblock %}
diff --git a/files/templates/userpage/private.html b/files/templates/userpage/private.html
index 9c0eb3251..22730f238 100644
--- a/files/templates/userpage/private.html
+++ b/files/templates/userpage/private.html
@@ -33,7 +33,7 @@
 {% if v %}
 	<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
 	<div id="username" class="d-none">{{u.username}}</div>
-	{%- include "emoji_modal.html" -%}
+	{%- include "modals/emoji.html" -%}
 	<script defer src="{{'js/userpage_v.js' | asset}}"></script>
 {% endif %}
 
