diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index 6af2e10a..6d19aafe 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -63,8 +63,9 @@ dependencies {
     annotationProcessor project(':api')
 
     // Common
-    compileOnly project(':common:common-server')
-    implementation project(path: ':common:common-server', configuration: 'runtimeElements')
+    compileOnly project(':common')
+    implementation project(':common:common-templates')
+    implementation project(path: ':common', configuration: 'runtimeElements')
 
     // DependencyDownload
     implementation(libs.mcdependencydownload.bukkit.bootstrap)
diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java b/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java
index a47d9fc6..87add4c5 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java
@@ -39,7 +39,7 @@ import com.discordsrv.common.config.manager.MainConfigManager;
 import com.discordsrv.common.debug.data.OnlineMode;
 import com.discordsrv.common.messageforwarding.game.MinecraftToDiscordChatModule;
 import com.discordsrv.common.plugin.PluginManager;
-import com.discordsrv.common.server.ServerDiscordSRV;
+import com.discordsrv.common.ServerDiscordSRV;
 import com.fasterxml.jackson.databind.JsonNode;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.Server;
diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/config/main/BukkitConfig.java b/bukkit/src/main/java/com/discordsrv/bukkit/config/main/BukkitConfig.java
index 49804822..d60765d6 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/config/main/BukkitConfig.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/config/main/BukkitConfig.java
@@ -20,8 +20,8 @@ package com.discordsrv.bukkit.config.main;
 
 import com.discordsrv.common.config.main.MainConfig;
 import com.discordsrv.common.config.main.channels.base.ChannelConfig;
-import com.discordsrv.common.server.config.channels.base.ServerBaseChannelConfig;
-import com.discordsrv.common.server.config.channels.base.ServerChannelConfig;
+import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
+import com.discordsrv.common.config.main.channels.base.server.ServerChannelConfig;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/config/manager/BukkitConfigManager.java b/bukkit/src/main/java/com/discordsrv/bukkit/config/manager/BukkitConfigManager.java
index 9d46c2eb..c5894e14 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/config/manager/BukkitConfigManager.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/config/manager/BukkitConfigManager.java
@@ -20,7 +20,7 @@ package com.discordsrv.bukkit.config.manager;
 
 import com.discordsrv.bukkit.config.main.BukkitConfig;
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.server.config.manager.ServerConfigManager;
+import com.discordsrv.common.config.manager.manager.ServerConfigManager;
 
 public class BukkitConfigManager extends ServerConfigManager<BukkitConfig> {
 
diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java
index a59d3cfe..fba8ba61 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java
@@ -20,7 +20,7 @@ package com.discordsrv.bukkit.player;
 
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.common.player.IOfflinePlayer;
-import com.discordsrv.common.server.player.ServerPlayerProvider;
+import com.discordsrv.common.player.ServerPlayerProvider;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/BukkitScheduler.java b/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/BukkitScheduler.java
index f5a8dbfd..51d37628 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/BukkitScheduler.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/BukkitScheduler.java
@@ -22,7 +22,7 @@ import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.bukkit.DiscordSRVBukkitBootstrap;
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.scheduler.StandardScheduler;
-import com.discordsrv.common.server.scheduler.ServerScheduler;
+import com.discordsrv.common.scheduler.ServerScheduler;
 import org.bukkit.plugin.Plugin;
 
 import java.util.function.BiConsumer;
diff --git a/bungee/build.gradle b/bungee/build.gradle
index a5fb61a1..d224ca21 100644
--- a/bungee/build.gradle
+++ b/bungee/build.gradle
@@ -36,7 +36,8 @@ dependencies {
     annotationProcessor project(':api')
 
     // Common
-    implementation project(':common:common-proxy')
+    implementation project(':common')
+    implementation project(':common:common-templates')
 
     // DependencyDownload
     implementation(libs.mcdependencydownload.bungee.bootstrap)
diff --git a/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java b/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java
index edc923a9..b232a547 100644
--- a/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java
+++ b/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java
@@ -30,7 +30,7 @@ import com.discordsrv.common.config.manager.MainConfigManager;
 import com.discordsrv.common.debug.data.OnlineMode;
 import com.discordsrv.common.plugin.PluginManager;
 import com.discordsrv.common.scheduler.StandardScheduler;
-import com.discordsrv.proxy.ProxyDiscordSRV;
+import com.discordsrv.common.ProxyDiscordSRV;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
diff --git a/common/proxy/build.gradle b/common/proxy/build.gradle
deleted file mode 100644
index c875220c..00000000
--- a/common/proxy/build.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies {
-    api project(':common')
-    api project(':common:common-templates')
-}
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/config/package-info.java b/common/proxy/src/main/java/com/discordsrv/proxy/config/package-info.java
deleted file mode 100644
index 5e2d7615..00000000
--- a/common/proxy/src/main/java/com/discordsrv/proxy/config/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file is part of DiscordSRV, licensed under the GPLv3 License
- * Copyright (c) 2016-2022 Austin "Scarsz" Shapiro, Henri "Vankka" Schubin and DiscordSRV contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.discordsrv.proxy.config;
diff --git a/common/server/build.gradle b/common/server/build.gradle
deleted file mode 100644
index c875220c..00000000
--- a/common/server/build.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies {
-    api project(':common')
-    api project(':common:common-templates')
-}
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/ProxyDiscordSRV.java b/common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java
similarity index 90%
rename from common/proxy/src/main/java/com/discordsrv/proxy/ProxyDiscordSRV.java
rename to common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java
index a49e5dec..15e41597 100644
--- a/common/proxy/src/main/java/com/discordsrv/proxy/ProxyDiscordSRV.java
+++ b/common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java
@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.proxy;
+package com.discordsrv.common;
 
-import com.discordsrv.common.AbstractDiscordSRV;
 import com.discordsrv.common.bootstrap.IBootstrap;
 import com.discordsrv.common.config.connection.ConnectionConfig;
 import com.discordsrv.common.config.main.MainConfig;
-import com.discordsrv.proxy.modules.ServerSwitchMessageModule;
+import com.discordsrv.common.messageforwarding.game.ServerSwitchMessageModule;
 
 public abstract class ProxyDiscordSRV<B extends IBootstrap, C extends MainConfig, CC extends ConnectionConfig> extends AbstractDiscordSRV<B, C, CC> {
 
diff --git a/common/server/src/main/java/com/discordsrv/common/server/ServerDiscordSRV.java b/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java
similarity index 87%
rename from common/server/src/main/java/com/discordsrv/common/server/ServerDiscordSRV.java
rename to common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java
index 7dc83b65..5f811690 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/ServerDiscordSRV.java
+++ b/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java
@@ -16,15 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server;
+package com.discordsrv.common;
 
-import com.discordsrv.common.AbstractDiscordSRV;
 import com.discordsrv.common.bootstrap.IBootstrap;
 import com.discordsrv.common.config.connection.ConnectionConfig;
 import com.discordsrv.common.config.main.MainConfig;
-import com.discordsrv.common.server.modules.DeathMessageModule;
-import com.discordsrv.common.server.player.ServerPlayerProvider;
-import com.discordsrv.common.server.scheduler.ServerScheduler;
+import com.discordsrv.common.messageforwarding.game.DeathMessageModule;
+import com.discordsrv.common.player.ServerPlayerProvider;
+import com.discordsrv.common.scheduler.ServerScheduler;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.OverridingMethodsMustInvokeSuper;
diff --git a/common/server/src/main/java/com/discordsrv/common/server/config/channels/DeathMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/DeathMessageConfig.java
similarity index 94%
rename from common/server/src/main/java/com/discordsrv/common/server/config/channels/DeathMessageConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/DeathMessageConfig.java
index 342e8d33..3664efe4 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/config/channels/DeathMessageConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/DeathMessageConfig.java
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.config.channels;
+package com.discordsrv.common.config.main.channels;
 
 import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
 import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
 import com.discordsrv.common.config.annotation.Untranslated;
-import com.discordsrv.common.config.main.channels.IMessageConfig;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/config/channels/ServerSwitchMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/ServerSwitchMessageConfig.java
similarity index 94%
rename from common/proxy/src/main/java/com/discordsrv/proxy/config/channels/ServerSwitchMessageConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/ServerSwitchMessageConfig.java
index 7c6b509d..84abb368 100644
--- a/common/proxy/src/main/java/com/discordsrv/proxy/config/channels/ServerSwitchMessageConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/ServerSwitchMessageConfig.java
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.proxy.config.channels;
+package com.discordsrv.common.config.main.channels;
 
 import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
 import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
 import com.discordsrv.common.config.annotation.Untranslated;
-import com.discordsrv.common.config.main.channels.IMessageConfig;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyBaseChannelConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyBaseChannelConfig.java
similarity index 91%
rename from common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyBaseChannelConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyBaseChannelConfig.java
index 5f46e325..c9fae4a4 100644
--- a/common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyBaseChannelConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyBaseChannelConfig.java
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.proxy.config.channels.base;
+package com.discordsrv.common.config.main.channels.base.proxy;
 
 import com.discordsrv.common.config.annotation.Order;
 import com.discordsrv.common.config.main.channels.JoinMessageConfig;
+import com.discordsrv.common.config.main.channels.ServerSwitchMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
-import com.discordsrv.proxy.config.channels.ServerSwitchMessageConfig;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyChannelConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyChannelConfig.java
similarity index 96%
rename from common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyChannelConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyChannelConfig.java
index 9a6cf751..1504873a 100644
--- a/common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyChannelConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyChannelConfig.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.proxy.config.channels.base;
+package com.discordsrv.common.config.main.channels.base.proxy;
 
 import com.discordsrv.common.config.main.channels.base.IChannelConfig;
 import com.discordsrv.common.config.main.channels.base.ThreadConfig;
diff --git a/common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerBaseChannelConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java
similarity index 91%
rename from common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerBaseChannelConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java
index 88acdff0..0a3689f4 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerBaseChannelConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.config.channels.base;
+package com.discordsrv.common.config.main.channels.base.server;
 
 import com.discordsrv.common.config.annotation.Order;
+import com.discordsrv.common.config.main.channels.DeathMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
-import com.discordsrv.common.server.config.channels.DeathMessageConfig;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
 @ConfigSerializable
diff --git a/common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerChannelConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerChannelConfig.java
similarity index 96%
rename from common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerChannelConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerChannelConfig.java
index 5ef40726..f9a9ea63 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerChannelConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerChannelConfig.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.config.channels.base;
+package com.discordsrv.common.config.main.channels.base.server;
 
 import com.discordsrv.common.config.main.channels.base.IChannelConfig;
 import com.discordsrv.common.config.main.channels.base.ThreadConfig;
diff --git a/common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerJoinMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerJoinMessageConfig.java
similarity index 95%
rename from common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerJoinMessageConfig.java
rename to common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerJoinMessageConfig.java
index 09c0f0a9..0323ea92 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerJoinMessageConfig.java
+++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerJoinMessageConfig.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.config.channels.base;
+package com.discordsrv.common.config.main.channels.base.server;
 
 import com.discordsrv.common.config.annotation.Order;
 import com.discordsrv.common.config.main.channels.JoinMessageConfig;
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/config/manager/ProxyConfigManager.java b/common/src/main/java/com/discordsrv/common/config/manager/manager/ProxyConfigManager.java
similarity index 87%
rename from common/proxy/src/main/java/com/discordsrv/proxy/config/manager/ProxyConfigManager.java
rename to common/src/main/java/com/discordsrv/common/config/manager/manager/ProxyConfigManager.java
index 6e06d9b4..20922ba5 100644
--- a/common/proxy/src/main/java/com/discordsrv/proxy/config/manager/ProxyConfigManager.java
+++ b/common/src/main/java/com/discordsrv/common/config/manager/manager/ProxyConfigManager.java
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.proxy.config.manager;
+package com.discordsrv.common.config.manager.manager;
 
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.config.main.MainConfig;
 import com.discordsrv.common.config.main.channels.base.IChannelConfig;
+import com.discordsrv.common.config.main.channels.base.proxy.ProxyBaseChannelConfig;
+import com.discordsrv.common.config.main.channels.base.proxy.ProxyChannelConfig;
 import com.discordsrv.common.config.manager.MainConfigManager;
-import com.discordsrv.proxy.config.channels.base.ProxyBaseChannelConfig;
-import com.discordsrv.proxy.config.channels.base.ProxyChannelConfig;
 import org.spongepowered.configurate.objectmapping.ObjectMapper;
 
 public abstract class ProxyConfigManager<T extends MainConfig> extends MainConfigManager<T> {
diff --git a/common/server/src/main/java/com/discordsrv/common/server/config/manager/ServerConfigManager.java b/common/src/main/java/com/discordsrv/common/config/manager/manager/ServerConfigManager.java
similarity index 87%
rename from common/server/src/main/java/com/discordsrv/common/server/config/manager/ServerConfigManager.java
rename to common/src/main/java/com/discordsrv/common/config/manager/manager/ServerConfigManager.java
index 492c08cf..63b59bb0 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/config/manager/ServerConfigManager.java
+++ b/common/src/main/java/com/discordsrv/common/config/manager/manager/ServerConfigManager.java
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.config.manager;
+package com.discordsrv.common.config.manager.manager;
 
 import com.discordsrv.common.DiscordSRV;
 import com.discordsrv.common.config.main.MainConfig;
 import com.discordsrv.common.config.main.channels.base.IChannelConfig;
 import com.discordsrv.common.config.manager.MainConfigManager;
-import com.discordsrv.common.server.config.channels.base.ServerBaseChannelConfig;
-import com.discordsrv.common.server.config.channels.base.ServerChannelConfig;
+import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
+import com.discordsrv.common.config.main.channels.base.server.ServerChannelConfig;
 import org.spongepowered.configurate.objectmapping.ObjectMapper;
 
 public abstract class ServerConfigManager<T extends MainConfig> extends MainConfigManager<T> {
diff --git a/common/server/src/main/java/com/discordsrv/common/server/modules/DeathMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
similarity index 89%
rename from common/server/src/main/java/com/discordsrv/common/server/modules/DeathMessageModule.java
rename to common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
index a03d4c6c..b877d966 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/modules/DeathMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.modules;
+package com.discordsrv.common.messageforwarding.game;
 
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
 import com.discordsrv.api.event.bus.EventPriority;
@@ -24,11 +24,10 @@ import com.discordsrv.api.event.bus.Subscribe;
 import com.discordsrv.api.event.events.message.forward.game.DeathMessageForwardedEvent;
 import com.discordsrv.api.event.events.message.receive.game.DeathMessageReceiveEvent;
 import com.discordsrv.common.DiscordSRV;
+import com.discordsrv.common.config.main.channels.DeathMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
+import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
 import com.discordsrv.common.function.OrDefault;
-import com.discordsrv.common.messageforwarding.game.AbstractGameMessageModule;
-import com.discordsrv.common.server.config.channels.DeathMessageConfig;
-import com.discordsrv.common.server.config.channels.base.ServerBaseChannelConfig;
 
 public class DeathMessageModule extends AbstractGameMessageModule<DeathMessageConfig, DeathMessageReceiveEvent> {
 
diff --git a/common/proxy/src/main/java/com/discordsrv/proxy/modules/ServerSwitchMessageModule.java b/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
similarity index 89%
rename from common/proxy/src/main/java/com/discordsrv/proxy/modules/ServerSwitchMessageModule.java
rename to common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
index 4ee1ca0f..f5124ce8 100644
--- a/common/proxy/src/main/java/com/discordsrv/proxy/modules/ServerSwitchMessageModule.java
+++ b/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.proxy.modules;
+package com.discordsrv.common.messageforwarding.game;
 
 import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
 import com.discordsrv.api.event.bus.EventPriority;
@@ -24,11 +24,10 @@ import com.discordsrv.api.event.bus.Subscribe;
 import com.discordsrv.api.event.events.message.forward.game.ServerSwitchMessageForwardedEvent;
 import com.discordsrv.api.event.events.message.receive.game.ServerSwitchMessageReceiveEvent;
 import com.discordsrv.common.DiscordSRV;
+import com.discordsrv.common.config.main.channels.ServerSwitchMessageConfig;
 import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
+import com.discordsrv.common.config.main.channels.base.proxy.ProxyBaseChannelConfig;
 import com.discordsrv.common.function.OrDefault;
-import com.discordsrv.common.messageforwarding.game.AbstractGameMessageModule;
-import com.discordsrv.proxy.config.channels.ServerSwitchMessageConfig;
-import com.discordsrv.proxy.config.channels.base.ProxyBaseChannelConfig;
 
 public class ServerSwitchMessageModule extends AbstractGameMessageModule<ServerSwitchMessageConfig, ServerSwitchMessageReceiveEvent> {
 
diff --git a/common/server/src/main/java/com/discordsrv/common/server/player/ServerPlayerProvider.java b/common/src/main/java/com/discordsrv/common/player/ServerPlayerProvider.java
similarity index 91%
rename from common/server/src/main/java/com/discordsrv/common/server/player/ServerPlayerProvider.java
rename to common/src/main/java/com/discordsrv/common/player/ServerPlayerProvider.java
index cf009818..ad31c32c 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/player/ServerPlayerProvider.java
+++ b/common/src/main/java/com/discordsrv/common/player/ServerPlayerProvider.java
@@ -16,11 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.player;
+package com.discordsrv.common.player;
 
 import com.discordsrv.common.DiscordSRV;
-import com.discordsrv.common.player.IOfflinePlayer;
-import com.discordsrv.common.player.IPlayer;
 import com.discordsrv.common.player.provider.AbstractPlayerProvider;
 
 import java.util.Optional;
diff --git a/common/server/src/main/java/com/discordsrv/common/server/scheduler/ServerScheduler.java b/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java
similarity index 96%
rename from common/server/src/main/java/com/discordsrv/common/server/scheduler/ServerScheduler.java
rename to common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java
index 9270f86f..aa6ac97b 100644
--- a/common/server/src/main/java/com/discordsrv/common/server/scheduler/ServerScheduler.java
+++ b/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.discordsrv.common.server.scheduler;
+package com.discordsrv.common.scheduler;
 
-import com.discordsrv.common.scheduler.Scheduler;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.concurrent.TimeUnit;
diff --git a/i18n/build.gradle b/i18n/build.gradle
index eda49460..9f09ed67 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -12,8 +12,7 @@ version = null
 
 dependencies {
     implementation(project(':common:common-api'))
-    implementation(project(':common:common-server'))
-    implementation(project(':common:common-proxy'))
+    implementation(project(':common'))
 
     // Depend on all platforms for configs
     implementation(project(':bukkit')) { transitive = false }
diff --git a/settings.gradle b/settings.gradle
index 38fde968..1219399a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -134,7 +134,7 @@ dependencyResolutionManagement {
 rootProject.name = 'DiscordSRV2'
 
 [
-        'common', 'common:api', 'common:server', 'common:proxy', 'common:unrelocate', 'common:templates',
+        'common', 'common:api', 'common:unrelocate', 'common:templates',
         'i18n',
         'api',
         'bukkit', 'bukkit:loader',
diff --git a/sponge/build.gradle b/sponge/build.gradle
index b7b3b3b3..9088664e 100644
--- a/sponge/build.gradle
+++ b/sponge/build.gradle
@@ -30,7 +30,8 @@ dependencies {
     annotationProcessor project(':api')
 
     // Common
-    implementation project(':common:common-server')
+    implementation project(':common')
+    implementation project(':common:common-templates')
 
     // Dependency Download
     implementation(libs.dependencydownload.jarinjar.bootstrap)
diff --git a/sponge/src/main/java/com/discordsrv/sponge/SpongeDiscordSRV.java b/sponge/src/main/java/com/discordsrv/sponge/SpongeDiscordSRV.java
index 99472fd8..0cce433d 100644
--- a/sponge/src/main/java/com/discordsrv/sponge/SpongeDiscordSRV.java
+++ b/sponge/src/main/java/com/discordsrv/sponge/SpongeDiscordSRV.java
@@ -26,7 +26,7 @@ import com.discordsrv.common.config.manager.ConnectionConfigManager;
 import com.discordsrv.common.config.manager.MainConfigManager;
 import com.discordsrv.common.debug.data.OnlineMode;
 import com.discordsrv.common.plugin.PluginManager;
-import com.discordsrv.common.server.ServerDiscordSRV;
+import com.discordsrv.common.ServerDiscordSRV;
 import com.discordsrv.sponge.console.SpongeConsole;
 import com.discordsrv.sponge.player.SpongePlayerProvider;
 import com.discordsrv.sponge.plugin.SpongePluginManager;
diff --git a/sponge/src/main/java/com/discordsrv/sponge/player/SpongePlayerProvider.java b/sponge/src/main/java/com/discordsrv/sponge/player/SpongePlayerProvider.java
index c6c07819..c249bd6a 100644
--- a/sponge/src/main/java/com/discordsrv/sponge/player/SpongePlayerProvider.java
+++ b/sponge/src/main/java/com/discordsrv/sponge/player/SpongePlayerProvider.java
@@ -19,7 +19,7 @@
 package com.discordsrv.sponge.player;
 
 import com.discordsrv.common.player.IOfflinePlayer;
-import com.discordsrv.common.server.player.ServerPlayerProvider;
+import com.discordsrv.common.player.ServerPlayerProvider;
 import com.discordsrv.sponge.SpongeDiscordSRV;
 import org.spongepowered.api.entity.living.player.User;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
diff --git a/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java b/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java
index d4b4577f..ff1947e4 100644
--- a/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java
+++ b/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java
@@ -18,7 +18,7 @@
 
 package com.discordsrv.sponge.scheduler;
 
-import com.discordsrv.common.server.scheduler.ServerScheduler;
+import com.discordsrv.common.scheduler.ServerScheduler;
 import com.discordsrv.common.scheduler.StandardScheduler;
 import com.discordsrv.sponge.SpongeDiscordSRV;
 import org.spongepowered.api.scheduler.TaskExecutorService;
diff --git a/velocity/build.gradle b/velocity/build.gradle
index 33388acc..3427cafd 100644
--- a/velocity/build.gradle
+++ b/velocity/build.gradle
@@ -24,7 +24,8 @@ dependencies {
     implementation project(':common:common-api')
 
     // Common
-    implementation project(':common:common-proxy')
+    implementation project(':common')
+    implementation project(':common:common-templates')
 
     // Platform
     annotationProcessor(libs.velocity)
diff --git a/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java b/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java
index 6748045f..c2b802a2 100644
--- a/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java
+++ b/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java
@@ -26,7 +26,7 @@ import com.discordsrv.common.config.manager.MainConfigManager;
 import com.discordsrv.common.debug.data.OnlineMode;
 import com.discordsrv.common.plugin.PluginManager;
 import com.discordsrv.common.scheduler.StandardScheduler;
-import com.discordsrv.proxy.ProxyDiscordSRV;
+import com.discordsrv.common.ProxyDiscordSRV;
 import com.discordsrv.velocity.command.game.handler.VelocityCommandHandler;
 import com.discordsrv.velocity.console.VelocityConsole;
 import com.discordsrv.velocity.player.VelocityPlayerProvider;