[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/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/config/StatisticModuleDefinition.java

@@ -1,14 +1,14 @@
 package dev.sheldan.abstracto.statistic.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;
 
 /**
  * Help module for all statistics related commands, they have their own module if they have a significant emount of commands on their own.
  */
 @Component
-public class StatisticModule implements ModuleInterface {
+public class StatisticModuleDefinition implements ModuleDefinition {
 
     public static final String STATISTIC = "statistic";
 

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DeleteTrackedEmote.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,12 +6,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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -47,7 +47,7 @@ public class DeleteTrackedEmote extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("deleteTrackedEmote")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -57,7 +57,7 @@ public class DeleteTrackedEmote extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DeletedEmoteStats.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,15 +6,15 @@ 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.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +86,7 @@ public class DeletedEmoteStats extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("deletedEmoteStats")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -97,7 +97,7 @@ public class DeletedEmoteStats extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DisableEmoteTracking.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,12 +6,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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -51,7 +51,7 @@ public class DisableEmoteTracking extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("disableEmoteTracking")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -61,7 +61,7 @@ public class DisableEmoteTracking extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/EmoteStats.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,15 +6,15 @@ 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.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * This command displays the emote stats for the current {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote} within the
+ * This command displays the emote stats for the current {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote} within the
  * {@link net.dv8tion.jda.api.entities.Guild} the command has been executed in
  */
 @Component
@@ -87,7 +87,7 @@ public class EmoteStats extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("emoteStats")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -98,7 +98,7 @@ public class EmoteStats extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ExportEmoteStats.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,7 +6,7 @@ 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.exception.AbstractoRunTimeException;
 import dev.sheldan.abstracto.core.exception.UploadFileTooLargeException;
 import dev.sheldan.abstracto.core.models.database.AServer;
@@ -14,11 +14,11 @@ import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.utils.FileService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.DownloadEmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.UsedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.DownloadEmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.UsedEmoteManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -123,7 +123,7 @@ public class ExportEmoteStats extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("exportEmoteStats")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -134,7 +134,7 @@ public class ExportEmoteStats extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ExternalEmoteStats.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,17 +6,17 @@ 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.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,7 +92,7 @@ public class ExternalEmoteStats extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("externalEmoteStats")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -103,8 +103,8 @@ public class ExternalEmoteStats extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
     @Override

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/PurgeEmoteStats.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,12 +6,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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This command will delete the instances of {@link dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote} of a given {@link TrackedEmote}
+ * This command will delete the instances of {@link dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote} of a given {@link TrackedEmote}
  * for the desired {@link Duration}, or all of them. This command cannot be undone.
  */
 @Component
@@ -57,7 +57,7 @@ public class PurgeEmoteStats extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("purgeEmoteStats")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -67,7 +67,7 @@ public class PurgeEmoteStats extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ResetEmoteStats.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This command removes all {@link dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote} instances
- * and all {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote} in a guild. This command cannot be undone.
+ * This command removes all {@link dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote} instances
+ * and all {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote} in a guild. This command cannot be undone.
  */
 @Component
 public class ResetEmoteStats extends AbstractConditionableCommand {
@@ -38,7 +38,7 @@ public class ResetEmoteStats extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("resetEmoteStats")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -48,7 +48,7 @@ public class ResetEmoteStats extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ShowExternalTrackedEmote.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.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.exception.AbstractoTemplatedException;
 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.service.ChannelService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -59,7 +59,7 @@ public class ShowExternalTrackedEmote extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("showExternalTrackedEmote")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -70,8 +70,8 @@ public class ShowExternalTrackedEmote extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
     @Override

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ShowTrackedEmotes.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -6,15 +6,15 @@ 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.service.ChannelService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteOverview;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteOverview;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * This command gives an overview over all {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote} in a guild.
+ * This command gives an overview over all {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote} in a guild.
  * It will not show external emotes, if the feature mode EmoteTrackingMode.EXTERNAL_EMOTES is disabled. There is a parameter to also show
  * emotes for which the tracking has been disabled
  */
@@ -84,7 +84,7 @@ public class ShowTrackedEmotes extends AbstractConditionableCommand {
             messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_DELETED_ANIMATED_RESPONSE, trackedEmoteOverview, commandContext.getChannel()));
         }
 
-        boolean externalTrackingEnabled = featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, commandContext.getGuild().getIdLong(), EmoteTrackingMode.EXTERNAL_EMOTES);
+        boolean externalTrackingEnabled = featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, commandContext.getGuild().getIdLong(), EmoteTrackingMode.EXTERNAL_EMOTES);
 
         // only show external emotes if external emotes are enabled
         if(externalTrackingEnabled) {
@@ -117,7 +117,7 @@ public class ShowTrackedEmotes extends AbstractConditionableCommand {
         parameters.add(Parameter.builder().name("showAll").templated(true).optional(true).type(Boolean.class).build());
         return CommandConfiguration.builder()
                 .name("showTrackedEmotes")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -128,7 +128,7 @@ public class ShowTrackedEmotes extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/SyncTrackedEmotes.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.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.service.ChannelService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteSynchronizationResult;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteSynchronizationResult;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * This command can be used to synchronize the state of {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote}
+ * This command can be used to synchronize the state of {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote}
  * in the database, with the state of {@link net.dv8tion.jda.api.entities.Emote} in the {@link net.dv8tion.jda.api.entities.Guild}.
  * It will mark emotes not in the guild anymore and add emotes which are not yet tracked.
  */
@@ -49,7 +49,7 @@ public class SyncTrackedEmotes extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("syncTrackedEmotes")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .async(true)
                 .supportsEmbedException(true)
@@ -60,7 +60,7 @@ public class SyncTrackedEmotes extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/TrackEmote.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -7,16 +7,16 @@ import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.exception.IncorrectParameterException;
 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.EmoteService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.command.parameter.TrackEmoteParameter;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingModule;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.command.parameter.TrackEmoteParameter;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingModuleDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -56,7 +56,7 @@ public class TrackEmote extends AbstractConditionableCommand {
             boolean external = !emoteService.emoteIsFromGuild(emoteToTrack.getEmote(), commandContext.getGuild());
             if(external) {
                 // this throws an exception if the feature mode is not enabled
-                featureModeService.validateActiveFeatureMode(serverId, StatisticFeatures.EMOTE_TRACKING, EmoteTrackingMode.EXTERNAL_EMOTES);
+                featureModeService.validateActiveFeatureMode(serverId, StatisticFeatureDefinition.EMOTE_TRACKING, EmoteTrackingMode.EXTERNAL_EMOTES);
             }
             trackedEmoteService.createTrackedEmote(emoteToTrack.getEmote(), commandContext.getGuild(), external);
         } else {
@@ -73,7 +73,7 @@ public class TrackEmote extends AbstractConditionableCommand {
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("trackEmote")
-                .module(EmoteTrackingModule.EMOTE_TRACKING)
+                .module(EmoteTrackingModuleDefinition.EMOTE_TRACKING)
                 .templated(true)
                 .supportsEmbedException(true)
                 .causesReaction(true)
@@ -83,7 +83,7 @@ public class TrackEmote extends AbstractConditionableCommand {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/TrackEmoteParameter.java

@@ -1,6 +1,6 @@
-package dev.sheldan.abstracto.statistic.emotes.command.parameter;
+package dev.sheldan.abstracto.statistic.emote.command.parameter;
 
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,7 +8,7 @@ import net.dv8tion.jda.api.entities.Emote;
 
 /**
  * Container class for containing both an {@link Emote} and a {@link TrackedEmote} for the purpose of a {@link dev.sheldan.abstracto.core.command.config.Parameter}.
- * This is used in {@link dev.sheldan.abstracto.statistic.emotes.command.TrackEmote} and is used as a convenience parameter, in which there
+ * This is used in {@link dev.sheldan.abstracto.statistic.emote.command.TrackEmote} and is used as a convenience parameter, in which there
  * might both a {@link Emote} and a {@link TrackedEmote} as parameter
  */
 @Getter

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterHandler.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.command.parameter.handler;
+package dev.sheldan.abstracto.statistic.emote.command.parameter.handler;
 
 import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece;
 import dev.sheldan.abstracto.core.command.handler.CommandParameterHandler;
 import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators;
 import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterParameterHandler.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.statistic.emotes.command.parameter.handler;
+package dev.sheldan.abstracto.statistic.emote.command.parameter.handler;
 
 import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece;
 import dev.sheldan.abstracto.core.command.handler.CommandParameterHandler;
 import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators;
 import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler;
-import dev.sheldan.abstracto.statistic.emotes.command.parameter.TrackEmoteParameter;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.command.parameter.TrackEmoteParameter;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 /**
  * {@link CommandParameterHandler} for the {@link TrackEmoteParameter} class. It will call the
  * {@link EmoteParameterHandler} and use the returned {@link Emote} if one is available. Otherwise it will only use the
- * {@link Long} which was passed. This handler will create a fake instance for the {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote}
+ * {@link Long} which was passed. This handler will create a fake instance for the {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote}
  * and only make the {@link Emote} available in the result, if it was passed as such. This handler has a slightly higher priority
  * than medium.
  */

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/config/EmoteTrackingModuleDefinition.java

@@ -1,15 +1,15 @@
-package dev.sheldan.abstracto.statistic.emotes.config;
+package dev.sheldan.abstracto.statistic.emote.config;
 
 import dev.sheldan.abstracto.core.command.config.ModuleInfo;
-import dev.sheldan.abstracto.core.command.config.ModuleInterface;
-import dev.sheldan.abstracto.statistic.config.StatisticModule;
+import dev.sheldan.abstracto.core.command.config.ModuleDefinition;
+import dev.sheldan.abstracto.statistic.config.StatisticModuleDefinition;
 import org.springframework.stereotype.Component;
 
 /**
  * Separate module just for all commands related to emote tracking.
  */
 @Component
-public class EmoteTrackingModule implements ModuleInterface {
+public class EmoteTrackingModuleDefinition implements ModuleDefinition {
     public static final String EMOTE_TRACKING = "emoteTracking";
 
     @Override
@@ -19,6 +19,6 @@ public class EmoteTrackingModule implements ModuleInterface {
 
     @Override
     public String getParentModule() {
-        return StatisticModule.STATISTIC;
+        return StatisticModuleDefinition.STATISTIC;
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/converter/EmoteStatsConverter.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.converter;
+package dev.sheldan.abstracto.statistic.emote.converter;
 
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResultDisplay;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResultDisplay;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/job/EmotePersistingJob.java

@@ -1,8 +1,8 @@
-package dev.sheldan.abstracto.statistic.emotes.job;
+package dev.sheldan.abstracto.statistic.emote.job;
 
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteRuntimeService;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteRuntimeService;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/CreateTrackedEmoteListener.java

@@ -1,13 +1,13 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
-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.ListenerPriority;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteCreatedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Emote;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * This listener listens for created {@link Emote} in a {@link net.dv8tion.jda.api.entities.Guild} and creates appropriate
- * {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote}, if the EMOTE_TRACKING feature is enabled and the AUTO_TRACK
+ * {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote}, if the EMOTE_TRACKING feature is enabled and the AUTO_TRACK
  * feature mode as well.
  */
 @Component
@@ -35,8 +35,8 @@ public class CreateTrackedEmoteListener implements AsyncEmoteCreatedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
     @Override

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/DeleteTrackedEmoteListener.java

@@ -1,13 +1,13 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
-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.ListenerPriority;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteDeletedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Emote;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * This listener listens for deleted {@link Emote} in a {@link net.dv8tion.jda.api.entities.Guild} and markes respective
- * {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote} as deleted, if the EMOTE_TRACKING feature is enabled and the AUTO_TRACK
+ * {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote} as deleted, if the EMOTE_TRACKING feature is enabled and the AUTO_TRACK
  * feature mode as well.
  */
 @Component
@@ -35,8 +35,8 @@ public class DeleteTrackedEmoteListener implements AsyncEmoteDeletedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
     @Override

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/EmoteTrackingListener.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
-import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageReceivedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -36,8 +36,8 @@ public class EmoteTrackingListener implements AsyncMessageReceivedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/UpdateTrackedEmoteListener.java

@@ -1,14 +1,14 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
-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.ListenerPriority;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteUpdatedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -32,8 +32,8 @@ public class UpdateTrackedEmoteListener implements AsyncEmoteUpdatedListener {
     }
 
     @Override
-    public FeatureEnum getFeature() {
-        return StatisticFeatures.EMOTE_TRACKING;
+    public FeatureDefinition getFeature() {
+        return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
     @Override

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/repository/TrackedEmoteRepository.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.statistic.emotes.repository;
+package dev.sheldan.abstracto.statistic.emote.repository;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/repository/UsedEmoteRepository.java

@@ -1,8 +1,8 @@
-package dev.sheldan.abstracto.statistic.emotes.repository;
+package dev.sheldan.abstracto.statistic.emote.repository;
 
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.embed.UsedEmoteDay;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.embed.UsedEmoteDay;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -19,7 +19,7 @@ import java.util.Optional;
 public interface UsedEmoteRepository extends JpaRepository<UsedEmote, UsedEmoteDay> {
 
     /**
-     * Selects the {@link UsedEmote} for one particular {@link dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote}
+     * Selects the {@link UsedEmote} for one particular {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote}
      * for the current date.
      * @param emoteId The ID of the {@link net.dv8tion.jda.api.entities.Emote} which is being tracked
      * @param server_id The ID of the {@link net.dv8tion.jda.api.entities.Guild} which is the server where the {@link net.dv8tion.jda.api.entities.Emote}

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRunTimeStorage.java

@@ -1,6 +1,6 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.service;
 
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -16,7 +16,7 @@ public class TrackedEmoteRunTimeStorage {
      * A map of *minutes* containing a map of server_ids containing a list of {@link PersistingEmote}, which contains
      * all necessary information about the emotes which were used.
      * The top most map contains all the different minutes in which there were used emotes. Mostly this
-     * map will not contain many keys, because the {@link dev.sheldan.abstracto.statistic.emotes.job.EmotePersistingJob}
+     * map will not contain many keys, because the {@link dev.sheldan.abstracto.statistic.emote.job.EmotePersistingJob}
      * will remove them a minute later. The Map within the current minute will contain every server as a key in which
      * there were emotes used in the particular minute. {@link PersistingEmote} does not contain any JDA related objects
      * but only the information necessary to identify any {@link net.dv8tion.jda.api.entities.Emote}.

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRuntimeServiceBean.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.service;
 
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBean.java

@@ -1,21 +1,21 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.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.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
 import dev.sheldan.abstracto.core.service.EmoteService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteOverview;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteSynchronizationResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.UsedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteOverview;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteSynchronizationResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.emote.service.management.UsedEmoteManagementService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
@@ -64,7 +64,7 @@ public class TrackedEmoteServiceBean implements TrackedEmoteService {
 
     @Override
     public void addEmoteToRuntimeStorage(List<CachedEmote> emotes, Guild guild) {
-        boolean externalTrackingEnabled = featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, guild.getIdLong(), EmoteTrackingMode.EXTERNAL_EMOTES);
+        boolean externalTrackingEnabled = featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, guild.getIdLong(), EmoteTrackingMode.EXTERNAL_EMOTES);
         emotes.forEach(emote -> {
             // either the emote is from the current guild (we always add those) or external emote tracking is enabled (we should always add those)
             if(externalTrackingEnabled || !emote.getExternal()) {
@@ -75,7 +75,7 @@ public class TrackedEmoteServiceBean implements TrackedEmoteService {
 
     @Override
     public void addEmoteToRuntimeStorage(CachedEmote emote, Guild guild, Long count) {
-        boolean externalTrackingEnabled = featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, guild.getIdLong(), EmoteTrackingMode.EXTERNAL_EMOTES);
+        boolean externalTrackingEnabled = featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, guild.getIdLong(), EmoteTrackingMode.EXTERNAL_EMOTES);
         // either the emote is from the current guild (we always add those) or external emote tracking is enabled (we should always add those)
         if(externalTrackingEnabled || !emote.getExternal()) {
             trackedEmoteRuntimeService.addEmoteForServer(emote, guild, count, emote.getExternal());
@@ -87,8 +87,8 @@ public class TrackedEmoteServiceBean implements TrackedEmoteService {
     public void storeEmoteStatistics(Map<Long, List<PersistingEmote>> usagesToStore) {
         usagesToStore.forEach((serverId, persistingEmotes) -> {
             log.info("Storing {} emotes for server {}.", persistingEmotes.size(), serverId);
-            boolean autoTrackExternalEmotes = featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, serverId, EmoteTrackingMode.AUTO_TRACK_EXTERNAL);
-            boolean trackExternalEmotes = featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, serverId, EmoteTrackingMode.EXTERNAL_EMOTES);
+            boolean autoTrackExternalEmotes = featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, serverId, EmoteTrackingMode.AUTO_TRACK_EXTERNAL);
+            boolean trackExternalEmotes = featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, serverId, EmoteTrackingMode.EXTERNAL_EMOTES);
             persistingEmotes.forEach(persistingEmote -> {
                 metricService.incrementCounter(EMOTE_USAGES_TRACKED);
                 Optional<TrackedEmote> emoteOptional = trackedEmoteManagementService.loadByEmoteIdOptional(persistingEmote.getEmoteId(), serverId);

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/UsedEmoteServiceBean.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.service;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.statistic.emotes.converter.EmoteStatsConverter;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.UsedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.emote.converter.EmoteStatsConverter;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.UsedEmoteManagementService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/TrackedEmoteManagementServiceBean.java

@@ -1,13 +1,13 @@
-package dev.sheldan.abstracto.statistic.emotes.service.management;
+package dev.sheldan.abstracto.statistic.emote.service.management;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.statistic.emotes.exception.TrackedEmoteNotFoundException;
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.repository.TrackedEmoteRepository;
+import dev.sheldan.abstracto.statistic.emote.exception.TrackedEmoteNotFoundException;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.repository.TrackedEmoteRepository;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/UsedEmoteManagementServiceBean.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.service.management;
+package dev.sheldan.abstracto.statistic.emote.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.embed.UsedEmoteDay;
-import dev.sheldan.abstracto.statistic.emotes.repository.UsedEmoteRepository;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.embed.UsedEmoteDay;
+import dev.sheldan.abstracto.statistic.emote.repository.UsedEmoteRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -8,80 +8,67 @@
     http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
     <property name="statisticModule" value="(SELECT id FROM module WHERE name = 'statistic')"/>
     <property name="emoteTrackingFeature" value="(SELECT id FROM feature WHERE key = 'emoteTracking')"/>
-    <property name="today" value="(SELECT NOW())"/>
 
     <changeSet  author="Sheldan"  id="statistic-commands">
         <insert tableName="command">
             <column name="name" value="emoteStats"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="deletedEmoteStats"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="externalEmoteStats"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="purgeEmoteStats"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="syncTrackedEmotes"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="trackEmote"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="disableEmoteTracking"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="deleteTrackedEmote"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="resetEmoteStats"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="exportEmoteStats"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="showExternalTrackedEmote"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="command">
             <column name="name" value="showTrackedEmotes"/>
             <column name="module_id" valueComputed="${statisticModule}"/>
             <column name="feature_id" valueComputed="${emoteTrackingFeature}"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/resources/migrations/1.0-statistic/statistic-seedData/emote_statistic_job.xml

@@ -10,7 +10,7 @@
         <insert tableName="scheduler_job">
             <column name="name" value="emoteStatisticJob"/>
             <column name="group_name" value="statistic"/>
-            <column name="clazz" value="dev.sheldan.abstracto.statistic.emotes.job.EmotePersistingJob"/>
+            <column name="clazz" value="dev.sheldan.abstracto.statistic.emote.job.EmotePersistingJob"/>
             <column name="active" value="true"/>
             <column name="cron_expression" value="40 * * * * ?"/>
             <column name="recovery" value="false"/>

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

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

@@ -6,15 +6,12 @@
                    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="statistic-module-insertion">
         <insert tableName="module">
             <column name="name" value="statistic"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
         <insert tableName="module">
             <column name="name" value="emoteTracking"/>
-            <column name="created" valueComputed="${today}"/>
         </insert>
     </changeSet>
 </databaseChangeLog>

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/DeleteTrackedEmoteTest.java

@@ -1,14 +1,14 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.exception.TrackedEmoteNotFoundException;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.exception.TrackedEmoteNotFoundException;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,7 +56,7 @@ public class DeleteTrackedEmoteTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/DeletedEmoteStatsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.models.database.AServer;
@@ -6,10 +6,10 @@ import dev.sheldan.abstracto.core.service.ChannelService;
 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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResultDisplay;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResultDisplay;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,8 +22,8 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.DeletedEmoteStats.EMOTE_STATS_ANIMATED_DELETED_RESPONSE;
-import static dev.sheldan.abstracto.statistic.emotes.command.DeletedEmoteStats.EMOTE_STATS_STATIC_DELETED_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.DeletedEmoteStats.EMOTE_STATS_ANIMATED_DELETED_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.DeletedEmoteStats.EMOTE_STATS_STATIC_DELETED_RESPONSE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -98,7 +98,7 @@ public class DeletedEmoteStatsTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/DisableEmoteTrackingTest.java

@@ -1,13 +1,13 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,7 +53,7 @@ public class DisableEmoteTrackingTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/EmoteStatsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.models.database.AServer;
@@ -6,10 +6,10 @@ import dev.sheldan.abstracto.core.service.ChannelService;
 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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResultDisplay;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResultDisplay;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,8 +22,8 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.EmoteStats.EMOTE_STATS_ANIMATED_RESPONSE;
-import static dev.sheldan.abstracto.statistic.emotes.command.EmoteStats.EMOTE_STATS_STATIC_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.EmoteStats.EMOTE_STATS_ANIMATED_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.EmoteStats.EMOTE_STATS_STATIC_RESPONSE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -98,7 +98,7 @@ public class EmoteStatsTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/ExportEmoteStatsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -10,10 +10,10 @@ 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.core.utils.FileService;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.DownloadEmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.UsedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.DownloadEmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.UsedEmoteManagementService;
 import dev.sheldan.abstracto.core.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import org.junit.Assert;
@@ -31,7 +31,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.ExportEmoteStats.*;
+import static dev.sheldan.abstracto.statistic.emote.command.ExportEmoteStats.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
@@ -154,7 +154,7 @@ public class ExportEmoteStatsTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     private void verifyModel() {

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/ExternalEmoteStatsTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.models.database.AServer;
@@ -6,10 +6,10 @@ import dev.sheldan.abstracto.core.service.ChannelService;
 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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResultDisplay;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResultDisplay;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,8 +22,8 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.ExternalEmoteStats.EMOTE_STATS_ANIMATED_EXTERNAL_RESPONSE;
-import static dev.sheldan.abstracto.statistic.emotes.command.ExternalEmoteStats.EMOTE_STATS_STATIC_EXTERNAL_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.ExternalEmoteStats.EMOTE_STATS_ANIMATED_EXTERNAL_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.ExternalEmoteStats.EMOTE_STATS_STATIC_EXTERNAL_RESPONSE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -98,7 +98,7 @@ public class ExternalEmoteStatsTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/PurgeEmoteStatsTest.java

@@ -1,13 +1,13 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.UsedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.UsedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,7 +60,7 @@ public class PurgeEmoteStatsTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/ResetEmoteStatsTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,6 +34,6 @@ public class ResetEmoteStatsTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/ShowExternalTrackedEmoteTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.exception.AbstractoTemplatedException;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
@@ -7,10 +7,10 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
 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.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,7 +22,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.ShowExternalTrackedEmote.SHOW_EXTERNAL_TRACKED_EMOTE_RESPONSE_TEMPLATE_KEY;
+import static dev.sheldan.abstracto.statistic.emote.command.ShowExternalTrackedEmote.SHOW_EXTERNAL_TRACKED_EMOTE_RESPONSE_TEMPLATE_KEY;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -66,7 +66,7 @@ public class ShowExternalTrackedEmoteTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/ShowTrackedEmotesTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.model.AvailableTrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteOverview;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.model.AvailableTrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteOverview;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,7 +23,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.ShowTrackedEmotes.*;
+import static dev.sheldan.abstracto.statistic.emote.command.ShowTrackedEmotes.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
@@ -50,7 +50,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
         when(channelService.sendEmbedTemplateInTextChannelList(eq(EMOTE_STATS_NO_STATS_AVAILABLE), any(), eq(commandContext.getChannel()))).thenReturn(CommandTestUtilities.messageFutureList());
         when(trackedEmoteService.loadTrackedEmoteOverview(commandContext.getGuild(), false)).thenReturn(overview);
         CompletableFuture<CommandResult> asyncResult = testUnit.executeAsync(commandContext);
@@ -63,7 +63,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getWithParameters(Arrays.asList(Boolean.TRUE));
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
         when(channelService.sendEmbedTemplateInTextChannelList(eq(EMOTE_STATS_NO_STATS_AVAILABLE), any(), eq(commandContext.getChannel()))).thenReturn(CommandTestUtilities.messageFutureList());
         when(trackedEmoteService.loadTrackedEmoteOverview(commandContext.getGuild(), true)).thenReturn(overview);
         CompletableFuture<CommandResult> asyncResult = testUnit.executeAsync(commandContext);
@@ -77,7 +77,7 @@ public class ShowTrackedEmotesTest {
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
         AvailableTrackedEmote staticEmote = Mockito.mock(AvailableTrackedEmote.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_STATIC_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
         when(overview.getStaticEmotes()).thenReturn(Arrays.asList(staticEmote));
         when(trackedEmoteService.loadTrackedEmoteOverview(commandContext.getGuild(), false)).thenReturn(overview);
@@ -91,7 +91,7 @@ public class ShowTrackedEmotesTest {
     public void testShowAnimatedEmotes() {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
         AvailableTrackedEmote animatedEmote = Mockito.mock(AvailableTrackedEmote.class);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_ANIMATED_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
@@ -108,7 +108,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
         TrackedEmote animatedEmote = Mockito.mock(TrackedEmote.class);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_DELETED_STATIC_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
         when(overview.getDeletedStaticEmotes()).thenReturn(Arrays.asList(animatedEmote));
@@ -124,7 +124,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(false);
         TrackedEmote animatedEmote = Mockito.mock(TrackedEmote.class);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_DELETED_ANIMATED_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
         when(overview.getDeletedAnimatedEmotes()).thenReturn(Arrays.asList(animatedEmote));
@@ -141,7 +141,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         TrackedEmote animatedEmote = Mockito.mock(TrackedEmote.class);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_EXTERNAL_STATIC_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
         when(overview.getExternalStaticEmotes()).thenReturn(Arrays.asList(animatedEmote));
@@ -157,7 +157,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         TrackedEmote animatedEmote = Mockito.mock(TrackedEmote.class);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_EXTERNAL_ANIMATED_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
         when(overview.getExternalAnimatedEmotes()).thenReturn(Arrays.asList(animatedEmote));
@@ -173,7 +173,7 @@ public class ShowTrackedEmotesTest {
         CommandContext commandContext = CommandTestUtilities.getNoParameters();
         when(commandContext.getGuild().getIdLong()).thenReturn(SERVER_ID);
         TrackedEmoteOverview overview = Mockito.mock(TrackedEmoteOverview.class);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         TrackedEmote animatedEmote = Mockito.mock(TrackedEmote.class);
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_STATIC_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
         when(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_ANIMATED_RESPONSE, overview, commandContext.getChannel())).thenReturn(CommandTestUtilities.messageFutureList());
@@ -222,7 +222,7 @@ public class ShowTrackedEmotesTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/SyncTrackedEmotesTest.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 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.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteSynchronizationResult;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteSynchronizationResult;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,7 +17,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.concurrent.CompletableFuture;
 
-import static dev.sheldan.abstracto.statistic.emotes.command.SyncTrackedEmotes.SYNC_TRACKED_EMOTES_RESULT_RESPONSE;
+import static dev.sheldan.abstracto.statistic.emote.command.SyncTrackedEmotes.SYNC_TRACKED_EMOTES_RESULT_RESPONSE;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -44,7 +44,7 @@ public class SyncTrackedEmotesTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/TrackEmoteTest.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.statistic.emotes.command;
+package dev.sheldan.abstracto.statistic.emote.command;
 
 import dev.sheldan.abstracto.core.command.exception.IncorrectFeatureModeException;
 import dev.sheldan.abstracto.core.command.exception.IncorrectParameterException;
@@ -9,12 +9,12 @@ import dev.sheldan.abstracto.core.service.EmoteService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.command.parameter.TrackEmoteParameter;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.command.parameter.TrackEmoteParameter;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import net.dv8tion.jda.api.entities.Emote;
 import org.junit.Assert;
 import org.junit.Test;
@@ -77,7 +77,7 @@ public class TrackEmoteTest {
         when(trackEmoteParameter.getEmote()).thenReturn(emoteToTrack);
         when(trackEmoteParameter.getTrackedEmote()).thenReturn(trackedEmote);
         when(emoteService.emoteIsFromGuild(emoteToTrack, commandContext.getGuild())).thenReturn(false);
-        doThrow(new IncorrectFeatureModeException(null, null)).when(featureModeService).validateActiveFeatureMode(SERVER_ID, StatisticFeatures.EMOTE_TRACKING, EmoteTrackingMode.EXTERNAL_EMOTES);
+        doThrow(new IncorrectFeatureModeException(null, null)).when(featureModeService).validateActiveFeatureMode(SERVER_ID, StatisticFeatureDefinition.EMOTE_TRACKING, EmoteTrackingMode.EXTERNAL_EMOTES);
         testUnit.execute(commandContext);
     }
 
@@ -95,7 +95,7 @@ public class TrackEmoteTest {
         CommandResult result = testUnit.execute(commandContext);
         CommandTestUtilities.checkSuccessfulCompletion(result);
         verify(trackedEmoteService, times(1)).createTrackedEmote(emoteToTrack, commandContext.getGuild(), true);
-        verify(featureModeService, times(1)).validateActiveFeatureMode(SERVER_ID, StatisticFeatures.EMOTE_TRACKING, EmoteTrackingMode.EXTERNAL_EMOTES);
+        verify(featureModeService, times(1)).validateActiveFeatureMode(SERVER_ID, StatisticFeatureDefinition.EMOTE_TRACKING, EmoteTrackingMode.EXTERNAL_EMOTES);
     }
 
     @Test(expected = IncorrectParameterException.class)
@@ -111,7 +111,7 @@ public class TrackEmoteTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterHandlerTest.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.command.handler;
+package dev.sheldan.abstracto.statistic.emote.command.handler;
 
 import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece;
 import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators;
 import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler;
-import dev.sheldan.abstracto.statistic.emotes.command.parameter.handler.TrackedEmoteParameterHandler;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.command.parameter.handler.TrackedEmoteParameterHandler;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterParameterHandlerTest.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.statistic.emotes.command.handler;
+package dev.sheldan.abstracto.statistic.emote.command.handler;
 
 import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece;
 import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators;
 import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler;
-import dev.sheldan.abstracto.statistic.emotes.command.parameter.TrackEmoteParameter;
-import dev.sheldan.abstracto.statistic.emotes.command.parameter.handler.TrackedEmoteParameterParameterHandler;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.command.parameter.TrackEmoteParameter;
+import dev.sheldan.abstracto.statistic.emote.command.parameter.handler.TrackedEmoteParameterParameterHandler;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/converter/EmoteStatsConverterTest.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.converter;
+package dev.sheldan.abstracto.statistic.emote.converter;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import org.junit.Assert;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/job/EmotePersistingJobTest.java

@@ -1,8 +1,8 @@
-package dev.sheldan.abstracto.statistic.emotes.job;
+package dev.sheldan.abstracto.statistic.emote.job;
 
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteRuntimeService;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteRuntimeService;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/CreateTrackedEmoteListenerTest.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.ListenerPriority;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +36,7 @@ public class CreateTrackedEmoteListenerTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/DeleteTrackedEmoteListenerTest.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.ListenerPriority;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +36,7 @@ public class DeleteTrackedEmoteListenerTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/EmoteTrackingListenerTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.service.TrackedEmoteService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Guild;
 import org.junit.Assert;
 import org.junit.Test;
@@ -95,7 +95,7 @@ public class EmoteTrackingListenerTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/UpdateTrackedEmoteListenerTest.java

@@ -1,10 +1,10 @@
-package dev.sheldan.abstracto.statistic.emotes.listener;
+package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.ListenerPriority;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,7 +40,7 @@ public class UpdateTrackedEmoteListenerTest {
 
     @Test
     public void testFeature() {
-        Assert.assertEquals(StatisticFeatures.EMOTE_TRACKING, testUnit.getFeature());
+        Assert.assertEquals(StatisticFeatureDefinition.EMOTE_TRACKING, testUnit.getFeature());
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRuntimeServiceBeanTest.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.service;
 
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
 import net.dv8tion.jda.api.entities.Guild;
 import org.junit.Assert;
 import org.junit.Test;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBeanTest.java

@@ -1,20 +1,20 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.service;
 
-import dev.sheldan.abstracto.core.metrics.service.MetricService;
+import dev.sheldan.abstracto.core.metric.service.MetricService;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
 import dev.sheldan.abstracto.core.service.EmoteService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.GuildService;
-import dev.sheldan.abstracto.statistic.config.StatisticFeatures;
-import dev.sheldan.abstracto.statistic.emotes.config.EmoteTrackingMode;
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteOverview;
-import dev.sheldan.abstracto.statistic.emotes.model.TrackedEmoteSynchronizationResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.TrackedEmoteManagementService;
-import dev.sheldan.abstracto.statistic.emotes.service.management.UsedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
+import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteOverview;
+import dev.sheldan.abstracto.statistic.emote.model.TrackedEmoteSynchronizationResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.emote.service.management.UsedEmoteManagementService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import org.junit.Assert;
@@ -199,7 +199,7 @@ public class TrackedEmoteServiceBeanTest {
 
     public void externalEmotesEnabled(boolean external) {
         when(guild.getIdLong()).thenReturn(SERVER_ID);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(external);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(external);
     }
 
     @Test
@@ -301,7 +301,7 @@ public class TrackedEmoteServiceBeanTest {
     public void testStoreEmptyEmoteStatistics() {
         HashMap<Long, List<PersistingEmote>> usagesToStore = new HashMap<>();
         testUnit.storeEmoteStatistics(usagesToStore);
-        verify(featureModeService, times(0)).featureModeActive(eq(StatisticFeatures.EMOTE_TRACKING), anyLong(), eq(EmoteTrackingMode.AUTO_TRACK));
+        verify(featureModeService, times(0)).featureModeActive(eq(StatisticFeatureDefinition.EMOTE_TRACKING), anyLong(), eq(EmoteTrackingMode.AUTO_TRACK));
         verify(metricService, times(0)).incrementCounter(any());
     }
 
@@ -315,8 +315,8 @@ public class TrackedEmoteServiceBeanTest {
         when(usedEmoteManagementService.loadUsedEmoteForTrackedEmoteToday(trackedEmote)).thenReturn(Optional.of(usedEmote));
         when(trackedEmote.getTrackingEnabled()).thenReturn(true);
         when(usedEmote.getAmount()).thenReturn(COUNT);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         testUnit.storeEmoteStatistics(usagesToStore);
         verify(usedEmote, times(1)).setAmount(2 * COUNT);
         verify(metricService, times(1)).incrementCounter(any());
@@ -330,8 +330,8 @@ public class TrackedEmoteServiceBeanTest {
         when(trackedEmoteManagementService.loadByEmoteIdOptional(EMOTE_ID, SERVER_ID)).thenReturn(Optional.of(trackedEmote));
         when(trackedEmote.getTrackedEmoteId()).thenReturn(new ServerSpecificId(SERVER_ID, EMOTE_ID));
         when(trackedEmote.getTrackingEnabled()).thenReturn(false);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         testUnit.storeEmoteStatistics(usagesToStore);
         verify(usedEmote, times(0)).setAmount(anyLong());
         verify(metricService, times(1)).incrementCounter(any());
@@ -346,8 +346,8 @@ public class TrackedEmoteServiceBeanTest {
         when(trackedEmoteManagementService.loadByEmoteIdOptional(EMOTE_ID, SERVER_ID)).thenReturn(Optional.of(trackedEmote));
         when(usedEmoteManagementService.loadUsedEmoteForTrackedEmoteToday(trackedEmote)).thenReturn(Optional.empty());
         when(trackedEmote.getTrackingEnabled()).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         testUnit.storeEmoteStatistics(usagesToStore);
         verify(usedEmoteManagementService, times(1)).createEmoteUsageForToday(trackedEmote, COUNT);
         verify(metricService, times(1)).incrementCounter(any());
@@ -359,8 +359,8 @@ public class TrackedEmoteServiceBeanTest {
         usagesToStore.put(SERVER_ID, Arrays.asList(persistingEmote));
         when(persistingEmote.getEmoteId()).thenReturn(EMOTE_ID);
         when(trackedEmoteManagementService.loadByEmoteIdOptional(EMOTE_ID, SERVER_ID)).thenReturn(Optional.empty());
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         testUnit.storeEmoteStatistics(usagesToStore);
         verify(usedEmoteManagementService, times(0)).createEmoteUsageForToday(any(TrackedEmote.class), anyLong());
         verify(metricService, times(1)).incrementCounter(any());
@@ -372,8 +372,8 @@ public class TrackedEmoteServiceBeanTest {
         usagesToStore.put(SERVER_ID, Arrays.asList(persistingEmote));
         when(persistingEmote.getEmoteId()).thenReturn(EMOTE_ID);
         when(trackedEmoteManagementService.loadByEmoteIdOptional(EMOTE_ID, SERVER_ID)).thenReturn(Optional.empty());
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(false);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(false);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         testUnit.storeEmoteStatistics(usagesToStore);
         verify(usedEmoteManagementService, times(0)).createEmoteUsageForToday(any(TrackedEmote.class), anyLong());
         verify(metricService, times(1)).incrementCounter(any());
@@ -388,8 +388,8 @@ public class TrackedEmoteServiceBeanTest {
         when(persistingEmote.getCount()).thenReturn(COUNT);
         when(trackedEmoteManagementService.loadByEmoteIdOptional(EMOTE_ID, SERVER_ID)).thenReturn(Optional.empty());
         when(trackedEmoteManagementService.createExternalTrackedEmote(persistingEmote)).thenReturn(trackedEmote);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
         testUnit.storeEmoteStatistics(usagesToStore);
         verify(usedEmoteManagementService, times(1)).createEmoteUsageForToday(trackedEmote, COUNT);
         verify(metricService, times(1)).incrementCounter(any());
@@ -405,8 +405,8 @@ public class TrackedEmoteServiceBeanTest {
         when(persistingEmote.getEmoteId()).thenReturn(EMOTE_ID);
         when(persistingEmote.getCount()).thenReturn(COUNT);
         when(usedEmoteManagementService.loadUsedEmoteForTrackedEmoteToday(trackedEmote)).thenReturn(Optional.of(usedEmote));
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, SERVER_ID, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
 
         Long serverId2 = SERVER_ID + 1;
         usagesToStore.put(serverId2, Arrays.asList(persistingEmote2));
@@ -415,8 +415,8 @@ public class TrackedEmoteServiceBeanTest {
         when(persistingEmote2.getEmoteId()).thenReturn(EMOTE_ID_2);
         when(persistingEmote2.getCount()).thenReturn(COUNT);
         when(usedEmote.getAmount()).thenReturn(COUNT);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, serverId2, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
-        when(featureModeService.featureModeActive(StatisticFeatures.EMOTE_TRACKING, serverId2, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, serverId2, EmoteTrackingMode.AUTO_TRACK_EXTERNAL)).thenReturn(true);
+        when(featureModeService.featureModeActive(StatisticFeatureDefinition.EMOTE_TRACKING, serverId2, EmoteTrackingMode.EXTERNAL_EMOTES)).thenReturn(true);
 
         testUnit.storeEmoteStatistics(usagesToStore);
 

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/service/UsedEmoteServiceBeanTest.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.statistic.emotes.service;
+package dev.sheldan.abstracto.statistic.emote.service;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.statistic.emotes.converter.EmoteStatsConverter;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsModel;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.service.management.UsedEmoteManagementService;
+import dev.sheldan.abstracto.statistic.emote.converter.EmoteStatsConverter;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsModel;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.service.management.UsedEmoteManagementService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/service/management/TrackedEmoteManagementServiceBeanTest.java

@@ -1,12 +1,12 @@
-package dev.sheldan.abstracto.statistic.emotes.service.management;
+package dev.sheldan.abstracto.statistic.emote.service.management;
 
 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.service.management.ServerManagementService;
-import dev.sheldan.abstracto.statistic.emotes.model.PersistingEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.repository.TrackedEmoteRepository;
+import dev.sheldan.abstracto.statistic.emote.model.PersistingEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.repository.TrackedEmoteRepository;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import org.junit.Assert;

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/service/management/UsedEmoteManagementServiceBeanTest.java

@@ -1,11 +1,11 @@
-package dev.sheldan.abstracto.statistic.emotes.service.management;
+package dev.sheldan.abstracto.statistic.emote.service.management;
 
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.statistic.emotes.model.EmoteStatsResult;
-import dev.sheldan.abstracto.statistic.emotes.model.database.TrackedEmote;
-import dev.sheldan.abstracto.statistic.emotes.model.database.UsedEmote;
-import dev.sheldan.abstracto.statistic.emotes.repository.UsedEmoteRepository;
+import dev.sheldan.abstracto.statistic.emote.model.EmoteStatsResult;
+import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
+import dev.sheldan.abstracto.statistic.emote.model.database.UsedEmote;
+import dev.sheldan.abstracto.statistic.emote.repository.UsedEmoteRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;