diff --git a/files/templates/comments.html b/files/templates/comments.html
index 816dc97d4..85a8222fb 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -200,7 +200,7 @@
 		{% endif %}
 	{% endif %}
 
-	{% include "expanded_image_modal.html" %}
+	{% include "component/modal/expanded_image.html.html" %}
 
 	<script src="{{ 'js/comments+submission_listing.js' | asset }}"></script>
 	<script src="{{ 'js/comments.js' | asset }}"></script>
diff --git a/files/templates/award_modal.html b/files/templates/component/modal/award.html
similarity index 100%
rename from files/templates/award_modal.html
rename to files/templates/component/modal/award.html
diff --git a/files/templates/delete_post_modal.html b/files/templates/component/modal/delete_post.html
similarity index 99%
rename from files/templates/delete_post_modal.html
rename to files/templates/component/modal/delete_post.html
index 442d73ad0..597348a26 100644
--- a/files/templates/delete_post_modal.html
+++ b/files/templates/component/modal/delete_post.html
@@ -10,19 +10,13 @@
 				</button>
 			</div>
 			<div class="modal-body text-center">
-
 				<div class="py-4">
 					<i class="fas fa-trash-alt text-muted d-none d-md-block" style="font-size: 3.5rem;"></i>
 				</div>
-
 				<div class="h4 d-md-none">Delete post?</div>
-
 				<p class="d-none d-md-block">Your post will be deleted everywhere on {{SITE_TITLE}}.</p>
-
 				<p class="text-muted d-md-none">Your post will be deleted everywhere on {{SITE_TITLE}}.</p>
-		
 				<button id="deletePostButton" class="btn btn-danger btn-block mt-5" data-bs-dismiss="modal">Delete post</button>
-
 				<button class="btn btn-secondary btn-block" data-bs-dismiss="modal">Cancel</button>
 			</div>
 		</div>
diff --git a/files/templates/expanded_image_modal.html b/files/templates/component/modal/expanded_image.html
similarity index 100%
rename from files/templates/expanded_image_modal.html
rename to files/templates/component/modal/expanded_image.html
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 02fb96e26..740122e5b 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -461,6 +461,6 @@ line breaks
 
 <h5>Comment Commands</h5>
 
-{% include "expanded_image_modal.html" %}
+{% include "component/modal/expanded_image.html.html" %}
 
 {% endblock %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 44209d9f7..6ac2dc750 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -553,7 +553,7 @@
 </div>
 
 {% if v and v.id==p.author_id %}
-	{% include "delete_post_modal.html" %}
+	{% include "component/modal/delete_post.html" %}
 {% endif %}
 
 {% if v %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index b6163b459..32784bdcb 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -407,13 +407,13 @@
 {% endfor %}
 
 {% if v %}
-	{% include "delete_post_modal.html" %}
+	{% include "component/modal/delete_post.html" %}
 	{% include "report_post_modal.html" %}
 	{% if v.admin_level > 1 %}
 		{% include "ban_modal.html" %}
 	{% endif %}
 {% endif %}
-{% include "expanded_image_modal.html" %}
+{% include "component/modal/expanded_image.html.html" %}
 
 <script src="{{ 'js/clipboard.js' | asset }}"></script>
 <script src="{{ 'js/comments+submission_listing.js' | asset }}"></script>