diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_modal_server_choice_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_modal_server_choice_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_modal_server_choice_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_modal_server_choice_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_no_server_available_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_no_server_available_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_no_server_available_embed_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_notification_message_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_notification_message_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_user_message_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_user_message_embed_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_user_message_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/listener/messageReceived/modmail_user_message_embed_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/close/modmail_close_header_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/logging/modmail_close_header_embed_en_US.ftl
similarity index 85%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/close/modmail_close_header_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/logging/modmail_close_header_embed_en_US.ftl
index 71a850a4a..64f8d4975 100644
--- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/close/modmail_close_header_embed_en_US.ftl
+++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/logging/modmail_close_header_embed_en_US.ftl
@@ -1,6 +1,6 @@
 {
   "title": {
-      "title": "Modmail thread has been closed"
+      "title": "<#include "modmail_closing_notification_title">"
     },
   "color" : {
     "r": 200,
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/close/modmail_close_logged_message_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/close/modmail_close_logged_message_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_closing_user_message_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/modmail_closing_user_message_embed_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_closing_user_message_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/closing/modmail_closing_user_message_embed_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/reply/modmail_staff_message_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_staff_message_embed_en_US.ftl
similarity index 100%
rename from abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/command/reply/modmail_staff_message_embed_en_US.ftl
rename to abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_staff_message_embed_en_US.ftl
diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_welcome_message_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_welcome_message_en_US.ftl
deleted file mode 100644
index dd117fc58..000000000
--- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_welcome_message_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-You opened a mod mail thread on the server reply in this channel to send messages to a staff only channel.
\ No newline at end of file
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_anonymous_message_note_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/logging/modmail_anonymous_message_note_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_anonymous_message_note_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/logging/modmail_anonymous_message_note_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/logging/modmail_closing_notification_title_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/logging/modmail_closing_notification_title_en_US.ftl
new file mode 100644
index 000000000..7521f7067
--- /dev/null
+++ b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/logging/modmail_closing_notification_title_en_US.ftl
@@ -0,0 +1 @@
+Mod mail thread has been closed
\ No newline at end of file
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_closing_user_message_description_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/modmail_closing_user_message_description_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_closing_user_message_description_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/closing/modmail_closing_user_message_description_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_failed_to_create_mod_mail_thread_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_failed_to_create_mod_mail_thread_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_failed_to_create_mod_mail_thread_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_failed_to_create_mod_mail_thread_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_generic_error_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_generic_error_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_generic_error_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_generic_error_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_no_server_available_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_no_server_available_en_US.ftl
new file mode 100644
index 000000000..3e7ce99ad
--- /dev/null
+++ b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/exception/modmail_no_server_available_en_US.ftl
@@ -0,0 +1 @@
+No server for mod mail available.
\ No newline at end of file
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_no_server_available_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_no_server_available_en_US.ftl
deleted file mode 100644
index 93965bb53..000000000
--- a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_no_server_available_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-No server for modmail available.
\ No newline at end of file
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_notification_message_description_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_notification_message_description_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_notification_message_description_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_notification_message_description_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_notification_message_title_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_notification_message_title_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_notification_message_title_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_notification_message_title_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_thread_header_embed_description_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_embed_description_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_thread_header_embed_description_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_embed_description_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_thread_staff_message_title_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/threadContent/modmail_thread_staff_message_title_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_thread_staff_message_title_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/threadContent/modmail_thread_staff_message_title_en_US.ftl
diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_thread_user_message_title_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/threadContent/modmail_thread_user_message_title_en_US.ftl
similarity index 100%
rename from abstracto-application/template-config/src/main/resources/templates/en_US/modMail/modmail_thread_user_message_title_en_US.ftl
rename to abstracto-application/template-config/src/main/resources/templates/en_US/modMail/threadContent/modmail_thread_user_message_title_en_US.ftl