[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/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/AnonReply.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -7,13 +7,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.AChannel;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class AnonReply extends AbstractConditionableCommand {
         return CommandConfiguration.builder()
                 .name("anonReply")
                 .async(true)
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .parameters(parameters)
                 .supportsEmbedException(true)
                 .help(helpInfo)
@@ -76,8 +76,8 @@ public class AnonReply extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Close.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -7,12 +7,12 @@ 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.AChannel;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -64,7 +64,7 @@ public class Close extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("close")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .parameters(parameters)
                 .help(helpInfo)
                 .async(true)
@@ -75,8 +75,8 @@ public class Close extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/CloseNoLog.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -6,14 +6,14 @@ import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.config.HelpInfo;
 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.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.config.ModMailMode;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -61,7 +61,7 @@ public class CloseNoLog extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("closeNoLog")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .async(true)
                 .help(helpInfo)
                 .supportsEmbedException(true)
@@ -71,8 +71,8 @@ public class CloseNoLog extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/CloseSilently.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -7,12 +7,12 @@ 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.AChannel;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
@@ -64,7 +64,7 @@ public class CloseSilently extends AbstractConditionableCommand {
         return CommandConfiguration.builder()
                 .name("closeSilently")
                 .async(true)
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .parameters(parameters)
                 .help(helpInfo)
                 .supportsEmbedException(true)
@@ -74,8 +74,8 @@ public class CloseSilently extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Contact.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -7,14 +7,14 @@ 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.core.utils.FutureUtils;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
-import dev.sheldan.abstracto.modmail.models.template.ModMailThreadExistsModel;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.template.ModMailThreadExistsModel;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import lombok.extern.slf4j.Slf4j;
@@ -73,7 +73,7 @@ public class Contact extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("contact")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .parameters(parameters)
                 .async(true)
                 .help(helpInfo)
@@ -84,8 +84,8 @@ public class Contact extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/ModMailModuleDefinition.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 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 ModMailModuleInterface implements ModuleInterface {
+public class ModMailModuleDefinition implements ModuleDefinition {
 
     public static final String MODMAIL = "modmail";
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/RemoveModMailRole.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.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.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.models.database.ARole;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.service.ModMailRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This command is used to remove a role from the roles to be notified when a new {@link dev.sheldan.abstracto.modmail.models.database.ModMailThread}
+ * This command is used to remove a role from the roles to be notified when a new {@link dev.sheldan.abstracto.modmail.model.database.ModMailThread}
  * is opened. The method this command executes also automatically dis-allows all mod mail related {@link dev.sheldan.abstracto.core.command.Command}
  * for this role.
  */
@@ -42,7 +42,7 @@ public class RemoveModMailRole extends AbstractConditionableCommand {
         List<String> aliases = Arrays.asList("rmMmRole");
         return CommandConfiguration.builder()
                 .name("removeModMailRole")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .aliases(aliases)
                 .supportsEmbedException(true)
                 .parameters(parameters)
@@ -53,7 +53,7 @@ public class RemoveModMailRole extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Reply.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -7,13 +7,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.AChannel;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +64,7 @@ public class Reply extends AbstractConditionableCommand {
         return CommandConfiguration.builder()
                 .name("reply")
                 .async(true)
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .parameters(parameters)
                 .help(helpInfo)
                 .supportsEmbedException(true)
@@ -74,8 +74,8 @@ public class Reply extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/SetModMailCategory.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,8 +6,8 @@ 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.modmail.config.ModMailFeatures;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -40,7 +40,7 @@ public class SetModMailCategory extends AbstractConditionableCommand {
         List<String> aliases = Arrays.asList("modMailCat");
         return CommandConfiguration.builder()
                 .name("setModMailCategory")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .aliases(aliases)
                 .supportsEmbedException(true)
                 .parameters(parameters)
@@ -51,7 +51,7 @@ public class SetModMailCategory extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/SetModMailRole.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.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.models.database.ARole;
 import dev.sheldan.abstracto.core.service.management.RoleManagementService;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.service.ModMailRoleService;
 import net.dv8tion.jda.api.entities.Role;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,7 @@ public class SetModMailRole extends AbstractConditionableCommand {
         List<String> aliases = Arrays.asList("modMailRole");
         return CommandConfiguration.builder()
                 .name("setModMailRole")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .aliases(aliases)
                 .supportsEmbedException(true)
                 .parameters(parameters)
@@ -59,7 +59,7 @@ public class SetModMailRole extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Subscribe.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.config.HelpInfo;
 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.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailSubscriptionService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +50,7 @@ public class Subscribe extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("subscribe")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .help(helpInfo)
                 .supportsEmbedException(true)
                 .templated(true)
@@ -59,8 +59,8 @@ public class Subscribe extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/UnSubscribe.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands;
+package dev.sheldan.abstracto.modmail.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.condition.CommandCondition;
@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.config.HelpInfo;
 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.modmail.condition.ModMailContextCondition;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailSubscriptionService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +52,7 @@ public class UnSubscribe extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("unSubscribe")
-                .module(ModMailModuleInterface.MODMAIL)
+                .module(ModMailModuleDefinition.MODMAIL)
                 .help(helpInfo)
                 .supportsEmbedException(true)
                 .templated(true)
@@ -61,8 +61,8 @@ public class UnSubscribe extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/condition/RequiresModMailCondition.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.modmail.commands.condition;
+package dev.sheldan.abstracto.modmail.command.condition;
 
 import dev.sheldan.abstracto.core.command.Command;
 import dev.sheldan.abstracto.core.command.condition.ConditionResult;
@@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.condition.ModMailContextCondition;
 import dev.sheldan.abstracto.modmail.condition.detail.NotInModMailThreadConditionDetail;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageDeletedListener.java

@@ -1,13 +1,13 @@
 package dev.sheldan.abstracto.modmail.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.MemberService;
 import dev.sheldan.abstracto.core.service.MessageService;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailMessage;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailMessage;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.management.ModMailMessageManagementService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,8 +69,8 @@ public class ModMailMessageDeletedListener implements AsyncMessageDeletedListene
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageEditedListener.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.modmail.listener;
 import dev.sheldan.abstracto.core.command.config.Parameters;
 import dev.sheldan.abstracto.core.command.service.CommandRegistry;
 import dev.sheldan.abstracto.core.command.service.CommandService;
-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.FullUserInServer;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
@@ -11,9 +11,9 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.MessageService;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailMessage;
-import dev.sheldan.abstracto.modmail.models.template.ModMailModeratorReplyModel;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailMessage;
+import dev.sheldan.abstracto.modmail.model.template.ModMailModeratorReplyModel;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadServiceBean;
 import dev.sheldan.abstracto.modmail.service.management.ModMailMessageManagementService;
@@ -134,8 +134,8 @@ public class ModMailMessageEditedListener implements AsyncMessageTextUpdatedList
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageListener.java

@@ -1,13 +1,13 @@
 package dev.sheldan.abstracto.modmail.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.listener.sync.jda.PrivateMessageReceivedListener;
 import dev.sheldan.abstracto.core.models.database.AUser;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserManagementService;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailThreadManagementService;
 import lombok.extern.slf4j.Slf4j;
@@ -62,8 +62,8 @@ public class ModMailMessageListener implements PrivateMessageReceivedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModMailFeatures.MOD_MAIL;
+    public FeatureDefinition getFeature() {
+        return ModMailFeatureDefinition.MOD_MAIL;
     }
 
     @Override

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/repository/ModMailMessageRepository.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.modmail.repository;
 
-import dev.sheldan.abstracto.modmail.models.database.ModMailMessage;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailMessage;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/repository/ModMailRoleRepository.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.modmail.repository;
 
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.modmail.models.database.ModMailRole;
+import dev.sheldan.abstracto.modmail.model.database.ModMailRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/repository/ModMailSubscriberRepository.java

@@ -1,8 +1,8 @@
 package dev.sheldan.abstracto.modmail.repository;
 
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThreadSubscriber;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThreadSubscriber;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/repository/ModMailThreadRepository.java

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
 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.modmail.models.database.ModMailThread;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThreadState;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThreadState;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.lang.NonNull;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailMessageServiceBean.java

@@ -4,10 +4,10 @@ import dev.sheldan.abstracto.core.models.ServerChannelMessageUser;
 import dev.sheldan.abstracto.core.service.BotService;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MemberService;
-import dev.sheldan.abstracto.modmail.models.database.ModMailMessage;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
-import dev.sheldan.abstracto.modmail.models.dto.LoadedModmailThreadMessage;
-import dev.sheldan.abstracto.modmail.models.dto.LoadedModmailThreadMessageList;
+import dev.sheldan.abstracto.modmail.model.database.ModMailMessage;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.dto.LoadedModmailThreadMessage;
+import dev.sheldan.abstracto.modmail.model.dto.LoadedModmailThreadMessageList;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailRoleServiceBean.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.modmail.service;
 import dev.sheldan.abstracto.core.command.service.CommandService;
 import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
 import dev.sheldan.abstracto.core.models.database.ARole;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.service.management.ModMailRoleManagementService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,13 +28,13 @@ public class ModMailRoleServiceBean implements ModMailRoleService {
         if(!modMailRoleManagementService.isRoleAlreadyAssigned(role)) {
             modMailRoleManagementService.addRoleToModMailRoles(role);
         }
-        commandService.allowFeatureForRole(ModMailFeatures.MOD_MAIL, role);
+        commandService.allowFeatureForRole(ModMailFeatureDefinition.MOD_MAIL, role);
     }
 
     @Override
     public void removeRoleFromModMailRoles(ARole role) {
         log.info("Remove role {} from modmail roles in server {}.", role.getId(), role.getServer().getId());
         modMailRoleManagementService.removeRoleFromModMailRoles(role);
-        commandService.disAllowFeatureForRole(ModMailFeatures.MOD_MAIL, role);
+        commandService.disAllowFeatureForRole(ModMailFeatureDefinition.MOD_MAIL, role);
     }
 }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailSubscriptionServiceBean.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.modmail.service;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.modmail.exception.AlreadySubscribedException;
 import dev.sheldan.abstracto.modmail.exception.NotSubscribedException;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.service.management.ModMailSubscriberManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java

@@ -4,9 +4,9 @@ import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.jagrosh.jdautilities.menu.ButtonMenu;
 import dev.sheldan.abstracto.core.command.exception.AbstractoTemplatedException;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
-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.FeatureValidationResult;
 import dev.sheldan.abstracto.core.models.FullGuild;
 import dev.sheldan.abstracto.core.models.FullUserInServer;
@@ -19,16 +19,16 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.abstracto.core.utils.CompletableFutureList;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.modmail.config.ModMailFeature;
-import dev.sheldan.abstracto.modmail.config.ModMailFeatures;
+import dev.sheldan.abstracto.modmail.config.ModMailFeatureDefinition;
 import dev.sheldan.abstracto.modmail.config.ModMailMode;
 import dev.sheldan.abstracto.modmail.config.ModMailPostTargets;
 import dev.sheldan.abstracto.modmail.exception.ModMailCategoryIdException;
 import dev.sheldan.abstracto.modmail.exception.ModMailThreadChannelNotFound;
 import dev.sheldan.abstracto.modmail.exception.ModMailThreadNotFoundException;
-import dev.sheldan.abstracto.modmail.models.database.*;
-import dev.sheldan.abstracto.modmail.models.dto.LoadedModmailThreadMessageList;
-import dev.sheldan.abstracto.modmail.models.dto.ServerChoice;
-import dev.sheldan.abstracto.modmail.models.template.*;
+import dev.sheldan.abstracto.modmail.model.database.*;
+import dev.sheldan.abstracto.modmail.model.dto.LoadedModmailThreadMessageList;
+import dev.sheldan.abstracto.modmail.model.dto.ServerChoice;
+import dev.sheldan.abstracto.modmail.model.template.*;
 import dev.sheldan.abstracto.modmail.service.management.ModMailMessageManagementService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailRoleManagementService;
 import dev.sheldan.abstracto.modmail.service.management.ModMailSubscriberManagementService;
@@ -500,7 +500,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
         MessageToSend messageToSend = templateService.renderEmbedTemplate(MODMAIL_STAFF_MESSAGE_TEMPLATE_KEY, modMailUserReplyModel);
         CompletableFuture<Message> future = messageService.sendMessageToSendToUser(targetMember.getUser(), messageToSend);
         CompletableFuture<Message> sameThreadMessageFuture;
-        if(featureModeService.featureModeActive(ModMailFeatures.MOD_MAIL, modMailThread.getServer(), ModMailMode.SEPARATE_MESSAGE)) {
+        if(featureModeService.featureModeActive(ModMailFeatureDefinition.MOD_MAIL, modMailThread.getServer(), ModMailMode.SEPARATE_MESSAGE)) {
             sameThreadMessageFuture = channelService.sendMessageToSendToAChannel(messageToSend, modMailThread.getChannel()).get(0);
         } else {
             sameThreadMessageFuture = CompletableFuture.completedFuture(null);
@@ -512,7 +512,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
 
     @Override
     public CompletableFuture<Void> closeModMailThread(ModMailThread modMailThread, String note, boolean notifyUser, List<UndoActionInstance> undoActions, Boolean log) {
-        boolean loggingMode = featureModeService.featureModeActive(ModMailFeatures.MOD_MAIL, modMailThread.getServer(), ModMailMode.LOGGING);
+        boolean loggingMode = featureModeService.featureModeActive(ModMailFeatureDefinition.MOD_MAIL, modMailThread.getServer(), ModMailMode.LOGGING);
         boolean shouldLogThread = log && loggingMode;
         return closeModMailThread(modMailThread, note, notifyUser, shouldLogThread, undoActions);
     }

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/management/ModMailMessageManagementServiceBean.java

@@ -1,8 +1,8 @@
 package dev.sheldan.abstracto.modmail.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.modmail.models.database.ModMailMessage;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailMessage;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
 import dev.sheldan.abstracto.modmail.repository.ModMailMessageRepository;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/management/ModMailRoleManagementServiceBean.java

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

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/management/ModMailSubscriberManagementServiceBean.java

@@ -1,8 +1,8 @@
 package dev.sheldan.abstracto.modmail.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThreadSubscriber;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThreadSubscriber;
 import dev.sheldan.abstracto.modmail.repository.ModMailSubscriberRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/management/ModMailThreadManagementServiceBean.java

@@ -6,8 +6,8 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.modmail.exception.ModMailThreadChannelNotFound;
 import dev.sheldan.abstracto.modmail.exception.ModMailThreadNotFoundException;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThread;
-import dev.sheldan.abstracto.modmail.models.database.ModMailThreadState;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
+import dev.sheldan.abstracto.modmail.model.database.ModMailThreadState;
 import dev.sheldan.abstracto.modmail.repository.ModMailThreadRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategoryDelayedActionConfig.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.modmail.setup;
 
 import dev.sheldan.abstracto.core.interactive.DelayedActionConfig;
-import dev.sheldan.abstracto.modmail.models.template.ModMailCategoryActionModel;
+import dev.sheldan.abstracto.modmail.model.template.ModMailCategoryActionModel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategorySetupBean.java

@@ -10,7 +10,7 @@ import dev.sheldan.abstracto.core.service.GuildService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ConfigManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
-import dev.sheldan.abstracto.modmail.models.template.SetupModMailCategoryMessageModel;
+import dev.sheldan.abstracto.modmail.model.template.SetupModMailCategoryMessageModel;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadServiceBean;
 import dev.sheldan.abstracto.modmail.validator.ModMailFeatureValidator;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java

@@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.ConfigService;
 import dev.sheldan.abstracto.core.service.FeatureValidatorService;
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.modmail.models.template.ModMailCategoryValidationErrorModel;
+import dev.sheldan.abstracto.modmail.model.template.ModMailCategoryValidationErrorModel;
 import dev.sheldan.abstracto.modmail.service.ModMailThreadServiceBean;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Category;

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

@@ -8,74 +8,62 @@
     http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
     <property name="modmailModule" value="(SELECT id FROM module WHERE name = 'modmail')"/>
     <property name="modmailFeature" value="(SELECT id FROM feature WHERE key = 'modmail')"/>
-    <property name="today" value="(SELECT NOW())"/>
 
     <changeSet  author="Sheldan"  id="modmail_modMail-commands">
         <insert tableName="command">
             <column name="name" value="anonReply"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="close"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="closeNoLog"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="closeSilently"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="contact"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="removeModMailRole"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="reply"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="setModMailCategory"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="setModMailRole"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="subscribe"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="unSubscribe"/>
             <column name="module_id" valueComputed="${modmailModule}"/>
             <column name="feature_id" valueComputed="${modmailFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/1.0-modmail/modMail-seedData/default_emote.xml

@@ -6,12 +6,10 @@
                    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="modmail_default_emote-insert">
        <insert tableName="default_emote">
            <column name="emote_key" value="readReaction"/>
            <column name="name" value="👀"/>
-           <column name="created" valueComputed="${today}"/>
        </insert>
     </changeSet>
 </databaseChangeLog>

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/1.0-modmail/modMail-seedData/feature.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="modmail_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="modmail"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 </databaseChangeLog>

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/1.0-modmail/modMail-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="modMail-module-insertion">
         <insert tableName="module">
             <column name="name" value="modmail"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 </databaseChangeLog>