[AB-197] splitting utility maven module into separate maven modules

aligning some package names
removing some unnecessary computed values from liquibase

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/AllowInvite.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,9 +6,9 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterServiceBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class AllowInvite extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("allowInvite")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -46,7 +46,7 @@ public class AllowInvite extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.INVITE_FILTER;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.INVITE_FILTER;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -8,10 +8,10 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.template.commands.BanLog;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.template.command.BanLog;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +57,7 @@ public class Ban extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).hasExample(true).build();
         return CommandConfiguration.builder()
                 .name("ban")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -68,8 +68,8 @@ public class Ban extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MODERATION;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MODERATION;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -7,10 +7,10 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.template.commands.BanIdLog;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.template.command.BanIdLog;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +51,7 @@ public class BanId extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).hasExample(true).build();
         return CommandConfiguration.builder()
                 .name("banId")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -62,7 +62,7 @@ public class BanId extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MODERATION;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MODERATION;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/DecayAllWarnings.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -41,7 +41,7 @@ public class DecayAllWarnings extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("decayAllWarnings")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -52,7 +52,7 @@ public class DecayAllWarnings extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.WARNING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.WARNING;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/DecayWarnings.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -41,7 +41,7 @@ public class DecayWarnings extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("decayWarnings")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -52,7 +52,7 @@ public class DecayWarnings extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.AUTOMATIC_WARN_DECAY;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/DeleteNote.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -8,11 +8,11 @@ import dev.sheldan.abstracto.core.command.config.ParameterValidator;
 import dev.sheldan.abstracto.core.command.config.validator.MinIntegerValueValidator;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.management.UserNoteManagementService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +56,7 @@ public class DeleteNote extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("deleteNote")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -66,7 +66,7 @@ public class DeleteNote extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.USER_NOTES;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.USER_NOTES;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/DeleteWarning.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -8,10 +8,10 @@ import dev.sheldan.abstracto.core.command.config.ParameterValidator;
 import dev.sheldan.abstracto.core.command.config.validator.MinIntegerValueValidator;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,7 +44,7 @@ public class DeleteWarning extends AbstractConditionableCommand {
         List<String> aliases = Arrays.asList("delWarn");
         return CommandConfiguration.builder()
                 .name("deleteWarning")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .aliases(aliases)
@@ -55,7 +55,7 @@ public class DeleteWarning extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.WARNING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.WARNING;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/DisAllowInvite.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,9 +6,9 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterServiceBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class DisAllowInvite extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("disAllowInvite")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -46,7 +46,7 @@ public class DisAllowInvite extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.INVITE_FILTER;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.INVITE_FILTER;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -8,10 +8,10 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.template.command.KickLogModel;
 import dev.sheldan.abstracto.moderation.service.KickServiceBean;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Member;
@@ -54,7 +54,7 @@ public class Kick extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).hasExample(true).build();
         return CommandConfiguration.builder()
                 .name("kick")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .async(true)
@@ -65,8 +65,8 @@ public class Kick extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MODERATION;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MODERATION;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Mute.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.mute;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -7,11 +7,11 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.ServerChannelMessage;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteContext;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteContext;
 import dev.sheldan.abstracto.moderation.service.MuteService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ public class Mute extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).hasExample(true).build();
         return CommandConfiguration.builder()
                 .name("mute")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .causesReaction(true)
@@ -76,8 +76,8 @@ public class Mute extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MUTING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MUTING;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/MyWarnings.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -7,13 +7,13 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.template.commands.MyWarningsModel;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.template.command.MyWarningsModel;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,7 +54,7 @@ public class MyWarnings extends AbstractConditionableCommand {
         List<String> aliases = Arrays.asList("myWarns");
         return CommandConfiguration.builder()
                 .name("myWarnings")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -65,7 +65,7 @@ public class MyWarnings extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.WARNING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.WARNING;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Purge.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -8,9 +8,9 @@ import dev.sheldan.abstracto.core.command.config.ParameterValidator;
 import dev.sheldan.abstracto.core.command.config.validator.MinIntegerValueValidator;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.PurgeService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +47,7 @@ public class Purge extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("purge")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -58,7 +58,7 @@ public class Purge extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MODERATION;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MODERATION;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/RemoveTrackedInviteLinks.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.InviteFilterMode;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.InviteFilterMode;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,7 +44,7 @@ public class RemoveTrackedInviteLinks extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("removeTrackedInviteLinks")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -54,8 +54,8 @@ public class RemoveTrackedInviteLinks extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.INVITE_FILTER;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.INVITE_FILTER;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SetMuteRole.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.mute;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,13 +6,13 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.RoleManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.management.MuteRoleManagementService;
 import net.dv8tion.jda.api.entities.Role;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +49,7 @@ public class SetMuteRole extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("setMuteRole")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -59,7 +59,7 @@ public class SetMuteRole extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MUTING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MUTING;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/ShowTrackedInviteLinks.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -7,15 +7,15 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.InviteFilterMode;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
-import dev.sheldan.abstracto.moderation.models.template.commands.TrackedInviteLinksModel;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.InviteFilterMode;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.template.command.TrackedInviteLinksModel;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -65,7 +65,7 @@ public class ShowTrackedInviteLinks extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("showTrackedInviteLinks")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -75,8 +75,8 @@ public class ShowTrackedInviteLinks extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.INVITE_FILTER;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.INVITE_FILTER;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SlowMode.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,10 +6,10 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.utils.ParseUtils;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.SlowModeService;
 import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@ public class SlowMode extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).hasExample(true).build();
         return CommandConfiguration.builder()
                 .name("slowmode")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -64,7 +64,7 @@ public class SlowMode extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MODERATION;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MODERATION;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/UnMute.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.mute;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.MuteService;
 import dev.sheldan.abstracto.moderation.service.management.MuteManagementService;
 import net.dv8tion.jda.api.entities.Member;
@@ -50,7 +50,7 @@ public class UnMute extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("unMute")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -61,7 +61,7 @@ public class UnMute extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MUTING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MUTING;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/UserNoteCommand.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.management.UserNoteManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +46,7 @@ public class UserNoteCommand extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("userNote")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -56,7 +56,7 @@ public class UserNoteCommand extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.USER_NOTES;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.USER_NOTES;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/UserNotes.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -7,7 +7,7 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.FullUserInServer;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
@@ -15,12 +15,12 @@ import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.converter.UserNotesConverter;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
-import dev.sheldan.abstracto.moderation.models.template.commands.ListNotesModel;
-import dev.sheldan.abstracto.moderation.models.template.commands.NoteEntryModel;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.template.command.ListNotesModel;
+import dev.sheldan.abstracto.moderation.model.template.command.NoteEntryModel;
 import dev.sheldan.abstracto.moderation.service.management.UserNoteManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +84,7 @@ public class UserNotes extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("userNotes")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -95,7 +95,7 @@ public class UserNotes extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.USER_NOTES;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.USER_NOTES;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -8,10 +8,10 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnContext;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnContext;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -55,7 +55,7 @@ public class Warn extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).hasExample(true).build();
         return CommandConfiguration.builder()
                 .name("warn")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -66,8 +66,8 @@ public class Warn extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.WARNING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.WARNING;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warnings.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.jagrosh.jdautilities.menu.Paginator;
@@ -9,17 +9,17 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.PaginatorService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.ModerationModule;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.converter.WarnEntryConverter;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnEntry;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarningsModel;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnEntry;
+import dev.sheldan.abstracto.moderation.model.template.command.WarningsModel;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,7 +89,7 @@ public class Warnings extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("warnings")
-                .module(ModerationModule.MODERATION)
+                .module(ModerationModuleDefinition.MODERATION)
                 .templated(true)
                 .async(true)
                 .causesReaction(true)
@@ -100,7 +100,7 @@ public class Warnings extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.WARNING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.WARNING;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/UserNotesConverter.java

@@ -5,8 +5,8 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
-import dev.sheldan.abstracto.moderation.models.template.commands.NoteEntryModel;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.template.command.NoteEntryModel;
 import dev.sheldan.abstracto.moderation.service.management.UserNoteManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverter.java

@@ -6,8 +6,8 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnEntry;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnEntry;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/job/WarnDecayJob.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.moderation.job;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.FeatureFlagService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.moderation.config.features.WarningDecayFeature;
+import dev.sheldan.abstracto.moderation.config.feature.WarningDecayFeature;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.DisallowConcurrentExecution;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/InviteLinkFilterListener.java

@@ -1,22 +1,22 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.ListenerPriority;
 import dev.sheldan.abstracto.core.execution.result.MessageReceivedListenerResult;
 import dev.sheldan.abstracto.core.listener.sync.jda.MessageReceivedListener;
-import dev.sheldan.abstracto.core.metrics.service.CounterMetric;
-import dev.sheldan.abstracto.core.metrics.service.MetricService;
-import dev.sheldan.abstracto.core.metrics.service.MetricTag;
+import dev.sheldan.abstracto.core.metric.service.CounterMetric;
+import dev.sheldan.abstracto.core.metric.service.MetricService;
+import dev.sheldan.abstracto.core.metric.service.MetricTag;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.InviteFilterMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.InviteFilterPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.DeletedInvite;
-import dev.sheldan.abstracto.moderation.models.template.listener.DeletedInvitesNotificationModel;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.InviteFilterMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.InviteFilterPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.listener.DeletedInvite;
+import dev.sheldan.abstracto.moderation.model.template.listener.DeletedInvitesNotificationModel;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -87,11 +87,11 @@ public class InviteLinkFilterListener implements MessageReceivedListener {
         if(toDelete) {
             metricService.incrementCounter(MESSAGE_INVITE_FILTERED);
             messageService.deleteMessage(message);
-            boolean trackUsages = featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, serverId, InviteFilterMode.TRACK_USES);
+            boolean trackUsages = featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, serverId, InviteFilterMode.TRACK_USES);
             if(trackUsages) {
                 codesToTrack.forEach(s -> inviteLinkFilterService.storeFilteredInviteLinkUsage(s, author));
             }
-            boolean sendNotification = featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, serverId, InviteFilterMode.FILTER_NOTIFICATIONS);
+            boolean sendNotification = featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, serverId, InviteFilterMode.FILTER_NOTIFICATIONS);
             if(sendNotification) {
                 sendDeletionNotification(codesToTrack, message);
             }
@@ -138,8 +138,8 @@ public class InviteLinkFilterListener implements MessageReceivedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.INVITE_FILTER;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.INVITE_FILTER;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncJoinListener;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
@@ -57,8 +57,8 @@ public class JoinLogger implements AsyncJoinListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.LOGGING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.LOGGING;
     }
 
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinMuteListener.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncJoinListener;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
 import dev.sheldan.abstracto.moderation.service.MuteService;
 import dev.sheldan.abstracto.moderation.service.management.MuteManagementService;
 import lombok.extern.slf4j.Slf4j;
@@ -35,8 +35,8 @@ public class JoinMuteListener implements AsyncJoinListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MUTING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MUTING;
     }
 
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncLeaveListener;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
@@ -60,8 +60,8 @@ public class LeaveLogger implements AsyncLeaveListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.LOGGING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.LOGGING;
     }
 
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java

@@ -1,6 +1,6 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageDeletedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.service.ChannelService;
@@ -10,10 +10,10 @@ import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.ContextUtils;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedAttachmentLog;
-import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedLog;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.listener.MessageDeletedAttachmentLog;
+import dev.sheldan.abstracto.moderation.model.template.listener.MessageDeletedLog;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -96,8 +96,8 @@ public class MessageDeleteLogListener implements AsyncMessageDeletedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.LOGGING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.LOGGING;
     }
 
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java

@@ -1,14 +1,14 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageTextUpdatedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.MessageEditedLog;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.listener.MessageEditedLog;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -61,8 +61,8 @@ public class MessageEditedListener implements AsyncMessageTextUpdatedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.LOGGING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.LOGGING;
     }
 
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/AllowedInviteLinkRepository.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.moderation.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.AllowedInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.AllowedInviteLink;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/FilteredInviteLinkRepository.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.moderation.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/MuteRepository.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.repository;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/MuteRoleRepository.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.moderation.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.MuteRole;
+import dev.sheldan.abstracto.moderation.model.database.MuteRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/UserNoteRepository.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/WarnRepository.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.lang.NonNull;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java

@@ -6,9 +6,9 @@ import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.GuildService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.ModerationMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.ModerationPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.ModerationMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.ModerationPostTarget;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -52,13 +52,13 @@ public class BanServiceBean implements BanService {
     @NotNull
     public CompletableFuture<Void> sendBanLogMessage(ServerContext banLog, Long guildId, String template) {
         CompletableFuture<Void> completableFuture;
-        if(featureModeService.featureModeActive(ModerationFeatures.MODERATION, guildId, ModerationMode.BAN_LOG)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, guildId, ModerationMode.BAN_LOG)) {
             MessageToSend banLogMessage = templateService.renderEmbedTemplate(template, banLog, guildId);
             log.trace("Sending ban log message in guild {}.", guildId);
             List<CompletableFuture<Message>> notificationFutures = postTargetService.sendEmbedInPostTarget(banLogMessage, ModerationPostTarget.BAN_LOG, guildId);
             completableFuture = FutureUtils.toSingleFutureGeneric(notificationFutures);
         } else {
-            log.trace("Feature {} has mode {} for logging disabled for server {}. Not sending notification.", ModerationFeatures.MODERATION, ModerationMode.BAN_LOG, guildId);
+            log.trace("Feature {} has mode {} for logging disabled for server {}. Not sending notification.", ModerationFeatureDefinition.MODERATION, ModerationMode.BAN_LOG, guildId);
             completableFuture = CompletableFuture.completedFuture(null);
         }
         return completableFuture;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/InviteLinkFilterServiceBean.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.moderation.exception.InvalidInviteException;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 import dev.sheldan.abstracto.moderation.service.management.AllowedInviteLinkManagement;
 import dev.sheldan.abstracto.moderation.service.management.FilteredInviteLinkManagement;
 import net.dv8tion.jda.api.entities.Message;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java

@@ -3,10 +3,10 @@ package dev.sheldan.abstracto.moderation.service;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.ModerationMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.ModerationPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.ModerationMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.ModerationPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.command.KickLogModel;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -43,12 +43,12 @@ public class KickServiceBean implements KickService {
 
     private CompletableFuture<Void> sendKickLog(KickLogModel kickLogModel)  {
         CompletableFuture<Void> completableFuture;
-        if(featureModeService.featureModeActive(ModerationFeatures.MODERATION, kickLogModel.getGuild().getIdLong(), ModerationMode.KICK_LOG)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, kickLogModel.getGuild().getIdLong(), ModerationMode.KICK_LOG)) {
             MessageToSend warnLogMessage = templateService.renderEmbedTemplate(KICK_LOG_TEMPLATE, kickLogModel, kickLogModel.getGuild().getIdLong());
             log.trace("Sending kick log message in guild {}.", kickLogModel.getGuild().getIdLong());
             completableFuture = FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(warnLogMessage, ModerationPostTarget.KICK_LOG, kickLogModel.getGuild().getIdLong()));
         } else {
-            log.trace("Feature {} has mode {} for logging disabled for server {}. Not sending kick notification.", ModerationFeatures.MODERATION, ModerationMode.BAN_LOG, kickLogModel.getGuild().getIdLong());
+            log.trace("Feature {} has mode {} for logging disabled for server {}. Not sending kick notification.", ModerationFeatureDefinition.MODERATION, ModerationMode.BAN_LOG, kickLogModel.getGuild().getIdLong());
             completableFuture = CompletableFuture.completedFuture(null);
         }
         return completableFuture;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java

@@ -11,16 +11,16 @@ import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.MutingMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.MutingPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.MutingMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.MutingPostTarget;
 import dev.sheldan.abstracto.moderation.exception.MuteRoleNotSetupException;
 import dev.sheldan.abstracto.moderation.exception.NoMuteFoundException;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
-import dev.sheldan.abstracto.moderation.models.database.MuteRole;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteContext;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteNotification;
-import dev.sheldan.abstracto.moderation.models.template.commands.UnMuteLog;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
+import dev.sheldan.abstracto.moderation.model.database.MuteRole;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteContext;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteNotification;
+import dev.sheldan.abstracto.moderation.model.template.command.UnMuteLog;
 import dev.sheldan.abstracto.moderation.service.management.MuteManagementService;
 import dev.sheldan.abstracto.moderation.service.management.MuteRoleManagementService;
 import dev.sheldan.abstracto.scheduling.model.JobParameters;
@@ -242,28 +242,28 @@ public class MuteServiceBean implements MuteService {
 
     private CompletableFuture<Void> sendMuteLog(MuteContext muteLogModel, AServer server)  {
         CompletableFuture<Void> completableFuture;
-        if(featureModeService.featureModeActive(ModerationFeatures.MUTING, server, MutingMode.MUTE_LOGGING)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, server, MutingMode.MUTE_LOGGING)) {
             log.trace("Sending mute log to the mute post target.");
             MessageToSend message = templateService.renderEmbedTemplate(MUTE_LOG_TEMPLATE, muteLogModel, server.getId());
             List<CompletableFuture<Message>> completableFutures = postTargetService.sendEmbedInPostTarget(message, MutingPostTarget.MUTE_LOG, muteLogModel.getContext().getServerId());
             completableFuture = FutureUtils.toSingleFutureGeneric(completableFutures);
         } else {
             completableFuture = CompletableFuture.completedFuture(null);
-            log.trace("Not sending mute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MUTE_LOGGING, ModerationFeatures.WARNING, server.getId());
+            log.trace("Not sending mute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MUTE_LOGGING, ModerationFeatureDefinition.WARNING, server.getId());
         }
         return completableFuture;
     }
 
     private CompletableFuture<Void> sendUnMuteLogMessage(UnMuteLog muteLogModel, AServer server)  {
         CompletableFuture<Void> completableFuture;
-        if(featureModeService.featureModeActive(ModerationFeatures.MUTING, server, MutingMode.MUTE_LOGGING)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, server, MutingMode.MUTE_LOGGING)) {
             log.trace("Sending unMute log for mute {} to the mute posttarget in server {}", muteLogModel.getMute().getMuteId().getId(), server.getId());
             MessageToSend message = templateService.renderEmbedTemplate(UN_MUTE_LOG_TEMPLATE, muteLogModel, server.getId());
             List<CompletableFuture<Message>> completableFutures = postTargetService.sendEmbedInPostTarget(message, MutingPostTarget.MUTE_LOG, server.getId());
             completableFuture = FutureUtils.toSingleFutureGeneric(completableFutures);
         } else {
             completableFuture = CompletableFuture.completedFuture(null);
-            log.trace("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.UN_MUTE_LOGGING, ModerationFeatures.WARNING, server.getId());
+            log.trace("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.UN_MUTE_LOGGING, ModerationFeatureDefinition.WARNING, server.getId());
         }
         return completableFuture;
     }
@@ -287,12 +287,12 @@ public class MuteServiceBean implements MuteService {
     @Transactional
     public CompletableFuture<Void> sendUnMuteLogForManualUnMute(Long muteId, CompletableFuture<Member> mutingMemberFuture, CompletableFuture<Member> mutedMemberFuture, Guild guild) {
         CompletableFuture<Void> completableFuture;
-        if(featureModeService.featureModeActive(ModerationFeatures.MUTING, guild.getIdLong(), MutingMode.MANUAL_UN_MUTE_LOGGING)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, guild.getIdLong(), MutingMode.MANUAL_UN_MUTE_LOGGING)) {
             completableFuture = self.sendUnmuteLog(muteId, guild, mutingMemberFuture, mutedMemberFuture);
             log.trace("Sending un mute notification for manual un mute for mute {} in server {}.", muteId, guild.getIdLong());
         } else {
             completableFuture = CompletableFuture.completedFuture(null);
-            log.trace("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MANUAL_UN_MUTE_LOGGING, ModerationFeatures.WARNING, guild.getIdLong());
+            log.trace("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MANUAL_UN_MUTE_LOGGING, ModerationFeatureDefinition.WARNING, guild.getIdLong());
 
         }
         return completableFuture;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/PurgeServiceBean.java

@@ -1,11 +1,11 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.core.metrics.service.CounterMetric;
-import dev.sheldan.abstracto.core.metrics.service.MetricService;
+import dev.sheldan.abstracto.core.metric.service.CounterMetric;
+import dev.sheldan.abstracto.core.metric.service.MetricService;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.moderation.exception.NoMessageFoundException;
-import dev.sheldan.abstracto.moderation.models.template.commands.PurgeStatusUpdateModel;
+import dev.sheldan.abstracto.moderation.model.template.command.PurgeStatusUpdateModel;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java

@@ -10,17 +10,17 @@ import dev.sheldan.abstracto.core.service.management.DefaultConfigManagementServ
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.WarningDecayFeature;
-import dev.sheldan.abstracto.moderation.config.features.mode.WarnDecayMode;
-import dev.sheldan.abstracto.moderation.config.features.mode.WarningMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.WarnDecayPostTarget;
-import dev.sheldan.abstracto.moderation.config.posttargets.WarningPostTarget;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnContext;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnNotification;
-import dev.sheldan.abstracto.moderation.models.template.job.WarnDecayLogModel;
-import dev.sheldan.abstracto.moderation.models.template.job.WarnDecayWarning;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.WarningDecayFeature;
+import dev.sheldan.abstracto.moderation.config.feature.mode.WarnDecayMode;
+import dev.sheldan.abstracto.moderation.config.feature.mode.WarningMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.WarnDecayPostTarget;
+import dev.sheldan.abstracto.moderation.config.posttarget.WarningPostTarget;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnContext;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnNotification;
+import dev.sheldan.abstracto.moderation.model.template.job.WarnDecayLogModel;
+import dev.sheldan.abstracto.moderation.model.template.job.WarnDecayWarning;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -99,12 +99,12 @@ public class WarnServiceBean implements WarnService {
         String warnNotificationMessage = templateService.renderTemplate(WARN_NOTIFICATION_TEMPLATE, warnNotification, server.getId());
         List<CompletableFuture<Message>> futures = new ArrayList<>();
         futures.add(messageService.sendMessageToUser(warnedMember.getUser(), warnNotificationMessage));
-        if(featureModeService.featureModeActive(ModerationFeatures.WARNING, server.getId(), WarningMode.WARN_LOG)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server.getId(), WarningMode.WARN_LOG)) {
             log.trace("Logging warning for server {}.", server.getId());
             MessageToSend message = templateService.renderEmbedTemplate(WARN_LOG_TEMPLATE, context, server.getId());
             futures.addAll(postTargetService.sendEmbedInPostTarget(message, WarningPostTarget.WARN_LOG, context.getGuild().getIdLong()));
         } else {
-            log.trace("Not logging warning because of feature {} with feature mode {} in server {}.", ModerationFeatures.WARNING, WarningMode.WARN_LOG, server.getId());
+            log.trace("Not logging warning because of feature {} with feature mode {} in server {}.", ModerationFeatureDefinition.WARNING, WarningMode.WARN_LOG, server.getId());
         }
 
         return FutureUtils.toSingleFutureGeneric(futures);
@@ -138,11 +138,11 @@ public class WarnServiceBean implements WarnService {
         List<Long> warningIds = flattenWarnings(warningsToDecay);
         Long serverId = server.getId();
         CompletableFuture<Void> completableFuture;
-        if(featureModeService.featureModeActive(ModerationFeatures.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)) {
             log.trace("Sending log messages for automatic warn decay in server {}.", server.getId());
             completableFuture = logDecayedWarnings(server, warningsToDecay);
         } else {
-            log.trace("Not logging automatic warn decay, because feature {} has its mode {} disabled in server {}.", ModerationFeatures.AUTOMATIC_WARN_DECAY, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG, server.getId());
+            log.trace("Not logging automatic warn decay, because feature {} has its mode {} disabled in server {}.", ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG, server.getId());
             completableFuture = CompletableFuture.completedFuture(null);
         }
         return completableFuture.thenAccept(aVoid ->
@@ -253,13 +253,13 @@ public class WarnServiceBean implements WarnService {
         List<Long> warnIds = flattenWarnings(warningsToDecay);
         log.info("Decaying ALL warning in server {}.", server.getId());
         Long serverId = server.getId();
-        if(featureModeService.featureModeActive(ModerationFeatures.WARNING, server, WarningMode.WARN_DECAY_LOG)) {
+        if(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server, WarningMode.WARN_DECAY_LOG)) {
             log.trace("Logging warn decays in server {}", serverId);
             return logDecayedWarnings(server, warningsToDecay).thenAccept(aVoid ->
                 self.decayWarnings(warnIds, serverId)
             );
         } else {
-            log.trace("Not logging warn decays for manual decay in server {} because feature {} with feature mode: {}", serverId, ModerationFeatures.WARNING, WarningMode.WARN_DECAY_LOG);
+            log.trace("Not logging warn decays for manual decay in server {} because feature {} with feature mode: {}", serverId, ModerationFeatureDefinition.WARNING, WarningMode.WARN_DECAY_LOG);
             self.decayWarnings(warnIds, serverId);
             return CompletableFuture.completedFuture(null);
         }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/AllowedInviteLinkManagementBean.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.moderation.exception.AllowedInviteLinkNotFound;
-import dev.sheldan.abstracto.moderation.models.database.AllowedInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.AllowedInviteLink;
 import dev.sheldan.abstracto.moderation.repository.AllowedInviteLinkRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/FilteredInviteLinkManagementBean.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.moderation.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 import dev.sheldan.abstracto.moderation.repository.FilteredInviteLinkRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBean.java

@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.models.AServerAChannelMessage;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
 import dev.sheldan.abstracto.moderation.repository.MuteRepository;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.MuteRole;
+import dev.sheldan.abstracto.moderation.model.database.MuteRole;
 import dev.sheldan.abstracto.moderation.repository.MuteRoleRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/UserNoteManagementServiceBean.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.CounterService;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
 import dev.sheldan.abstracto.moderation.repository.UserNoteRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBean.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import dev.sheldan.abstracto.moderation.repository.WarnRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-seedData/command.xml

@@ -14,38 +14,32 @@
     <property name="warnDecayFeature" value="(SELECT id FROM feature WHERE key = 'warnDecay')"/>
     <property name="userNotesFeature" value="(SELECT id FROM feature WHERE key = 'userNotes')"/>
     <property name="inviteLinkFilteringFeature" value="(SELECT id FROM feature WHERE key = 'inviteFilter')"/>
-    <property name="today" value="(SELECT NOW())"/>
 
     <changeSet  author="Sheldan"  id="moderation_moderation-commands">
         <insert tableName="command">
             <column name="name" value="ban"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${moderationFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="banId"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${moderationFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="kick"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${moderationFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="purge"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${moderationFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="slowMode"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${moderationFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 
@@ -54,7 +48,6 @@
             <column name="name" value="deleteWarning"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${warningsFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="decayAllWarnings"/>
@@ -65,19 +58,16 @@
             <column name="name" value="myWarnings"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${warningsFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="warn"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${warningsFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="warnings"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${warningsFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 
@@ -86,19 +76,16 @@
             <column name="name" value="mute"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${mutingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="setMuteRole"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${mutingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="unMute"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${mutingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 
@@ -107,7 +94,6 @@
             <column name="name" value="decayWarnings"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${warnDecayFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 
@@ -116,19 +102,16 @@
             <column name="name" value="deleteNote"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${userNotesFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="userNote"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${userNotesFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="userNotes"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${userNotesFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 
@@ -137,25 +120,21 @@
             <column name="name" value="allowInvite"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${inviteLinkFilteringFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="disAllowInvite"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${inviteLinkFilteringFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="removeTrackedInviteLinks"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${inviteLinkFilteringFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="showTrackedInviteLinks"/>
             <column name="module_id" valueComputed="${moderationModule}"/>
             <column name="feature_id" valueComputed="${inviteLinkFilteringFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-seedData/feature.xml

@@ -6,35 +6,27 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
     http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
     http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
-    <property name="today" value="(SELECT NOW())"/>
     <changeSet author="Sheldan"  id="moderation_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="moderation"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="feature">
             <column name="key" value="warnings"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="feature">
             <column name="key" value="warnDecay"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="feature">
             <column name="key" value="logging"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="feature">
             <column name="key" value="muting"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="feature">
             <column name="key" value="userNotes"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="feature">
             <column name="key" value="inviteFilter"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 </databaseChangeLog>

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-seedData/module.xml

@@ -6,11 +6,9 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
     http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
     http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
-    <property name="today" value="(SELECT NOW())"/>
     <changeSet  author="Sheldan"  id="moderation-module-insertion">
         <insert tableName="module">
             <column name="name"  value="moderation"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 </databaseChangeLog>

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/BanIdTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.template.commands.BanIdLog;
+import dev.sheldan.abstracto.moderation.model.template.command.BanIdLog;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/BanTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.template.commands.BanLog;
+import dev.sheldan.abstracto.moderation.model.template.command.BanLog;
 import dev.sheldan.abstracto.moderation.service.BanService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Member;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/DecayAllWarningsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/DecayWarningsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/DeleteNoteTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/DeleteWarningTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import org.junit.Test;
 import org.junit.runner.RunWith;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/KickTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel;
+import dev.sheldan.abstracto.moderation.model.template.command.KickLogModel;
 import dev.sheldan.abstracto.moderation.service.KickServiceBean;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Member;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/MyWarningsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -8,8 +8,8 @@ import dev.sheldan.abstracto.core.service.FeatureFlagService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.config.features.WarningDecayFeature;
-import dev.sheldan.abstracto.moderation.models.template.commands.MyWarningsModel;
+import dev.sheldan.abstracto.moderation.config.feature.WarningDecayFeature;
+import dev.sheldan.abstracto.moderation.model.template.command.MyWarningsModel;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/PurgeTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/SlowModeTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/UserNoteCommandTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/UserNotesTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -10,9 +10,9 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
 import dev.sheldan.abstracto.moderation.converter.UserNotesConverter;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
-import dev.sheldan.abstracto.moderation.models.template.commands.ListNotesModel;
-import dev.sheldan.abstracto.moderation.models.template.commands.NoteEntryModel;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.template.command.ListNotesModel;
+import dev.sheldan.abstracto.moderation.model.template.command.NoteEntryModel;
 import dev.sheldan.abstracto.moderation.service.management.UserNoteManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/WarnTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnContext;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnContext;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Member;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/WarningsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands;
+package dev.sheldan.abstracto.moderation.command;
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.jagrosh.jdautilities.menu.Paginator;
@@ -12,9 +12,9 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
 import dev.sheldan.abstracto.moderation.converter.WarnEntryConverter;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnEntry;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarningsModel;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnEntry;
+import dev.sheldan.abstracto.moderation.model.template.command.WarningsModel;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/invite/AllowInviteTest.java

@@ -1,9 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command.invite;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
+import dev.sheldan.abstracto.moderation.command.AllowInvite;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterServiceBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/invite/DisAllowInviteTest.java

@@ -1,9 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command.invite;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
+import dev.sheldan.abstracto.moderation.command.DisAllowInvite;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterServiceBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/invite/RemoveTrackedInviteLinksTest.java

@@ -1,9 +1,10 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command.invite;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
+import dev.sheldan.abstracto.moderation.command.RemoveTrackedInviteLinks;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import org.junit.Test;
 import org.junit.runner.RunWith;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/invite/ShowTrackedInviteLinksTest.java

@@ -1,12 +1,13 @@
-package dev.sheldan.abstracto.moderation.commands.invite;
+package dev.sheldan.abstracto.moderation.command.invite;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
-import dev.sheldan.abstracto.moderation.models.template.commands.TrackedInviteLinksModel;
+import dev.sheldan.abstracto.moderation.command.ShowTrackedInviteLinks;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.template.command.TrackedInviteLinksModel;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -20,7 +21,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
 
-import static dev.sheldan.abstracto.moderation.commands.invite.ShowTrackedInviteLinks.TRACKED_INVITE_LINKS_EMBED_TEMPLATE_KEY;
+import static dev.sheldan.abstracto.moderation.command.ShowTrackedInviteLinks.TRACKED_INVITE_LINKS_EMBED_TEMPLATE_KEY;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/mute/MuteTest.java

@@ -1,10 +1,11 @@
-package dev.sheldan.abstracto.moderation.commands.mute;
+package dev.sheldan.abstracto.moderation.command.mute;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteContext;
+import dev.sheldan.abstracto.moderation.command.Mute;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteContext;
 import dev.sheldan.abstracto.moderation.service.MuteService;
 import net.dv8tion.jda.api.entities.Member;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/mute/SetMuteRoleTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.mute;
+package dev.sheldan.abstracto.moderation.command.mute;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -8,6 +8,7 @@ import dev.sheldan.abstracto.core.service.management.RoleManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
+import dev.sheldan.abstracto.moderation.command.SetMuteRole;
 import dev.sheldan.abstracto.moderation.service.management.MuteRoleManagementService;
 import net.dv8tion.jda.api.entities.Role;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/command/mute/UnMuteTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.commands.mute;
+package dev.sheldan.abstracto.moderation.command.mute;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -6,6 +6,7 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
+import dev.sheldan.abstracto.moderation.command.UnMute;
 import dev.sheldan.abstracto.moderation.exception.NoMuteFoundException;
 import dev.sheldan.abstracto.moderation.service.MuteService;
 import dev.sheldan.abstracto.moderation.service.management.MuteManagementService;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/converter/UserNotesConverterTest.java

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
-import dev.sheldan.abstracto.moderation.models.template.commands.NoteEntryModel;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.template.command.NoteEntryModel;
 import dev.sheldan.abstracto.moderation.service.management.UserNoteManagementService;
 import net.dv8tion.jda.api.entities.Member;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/converter/WarnEntryConverterTest.java

@@ -5,8 +5,8 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnEntry;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnEntry;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/job/WarnDecayJobTest.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.moderation.job;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.FeatureFlagService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.moderation.config.features.WarningDecayFeature;
+import dev.sheldan.abstracto.moderation.config.feature.WarningDecayFeature;
 import dev.sheldan.abstracto.moderation.service.WarnService;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/InviteLinkFilterListenerTest.java

@@ -1,16 +1,16 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.execution.result.MessageReceivedListenerResult;
-import dev.sheldan.abstracto.core.metrics.service.MetricService;
+import dev.sheldan.abstracto.core.metric.service.MetricService;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.InviteFilterMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.InviteFilterPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.DeletedInvitesNotificationModel;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.InviteFilterMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.InviteFilterPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.listener.DeletedInvitesNotificationModel;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -28,7 +28,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.concurrent.CompletableFuture;
 
-import static dev.sheldan.abstracto.moderation.listener.async.InviteLinkFilterListener.INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
@@ -98,8 +97,8 @@ public class InviteLinkFilterListenerTest {
         when(message.getContentRaw()).thenReturn(INVITE_LINK);
         when(messageService.deleteMessage(message)).thenReturn(CompletableFuture.completedFuture(null));
         when(inviteLinkFilterService.isCodeFiltered(eq(INVITE_CODE), any(ServerUser.class))).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(false);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(false);
         setupBasicMessage();
         MessageReceivedListenerResult result = testUnit.execute(message);
         Assert.assertEquals(MessageReceivedListenerResult.DELETED, result);
@@ -111,8 +110,8 @@ public class InviteLinkFilterListenerTest {
         when(message.getContentRaw()).thenReturn(INVITE_LINK);
         when(messageService.deleteMessage(message)).thenReturn(CompletableFuture.completedFuture(null));
         when(inviteLinkFilterService.isCodeFiltered(eq(INVITE_CODE), any(ServerUser.class))).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(false);
         setupBasicMessage();
         MessageReceivedListenerResult result = testUnit.execute(message);
         Assert.assertEquals(MessageReceivedListenerResult.DELETED, result);
@@ -125,8 +124,8 @@ public class InviteLinkFilterListenerTest {
         when(message.getContentRaw()).thenReturn(INVITE_LINK);
         when(messageService.deleteMessage(message)).thenReturn(CompletableFuture.completedFuture(null));
         when(inviteLinkFilterService.isCodeFiltered(eq(INVITE_CODE), any(ServerUser.class))).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(true);
         setupForNotification();
         setupBasicMessage();
         MessageReceivedListenerResult result = testUnit.execute(message);
@@ -140,8 +139,8 @@ public class InviteLinkFilterListenerTest {
         when(message.getContentRaw()).thenReturn(INVITE_LINK);
         when(messageService.deleteMessage(message)).thenReturn(CompletableFuture.completedFuture(null));
         when(inviteLinkFilterService.isCodeFiltered(eq(INVITE_CODE), any(ServerUser.class))).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(false);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(true);
         setupForNotification();
         setupBasicMessage();
         MessageReceivedListenerResult result = testUnit.execute(message);
@@ -155,15 +154,15 @@ public class InviteLinkFilterListenerTest {
         when(message.getContentRaw()).thenReturn(INVITE_LINK);
         when(messageService.deleteMessage(message)).thenReturn(CompletableFuture.completedFuture(null));
         when(inviteLinkFilterService.isCodeFiltered(eq(INVITE_CODE), any(ServerUser.class))).thenReturn(true);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(false);
-        when(featureModeService.featureModeActive(ModerationFeatures.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.TRACK_USES)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.INVITE_FILTER, SERVER_ID, InviteFilterMode.FILTER_NOTIFICATIONS)).thenReturn(true);
         when(postTargetService.postTargetDefinedInServer(InviteFilterPostTarget.INVITE_DELETE_LOG, SERVER_ID)).thenReturn(false);
         setupBasicMessage();
         MessageReceivedListenerResult result = testUnit.execute(message);
         verify(metricService, times(1)).incrementCounter(any());
         Assert.assertEquals(MessageReceivedListenerResult.DELETED, result);
         verify(inviteLinkFilterService, times(0)).storeFilteredInviteLinkUsage(eq(INVITE_CODE), any(ServerUser.class));
-        verify(templateService, times(0)).renderEmbedTemplate(eq(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(DeletedInvitesNotificationModel.class), eq(SERVER_ID));
+        verify(templateService, times(0)).renderEmbedTemplate(eq(InviteLinkFilterListener.INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(DeletedInvitesNotificationModel.class), eq(SERVER_ID));
     }
 
     private void verifyTracking() {
@@ -173,7 +172,7 @@ public class InviteLinkFilterListenerTest {
     private void setupForNotification() {
         when(postTargetService.postTargetDefinedInServer(InviteFilterPostTarget.INVITE_DELETE_LOG, SERVER_ID)).thenReturn(true);
         MessageToSend messageToSend = Mockito.mock(MessageToSend.class);
-        when(templateService.renderEmbedTemplate(eq(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(DeletedInvitesNotificationModel.class), eq(SERVER_ID))).thenReturn(messageToSend);
+        when(templateService.renderEmbedTemplate(eq(InviteLinkFilterListener.INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(DeletedInvitesNotificationModel.class), eq(SERVER_ID))).thenReturn(messageToSend);
         when(postTargetService.sendEmbedInPostTarget(messageToSend, InviteFilterPostTarget.INVITE_DELETE_LOG, SERVER_ID)).thenReturn(CommandTestUtilities.messageFutureList());
         when(textChannel.getIdLong()).thenReturn(CHANNEL_ID);
         when(message.getIdLong()).thenReturn(MESSAGE_ID);

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/JoinLoggerTest.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Member;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/JoinMuteListenerTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/LeaveLoggerTest.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListenerTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.models.cache.CachedAttachment;
 import dev.sheldan.abstracto.core.models.cache.CachedAuthor;
@@ -9,9 +9,9 @@ import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedAttachmentLog;
-import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedLog;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.listener.MessageDeletedAttachmentLog;
+import dev.sheldan.abstracto.moderation.model.template.listener.MessageDeletedLog;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Guild;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListenerTest.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.moderation.listener.async;
+package dev.sheldan.abstracto.moderation.listener;
 
 import dev.sheldan.abstracto.core.models.cache.CachedAuthor;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.MessageEditedLog;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.listener.MessageEditedLog;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Guild;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/BanServiceBeanTest.java

@@ -5,9 +5,9 @@ import dev.sheldan.abstracto.core.models.context.ServerContext;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.GuildService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.ModerationMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.ModerationPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.ModerationMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.ModerationPostTarget;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Guild;
@@ -58,7 +58,7 @@ public class BanServiceBeanTest {
         when(mockedAction.submit()).thenReturn(CompletableFuture.completedFuture(null));
         when(mockedGuild.ban(USER_ID.toString(), 0, REASON)).thenReturn(mockedAction);
         MessageToSend mockedMessage = Mockito.mock(MessageToSend.class);
-        when(featureModeService.featureModeActive(ModerationFeatures.MODERATION, SERVER_ID, ModerationMode.BAN_LOG)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, SERVER_ID, ModerationMode.BAN_LOG)).thenReturn(false);
         testUnit.banMember(memberToBan, REASON, context);
         verify(mockedGuild, times(1)).ban(USER_ID.toString(), 0, REASON);
         verify(postTargetService, times(0)).sendEmbedInPostTarget(mockedMessage, ModerationPostTarget.BAN_LOG, SERVER_ID);
@@ -78,7 +78,7 @@ public class BanServiceBeanTest {
         when(mockedGuild.ban(USER_ID.toString(), 0, REASON)).thenReturn(mockedAction);
         MessageToSend mockedMessage = Mockito.mock(MessageToSend.class);
         when(templateService.renderEmbedTemplate(BanServiceBean.BAN_LOG_TEMPLATE, context, SERVER_ID)).thenReturn(mockedMessage);
-        when(featureModeService.featureModeActive(ModerationFeatures.MODERATION, SERVER_ID, ModerationMode.BAN_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, SERVER_ID, ModerationMode.BAN_LOG)).thenReturn(true);
         testUnit.banMember(memberToBan, REASON, context);
         verify(mockedGuild, times(1)).ban(USER_ID.toString(), 0, REASON);
         verify(postTargetService, times(1)).sendEmbedInPostTarget(mockedMessage, ModerationPostTarget.BAN_LOG, SERVER_ID);
@@ -94,7 +94,7 @@ public class BanServiceBeanTest {
         when(mockedGuild.ban(USER_ID.toString(), 0, REASON)).thenReturn(mockedAction);
         MessageToSend mockedMessage = Mockito.mock(MessageToSend.class);
         when(templateService.renderEmbedTemplate(BanServiceBean.BAN_ID_LOG_TEMPLATE, context, SERVER_ID)).thenReturn(mockedMessage);
-        when(featureModeService.featureModeActive(ModerationFeatures.MODERATION, SERVER_ID, ModerationMode.BAN_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, SERVER_ID, ModerationMode.BAN_LOG)).thenReturn(true);
         when(guildService.getGuildByIdOptional(SERVER_ID)).thenReturn(Optional.of(mockedGuild));
         testUnit.banUserViaId(SERVER_ID, USER_ID, REASON, context);
         verify(mockedGuild, times(1)).ban(USER_ID.toString(), 0, REASON);

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/InviteLinkFilterServiceBeanTest.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.moderation.exception.InvalidInviteException;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 import dev.sheldan.abstracto.moderation.service.management.AllowedInviteLinkManagement;
 import dev.sheldan.abstracto.moderation.service.management.FilteredInviteLinkManagement;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/KickServiceBeanTest.java

@@ -2,10 +2,10 @@ package dev.sheldan.abstracto.moderation.service;
 
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.ModerationMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.ModerationPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.ModerationMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.ModerationPostTarget;
+import dev.sheldan.abstracto.moderation.model.template.command.KickLogModel;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.Guild;
@@ -55,7 +55,7 @@ public class KickServiceBeanTest {
         when(mockedAction.submit()).thenReturn(CompletableFuture.completedFuture(null));
         KickLogModel model = Mockito.mock(KickLogModel.class);
         when(model.getGuild()).thenReturn(mockedGuild);
-        when(featureModeService.featureModeActive(ModerationFeatures.MODERATION, SERVER_ID, ModerationMode.KICK_LOG)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, SERVER_ID, ModerationMode.KICK_LOG)).thenReturn(false);
         testUnit.kickMember(member, reason, model);
         verify(postTargetService, times(0)).sendEmbedInPostTarget(any(MessageToSend.class), eq(ModerationPostTarget.KICK_LOG), eq(SERVER_ID));
         verify(templateService, times(0)).renderEmbedTemplate(KickServiceBean.KICK_LOG_TEMPLATE, model, SERVER_ID);
@@ -78,7 +78,7 @@ public class KickServiceBeanTest {
         when(model.getGuild()).thenReturn(mockedGuild);
         MessageToSend messageToSend = Mockito.mock(MessageToSend.class);
         when(templateService.renderEmbedTemplate(KickServiceBean.KICK_LOG_TEMPLATE, model, SERVER_ID)).thenReturn(messageToSend);
-        when(featureModeService.featureModeActive(ModerationFeatures.MODERATION, SERVER_ID, ModerationMode.KICK_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, SERVER_ID, ModerationMode.KICK_LOG)).thenReturn(true);
         testUnit.kickMember(member, reason, model);
         verify(postTargetService, times(1)).sendEmbedInPostTarget(messageToSend, ModerationPostTarget.KICK_LOG, SERVER_ID);
     }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/MuteServiceBeanTest.java

@@ -8,15 +8,15 @@ import dev.sheldan.abstracto.core.service.*;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.mode.MutingMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.MutingPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.mode.MutingMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.MutingPostTarget;
 import dev.sheldan.abstracto.moderation.exception.MuteRoleNotSetupException;
 import dev.sheldan.abstracto.moderation.exception.NoMuteFoundException;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
-import dev.sheldan.abstracto.moderation.models.database.MuteRole;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteContext;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteNotification;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
+import dev.sheldan.abstracto.moderation.model.database.MuteRole;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteContext;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteNotification;
 import dev.sheldan.abstracto.moderation.service.management.MuteManagementService;
 import dev.sheldan.abstracto.moderation.service.management.MuteRoleManagementService;
 import dev.sheldan.abstracto.scheduling.service.SchedulerService;
@@ -270,7 +270,7 @@ public class MuteServiceBeanTest {
         when(muteLog.getMuteTargetDate()).thenReturn(unMuteDate);
         when(server.getId()).thenReturn(SERVER_ID);
         when(serverManagementService.loadOrCreate(SERVER_ID)).thenReturn(server);
-        when(featureModeService.featureModeActive(ModerationFeatures.MUTING, server, MutingMode.MUTE_LOGGING)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, server, MutingMode.MUTE_LOGGING)).thenReturn(true);
         String notificationText = "text";
         when(templateService.renderTemplate(eq(MUTE_NOTIFICATION_TEMPLATE), any(MuteNotification.class), eq(SERVER_ID))).thenReturn(notificationText);
         when(messageService.sendMessageToUser(memberBeingMuted.getUser(), notificationText)).thenReturn(CompletableFuture.completedFuture(null));
@@ -301,7 +301,7 @@ public class MuteServiceBeanTest {
         when(muteLog.getContext()).thenReturn(serverChannelMessage);
         when(muteLog.getMuteTargetDate()).thenReturn(unMuteDate);
         when(serverManagementService.loadOrCreate(SERVER_ID)).thenReturn(server);
-        when(featureModeService.featureModeActive(ModerationFeatures.MUTING, server, MutingMode.MUTE_LOGGING)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, server, MutingMode.MUTE_LOGGING)).thenReturn(false);
         String notificationText = "text";
         when(templateService.renderTemplate(eq(MUTE_NOTIFICATION_TEMPLATE), any(MuteNotification.class), eq(SERVER_ID))).thenReturn(notificationText);
         when(messageService.sendMessageToUser(memberBeingMuted.getUser(), notificationText)).thenReturn(CompletableFuture.completedFuture(null));

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/PurgeServiceBeanTest.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.core.metrics.service.MetricService;
+import dev.sheldan.abstracto.core.metric.service.MetricService;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.moderation.exception.NoMessageFoundException;
-import dev.sheldan.abstracto.moderation.models.template.commands.PurgeStatusUpdateModel;
+import dev.sheldan.abstracto.moderation.model.template.command.PurgeStatusUpdateModel;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.*;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/WarnServiceBeanTest.java

@@ -9,15 +9,15 @@ import dev.sheldan.abstracto.core.service.*;
 import dev.sheldan.abstracto.core.service.management.DefaultConfigManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
-import dev.sheldan.abstracto.moderation.config.features.WarningDecayFeature;
-import dev.sheldan.abstracto.moderation.config.features.mode.WarnDecayMode;
-import dev.sheldan.abstracto.moderation.config.features.mode.WarningMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.WarningPostTarget;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnContext;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnNotification;
-import dev.sheldan.abstracto.moderation.models.template.job.WarnDecayLogModel;
+import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
+import dev.sheldan.abstracto.moderation.config.feature.WarningDecayFeature;
+import dev.sheldan.abstracto.moderation.config.feature.mode.WarnDecayMode;
+import dev.sheldan.abstracto.moderation.config.feature.mode.WarningMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.WarningPostTarget;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnContext;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnNotification;
+import dev.sheldan.abstracto.moderation.model.template.job.WarnDecayLogModel;
 import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -150,7 +150,7 @@ public class WarnServiceBeanTest {
     @Test
     public void testDecayWarningsForServer() {
         setupWarnDecay();
-        when(featureModeService.featureModeActive(ModerationFeatures.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)).thenReturn(true);
         testUnit.decayWarningsForServer(server);
         verify(self, times(1)).renderAndSendWarnDecayLogs(eq(SERVER_ID), any());
     }
@@ -158,7 +158,7 @@ public class WarnServiceBeanTest {
     @Test
     public void testDecayWarningsForServerWithoutLog() {
         setupWarnDecay();
-        when(featureModeService.featureModeActive(ModerationFeatures.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)).thenReturn(false);
         testUnit.decayWarningsForServer(server);
         verify(self, times(0)).renderAndSendWarnDecayLogs(eq(SERVER_ID), any());
     }
@@ -166,7 +166,7 @@ public class WarnServiceBeanTest {
     @Test
     public void testDecayAllWarningsForServer() {
         setupWarnDecay();
-        when(featureModeService.featureModeActive(ModerationFeatures.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(true);
         testUnit.decayAllWarningsForServer(server);
         verify(self, times(1)).renderAndSendWarnDecayLogs(eq(SERVER_ID), any());
     }
@@ -174,7 +174,7 @@ public class WarnServiceBeanTest {
     @Test
     public void testDecayAllWarningsForServerWithoutLog() {
         setupWarnDecay();
-        when(featureModeService.featureModeActive(ModerationFeatures.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(false);
         testUnit.decayAllWarningsForServer(server);
         verify(self, times(0)).renderAndSendWarnDecayLogs(eq(SERVER_ID), any());
     }
@@ -185,7 +185,7 @@ public class WarnServiceBeanTest {
         List<Warning> warnings = Collections.emptyList();
         when(server.getId()).thenReturn(SERVER_ID);
         when(warnManagementService.getActiveWarningsInServerOlderThan(eq(server), any(Instant.class))).thenReturn(warnings);
-        when(featureModeService.featureModeActive(ModerationFeatures.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(false);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(false);
         testUnit.decayAllWarningsForServer(server);
         verify(self, times(0)).renderAndSendWarnDecayLogs(eq(SERVER_ID), any());
     }
@@ -195,7 +195,7 @@ public class WarnServiceBeanTest {
         List<Warning> warnings = Collections.emptyList();
         when(server.getId()).thenReturn(SERVER_ID);
         when(warnManagementService.getActiveWarningsInServerOlderThan(eq(server), any(Instant.class))).thenReturn(warnings);
-        when(featureModeService.featureModeActive(ModerationFeatures.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server, WarningMode.WARN_DECAY_LOG)).thenReturn(true);
         testUnit.decayAllWarningsForServer(server);
         verify(self, times(1)).renderAndSendWarnDecayLogs(eq(SERVER_ID), any());
     }
@@ -203,7 +203,7 @@ public class WarnServiceBeanTest {
     @Test
     public void testWarnFullUser() {
         setupWarnContext();
-        when(featureModeService.featureModeActive(ModerationFeatures.WARNING, SERVER_ID, WarningMode.WARN_LOG)).thenReturn(true);
+        when(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, SERVER_ID, WarningMode.WARN_LOG)).thenReturn(true);
         setupMocksForWarning();
         CompletableFuture<Void> future = testUnit.notifyAndLogFullUserWarning(context);
         future.join();

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/AllowedInviteLinkManagementBeanTest.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.moderation.exception.AllowedInviteLinkNotFound;
-import dev.sheldan.abstracto.moderation.models.database.AllowedInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.AllowedInviteLink;
 import dev.sheldan.abstracto.moderation.repository.AllowedInviteLinkRepository;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/FilteredInviteLinkManagementBeanTest.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.moderation.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 import dev.sheldan.abstracto.moderation.repository.FilteredInviteLinkRepository;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBeanTest.java

@@ -7,7 +7,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUser;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
 import dev.sheldan.abstracto.moderation.repository.MuteRepository;
 import net.dv8tion.jda.api.entities.Member;
 import org.junit.Assert;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBeanTest.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.MuteRole;
+import dev.sheldan.abstracto.moderation.model.database.MuteRole;
 import dev.sheldan.abstracto.moderation.repository.MuteRoleRepository;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/UserNoteManagementServiceBeanTest.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUser;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.CounterService;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
 import dev.sheldan.abstracto.moderation.repository.UserNoteRepository;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBeanTest.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUser;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import dev.sheldan.abstracto.moderation.repository.WarnRepository;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/ModerationModuleDefinition.java

@@ -1,11 +1,11 @@
 package dev.sheldan.abstracto.moderation.config;
 
 import dev.sheldan.abstracto.core.command.config.ModuleInfo;
-import dev.sheldan.abstracto.core.command.config.ModuleInterface;
+import dev.sheldan.abstracto.core.command.config.ModuleDefinition;
 import org.springframework.stereotype.Component;
 
 @Component
-public class ModerationModule implements ModuleInterface {
+public class ModerationModuleDefinition implements ModuleDefinition {
 
     public static final String MODERATION = "moderation";
 

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/InviteFilterFeature.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.moderation.config.features;
+package dev.sheldan.abstracto.moderation.config.feature;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
-import dev.sheldan.abstracto.moderation.config.posttargets.InviteFilterPostTarget;
+import dev.sheldan.abstracto.moderation.config.posttarget.InviteFilterPostTarget;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -12,8 +12,8 @@ import java.util.List;
 @Component
 public class InviteFilterFeature implements FeatureConfig {
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.INVITE_FILTER;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.INVITE_FILTER;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/LoggingFeature.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.moderation.config.features;
+package dev.sheldan.abstracto.moderation.config.feature;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
-import dev.sheldan.abstracto.moderation.config.posttargets.LoggingPostTarget;
+import dev.sheldan.abstracto.moderation.config.posttarget.LoggingPostTarget;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -13,8 +13,8 @@ import java.util.List;
 public class LoggingFeature implements FeatureConfig {
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.LOGGING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.LOGGING;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/ModerationFeature.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.moderation.config.features;
+package dev.sheldan.abstracto.moderation.config.feature;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
-import dev.sheldan.abstracto.moderation.config.features.mode.ModerationMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.ModerationPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.mode.ModerationMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.ModerationPostTarget;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -15,8 +15,8 @@ import java.util.List;
 public class ModerationFeature implements FeatureConfig {
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MODERATION;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MODERATION;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/ModerationFeatureDefinition.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.moderation.config.features;
+package dev.sheldan.abstracto.moderation.config.feature;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import lombok.Getter;
 
 @Getter
-public enum ModerationFeatures implements FeatureEnum {
+public enum ModerationFeatureDefinition implements FeatureDefinition {
     MODERATION("moderation"),
     WARNING("warnings"),
     LOGGING("logging"),
@@ -15,7 +15,7 @@ public enum ModerationFeatures implements FeatureEnum {
 
     private final String key;
 
-    ModerationFeatures(String key) {
+    ModerationFeatureDefinition(String key) {
         this.key = key;
     }
 }

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/MutingFeature.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.moderation.config.features;
+package dev.sheldan.abstracto.moderation.config.feature;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
-import dev.sheldan.abstracto.moderation.config.features.mode.MutingMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.MutingPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.mode.MutingMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.MutingPostTarget;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -15,8 +15,8 @@ import java.util.List;
 public class MutingFeature implements FeatureConfig {
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.MUTING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.MUTING;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/UserNoteFeature.java

@@ -0,0 +1,13 @@
+package dev.sheldan.abstracto.moderation.config.feature;
+
+import dev.sheldan.abstracto.core.config.FeatureConfig;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserNoteFeature implements FeatureConfig {
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.USER_NOTES;
+    }
+}