[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-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;
+    }
+}

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/WarningDecayFeature.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.WarnDecayMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.WarnDecayPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.mode.WarnDecayMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.WarnDecayPostTarget;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,8 +21,8 @@ public class WarningDecayFeature implements FeatureConfig {
 
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.AUTOMATIC_WARN_DECAY;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY;
     }
 
     @Override

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/feature/WarningFeature.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.WarningMode;
-import dev.sheldan.abstracto.moderation.config.posttargets.WarningPostTarget;
+import dev.sheldan.abstracto.moderation.config.feature.mode.WarningMode;
+import dev.sheldan.abstracto.moderation.config.posttarget.WarningPostTarget;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -19,8 +19,8 @@ public class WarningFeature implements FeatureConfig {
     private WarningDecayFeature warningDecayFeature;
 
     @Override
-    public FeatureEnum getFeature() {
-        return ModerationFeatures.WARNING;
+    public FeatureDefinition getFeature() {
+        return ModerationFeatureDefinition.WARNING;
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.features.mode;
+package dev.sheldan.abstracto.moderation.config.feature.mode;
 
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.features.mode;
+package dev.sheldan.abstracto.moderation.config.feature.mode;
 
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.features.mode;
+package dev.sheldan.abstracto.moderation.config.feature.mode;
 
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.features.mode;
+package dev.sheldan.abstracto.moderation.config.feature.mode;
 
 
 import dev.sheldan.abstracto.core.config.FeatureMode;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.features.mode;
+package dev.sheldan.abstracto.moderation.config.feature.mode;
 
 import dev.sheldan.abstracto.core.config.FeatureMode;
 import lombok.Getter;

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

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

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.posttargets;
+package dev.sheldan.abstracto.moderation.config.posttarget;
 
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.posttargets;
+package dev.sheldan.abstracto.moderation.config.posttarget;
 
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.posttargets;
+package dev.sheldan.abstracto.moderation.config.posttarget;
 
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.posttargets;
+package dev.sheldan.abstracto.moderation.config.posttarget;
 
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.posttargets;
+package dev.sheldan.abstracto.moderation.config.posttarget;
 
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.config.posttargets;
+package dev.sheldan.abstracto.moderation.config.posttarget;
 
 import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/AllowedInviteLink.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.database;
+package dev.sheldan.abstracto.moderation.model.database;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/FilteredInviteLink.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.database;
+package dev.sheldan.abstracto.moderation.model.database;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/Mute.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.database;
+package dev.sheldan.abstracto.moderation.model.database;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AChannel;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/MuteRole.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.database;
+package dev.sheldan.abstracto.moderation.model.database;
 
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/UserNote.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.database;
+package dev.sheldan.abstracto.moderation.model.database;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/Warning.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.database;
+package dev.sheldan.abstracto.moderation.model.database;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/BanIdLog.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/BanLog.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/KickLogModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/ListNotesModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.FullUserInServer;
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/MuteContext.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.ServerChannelMessage;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/MuteNotification.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import lombok.Builder;
 import lombok.Value;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/MyWarningsModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/NoteEntryModel.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.FullUserInServer;
-import dev.sheldan.abstracto.moderation.models.database.UserNote;
+import dev.sheldan.abstracto.moderation.model.database.UserNote;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/PurgeStatusUpdateModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/TrackedInviteLinksModel.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/UnMuteLog.java

@@ -1,8 +1,8 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.ServerContext;
 import dev.sheldan.abstracto.core.utils.MessageUtils;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/WarnContext.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/WarnEntry.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.FullUserInServer;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/WarnNotification.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import lombok.Builder;
 import lombok.Value;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/command/WarningsModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.commands;
+package dev.sheldan.abstracto.moderation.model.template.command;
 
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;
 import lombok.Getter;
@@ -15,7 +15,7 @@ import java.util.List;
 @SuperBuilder
 public class WarningsModel extends SlimUserInitiatedServerContext {
     /**
-     * A collection of {@link dev.sheldan.abstracto.moderation.models.database.Warning}s being rendered, might be all warnings of the server, or only the warnings of a specific user
+     * A collection of {@link dev.sheldan.abstracto.moderation.model.database.Warning}s being rendered, might be all warnings of the server, or only the warnings of a specific user
      */
     private List<WarnEntry> warnings;
 }

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/job/WarnDecayLogModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.job;
+package dev.sheldan.abstracto.moderation.model.template.job;
 
 import dev.sheldan.abstracto.core.models.context.ServerContext;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/job/WarnDecayWarning.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.moderation.models.template.job;
+package dev.sheldan.abstracto.moderation.model.template.job;
 
 import dev.sheldan.abstracto.core.models.ServerUser;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/listener/DeletedInvite.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.listener;
+package dev.sheldan.abstracto.moderation.model.template.listener;
 
 
 import lombok.AllArgsConstructor;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/listener/DeletedInvitesNotificationModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.listener;
+package dev.sheldan.abstracto.moderation.model.template.listener;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/listener/MessageDeletedAttachmentLog.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.listener;
+package dev.sheldan.abstracto.moderation.model.template.listener;
 
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;
 import lombok.Getter;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/listener/MessageDeletedLog.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.listener;
+package dev.sheldan.abstracto.moderation.model.template.listener;
 
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.models.context.SlimUserInitiatedServerContext;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/template/listener/MessageEditedLog.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.moderation.models.template.listener;
+package dev.sheldan.abstracto.moderation.model.template.listener;
 
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/InviteLinkFilterService.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.moderation.service;
 
 import dev.sheldan.abstracto.core.models.ServerUser;
-import dev.sheldan.abstracto.moderation.models.database.FilteredInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.FilteredInviteLink;
 
 import java.util.List;
 

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/KickService.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel;
+import dev.sheldan.abstracto.moderation.model.template.command.KickLogModel;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.util.concurrent.CompletableFuture;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/MuteService.java

@@ -3,8 +3,8 @@ package dev.sheldan.abstracto.moderation.service;
 import dev.sheldan.abstracto.core.models.FullUserInServer;
 import dev.sheldan.abstracto.core.models.ServerChannelMessage;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
-import dev.sheldan.abstracto.moderation.models.database.Mute;
-import dev.sheldan.abstracto.moderation.models.template.commands.MuteContext;
+import dev.sheldan.abstracto.moderation.model.database.Mute;
+import dev.sheldan.abstracto.moderation.model.template.command.MuteContext;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.time.Instant;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/WarnService.java

@@ -1,8 +1,8 @@
 package dev.sheldan.abstracto.moderation.service;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.moderation.models.database.Warning;
-import dev.sheldan.abstracto.moderation.models.template.commands.WarnContext;
+import dev.sheldan.abstracto.moderation.model.database.Warning;
+import dev.sheldan.abstracto.moderation.model.template.command.WarnContext;
 
 import java.time.Instant;
 import java.util.concurrent.CompletableFuture;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/AllowedInviteLinkManagement.java

@@ -2,7 +2,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.models.database.AllowedInviteLink;
+import dev.sheldan.abstracto.moderation.model.database.AllowedInviteLink;
 
 public interface AllowedInviteLinkManagement {
     AllowedInviteLink createAllowedInviteLink(AServer server, String code);

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/FilteredInviteLinkManagement.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 java.util.List;
 import java.util.Optional;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementService.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 
 import dev.sheldan.abstracto.core.models.AServerAChannelMessage;
 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 net.dv8tion.jda.api.entities.Member;
 
 import java.time.Instant;

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementService.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 java.util.List;
 

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/UserNoteManagementService.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 
 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 java.util.List;
 

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementService.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.moderation.service.management;
 
 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 java.time.Instant;
 import java.util.List;