diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/disableFeature/disable_features_response_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/disableFeature/disable_features_response_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/disableFeature/disable_features_response_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/disableFeature/disable_features_response_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/echo/echo_response_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/echo/echo_response_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/echo/echo_response_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/echo/echo_response_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/enableFeature/enable_features_response_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enable_features_response_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/enableFeature/enable_features_response_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enable_features_response_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/featureModes/feature_modes_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/featureModes/feature_modes_response_embed_en_US.ftl
similarity index 87%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/featureModes/feature_modes_response_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/featureModes/feature_modes_response_embed_en_US.ftl
index e5a4df6a..0f0edaa6 100644
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/featureModes/feature_modes_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/featureModes/feature_modes_response_embed_en_US.ftl
@@ -5,7 +5,7 @@
   <#include "abstracto_color">,
   "description": "
 <#list featureModes as featureMode>
-<#assign featureName><@safe_include "${featureMode.featureConfig.feature.key}_feature"/></#assign>
+<#assign featureName><@safe_include "feature_${featureMode.featureConfig.feature.key}"/></#assign>
 <#assign featureKey=featureMode.featureConfig.feature.key>
 <#assign featureModeName=featureMode.featureMode.featureMode>
 <#assign featureModeEnabled>${featureMode.featureMode.enabled?string('✅', '❌')}</#assign>
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/features/features_response_embed_en_US.ftl
similarity index 72%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/features/features_response_embed_en_US.ftl
index 30457755..c3e26139 100644
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/features/features_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/features/features_response_embed_en_US.ftl
@@ -5,10 +5,10 @@
   <#include "abstracto_color">,
   "description": "
 <#list features as feature>
-${feature.featureFlag.enabled?string('✅', '❌')} **<@safe_include "${feature.featureConfig.feature.key}_feature"/>** <@safe_include "features_embed_key"/>: `${feature.featureConfig.feature.key}`
+${feature.featureFlag.enabled?string('✅', '❌')} **<@safe_include "feature_${feature.featureConfig.feature.key}"/>** <@safe_include "features_embed_key"/>: `${feature.featureConfig.feature.key}`
 </#list>
 <#list defaultFeatures as defaultFeature>
-${defaultFeature.featureFlagProperty.enabled?string('✅', '❌')} **<@safe_include "${defaultFeature.featureConfig.feature.key}_feature"/>** <@safe_include "features_embed_key"/>: `${defaultFeature.featureConfig.feature.key}` (<@safe_include "features_default_marker"/>)
+${defaultFeature.featureFlagProperty.enabled?string('✅', '❌')} **<@safe_include "feature_${defaultFeature.featureConfig.feature.key}"/>** <@safe_include "features_embed_key"/>: `${defaultFeature.featureConfig.feature.key}` (<@safe_include "features_default_marker"/>)
 </#list>
 "
 }
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/help/help_command_details_response_embed_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_command_details_response_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/help/help_command_details_response_embed_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_details_response_embed_en_US.ftl
similarity index 80%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_details_response_embed_en_US.ftl
index 9fbea24c..162bc88f 100644
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_details_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_details_response_embed_en_US.ftl
@@ -6,7 +6,7 @@
   <#include "abstracto_color">,
   "description": "
        <@safe_include "help_module_embed_module_name"/>: **${name?js_string}**
-       <@safe_include "help_module_embed_module_description"/>: ${module.moduleInterface.info.description?js_string}
+       <@safe_include "help_module_embed_module_description"/>: <#if module.moduleInterface.info.templated?? && module.moduleInterface.info.templated><@safe_include "module_${name}_description"/><#else>${module.moduleInterface.info.description?js_string}</#if>
        <@safe_include "help_module_embed_commands"/>:
        <#list module.commands as command>`${command.configuration.name?js_string}`<#sep>, <#else><@safe_include "help_module_no_commands_available"/></#list>
        <#if subModules?has_content && subModules?size gt 0>
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_overview_response_embed_en_US.ftl
similarity index 58%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_overview_response_embed_en_US.ftl
index e0cc86fc..d32dc2dc 100644
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/help/help_module_overview_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/help/help_module_overview_response_embed_en_US.ftl
@@ -5,8 +5,8 @@
   <#include "abstracto_color">,
   "description": "
        <#list modules as module><#assign module=module/>
-       <@safe_include "help_module_embed_module_name"/>: **${module.info.name?js_string}**
-       <@safe_include "help_module_embed_module_description"/>: ${module.info.description?js_string}
+       **${module.info.name?js_string}**
+       <#if module.info.templated?? && module.info.templated><@safe_include "module_${module.info.name}_description"/><#else>${module.info.description?js_string}</#if>
        </#list>
   ",
   "footer": {
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/ping/ping_response_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/ping/ping_response_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/ping/ping_response_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/ping/ping_response_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/posttarget/posttarget_show_targets_embed_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/posttarget/posttarget_show_targets_embed_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/posttarget/posttarget_show_targets_embed_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_cancellation_notification_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_cancellation_notification_en_US.ftl
new file mode 100644
index 00000000..c73f496d
--- /dev/null
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_cancellation_notification_en_US.ftl
@@ -0,0 +1 @@
+<#assign featureName><#include "feature_${featureConfig.feature.key}"></#assign><#include "feature_setup_cancellation_message">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_completion_notification_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_completion_notification_en_US.ftl
new file mode 100644
index 00000000..bd79db92
--- /dev/null
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_completion_notification_en_US.ftl
@@ -0,0 +1 @@
+<#assign featureName><#include "feature_${featureConfig.feature.key}"></#assign><#include "feature_setup_completion_message">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_confirmation_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_confirmation_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_confirmation_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_confirmation_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_initial_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_initial_message_en_US.ftl
new file mode 100644
index 00000000..8005c250
--- /dev/null
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_initial_message_en_US.ftl
@@ -0,0 +1 @@
+<#assign featureName><@safe_include "feature_${featureConfig.feature.key}"/></#assign><#include "feature_setup_initial_message_display">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_post_target_action_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_action_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_post_target_action_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_action_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_post_target_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_message_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_post_target_message_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_message_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_system_config_action_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_system_config_action_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_system_config_action_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_system_config_action_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_system_config_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_system_config_message_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_system_config_message_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_system_config_message_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/condition/feature_disabled_condition_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/condition/feature_disabled_condition_en_US.ftl
index efae6212..a0144165 100644
--- a/abstracto-modules/core/src/main/resources/en_US/condition/feature_disabled_condition_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/condition/feature_disabled_condition_en_US.ftl
@@ -1,3 +1,3 @@
-<#assign featureName><#include "${model.featureConfig.feature.key}_feature"></#assign>
+<#assign featureName><#include "feature_${model.featureConfig.feature.key}"></#assign>
 <#assign featureKey>${model.featureConfig.feature.key}</#assign>
 <#include "feature_disabled_exception_text">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_cancellation_notification_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_cancellation_notification_en_US.ftl
deleted file mode 100644
index 1173cee9..00000000
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_cancellation_notification_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#assign featureName><#include "${featureConfig.feature.key}_feature"></#assign><#include "feature_setup_cancellation_message">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_completion_notification_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_completion_notification_en_US.ftl
deleted file mode 100644
index 970e84c3..00000000
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_completion_notification_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#assign featureName><#include "${featureConfig.feature.key}_feature"></#assign><#include "feature_setup_completion_message">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_initial_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_initial_message_en_US.ftl
deleted file mode 100644
index 9ad45597..00000000
--- a/abstracto-modules/core/src/main/resources/en_US/coreCommands/setupFeature/feature_setup_initial_message_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#assign featureName><@safe_include "${featureConfig.feature.key}_feature"/></#assign><#include "feature_setup_initial_message_display">
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_join_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/events/user_join_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreEvents/user_join_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/events/user_join_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/coreEvents/user_leave_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/events/user_leave_en_US.ftl
similarity index 100%
rename from abstracto-modules/core/src/main/resources/en_US/coreEvents/user_leave_en_US.ftl
rename to abstracto-modules/core/src/main/resources/en_US/events/user_leave_en_US.ftl
diff --git a/abstracto-modules/core/src/main/resources/en_US/exceptions/feature_mode_not_correct_exception_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/exceptions/feature_mode_not_correct_exception_en_US.ftl
index 03c77a0a..3564ed83 100644
--- a/abstracto-modules/core/src/main/resources/en_US/exceptions/feature_mode_not_correct_exception_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/exceptions/feature_mode_not_correct_exception_en_US.ftl
@@ -1,4 +1,4 @@
-<#assign featureName><#include "${model.featureConfig.feature.key}_feature"></#assign>
+<#assign featureName><#include "feature_${model.featureConfig.feature.key}"></#assign>
 <#assign featureKey>${model.featureConfig.feature.key}</#assign>
 <#assign requiredModes><#list command.featureModeLimitations as mode>`${mode.key}`<sep>, </#list></#assign>
 <#include "feature_mode_not_correct_exception_text">
\ No newline at end of file
diff --git a/translations/assignable-roles/src/main/resources/en_US/config/assignableRole_feature_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/config/feature_assignableRole_en_US.ftl
similarity index 100%
rename from translations/assignable-roles/src/main/resources/en_US/config/assignableRole_feature_en_US.ftl
rename to translations/assignable-roles/src/main/resources/en_US/config/feature_assignableRole_en_US.ftl
diff --git a/translations/assignable-roles/src/main/resources/en_US/config/module_assignableRole_description_en_US.ftl b/translations/assignable-roles/src/main/resources/en_US/config/module_assignableRole_description_en_US.ftl
new file mode 100644
index 00000000..d26ff70a
--- /dev/null
+++ b/translations/assignable-roles/src/main/resources/en_US/config/module_assignableRole_description_en_US.ftl
@@ -0,0 +1 @@
+Module containing commands for creating and maintaining assignable role posts.
\ No newline at end of file
diff --git a/translations/core/src/main/resources/en_US/config/core_feature_en_US.ftl b/translations/core/src/main/resources/en_US/config/feature_core_en_US.ftl
similarity index 100%
rename from translations/core/src/main/resources/en_US/config/core_feature_en_US.ftl
rename to translations/core/src/main/resources/en_US/config/feature_core_en_US.ftl
diff --git a/translations/core/src/main/resources/en_US/config/module_channels_description_en_US.ftl b/translations/core/src/main/resources/en_US/config/module_channels_description_en_US.ftl
new file mode 100644
index 00000000..3abfcc96
--- /dev/null
+++ b/translations/core/src/main/resources/en_US/config/module_channels_description_en_US.ftl
@@ -0,0 +1 @@
+Includes utilities to configure the channel configuration stored in the database
\ No newline at end of file
diff --git a/translations/core/src/main/resources/en_US/config/module_config_description_en_US.ftl b/translations/core/src/main/resources/en_US/config/module_config_description_en_US.ftl
new file mode 100644
index 00000000..ee7fe1c0
--- /dev/null
+++ b/translations/core/src/main/resources/en_US/config/module_config_description_en_US.ftl
@@ -0,0 +1 @@
+Utilities to configure the bot
\ No newline at end of file
diff --git a/translations/core/src/main/resources/en_US/config/module_core_description_en_US.ftl b/translations/core/src/main/resources/en_US/config/module_core_description_en_US.ftl
new file mode 100644
index 00000000..d8713e92
--- /dev/null
+++ b/translations/core/src/main/resources/en_US/config/module_core_description_en_US.ftl
@@ -0,0 +1 @@
+Default module provided by abstracto
\ No newline at end of file
diff --git a/translations/core/src/main/resources/en_US/config/module_support_description_en_US.ftl b/translations/core/src/main/resources/en_US/config/module_support_description_en_US.ftl
new file mode 100644
index 00000000..fd3a8110
--- /dev/null
+++ b/translations/core/src/main/resources/en_US/config/module_support_description_en_US.ftl
@@ -0,0 +1 @@
+Utilities for information about the bot
\ No newline at end of file
diff --git a/translations/experience-tracking/src/main/resources/en_US/config/experience_feature_en_US.ftl b/translations/experience-tracking/src/main/resources/en_US/config/feature_experience_en_US.ftl
similarity index 100%
rename from translations/experience-tracking/src/main/resources/en_US/config/experience_feature_en_US.ftl
rename to translations/experience-tracking/src/main/resources/en_US/config/feature_experience_en_US.ftl
diff --git a/translations/experience-tracking/src/main/resources/en_US/config/module_experience_description_en_US.ftl b/translations/experience-tracking/src/main/resources/en_US/config/module_experience_description_en_US.ftl
new file mode 100644
index 00000000..0ff9bc4d
--- /dev/null
+++ b/translations/experience-tracking/src/main/resources/en_US/config/module_experience_description_en_US.ftl
@@ -0,0 +1 @@
+Module containing commands related to experience tracking
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/config/inviteFilter_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_inviteFilter_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/inviteFilter_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_inviteFilter_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/logging_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_logging_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/logging_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_logging_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/moderation_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_moderation_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/moderation_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_moderation_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/muting_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_muting_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/muting_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_muting_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/userNotes_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_userNotes_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/userNotes_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_userNotes_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/warnDecay_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_warnDecay_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/warnDecay_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_warnDecay_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/warnings_feature_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/feature_warnings_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/warnings_feature_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/config/feature_warnings_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/module_moderation_description_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/module_moderation_description_en_US.ftl
new file mode 100644
index 00000000..48ed6188
--- /dev/null
+++ b/translations/moderation/src/main/resources/en_US/config/module_moderation_description_en_US.ftl
@@ -0,0 +1 @@
+Utilities to moderate the server
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/config/module_repostDetection_description_en_US.ftl b/translations/moderation/src/main/resources/en_US/config/module_repostDetection_description_en_US.ftl
new file mode 100644
index 00000000..a03976eb
--- /dev/null
+++ b/translations/moderation/src/main/resources/en_US/config/module_repostDetection_description_en_US.ftl
@@ -0,0 +1 @@
+Commands related to repost detection
\ No newline at end of file
diff --git a/translations/modmail/src/main/resources/en_US/config/modmail_feature_en_US.ftl b/translations/modmail/src/main/resources/en_US/config/feature_modmail_en_US.ftl
similarity index 100%
rename from translations/modmail/src/main/resources/en_US/config/modmail_feature_en_US.ftl
rename to translations/modmail/src/main/resources/en_US/config/feature_modmail_en_US.ftl
diff --git a/translations/modmail/src/main/resources/en_US/config/modmail_logging_feature_en_US.ftl b/translations/modmail/src/main/resources/en_US/config/modmail_logging_feature_en_US.ftl
deleted file mode 100644
index fc38b01c..00000000
--- a/translations/modmail/src/main/resources/en_US/config/modmail_logging_feature_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Mod mail logging
\ No newline at end of file
diff --git a/translations/modmail/src/main/resources/en_US/config/modmail_help_module_info_en_US.ftl b/translations/modmail/src/main/resources/en_US/config/module_modmail_description_en_US.ftl
similarity index 100%
rename from translations/modmail/src/main/resources/en_US/config/modmail_help_module_info_en_US.ftl
rename to translations/modmail/src/main/resources/en_US/config/module_modmail_description_en_US.ftl
diff --git a/translations/statistic/src/main/resources/en_US/config/emoteTracking_feature_en_US.ftl b/translations/statistic/src/main/resources/en_US/config/feature_emoteTracking_en_US.ftl
similarity index 100%
rename from translations/statistic/src/main/resources/en_US/config/emoteTracking_feature_en_US.ftl
rename to translations/statistic/src/main/resources/en_US/config/feature_emoteTracking_en_US.ftl
diff --git a/translations/statistic/src/main/resources/en_US/config/module_emoteTracking_description_en_US.ftl b/translations/statistic/src/main/resources/en_US/config/module_emoteTracking_description_en_US.ftl
new file mode 100644
index 00000000..79a55aa7
--- /dev/null
+++ b/translations/statistic/src/main/resources/en_US/config/module_emoteTracking_description_en_US.ftl
@@ -0,0 +1 @@
+Module containing commands related to emote tracking
\ No newline at end of file
diff --git a/translations/statistic/src/main/resources/en_US/config/module_statistic_description_en_US.ftl b/translations/statistic/src/main/resources/en_US/config/module_statistic_description_en_US.ftl
new file mode 100644
index 00000000..93ac6001
--- /dev/null
+++ b/translations/statistic/src/main/resources/en_US/config/module_statistic_description_en_US.ftl
@@ -0,0 +1 @@
+Module containing commands related to statistic
\ No newline at end of file
diff --git a/translations/utility/src/main/resources/en_US/config/entertainment_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_entertainment_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/entertainment_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_entertainment_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/linkEmbeds_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_linkEmbeds_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/linkEmbeds_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_linkEmbeds_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/remind_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_remind_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/remind_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_remind_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/repostDetection_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_repostDetection_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/repostDetection_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_repostDetection_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/starboard_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_starboard_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/starboard_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_starboard_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/suggestion_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_suggestion_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/suggestion_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_suggestion_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/utility_feature_en_US.ftl b/translations/utility/src/main/resources/en_US/config/feature_utility_en_US.ftl
similarity index 100%
rename from translations/utility/src/main/resources/en_US/config/utility_feature_en_US.ftl
rename to translations/utility/src/main/resources/en_US/config/feature_utility_en_US.ftl
diff --git a/translations/utility/src/main/resources/en_US/config/module_entertainment_description_en_US.ftl b/translations/utility/src/main/resources/en_US/config/module_entertainment_description_en_US.ftl
new file mode 100644
index 00000000..8fde3931
--- /dev/null
+++ b/translations/utility/src/main/resources/en_US/config/module_entertainment_description_en_US.ftl
@@ -0,0 +1 @@
+Entertainment commands
\ No newline at end of file
diff --git a/translations/utility/src/main/resources/en_US/config/module_utility_description_en_US.ftl b/translations/utility/src/main/resources/en_US/config/module_utility_description_en_US.ftl
new file mode 100644
index 00000000..b0fad551
--- /dev/null
+++ b/translations/utility/src/main/resources/en_US/config/module_utility_description_en_US.ftl
@@ -0,0 +1 @@
+General utilities
\ No newline at end of file