restructured packages - aligned the whole project to use a similar package layout for classes with similar purpose

removed context aware template support

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java

@@ -1,12 +1,17 @@
 package dev.sheldan.abstracto.core.command;
 
+import dev.sheldan.abstracto.core.command.condition.CommandCondition;
+import dev.sheldan.abstracto.core.command.condition.ConditionResult;
+import dev.sheldan.abstracto.core.command.condition.ConditionalCommand;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameters;
 import dev.sheldan.abstracto.core.command.exception.IncorrectParameter;
 import dev.sheldan.abstracto.core.command.exception.ParameterTooLong;
-import dev.sheldan.abstracto.core.command.models.ACommand;
 import dev.sheldan.abstracto.core.command.service.ChannelGroupCommandService;
+import dev.sheldan.abstracto.core.command.service.CommandManager;
 import dev.sheldan.abstracto.core.command.service.PostCommandExecution;
 import dev.sheldan.abstracto.core.command.execution.*;
-import dev.sheldan.abstracto.core.command.meta.UnParsedCommandParameter;
+import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter;
 import dev.sheldan.abstracto.core.Constants;
 import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
@@ -35,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Nonnull;
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 @Service
 @Slf4j

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/ExceptionPostExecution.java

@@ -2,11 +2,11 @@ package dev.sheldan.abstracto.core.command.post;
 
 import dev.sheldan.abstracto.core.command.Command;
 import dev.sheldan.abstracto.core.command.service.PostCommandExecution;
-import dev.sheldan.abstracto.core.command.Templatable;
+import dev.sheldan.abstracto.templating.Templatable;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ResultState;
-import dev.sheldan.abstracto.templating.TemplateService;
+import dev.sheldan.abstracto.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ChannelGroupCommandRepository.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.repository;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.models.database.AChannelGroup;
 import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand;
 import org.springframework.data.jpa.repository.JpaRepository;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/CommandRepository.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.repository;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CommandRepository extends JpaRepository<ACommand, Long> {

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ModuleRepository.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.repository;
 
-import dev.sheldan.abstracto.core.command.models.AModule;
+import dev.sheldan.abstracto.core.command.models.database.AModule;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ModuleRepository extends JpaRepository<AModule, Long> {

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.command.service.management.ChannelGroupCommandManagementService;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandManager.java

@@ -1,11 +1,13 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.service;
 
+import dev.sheldan.abstracto.core.command.Command;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
 import dev.sheldan.abstracto.core.command.exception.CommandNotFound;
 import dev.sheldan.abstracto.core.command.exception.InsufficientParameters;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
-import dev.sheldan.abstracto.core.command.meta.CommandRegistry;
-import dev.sheldan.abstracto.core.command.meta.UnParsedCommandParameter;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.service.CommandRegistry;
+import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.command.service;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
-import dev.sheldan.abstracto.core.command.models.AModule;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.AModule;
 import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
 import dev.sheldan.abstracto.core.command.service.management.ModuleManagementService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleManager.java

@@ -1,6 +1,10 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.service;
 
-import dev.sheldan.abstracto.core.command.meta.CommandRegistry;
+import dev.sheldan.abstracto.core.command.Command;
+import dev.sheldan.abstracto.core.command.config.CommandHierarchy;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
+import dev.sheldan.abstracto.core.command.config.PackedModule;
+import dev.sheldan.abstracto.core.command.service.CommandRegistry;
 import dev.sheldan.abstracto.core.command.service.ModuleRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service.management;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.command.repository.ChannelGroupCommandRepository;
 import dev.sheldan.abstracto.core.models.database.AChannelGroup;
 import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.command.service.management;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
-import dev.sheldan.abstracto.core.command.models.AModule;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.AModule;
 import dev.sheldan.abstracto.core.command.repository.CommandRepository;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementServiceBean.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service.management;
 
-import dev.sheldan.abstracto.core.command.models.AModule;
+import dev.sheldan.abstracto.core.command.models.database.AModule;
 import dev.sheldan.abstracto.core.command.repository.ModuleRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Disable.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.commands.utility.UtilityModuleInterface;
 import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Enable.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.commands.utility.UtilityModuleInterface;
 import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/AddToChannelGroup.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.ChannelGroupService;
 import net.dv8tion.jda.api.entities.TextChannel;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ChannelsModuleInterface.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
-import dev.sheldan.abstracto.core.command.ModuleInterface;
-import dev.sheldan.abstracto.core.command.module.ModuleInfo;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
+import dev.sheldan.abstracto.core.command.config.ModuleInfo;
 import org.springframework.stereotype.Component;
 
 @Component

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/CreateChannelGroup.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.ChannelGroupService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DeleteChannelGroup.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.ChannelGroupService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DisableCommand.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.ChannelGroupService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/EnableCommand.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.ChannelGroupService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java

@@ -1,19 +1,19 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.execution.ContextConverter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
-import dev.sheldan.abstracto.core.models.MessageToSend;
-import dev.sheldan.abstracto.core.models.command.ChannelGroupChannelModel;
-import dev.sheldan.abstracto.core.models.command.ChannelGroupModel;
-import dev.sheldan.abstracto.core.models.command.ListChannelGroupsModel;
+import dev.sheldan.abstracto.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.models.template.commands.ChannelGroupChannelModel;
+import dev.sheldan.abstracto.core.models.template.commands.ChannelGroupModel;
+import dev.sheldan.abstracto.core.models.template.commands.ListChannelGroupsModel;
 import dev.sheldan.abstracto.core.models.database.AChannelGroup;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.management.ChannelGroupManagementService;
-import dev.sheldan.abstracto.templating.TemplateService;
+import dev.sheldan.abstracto.templating.service.TemplateService;
 import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java

@@ -1,13 +1,15 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.*;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
-import dev.sheldan.abstracto.core.models.command.PostTargetErrorModel;
+import dev.sheldan.abstracto.core.models.template.commands.PostTargetErrorModel;
 import dev.sheldan.abstracto.core.service.PostTargetService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.PostTargetManagement;
-import dev.sheldan.abstracto.templating.TemplateService;
+import dev.sheldan.abstracto.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.GuildChannel;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/RemoveFromChannelGroup.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.channels;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.ChannelGroupService;
 import net.dv8tion.jda.api.entities.TextChannel;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java

@@ -1,11 +1,11 @@
 package dev.sheldan.abstracto.core.commands.help;
 
 import dev.sheldan.abstracto.core.command.*;
+import dev.sheldan.abstracto.core.command.config.*;
 import dev.sheldan.abstracto.core.command.execution.*;
-import dev.sheldan.abstracto.core.command.module.ModuleInfo;
 import dev.sheldan.abstracto.core.command.service.ModuleRegistry;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
-import dev.sheldan.abstracto.templating.TemplateService;
+import dev.sheldan.abstracto.templating.service.TemplateService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/SupportModuleInterface.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.commands.help;
 
-import dev.sheldan.abstracto.core.command.ModuleInterface;
-import dev.sheldan.abstracto.core.command.module.ModuleInfo;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
+import dev.sheldan.abstracto.core.command.config.ModuleInfo;
 import org.springframework.stereotype.Component;
 
 @Component

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java

@@ -1,14 +1,14 @@
 package dev.sheldan.abstracto.core.commands.utility;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.HelpInfo;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
-import dev.sheldan.abstracto.core.models.command.EchoModel;
-import dev.sheldan.abstracto.templating.TemplateService;
+import dev.sheldan.abstracto.core.models.template.commands.EchoModel;
+import dev.sheldan.abstracto.templating.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Ping.java

@@ -1,12 +1,12 @@
 package dev.sheldan.abstracto.core.commands.utility;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
-import dev.sheldan.abstracto.core.models.command.PingModel;
-import dev.sheldan.abstracto.templating.TemplateService;
+import dev.sheldan.abstracto.core.models.template.commands.PingModel;
+import dev.sheldan.abstracto.templating.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java

@@ -1,10 +1,10 @@
 package dev.sheldan.abstracto.core.commands.utility;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.command.execution.Parameter;
+import dev.sheldan.abstracto.core.command.config.Parameter;
 import dev.sheldan.abstracto.core.config.AbstractoFeatures;
 import dev.sheldan.abstracto.core.service.EmoteService;
 import dev.sheldan.abstracto.core.service.management.EmoteManagementService;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/UtilityModuleInterface.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.commands.utility;
 
-import dev.sheldan.abstracto.core.command.ModuleInterface;
-import dev.sheldan.abstracto.core.command.module.ModuleInfo;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
+import dev.sheldan.abstracto.core.command.config.ModuleInfo;
 import org.springframework.stereotype.Component;
 
 @Component

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.listener;
 
-import dev.sheldan.abstracto.core.service.StartupManager;
+import dev.sheldan.abstracto.core.service.StartupServiceBean;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +13,7 @@ import javax.annotation.Nonnull;
 public class ReadyListener extends ListenerAdapter {
 
     @Autowired
-    private StartupManager startup;
+    private StartupServiceBean startup;
 
     @Value("${abstracto.startup.synchronize}")
     private boolean synchronize;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service;
 
 import dev.sheldan.abstracto.core.exception.ChannelException;
 import dev.sheldan.abstracto.core.exception.GuildException;
-import dev.sheldan.abstracto.core.models.ServerChannelUser;
+import dev.sheldan.abstracto.core.models.GuildChannelMember;
 import dev.sheldan.abstracto.core.models.database.AEmote;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;
@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
 
 @Service
 @Slf4j
-public class BotService implements Bot {
+public class BotServiceBean implements Bot {
 
     private JDA instance;
 
@@ -41,7 +41,7 @@ public class BotService implements Bot {
     }
 
     @Override
-    public ServerChannelUser getServerChannelUser(Long serverId, Long channelId, Long userId)  {
+    public GuildChannelMember getServerChannelUser(Long serverId, Long channelId, Long userId)  {
         Optional<Guild> guildOptional = getGuildById(serverId);
         if(guildOptional.isPresent()) {
             Guild guild = guildOptional.get();
@@ -49,7 +49,7 @@ public class BotService implements Bot {
             if(textChannelOptional.isPresent()) {
                 TextChannel textChannel = textChannelOptional.get();
                 Member member = guild.getMemberById(userId);
-                return ServerChannelUser.builder().guild(guild).textChannel(textChannel).member(member).build();
+                return GuildChannelMember.builder().guild(guild).textChannel(textChannel).member(member).build();
             } else {
                 throw new ChannelException(String.format("Text channel %s not found in guild %s", channelId, serverId));
             }

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service;
 
 import dev.sheldan.abstracto.core.command.exception.ChannelGroupException;
 import dev.sheldan.abstracto.core.command.exception.CommandException;
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.command.service.management.ChannelGroupCommandManagementService;
 import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
 import dev.sheldan.abstracto.core.models.database.AChannel;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service;
 
 import dev.sheldan.abstracto.core.exception.ChannelException;
 import dev.sheldan.abstracto.core.exception.GuildException;
-import dev.sheldan.abstracto.core.models.MessageToSend;
+import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java

@@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.exception.GuildException;
 import dev.sheldan.abstracto.core.service.management.PostTargetManagement;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.models.database.PostTarget;
-import dev.sheldan.abstracto.core.models.MessageToSend;
+import dev.sheldan.abstracto.templating.model.MessageToSend;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupServiceBean.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class StartupManager implements Startup {
+public class StartupServiceBean implements Startup {
 
     @Autowired
     private Bot service;

abstracto-application/core/core-interface/pom.xml

@@ -26,5 +26,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.templating</groupId>
+            <artifactId>templating-interface</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command;
 
-import dev.sheldan.abstracto.core.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.listener.FeatureAware;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ModuleInterface.java

@@ -1,9 +0,0 @@
-package dev.sheldan.abstracto.core.command;
-
-
-import dev.sheldan.abstracto.core.command.module.ModuleInfo;
-
-public interface ModuleInterface {
-    ModuleInfo getInfo();
-    String getParentModule();
-}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Templatable.java

@@ -1,6 +0,0 @@
-package dev.sheldan.abstracto.core.command;
-
-public interface Templatable {
-    String getTemplateName();
-    Object getTemplateModel();
-}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/AbstractConditionableCommand.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.condition;
 
 import dev.sheldan.abstracto.core.service.ChannelService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandCondition.java

@@ -1,6 +1,7 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.condition;
 
 
+import dev.sheldan.abstracto.core.command.Command;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 
 public interface CommandCondition {

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisabledCondition.java

@@ -1,7 +1,8 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.condition;
 
+import dev.sheldan.abstracto.core.command.Command;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.command.service.ChannelGroupCommandService;
 import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionResult.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.condition;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionalCommand.java

@@ -1,4 +1,6 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.condition;
+
+import dev.sheldan.abstracto.core.command.Command;
 
 import java.util.List;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java

@@ -1,5 +1,6 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.condition;
 
+import dev.sheldan.abstracto.core.command.Command;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/AbstracatoModuleInterface.java

@@ -1,6 +1,5 @@
-package dev.sheldan.abstracto.core.command.module;
+package dev.sheldan.abstracto.core.command.config;
 
-import dev.sheldan.abstracto.core.command.ModuleInterface;
 import org.springframework.stereotype.Service;
 
 @Service

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandConfiguration.java

@@ -1,6 +1,5 @@
-package dev.sheldan.abstracto.core.command.execution;
+package dev.sheldan.abstracto.core.command.config;
 
-import dev.sheldan.abstracto.core.command.HelpInfo;
 import lombok.Builder;
 import lombok.Getter;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandHierarchy.java

@@ -1,5 +1,6 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.config;
 
+import dev.sheldan.abstracto.core.command.Command;
 import lombok.Builder;
 import lombok.Getter;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/HelpInfo.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.config;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInfo.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command.module;
+package dev.sheldan.abstracto.core.command.config;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInterface.java

@@ -0,0 +1,9 @@
+package dev.sheldan.abstracto.core.command.config;
+
+
+import dev.sheldan.abstracto.core.command.config.ModuleInfo;
+
+public interface ModuleInterface {
+    ModuleInfo getInfo();
+    String getParentModule();
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/PackedModule.java

@@ -1,5 +1,6 @@
-package dev.sheldan.abstracto.core.command;
+package dev.sheldan.abstracto.core.command.config;
 
+import dev.sheldan.abstracto.core.command.Command;
 import lombok.Builder;
 import lombok.Getter;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameter.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command.execution;
+package dev.sheldan.abstracto.core.command.config;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameters.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command.execution;
+package dev.sheldan.abstracto.core.command.config;
 
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.exception;
 
-import dev.sheldan.abstracto.core.command.Templatable;
+import dev.sheldan.abstracto.templating.Templatable;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 
 public class CommandNotFound extends AbstractoRunTimeException implements Templatable {

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.command.exception;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.Templatable;
+import dev.sheldan.abstracto.templating.Templatable;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 
 import java.util.HashMap;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.exception;
 
-import dev.sheldan.abstracto.core.command.Templatable;
+import dev.sheldan.abstracto.templating.Templatable;
 import dev.sheldan.abstracto.core.command.Command;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.command.exception;
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.Templatable;
+import dev.sheldan.abstracto.templating.Templatable;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 
 import java.util.HashMap;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java

@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.core.command.execution;
 
+import dev.sheldan.abstracto.core.command.config.Parameters;
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import lombok.Builder;
 import lombok.Getter;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command.meta;
+package dev.sheldan.abstracto.core.command.execution;
 
 import lombok.Getter;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.command.models;
+package dev.sheldan.abstracto.core.command.models.database;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandService.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 
 public interface ChannelGroupCommandService {

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandRegistry.java

@@ -1,9 +1,9 @@
-package dev.sheldan.abstracto.core.command.meta;
+package dev.sheldan.abstracto.core.command.service;
 
 
 import dev.sheldan.abstracto.core.command.Command;
-import dev.sheldan.abstracto.core.command.ModuleInterface;
-import dev.sheldan.abstracto.core.command.module.ModuleInfo;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
+import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter;
 import net.dv8tion.jda.api.entities.Message;
 
 import java.util.List;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 
 public interface CommandService {
     ACommand createCommand(String name, String moduleName);

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleRegistry.java

@@ -1,8 +1,8 @@
 package dev.sheldan.abstracto.core.command.service;
 
 
-import dev.sheldan.abstracto.core.command.CommandHierarchy;
-import dev.sheldan.abstracto.core.command.ModuleInterface;
+import dev.sheldan.abstracto.core.command.config.CommandHierarchy;
+import dev.sheldan.abstracto.core.command.config.ModuleInterface;
 
 import java.util.List;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementService.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service.management;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import dev.sheldan.abstracto.core.models.database.AChannelGroup;
 import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.command.service.management;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
-import dev.sheldan.abstracto.core.command.models.AModule;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.AModule;
 
 public interface CommandManagementService {
     ACommand createCommand(String name, String moduleName);

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementService.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.command.service.management;
 
-import dev.sheldan.abstracto.core.command.models.AModule;
+import dev.sheldan.abstracto.core.command.models.database.AModule;
 
 public interface ModuleManagementService {
     AModule createModule(String name);

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerAChannelMessage.java

@@ -9,7 +9,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Builder
-public class AServerChannelMessage {
+public class AServerAChannelMessage {
     private AServer server;
     private AChannel channel;
     private Long messageId;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/GuildChannelMember.java

@@ -10,7 +10,7 @@ import net.dv8tion.jda.api.entities.TextChannel;
 @Getter
 @Setter
 @Builder
-public class ServerChannelUser {
+public class GuildChannelMember {
     public Guild guild;
     private TextChannel textChannel;
     private Member member;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java

@@ -1,16 +0,0 @@
-package dev.sheldan.abstracto.core.models;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-import net.dv8tion.jda.api.entities.MessageEmbed;
-
-import java.util.List;
-
-@Getter
-@Setter
-@Builder
-public class MessageToSend {
-    private List<MessageEmbed> embeds;
-    private String message;
-}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java

@@ -1,5 +0,0 @@
-package dev.sheldan.abstracto.core.models.context;
-
-public interface ContextAware {
-    String getTemplateSuffix();
-}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java

@@ -13,12 +13,8 @@ import net.dv8tion.jda.api.entities.Guild;
 @AllArgsConstructor
 @NoArgsConstructor
 @Setter
-public class ServerContext implements ContextAware{
+public class ServerContext {
     private Guild guild;
     private AServer server;
 
-    @Override
-    public String getTemplateSuffix() {
-        return "server";
-    }
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java

@@ -20,8 +20,4 @@ public class UserInitiatedServerContext extends ServerContext {
     private AUser user;
     private AUserInAServer aUserInAServer;
 
-    @Override
-    public String getTemplateSuffix() {
-        return "";
-    }
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroupCommand.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.models.database;
 
-import dev.sheldan.abstracto.core.command.models.ACommand;
+import dev.sheldan.abstracto.core.command.models.database.ACommand;
 import lombok.*;
 
 import javax.persistence.*;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupChannelModel.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.core.models.command;
+package dev.sheldan.abstracto.core.models.template.commands;
 
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import lombok.Builder;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupModel.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/EchoModel.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ListChannelGroupsModel.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PingModel.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PostTargetErrorModel.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/listener/MessageEmbeddedModel.java

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/Bot.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.service;
 
-import dev.sheldan.abstracto.core.models.ServerChannelUser;
+import dev.sheldan.abstracto.core.models.GuildChannelMember;
 import dev.sheldan.abstracto.core.models.database.AEmote;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Emote;
@@ -17,7 +17,7 @@ import java.util.concurrent.CompletableFuture;
 public interface Bot {
     void login() throws LoginException;
     JDA getInstance();
-    ServerChannelUser getServerChannelUser(Long serverId, Long channelId, Long userId);
+    GuildChannelMember getServerChannelUser(Long serverId, Long channelId, Long userId);
     Member getMemberInServer(Long serverId, Long memberId);
     CompletableFuture<Void> deleteMessage(Long serverId, Long channelId, Long messageId);
     Optional<Emote> getEmote(Long serverId, AEmote emote);

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java

@@ -1,6 +1,6 @@
 package dev.sheldan.abstracto.core.service;
 
-import dev.sheldan.abstracto.core.models.MessageToSend;
+import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.TextChannel;

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/PostTargetService.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.service;
 
 import dev.sheldan.abstracto.core.models.database.PostTarget;
-import dev.sheldan.abstracto.core.models.MessageToSend;
+import dev.sheldan.abstracto.templating.model.MessageToSend;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserManagementService;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
-import dev.sheldan.abstracto.core.models.ServerChannelUser;
+import dev.sheldan.abstracto.core.models.GuildChannelMember;
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.Bot;
@@ -33,15 +33,15 @@ public class ContextUtils {
 
     public <T extends UserInitiatedServerContext> UserInitiatedServerContext fromMessage(CachedMessage message, Class<T> clazz) {
         Method m = null;
-        ServerChannelUser serverChannelUser = bot.getServerChannelUser(message.getServerId(), message.getChannelId(), message.getAuthorId());
+        GuildChannelMember guildChannelMember = bot.getServerChannelUser(message.getServerId(), message.getChannelId(), message.getAuthorId());
         try {
             m = clazz.getMethod("builder");
             UserInitiatedServerContext.UserInitiatedServerContextBuilder<?, ?> builder = (UserInitiatedServerContext.UserInitiatedServerContextBuilder) m.invoke(null, null);
             AUserInAServer aUserInAServer = userManagementService.loadUser(message.getServerId(), message.getAuthorId());
             return builder
-                    .member(serverChannelUser.getMember())
-                    .guild(serverChannelUser.getGuild())
-                    .messageChannel(serverChannelUser.getTextChannel())
+                    .member(guildChannelMember.getMember())
+                    .guild(guildChannelMember.getGuild())
+                    .messageChannel(guildChannelMember.getTextChannel())
                     .channel(channelManagementService.loadChannel(message.getChannelId()))
                     .server(serverManagementService.loadOrCreate(message.getServerId()))
                     .aUserInAServer(aUserInAServer)