Reorganize packages

api/src/ap/java/com/discordsrv/api/processor/SubscribeProcessor.java

@@ -23,7 +23,7 @@
 
 package com.discordsrv.api.processor;
 
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;

api/src/main/java/com/discordsrv/api/DiscordSRVApi.java

@@ -26,7 +26,7 @@ package com.discordsrv.api;
 import com.discordsrv.api.component.MinecraftComponentFactory;
 import com.discordsrv.api.discord.DiscordAPI;
 import com.discordsrv.api.discord.connection.details.DiscordConnectionDetails;
-import com.discordsrv.api.event.bus.EventBus;
+import com.discordsrv.api.eventbus.EventBus;
 import com.discordsrv.api.placeholder.PlaceholderService;
 import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat;
 import com.discordsrv.api.player.DiscordSRVPlayer;

api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/CommandOption.java

@@ -25,6 +25,7 @@ package com.discordsrv.api.discord.entity.interaction.command;
 
 import com.discordsrv.api.discord.entity.JDAEntity;
 import com.discordsrv.api.discord.entity.channel.DiscordChannelType;
+import com.discordsrv.api.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import org.jetbrains.annotations.NotNull;
@@ -229,11 +230,11 @@ public class CommandOption implements JDAEntity<OptionData> {
         }
 
         /**
-         * Sets if this option is auto completed. See {@link com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent}.
+         * Sets if this option is auto completed. See {@link DiscordCommandAutoCompleteInteractionEvent}.
          *
          * @param autoComplete is this choice auto completing
          * @return this builder, useful for chaining
-         * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent
+         * @see DiscordCommandAutoCompleteInteractionEvent
          */
         @NotNull
         public Builder setAutoComplete(boolean autoComplete) {

api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/DiscordCommand.java

@@ -25,7 +25,7 @@ package com.discordsrv.api.discord.entity.interaction.command;
 
 import com.discordsrv.api.discord.entity.JDAEntity;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
-import com.discordsrv.api.event.events.discord.interaction.command.*;
+import com.discordsrv.api.events.discord.interaction.command.*;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.*;
@@ -52,7 +52,7 @@ public class DiscordCommand implements JDAEntity<CommandData> {
      * @param name the name of the command, 1-32 characters alphanumeric and dashes
      * @param description the description of the command
      * @return a new chat input command builder
-     * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordChatInputInteractionEvent
+     * @see DiscordChatInputInteractionEvent
      */
     public static ChatInputBuilder chatInput(
             ComponentIdentifier id,
@@ -71,7 +71,7 @@ public class DiscordCommand implements JDAEntity<CommandData> {
      * @param id a unique identifier for this interaction, used to check if a given event was for this interaction
      * @param name the name of the command, 1-32 characters
      * @return a new command builder
-     * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordUserContextInteractionEvent
+     * @see DiscordUserContextInteractionEvent
      */
     public static Builder<DiscordUserContextInteractionEvent> user(
             ComponentIdentifier id,
@@ -86,7 +86,7 @@ public class DiscordCommand implements JDAEntity<CommandData> {
      * @param id a unique identifier for this interaction, used to check if a given event was for this interaction
      * @param name the name of the command, 1-32 characters
      * @return a new command builder
-     * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordMessageContextInteractionEvent
+     * @see DiscordMessageContextInteractionEvent
      */
     public static Builder<DiscordMessageContextInteractionEvent> message(
             ComponentIdentifier id,

api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Button.java

@@ -26,6 +26,7 @@ package com.discordsrv.api.discord.entity.interaction.component.impl;
 import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
 import com.discordsrv.api.discord.entity.interaction.component.MessageComponent;
+import com.discordsrv.api.events.discord.interaction.component.DiscordButtonInteractionEvent;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
@@ -38,7 +39,7 @@ import java.util.UUID;
  * A Discord button.
  * @see #builder(ComponentIdentifier, Style)
  * @see #urlBuilder(String)
- * @see com.discordsrv.api.event.events.discord.interaction.component.DiscordButtonInteractionEvent
+ * @see DiscordButtonInteractionEvent
  */
 public class Button implements MessageComponent {
 

api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Modal.java

@@ -27,6 +27,7 @@ import com.discordsrv.api.discord.entity.JDAEntity;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
 import com.discordsrv.api.discord.entity.interaction.component.actionrow.ActionRow;
 import com.discordsrv.api.discord.entity.interaction.component.actionrow.ModalActionRow;
+import com.discordsrv.api.events.discord.interaction.DiscordModalInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -37,7 +38,7 @@ import java.util.stream.Collectors;
 /**
  * A Discord modal.
  * @see #builder(ComponentIdentifier, String)
- * @see com.discordsrv.api.event.events.discord.interaction.DiscordModalInteractionEvent
+ * @see DiscordModalInteractionEvent
  */
 public class Modal implements JDAEntity<net.dv8tion.jda.api.interactions.modals.Modal> {
 

api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/SelectMenu.java

@@ -26,6 +26,7 @@ package com.discordsrv.api.discord.entity.interaction.component.impl;
 import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
 import com.discordsrv.api.discord.entity.interaction.component.MessageComponent;
+import com.discordsrv.api.events.discord.interaction.component.DiscordSelectMenuInteractionEvent;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import org.jetbrains.annotations.CheckReturnValue;
@@ -38,7 +39,7 @@ import java.util.List;
 /**
  * A Discord selection menu.
  * @see #builder(ComponentIdentifier)
- * @see com.discordsrv.api.event.events.discord.interaction.component.DiscordSelectMenuInteractionEvent
+ * @see DiscordSelectMenuInteractionEvent
  */
 // TODO: newest changes
 public class SelectMenu implements MessageComponent {

api/src/main/java/com/discordsrv/api/discord/entity/message/impl/SendableDiscordMessageImpl.java

@@ -29,8 +29,8 @@ import com.discordsrv.api.discord.entity.message.AllowedMention;
 import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
 import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
 import com.discordsrv.api.discord.util.DiscordFormattingUtil;
-import com.discordsrv.api.placeholder.format.FormattedText;
 import com.discordsrv.api.placeholder.PlaceholderService;
+import com.discordsrv.api.placeholder.format.FormattedText;
 import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat;
 import com.discordsrv.api.placeholder.util.Placeholders;
 import net.dv8tion.jda.api.entities.MessageEmbed;

api/src/main/java/com/discordsrv/api/eventbus/EventBus.java

@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.bus;
+package com.discordsrv.api.eventbus;
 
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import net.dv8tion.jda.api.events.GenericEvent;
 import org.jetbrains.annotations.Blocking;
 import org.jetbrains.annotations.NotNull;

api/src/main/java/com/discordsrv/api/eventbus/EventListener.java

@@ -21,8 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.bus;
+package com.discordsrv.api.eventbus;
 
+import com.discordsrv.api.events.Event;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
@@ -51,7 +52,7 @@ public interface EventListener {
 
     /**
      * The event this listener is listening to.
-     * @return the event extending {@link com.discordsrv.api.event.events.Event} or {@link net.dv8tion.jda.api.events.GenericEvent}
+     * @return the event extending {@link Event} or {@link net.dv8tion.jda.api.events.GenericEvent}
      */
     @NotNull
     Class<?> eventClass();

api/src/main/java/com/discordsrv/api/eventbus/EventPriority.java

@@ -21,7 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.bus;
+package com.discordsrv.api.eventbus;
+
+import com.discordsrv.api.events.Processable;
 
 /**
  * A simple enum to dictate the order that event listeners will be executed, going from {@link #POST} to {@link #POST}.
@@ -45,17 +47,17 @@ public enum EventPriority {
 
     /**
      * The default priority, right in the middle of the priority order. Use this if you need to override
-     * one of DiscordSRV's implementations for {@link com.discordsrv.api.event.events.Processable}s.
+     * one of DiscordSRV's implementations for {@link Processable}s.
      */
     DEFAULT,
 
     /**
-     * This is where DiscordSRV's integrations for other plugins will process {@link com.discordsrv.api.event.events.Processable}'s.
+     * This is where DiscordSRV's integrations for other plugins will process {@link Processable}'s.
      */
     LATE,
 
     /**
-     * This is where DiscordSRV's default implementations for {@link com.discordsrv.api.event.events.Processable}'s will run.
+     * This is where DiscordSRV's default implementations for {@link Processable}'s will run.
      */
     LAST,
 

api/src/main/java/com/discordsrv/api/eventbus/Subscribe.java

@@ -21,11 +21,11 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.bus;
+package com.discordsrv.api.eventbus;
 
 import com.discordsrv.api.DiscordSRVApi;
-import com.discordsrv.api.event.events.Cancellable;
+import com.discordsrv.api.events.Cancellable;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

api/src/main/java/com/discordsrv/api/eventbus/internal/EventStateHolder.java

@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.bus.internal;
+package com.discordsrv.api.eventbus.internal;
 
-import com.discordsrv.api.event.bus.EventListener;
+import com.discordsrv.api.eventbus.EventListener;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 

api/src/main/java/com/discordsrv/api/events/Cancellable.java

@@ -21,11 +21,12 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events;
+package com.discordsrv.api.events;
 
-import com.discordsrv.api.event.bus.EventListener;
+import com.discordsrv.api.eventbus.EventBus;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.EventListener;
-import com.discordsrv.api.event.bus.internal.EventStateHolder;
+import com.discordsrv.api.eventbus.Subscribe;
+import com.discordsrv.api.eventbus.internal.EventStateHolder;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -52,7 +53,7 @@ public interface Cancellable extends Event {
      * Returns the {@link EventListener} that cancelled this event.
      * This is changed every time the event goes from not being cancelled to being cancelled.
      *
-     * @return the event listener that cancelled this event or {@code null} if it was cancelled before being passed to the {@link com.discordsrv.api.event.bus.EventBus}
+     * @return the event listener that cancelled this event or {@code null} if it was cancelled before being passed to the {@link EventBus}
      * @throws IllegalStateException if the event isn't cancelled
      */
     @ApiStatus.NonExtendable

api/src/main/java/com/discordsrv/api/events/Event.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events;
+package com.discordsrv.api.events;
 
 /**
  * A DiscordSRV event.

api/src/main/java/com/discordsrv/api/events/PlayerEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events;
+package com.discordsrv.api.events;
 
 import com.discordsrv.api.player.DiscordSRVPlayer;
 

api/src/main/java/com/discordsrv/api/events/Processable.java

@@ -21,10 +21,11 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events;
+package com.discordsrv.api.events;
 
-import com.discordsrv.api.event.bus.EventListener;
+import com.discordsrv.api.eventbus.EventBus;
-import com.discordsrv.api.event.bus.internal.EventStateHolder;
+import com.discordsrv.api.eventbus.EventListener;
+import com.discordsrv.api.eventbus.internal.EventStateHolder;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,7 +44,7 @@ public interface Processable extends Event {
     /**
      * Returns the {@link EventListener} that processed this event.
      *
-     * @return the event listener that processed this event or {@code null} if it was processed before being passed to the {@link com.discordsrv.api.event.bus.EventBus}
+     * @return the event listener that processed this event or {@code null} if it was processed before being passed to the {@link EventBus}
      * @throws IllegalStateException if the event has not been processed
      */
     @ApiStatus.NonExtendable

api/src/main/java/com/discordsrv/api/events/channel/GameChannelLookupEvent.java

@@ -21,17 +21,18 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.channel;
+package com.discordsrv.api.events.channel;
 
 import com.discordsrv.api.channel.GameChannel;
-import com.discordsrv.api.event.events.Processable;
+import com.discordsrv.api.eventbus.EventPriority;
+import com.discordsrv.api.events.Processable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * This event is used to lookup {@link GameChannel}s by their name (and optionally plugin name).
  * This is also used to determine which plugin's channel should take priority when multiple plugins
- * define channels with the same name ({@link com.discordsrv.api.event.bus.EventPriority}).
+ * define channels with the same name ({@link EventPriority}).
  *
  * @see #isDefault()
  */

api/src/main/java/com/discordsrv/api/events/discord/AbstractDiscordEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord;
+package com.discordsrv.api.events.discord;
 
 import net.dv8tion.jda.api.events.GenericEvent;
 

api/src/main/java/com/discordsrv/api/events/discord/DiscordEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord;
+package com.discordsrv.api.events.discord;
 
 import com.discordsrv.api.discord.entity.JDAEntity;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import net.dv8tion.jda.api.events.GenericEvent;
 
 public interface DiscordEvent<T extends GenericEvent> extends Event, JDAEntity<T> {

api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractDeferrableInteractionEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction;
+package com.discordsrv.api.events.discord.interaction;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;

api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractInteractionEvent.java

@@ -21,19 +21,20 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction;
+package com.discordsrv.api.events.discord.interaction;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.guild.DiscordGuild;
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
-import com.discordsrv.api.event.events.discord.AbstractDiscordEvent;
+import com.discordsrv.api.events.discord.AbstractDiscordEvent;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class AbstractInteractionEvent<T extends GenericInteractionCreateEvent> extends AbstractDiscordEvent<T> {
+public abstract class AbstractInteractionEvent<T extends GenericInteractionCreateEvent> extends
+                                                                                        AbstractDiscordEvent<T> {
 
     protected final ComponentIdentifier identifier;
     protected final DiscordUser user;

api/src/main/java/com/discordsrv/api/events/discord/interaction/DiscordModalInteractionEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction;
+package com.discordsrv.api.events.discord.interaction;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;

api/src/main/java/com/discordsrv/api/events/discord/interaction/command/AbstractCommandInteractionEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.command;
+package com.discordsrv.api.events.discord.interaction.command;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
@@ -29,7 +29,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
 import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
-import com.discordsrv.api.event.events.discord.interaction.AbstractDeferrableInteractionEvent;
+import com.discordsrv.api.events.discord.interaction.AbstractDeferrableInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import org.jetbrains.annotations.Nullable;

api/src/main/java/com/discordsrv/api/events/discord/interaction/command/CommandRegisterEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.command;
+package com.discordsrv.api.events.discord.interaction.command;
 
 import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 

api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordChatInputInteractionEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.command;
+package com.discordsrv.api.events.discord.interaction.command;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;

api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java

@@ -21,13 +21,13 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.command;
+package com.discordsrv.api.events.discord.interaction.command;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
-import com.discordsrv.api.event.events.discord.interaction.AbstractInteractionEvent;
+import com.discordsrv.api.events.discord.interaction.AbstractInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 

api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.command;
+package com.discordsrv.api.events.discord.interaction.command;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;

api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordUserContextInteractionEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.command;
+package com.discordsrv.api.events.discord.interaction.command;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;

api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordButtonInteractionEvent.java

@@ -21,14 +21,14 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.component;
+package com.discordsrv.api.events.discord.interaction.component;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
-import com.discordsrv.api.event.events.discord.interaction.AbstractDeferrableInteractionEvent;
+import com.discordsrv.api.events.discord.interaction.AbstractDeferrableInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 
 public class DiscordButtonInteractionEvent extends AbstractDeferrableInteractionEvent<ButtonInteractionEvent> {

api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java

@@ -21,14 +21,14 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.interaction.component;
+package com.discordsrv.api.events.discord.interaction.component;
 
 import com.discordsrv.api.discord.entity.DiscordUser;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook;
 import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier;
-import com.discordsrv.api.event.events.discord.interaction.AbstractDeferrableInteractionEvent;
+import com.discordsrv.api.events.discord.interaction.AbstractDeferrableInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
 
 public class DiscordSelectMenuInteractionEvent extends AbstractDeferrableInteractionEvent<GenericSelectMenuInteractionEvent<?, ?>> {

api/src/main/java/com/discordsrv/api/events/discord/member/AbstractDiscordMemberEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.member;
+package com.discordsrv.api.events.discord.member;
 
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
-import com.discordsrv.api.event.events.discord.AbstractDiscordEvent;
+import com.discordsrv.api.events.discord.AbstractDiscordEvent;
 import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent;
 
 public abstract class AbstractDiscordMemberEvent<T extends GenericGuildMemberEvent> extends AbstractDiscordEvent<T> {

api/src/main/java/com/discordsrv/api/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java

@@ -21,11 +21,11 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.member.role;
+package com.discordsrv.api.events.discord.member.role;
 
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.guild.DiscordRole;
-import com.discordsrv.api.event.events.discord.member.AbstractDiscordMemberEvent;
+import com.discordsrv.api.events.discord.member.AbstractDiscordMemberEvent;
 import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent;
 
 import java.util.List;

api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleAddEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.member.role;
+package com.discordsrv.api.events.discord.member.role;
 
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.guild.DiscordRole;

api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleRemoveEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.member.role;
+package com.discordsrv.api.events.discord.member.role;
 
 import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
 import com.discordsrv.api.discord.entity.guild.DiscordRole;

api/src/main/java/com/discordsrv/api/events/discord/message/AbstractDiscordMessageEvent.java

@@ -21,13 +21,13 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.message;
+package com.discordsrv.api.events.discord.message;
 
 import com.discordsrv.api.discord.entity.channel.DiscordDMChannel;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.channel.DiscordTextChannel;
 import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
-import com.discordsrv.api.event.events.discord.AbstractDiscordEvent;
+import com.discordsrv.api.events.discord.AbstractDiscordEvent;
 import net.dv8tion.jda.api.events.message.GenericMessageEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageDeleteEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.message;
+package com.discordsrv.api.events.discord.message;
 
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import net.dv8tion.jda.api.events.message.MessageDeleteEvent;

api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageReceiveEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.message;
+package com.discordsrv.api.events.discord.message;
 
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;

api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageUpdateEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.discord.message;
+package com.discordsrv.api.events.discord.message;
 
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;

api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVConnectedEvent.java

@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.lifecycle;
+package com.discordsrv.api.events.lifecycle;
 
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 
 /**
  * Indicates that DiscordSRV's Discord connection has been (re-)established. This may run more than once.

api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReadyEvent.java

@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.lifecycle;
+package com.discordsrv.api.events.lifecycle;
 
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 
 /**
  * Indicates that DiscordSRV is ready (including Discord connection), this only runs once when DiscordSRV enables.

api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReloadedEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.lifecycle;
+package com.discordsrv.api.events.lifecycle;
 
 import com.discordsrv.api.DiscordSRVApi;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 
 import java.util.Set;
 

api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVShuttingDownEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.lifecycle;
+package com.discordsrv.api.events.lifecycle;
 
-import com.discordsrv.api.event.bus.EventPriority;
+import com.discordsrv.api.eventbus.EventPriority;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 
 /**
  * Indicates that DiscordSRV is shutting down.

api/src/main/java/com/discordsrv/api/events/linking/AccountLinkedEvent.java

@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.linking;
+package com.discordsrv.api.events.linking;
 
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import com.discordsrv.api.profile.IProfile;
 import org.jetbrains.annotations.NotNull;
 

api/src/main/java/com/discordsrv/api/events/linking/AccountUnlinkedEvent.java

@@ -21,9 +21,9 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.linking;
+package com.discordsrv.api.events.linking;
 
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;

api/src/main/java/com/discordsrv/api/events/message/forward/discord/DiscordChatMessageForwardedEvent.java

@@ -21,11 +21,11 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.discord;
+package com.discordsrv.api.events.message.forward.discord;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import org.jetbrains.annotations.NotNull;
 
 /**

api/src/main/java/com/discordsrv/api/events/message/forward/game/AbstractGameMessageForwardedEvent.java

@@ -21,11 +21,11 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

api/src/main/java/com/discordsrv/api/events/message/forward/game/AwardMessageForwardedEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;

api/src/main/java/com/discordsrv/api/events/message/forward/game/DeathMessageForwardedEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;

api/src/main/java/com/discordsrv/api/events/message/forward/game/GameChatMessageForwardedEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;

api/src/main/java/com/discordsrv/api/events/message/forward/game/JoinMessageForwardedEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;

api/src/main/java/com/discordsrv/api/events/message/forward/game/LeaveMessageForwardedEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;

api/src/main/java/com/discordsrv/api/events/message/forward/game/ServerSwitchMessageForwardedEvent.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.forward.game;
+package com.discordsrv.api.events.message.forward.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;

api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java

@@ -21,12 +21,12 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.process.discord;
+package com.discordsrv.api.events.message.process.discord;
 
 import com.discordsrv.api.component.MinecraftComponent;
 import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji;
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
-import com.discordsrv.api.event.events.Processable;
+import com.discordsrv.api.events.Processable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageProcessEvent.java

@@ -21,14 +21,14 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.process.discord;
+package com.discordsrv.api.events.message.process.discord;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
-import com.discordsrv.api.event.events.Cancellable;
+import com.discordsrv.api.events.Cancellable;
-import com.discordsrv.api.event.events.Processable;
+import com.discordsrv.api.events.Processable;
-import com.discordsrv.api.event.events.message.receive.discord.DiscordChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.discord.DiscordChatMessageReceiveEvent;
 
 /**
  * Indicates that a Discord message is about to be processed, this will run once per {@link GameChannel} destination,

api/src/main/java/com/discordsrv/api/events/message/receive/discord/DiscordChatMessageReceiveEvent.java

@@ -21,15 +21,15 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.discord;
+package com.discordsrv.api.events.message.receive.discord;
 
 import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
 import com.discordsrv.api.discord.entity.channel.DiscordTextChannel;
 import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
 import com.discordsrv.api.discord.entity.guild.DiscordGuild;
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
-import com.discordsrv.api.event.events.Cancellable;
+import com.discordsrv.api.events.Cancellable;
-import com.discordsrv.api.event.events.message.process.discord.DiscordChatMessageProcessEvent;
+import com.discordsrv.api.events.message.process.discord.DiscordChatMessageProcessEvent;
 import org.jetbrains.annotations.NotNull;
 
 /**

api/src/main/java/com/discordsrv/api/events/message/receive/game/AbstractGameMessageReceiveEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
-import com.discordsrv.api.event.events.Cancellable;
+import com.discordsrv.api.events.Cancellable;
-import com.discordsrv.api.event.events.Processable;
+import com.discordsrv.api.events.Processable;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class AbstractGameMessageReceiveEvent implements Cancellable, Processable.NoArgument {

api/src/main/java/com/discordsrv/api/events/message/receive/game/AwardMessageReceiveEvent.java

@@ -21,17 +21,18 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
+import com.discordsrv.api.eventbus.EventPriority;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that an advancement or achievement message was received will be processed
- * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
+ * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
  */
 public class AwardMessageReceiveEvent extends AbstractGameMessageReceiveEvent {
 

api/src/main/java/com/discordsrv/api/events/message/receive/game/DeathMessageReceiveEvent.java

@@ -21,17 +21,18 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
+import com.discordsrv.api.eventbus.EventPriority;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that a death message was received and will be processed
- * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
+ * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
  */
 public class DeathMessageReceiveEvent extends AbstractGameMessageReceiveEvent {
 

api/src/main/java/com/discordsrv/api/events/message/receive/game/GameChatMessageReceiveEvent.java

@@ -21,18 +21,19 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.events.PlayerEvent;
+import com.discordsrv.api.eventbus.EventPriority;
+import com.discordsrv.api.events.PlayerEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that a chat message was received and will be processed
- * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
+ * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
  */
 public class GameChatMessageReceiveEvent extends AbstractGameMessageReceiveEvent implements PlayerEvent {
 

api/src/main/java/com/discordsrv/api/events/message/receive/game/JoinMessageReceiveEvent.java

@@ -21,17 +21,18 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
+import com.discordsrv.api.eventbus.EventPriority;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that a join message was received and will be processed
- * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
+ * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
  */
 public class JoinMessageReceiveEvent extends AbstractGameMessageReceiveEvent {
 

api/src/main/java/com/discordsrv/api/events/message/receive/game/LeaveMessageReceiveEvent.java

@@ -21,17 +21,18 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
+import com.discordsrv.api.eventbus.EventPriority;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that a leave message was received and will be processed
- * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
+ * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
  */
 public class LeaveMessageReceiveEvent extends AbstractGameMessageReceiveEvent {
 

api/src/main/java/com/discordsrv/api/events/message/receive/game/ServerSwitchMessageReceiveEvent.java

@@ -21,16 +21,17 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.message.receive.game;
+package com.discordsrv.api.events.message.receive.game;
 
 import com.discordsrv.api.component.MinecraftComponent;
+import com.discordsrv.api.eventbus.EventPriority;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Indicates that a server switch message was received and will be processed
- * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
+ * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party.
  */
 public class ServerSwitchMessageReceiveEvent extends AbstractGameMessageReceiveEvent {
 

api/src/main/java/com/discordsrv/api/events/placeholder/PlaceholderLookupEvent.java

@@ -21,10 +21,10 @@
  * SOFTWARE.
  */
 
-package com.discordsrv.api.event.events.placeholder;
+package com.discordsrv.api.events.placeholder;
 
-import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.events.Event;
-import com.discordsrv.api.event.events.Processable;
+import com.discordsrv.api.events.Processable;
 import com.discordsrv.api.placeholder.PlaceholderLookupResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

api/src/main/java/com/discordsrv/api/module/Module.java

@@ -27,8 +27,9 @@ import com.discordsrv.api.DiscordSRVApi;
 import com.discordsrv.api.discord.connection.details.DiscordCacheFlag;
 import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent;
 import com.discordsrv.api.discord.connection.details.DiscordMemberCachePolicy;
-import com.discordsrv.api.event.bus.EventListener;
+import com.discordsrv.api.eventbus.EventListener;
-import com.discordsrv.api.event.events.discord.message.AbstractDiscordMessageEvent;
+import com.discordsrv.api.eventbus.Subscribe;
+import com.discordsrv.api.events.discord.message.AbstractDiscordMessageEvent;
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent;
 import net.dv8tion.jda.api.requests.GatewayIntent;
@@ -60,7 +61,7 @@ public interface Module {
 
     /**
      * Provides a {@link Collection} of {@link DiscordGatewayIntent}s that are required for this {@link Module}.
-     * This defaults to determining intents based on the events listened to in this class via {@link com.discordsrv.api.event.bus.Subscribe} methods.
+     * This defaults to determining intents based on the events listened to in this class via {@link Subscribe} methods.
      * @return the collection of gateway intents required by this module at the time this method is called
      */
     @SuppressWarnings("unchecked") // Class generic cast

api/src/main/java/com/discordsrv/api/placeholder/provider/PlaceholderProvider.java

@@ -23,6 +23,7 @@
 
 package com.discordsrv.api.placeholder.provider;
 
+import com.discordsrv.api.events.placeholder.PlaceholderLookupEvent;
 import com.discordsrv.api.placeholder.PlaceholderLookupResult;
 import com.discordsrv.api.placeholder.annotation.Placeholder;
 import org.jetbrains.annotations.NotNull;
@@ -31,7 +32,7 @@ import java.util.Set;
 
 /**
  * A placeholder provider used internally by DiscordSRV for {@link Placeholder}.
- * API users should use the {@link com.discordsrv.api.event.events.placeholder.PlaceholderLookupEvent} instead.
+ * API users should use the {@link PlaceholderLookupEvent} instead.
  */
 public interface PlaceholderProvider {
 

bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/AbstractBukkitAwardListener.java

@@ -19,8 +19,8 @@
 package com.discordsrv.bukkit.listener.award;
 
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.logging.Logger;
+import com.discordsrv.common.core.logging.Logger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.logging.NamedLogger;
 import org.bukkit.event.Listener;
 
 public abstract class AbstractBukkitAwardListener implements Listener {

bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/BukkitLegacyAdvancementListener.java

@@ -19,7 +19,7 @@
 package com.discordsrv.bukkit.listener.award;
 
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.advancement.Advancement;

bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IBukkitScheduler.java

@@ -18,9 +18,9 @@
 
 package com.discordsrv.bukkit.scheduler;
 
-import com.discordsrv.common.function.CheckedSupplier;
+import com.discordsrv.common.core.scheduler.ServerScheduler;
-import com.discordsrv.common.future.util.CompletableFutureUtil;
+import com.discordsrv.common.util.CompletableFutureUtil;
-import com.discordsrv.common.scheduler.ServerScheduler;
+import com.discordsrv.common.util.function.CheckedSupplier;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;

bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java

@@ -18,7 +18,7 @@
 
 package com.discordsrv.bukkit.scheduler;
 
-import com.discordsrv.common.scheduler.ServerScheduler;
+import com.discordsrv.common.core.scheduler.ServerScheduler;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ProxiedCommandSender;

bukkit/paper/src/main/java/com/discordsrv/bukkit/component/PaperComponentHandle.java

@@ -19,8 +19,8 @@
 package com.discordsrv.bukkit.component;
 
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.common.component.ComponentFactory;
+import com.discordsrv.common.core.component.ComponentFactory;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 
 import java.lang.invoke.MethodHandle;

bukkit/paper/src/main/java/com/discordsrv/bukkit/player/PaperPlayer.java

@@ -18,7 +18,7 @@
 
 package com.discordsrv.bukkit.player;
 
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 

bukkit/spigot/src/main/java/com/discordsrv/bukkit/listener/award/SpigotModernAdvancementListener.java

@@ -20,7 +20,7 @@ package com.discordsrv.bukkit.listener.award;
 
 import com.discordsrv.api.component.MinecraftComponent;
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementDisplay;

bukkit/spigot/src/main/java/com/discordsrv/bukkit/player/SpigotPlayer.java

@@ -18,7 +18,7 @@
 
 package com.discordsrv.bukkit.player;
 
-import com.discordsrv.common.player.provider.model.SkinInfo;
+import com.discordsrv.common.abstraction.player.provider.model.SkinInfo;
 import org.bukkit.entity.Player;
 import org.bukkit.profile.PlayerTextures;
 

bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java

@@ -41,14 +41,14 @@ import com.discordsrv.bukkit.scheduler.BukkitScheduler;
 import com.discordsrv.bukkit.scheduler.FoliaScheduler;
 import com.discordsrv.bukkit.scheduler.IBukkitScheduler;
 import com.discordsrv.common.ServerDiscordSRV;
+import com.discordsrv.common.abstraction.plugin.PluginManager;
 import com.discordsrv.common.command.game.handler.ICommandHandler;
 import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager;
 import com.discordsrv.common.config.configurate.manager.MainConfigManager;
 import com.discordsrv.common.config.configurate.manager.MessagesConfigManager;
 import com.discordsrv.common.config.messages.MessagesConfig;
-import com.discordsrv.common.debug.data.OnlineMode;
+import com.discordsrv.common.feature.debug.data.OnlineMode;
-import com.discordsrv.common.messageforwarding.game.minecrafttodiscord.MinecraftToDiscordChatModule;
+import com.discordsrv.common.feature.messageforwarding.game.minecrafttodiscord.MinecraftToDiscordChatModule;
-import com.discordsrv.common.plugin.PluginManager;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.Server;
 import org.bukkit.plugin.ServicePriority;

bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java

@@ -18,10 +18,10 @@
 
 package com.discordsrv.bukkit;
 
-import com.discordsrv.common.bootstrap.IBootstrap;
+import com.discordsrv.common.abstraction.bootstrap.IBootstrap;
-import com.discordsrv.common.bootstrap.LifecycleManager;
+import com.discordsrv.common.abstraction.bootstrap.LifecycleManager;
-import com.discordsrv.common.logging.Logger;
+import com.discordsrv.common.core.logging.Logger;
-import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl;
+import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl;
 import dev.vankka.dependencydownload.classpath.ClasspathAppender;
 import dev.vankka.dependencydownload.jarinjar.classloader.JarInJarClassLoader;
 import dev.vankka.mcdependencydownload.bukkit.bootstrap.BukkitBootstrap;

bukkit/src/main/java/com/discordsrv/bukkit/ban/BukkitBanModule.java

@@ -22,9 +22,9 @@ import com.discordsrv.api.component.MinecraftComponent;
 import com.discordsrv.api.module.type.PunishmentModule;
 import com.discordsrv.api.punishment.Punishment;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.bansync.BanSyncModule;
+import com.discordsrv.common.core.module.type.AbstractModule;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.feature.bansync.BanSyncModule;
-import com.discordsrv.common.module.type.AbstractModule;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.bukkit.BanEntry;
 import org.bukkit.BanList;

bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/AbstractBukkitCommandHandler.java

@@ -23,8 +23,8 @@ import com.discordsrv.bukkit.command.game.sender.BukkitCommandSender;
 import com.discordsrv.common.command.game.abstraction.GameCommand;
 import com.discordsrv.common.command.game.handler.ICommandHandler;
 import com.discordsrv.common.command.game.sender.ICommandSender;
-import com.discordsrv.common.logging.Logger;
+import com.discordsrv.common.core.logging.Logger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.logging.NamedLogger;
 import org.bukkit.Server;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java

@@ -19,9 +19,9 @@
 package com.discordsrv.bukkit.component.translation;
 
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.component.translation.Translation;
+import com.discordsrv.common.core.component.translation.Translation;
-import com.discordsrv.common.component.translation.TranslationRegistry;
+import com.discordsrv.common.core.component.translation.TranslationRegistry;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.logging.NamedLogger;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import java.io.IOException;

bukkit/src/main/java/com/discordsrv/bukkit/console/BukkitConsole.java

@@ -22,11 +22,11 @@ import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.command.game.sender.BukkitCommandSender;
 import com.discordsrv.bukkit.console.executor.BukkitCommandExecutorProvider;
 import com.discordsrv.common.command.game.executor.CommandExecutorProvider;
-import com.discordsrv.common.console.Console;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.logging.backend.LoggingBackend;
-import com.discordsrv.common.logging.backend.LoggingBackend;
+import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl;
-import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl;
+import com.discordsrv.common.core.logging.backend.impl.Log4JLoggerImpl;
-import com.discordsrv.common.logging.backend.impl.Log4JLoggerImpl;
+import com.discordsrv.common.feature.console.Console;
 
 public class BukkitConsole extends BukkitCommandSender implements Console {
 

bukkit/src/main/java/com/discordsrv/bukkit/console/executor/BukkitCommandExecutorProvider.java

@@ -21,7 +21,7 @@ package com.discordsrv.bukkit.console.executor;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.common.command.game.executor.CommandExecutor;
 import com.discordsrv.common.command.game.executor.CommandExecutorProvider;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/discordsrv/bukkit/integration/EssentialsXIntegration.java

@@ -20,18 +20,18 @@ package com.discordsrv.bukkit.integration;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.bus.EventPriority;
+import com.discordsrv.api.eventbus.EventPriority;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.channel.GameChannelLookupEvent;
+import com.discordsrv.api.events.channel.GameChannelLookupEvent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.module.type.NicknameModule;
 import com.discordsrv.api.module.type.PunishmentModule;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.api.punishment.Punishment;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.player.BukkitPlayer;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.core.module.type.PluginIntegration;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.util.ComponentUtil;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.UserData;

bukkit/src/main/java/com/discordsrv/bukkit/integration/PlaceholderAPIIntegration.java

@@ -18,15 +18,15 @@
 
 package com.discordsrv.bukkit.integration;
 
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.placeholder.PlaceholderLookupEvent;
+import com.discordsrv.api.events.placeholder.PlaceholderLookupEvent;
 import com.discordsrv.api.placeholder.PlaceholderLookupResult;
 import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.api.profile.IProfile;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.abstraction.player.IOfflinePlayer;
-import com.discordsrv.common.player.IOfflinePlayer;
+import com.discordsrv.common.core.module.type.PluginIntegration;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;

bukkit/src/main/java/com/discordsrv/bukkit/integration/VaultIntegration.java

@@ -20,10 +20,10 @@ package com.discordsrv.bukkit.integration;
 
 import com.discordsrv.api.module.type.PermissionModule;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
+import com.discordsrv.common.core.module.type.PluginIntegration;
 import com.discordsrv.common.exception.MessageException;
-import com.discordsrv.common.function.CheckedSupplier;
+import com.discordsrv.common.util.CompletableFutureUtil;
-import com.discordsrv.common.future.util.CompletableFutureUtil;
+import com.discordsrv.common.util.function.CheckedSupplier;
-import com.discordsrv.common.module.type.PluginIntegration;
 import net.milkbowl.vault.chat.Chat;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.OfflinePlayer;

bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/ChattyChatIntegration.java

@@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.channel.GameChannelLookupEvent;
+import com.discordsrv.api.events.channel.GameChannelLookupEvent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.player.BukkitPlayer;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.module.type.PluginIntegration;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/GriefPreventionChatIntegration.java

@@ -18,13 +18,13 @@
 
 package com.discordsrv.bukkit.integration.chat;
 
-import com.discordsrv.api.event.bus.EventPriority;
+import com.discordsrv.api.eventbus.EventPriority;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.core.module.type.PluginIntegration;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import org.jetbrains.annotations.NotNull;
 

bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/LunaChatIntegration.java

@@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.channel.GameChannelLookupEvent;
+import com.discordsrv.api.events.channel.GameChannelLookupEvent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.player.BukkitPlayer;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.module.type.PluginIntegration;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.util.ComponentUtil;
 import com.github.ucchyocean.lc3.LunaChatAPI;
 import com.github.ucchyocean.lc3.LunaChatBukkit;
 import com.github.ucchyocean.lc3.bukkit.event.LunaChatBukkitChannelChatEvent;

bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/McMMOChatIntegration.java

@@ -20,16 +20,16 @@ package com.discordsrv.bukkit.integration.chat;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.bus.EventPriority;
+import com.discordsrv.api.eventbus.EventPriority;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.channel.GameChannelLookupEvent;
+import com.discordsrv.api.events.channel.GameChannelLookupEvent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.player.BukkitPlayer;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.module.type.PluginIntegration;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.util.ComponentUtil;
 import com.gmail.nossr50.api.ChatAPI;
 import com.gmail.nossr50.chat.author.Author;
 import com.gmail.nossr50.chat.author.PlayerAuthor;

bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/TownyChatIntegration.java

@@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.channel.GameChannelLookupEvent;
+import com.discordsrv.api.events.channel.GameChannelLookupEvent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.player.BukkitPlayer;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.module.type.PluginIntegration;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.util.ComponentUtil;
 import com.palmergames.bukkit.TownyChat.Chat;
 import com.palmergames.bukkit.TownyChat.channels.Channel;
 import com.palmergames.bukkit.TownyChat.events.AsyncChatHookEvent;

bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/VentureChatIntegration.java

@@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat;
 
 import com.discordsrv.api.channel.GameChannel;
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.bus.Subscribe;
+import com.discordsrv.api.eventbus.Subscribe;
-import com.discordsrv.api.event.events.channel.GameChannelLookupEvent;
+import com.discordsrv.api.events.channel.GameChannelLookupEvent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.player.BukkitPlayer;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.core.logging.NamedLogger;
-import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.core.module.type.PluginIntegration;
-import com.discordsrv.common.module.type.PluginIntegration;
+import com.discordsrv.common.util.ComponentUtil;
 import mineverse.Aust1n46.chat.api.MineverseChatAPI;
 import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
 import mineverse.Aust1n46.chat.api.events.VentureChatEvent;

bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitDeathListener.java

@@ -19,7 +19,7 @@
 package com.discordsrv.bukkit.listener;
 
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.events.message.receive.game.DeathMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.DeathMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.component.PaperComponentHandle;

bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitStatusMessageListener.java

@@ -19,8 +19,8 @@
 package com.discordsrv.bukkit.listener;
 
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.events.message.receive.game.JoinMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.JoinMessageReceiveEvent;
-import com.discordsrv.api.event.events.message.receive.game.LeaveMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.LeaveMessageReceiveEvent;
 import com.discordsrv.api.player.DiscordSRVPlayer;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.component.PaperComponentHandle;

bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAchievementListener.java

@@ -20,7 +20,7 @@ package com.discordsrv.bukkit.listener.award;
 
 import com.discordsrv.api.component.MinecraftComponent;
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAwardForwarder.java

@@ -19,9 +19,9 @@
 package com.discordsrv.bukkit.listener.award;
 
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.events.message.receive.game.AwardMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.AwardMessageReceiveEvent;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.player.IPlayer;
+import com.discordsrv.common.abstraction.player.IPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.intellij.lang.annotations.Language;

bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatForwarder.java

@@ -19,11 +19,11 @@
 package com.discordsrv.bukkit.listener.chat;
 
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent;
+import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.component.PaperComponentHandle;
-import com.discordsrv.common.channel.GlobalChannel;
+import com.discordsrv.common.abstraction.player.IPlayer;
-import com.discordsrv.common.player.IPlayer;
+import com.discordsrv.common.feature.channel.global.GlobalChannel;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;

bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatListener.java

@@ -19,7 +19,7 @@
 package com.discordsrv.bukkit.listener.chat;
 
 import com.discordsrv.api.component.MinecraftComponent;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitOfflinePlayer.java

@@ -20,8 +20,8 @@ package com.discordsrv.bukkit.player;
 
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.player.IOfflinePlayer;
+import com.discordsrv.common.abstraction.player.IOfflinePlayer;
-import com.discordsrv.common.player.provider.model.SkinInfo;
+import com.discordsrv.common.abstraction.player.provider.model.SkinInfo;
 import net.kyori.adventure.identity.Identity;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;

bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayer.java

@@ -23,9 +23,9 @@ import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.command.game.sender.BukkitCommandSender;
 import com.discordsrv.bukkit.component.PaperComponentHandle;
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.component.util.ComponentUtil;
+import com.discordsrv.common.abstraction.player.IPlayer;
-import com.discordsrv.common.player.IPlayer;
+import com.discordsrv.common.abstraction.player.provider.model.SkinInfo;
-import com.discordsrv.common.player.provider.model.SkinInfo;
+import com.discordsrv.common.util.ComponentUtil;
 import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import net.kyori.adventure.text.Component;

bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java

@@ -19,9 +19,9 @@
 package com.discordsrv.bukkit.player;
 
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.player.IOfflinePlayer;
+import com.discordsrv.common.abstraction.player.IOfflinePlayer;
-import com.discordsrv.common.player.IPlayer;
+import com.discordsrv.common.abstraction.player.IPlayer;
-import com.discordsrv.common.player.provider.ServerPlayerProvider;
+import com.discordsrv.common.abstraction.player.provider.ServerPlayerProvider;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

bukkit/src/main/java/com/discordsrv/bukkit/plugin/BukkitPluginManager.java

@@ -19,8 +19,8 @@
 package com.discordsrv.bukkit.plugin;
 
 import com.discordsrv.bukkit.BukkitDiscordSRV;
-import com.discordsrv.common.plugin.Plugin;
+import com.discordsrv.common.abstraction.plugin.Plugin;
-import com.discordsrv.common.plugin.PluginManager;
+import com.discordsrv.common.abstraction.plugin.PluginManager;
 import org.bukkit.plugin.PluginDescriptionFile;
 
 import java.util.Arrays;