diff --git a/.gitmodules b/.gitmodules
index cf004149..074c6a2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "common/src/main/resources/languages"]
-	path = common/src/main/resources/languages
+[submodule "core/src/main/resources/languages"]
+	path = core/src/main/resources/languages
 	url = https://github.com/GeyserMC/languages
 	branch = l10n_floodgate
diff --git a/Jenkinsfile b/Jenkinsfile
index d24e0da9..bd5d8114 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
             }
             post {
                 success {
-                    archiveArtifacts artifacts: '**/target/floodgate-*.jar', excludes: "**/target/floodgate-common.jar", fingerprint: true
+                    archiveArtifacts artifacts: '**/target/floodgate-*.jar', excludes: "**/target/floodgate-core.jar", fingerprint: true
                 }
             }
         }
@@ -24,7 +24,7 @@ pipeline {
             when {
                 anyOf {
                     branch "master"
-                    branch "dev/2.0"
+                    branch "dev/2.1.1"
                 }
             }
 
diff --git a/api/pom.xml b/api/pom.xml
index a57fdda6..08406568 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>api</artifactId>
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 825c4f1a..b369d3bc 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>bungee</artifactId>
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>org.geysermc.floodgate</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- following dependencies are relocated -->
diff --git a/common/src/main/resources/languages b/common/src/main/resources/languages
deleted file mode 160000
index d08abbfa..00000000
--- a/common/src/main/resources/languages
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d08abbfab6e15bee15ba356ba4aa2a7ac0e329ce
diff --git a/common/pom.xml b/core/pom.xml
similarity index 98%
rename from common/pom.xml
rename to core/pom.xml
index 25a755ad..193914ea 100644
--- a/common/pom.xml
+++ b/core/pom.xml
@@ -7,10 +7,10 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>common</artifactId>
+  <artifactId>core</artifactId>
 
   <properties>
     <java-websocket.version>1.5.2</java-websocket.version>
diff --git a/common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java b/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
rename to core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java b/core/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java
rename to core/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java b/core/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java
rename to core/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java b/core/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java
rename to core/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java b/core/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java
rename to core/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java b/core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java
rename to core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java b/core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java
rename to core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java b/core/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java
rename to core/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java b/core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java
rename to core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java b/core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java
rename to core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/debug/State.java b/core/src/main/java/org/geysermc/floodgate/addon/debug/State.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/debug/State.java
rename to core/src/main/java/org/geysermc/floodgate/addon/debug/State.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/debug/StateChangeDetector.java b/core/src/main/java/org/geysermc/floodgate/addon/debug/StateChangeDetector.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/debug/StateChangeDetector.java
rename to core/src/main/java/org/geysermc/floodgate/addon/debug/StateChangeDetector.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java b/core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java
rename to core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java b/core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java
rename to core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java
rename to core/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java
diff --git a/common/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java
rename to core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java b/core/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java
rename to core/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java b/core/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java
rename to core/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/TestCommand.java b/core/src/main/java/org/geysermc/floodgate/command/TestCommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/TestCommand.java
rename to core/src/main/java/org/geysermc/floodgate/command/TestCommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java b/core/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java
rename to core/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java b/core/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java
rename to core/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java b/core/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java
rename to core/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java b/core/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
rename to core/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java b/core/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java
rename to core/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/FloodgateConfigHolder.java b/core/src/main/java/org/geysermc/floodgate/config/FloodgateConfigHolder.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/FloodgateConfigHolder.java
rename to core/src/main/java/org/geysermc/floodgate/config/FloodgateConfigHolder.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java b/core/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java
rename to core/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/loader/ConfigInitializer.java b/core/src/main/java/org/geysermc/floodgate/config/loader/ConfigInitializer.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/loader/ConfigInitializer.java
rename to core/src/main/java/org/geysermc/floodgate/config/loader/ConfigInitializer.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java b/core/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java
rename to core/src/main/java/org/geysermc/floodgate/config/loader/ConfigLoader.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/loader/DefaultConfigHandler.java b/core/src/main/java/org/geysermc/floodgate/config/loader/DefaultConfigHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/loader/DefaultConfigHandler.java
rename to core/src/main/java/org/geysermc/floodgate/config/loader/DefaultConfigHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/updater/ConfigFileUpdater.java b/core/src/main/java/org/geysermc/floodgate/config/updater/ConfigFileUpdater.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/updater/ConfigFileUpdater.java
rename to core/src/main/java/org/geysermc/floodgate/config/updater/ConfigFileUpdater.java
diff --git a/common/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java b/core/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java
rename to core/src/main/java/org/geysermc/floodgate/config/updater/ConfigUpdater.java
diff --git a/common/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java b/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java
rename to core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java
diff --git a/common/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java b/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java
rename to core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java
diff --git a/common/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java b/core/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java
rename to core/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java
diff --git a/common/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
rename to core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
diff --git a/common/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
rename to core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
diff --git a/common/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java b/core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
rename to core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
diff --git a/common/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java b/core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
rename to core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
diff --git a/common/src/main/java/org/geysermc/floodgate/link/PlayerLinkLoader.java b/core/src/main/java/org/geysermc/floodgate/link/PlayerLinkLoader.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/link/PlayerLinkLoader.java
rename to core/src/main/java/org/geysermc/floodgate/link/PlayerLinkLoader.java
diff --git a/common/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java b/core/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java
rename to core/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/CommandModule.java b/core/src/main/java/org/geysermc/floodgate/module/CommandModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/CommandModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/CommandModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/CommonModule.java b/core/src/main/java/org/geysermc/floodgate/module/CommonModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/CommonModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/CommonModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java b/core/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java b/core/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java b/core/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java b/core/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java b/core/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java
rename to core/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java
diff --git a/common/src/main/java/org/geysermc/floodgate/news/NewsChecker.java b/core/src/main/java/org/geysermc/floodgate/news/NewsChecker.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/news/NewsChecker.java
rename to core/src/main/java/org/geysermc/floodgate/news/NewsChecker.java
diff --git a/common/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java b/core/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java
rename to core/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java
diff --git a/common/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java b/core/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java
rename to core/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java
diff --git a/common/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java b/core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java
rename to core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java
diff --git a/common/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java b/core/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java
rename to core/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java
diff --git a/common/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java b/core/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java
rename to core/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java
diff --git a/common/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java b/core/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java
rename to core/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java
diff --git a/common/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java b/core/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java
rename to core/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java b/core/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java
rename to core/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java b/core/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
rename to core/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java b/core/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java
rename to core/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java b/core/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java
rename to core/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/ServerAudience.java b/core/src/main/java/org/geysermc/floodgate/player/ServerAudience.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/ServerAudience.java
rename to core/src/main/java/org/geysermc/floodgate/player/ServerAudience.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/UserAudience.java b/core/src/main/java/org/geysermc/floodgate/player/UserAudience.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/UserAudience.java
rename to core/src/main/java/org/geysermc/floodgate/player/UserAudience.java
diff --git a/common/src/main/java/org/geysermc/floodgate/player/UserAudienceArgument.java b/core/src/main/java/org/geysermc/floodgate/player/UserAudienceArgument.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/player/UserAudienceArgument.java
rename to core/src/main/java/org/geysermc/floodgate/player/UserAudienceArgument.java
diff --git a/common/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java
rename to core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java
diff --git a/common/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java
rename to core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java
diff --git a/common/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java
rename to core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java
diff --git a/common/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java
rename to core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java
diff --git a/common/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
rename to core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
diff --git a/common/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java
rename to core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java
diff --git a/common/src/main/java/org/geysermc/floodgate/register/AddonRegister.java b/core/src/main/java/org/geysermc/floodgate/register/AddonRegister.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/register/AddonRegister.java
rename to core/src/main/java/org/geysermc/floodgate/register/AddonRegister.java
diff --git a/common/src/main/java/org/geysermc/floodgate/register/CommandRegister.java b/core/src/main/java/org/geysermc/floodgate/register/CommandRegister.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/register/CommandRegister.java
rename to core/src/main/java/org/geysermc/floodgate/register/CommandRegister.java
diff --git a/common/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java b/core/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java
rename to core/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java
diff --git a/common/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java b/core/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java
rename to core/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java
diff --git a/common/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java b/core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java
rename to core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java
diff --git a/common/src/main/java/org/geysermc/floodgate/skin/SkinData.java b/core/src/main/java/org/geysermc/floodgate/skin/SkinData.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/skin/SkinData.java
rename to core/src/main/java/org/geysermc/floodgate/skin/SkinData.java
diff --git a/common/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java b/core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java
rename to core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java
diff --git a/common/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java b/core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java
rename to core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/Constants.java b/core/src/main/java/org/geysermc/floodgate/util/Constants.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/Constants.java
rename to core/src/main/java/org/geysermc/floodgate/util/Constants.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/GitProperties.java b/core/src/main/java/org/geysermc/floodgate/util/GitProperties.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/GitProperties.java
rename to core/src/main/java/org/geysermc/floodgate/util/GitProperties.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/HttpUtils.java b/core/src/main/java/org/geysermc/floodgate/util/HttpUtils.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/HttpUtils.java
rename to core/src/main/java/org/geysermc/floodgate/util/HttpUtils.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java b/core/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java
rename to core/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/LanguageManager.java b/core/src/main/java/org/geysermc/floodgate/util/LanguageManager.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/LanguageManager.java
rename to core/src/main/java/org/geysermc/floodgate/util/LanguageManager.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java b/core/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java
rename to core/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/Permissions.java b/core/src/main/java/org/geysermc/floodgate/util/Permissions.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/Permissions.java
rename to core/src/main/java/org/geysermc/floodgate/util/Permissions.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/PrefixCheckTask.java b/core/src/main/java/org/geysermc/floodgate/util/PrefixCheckTask.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/PrefixCheckTask.java
rename to core/src/main/java/org/geysermc/floodgate/util/PrefixCheckTask.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java b/core/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java
rename to core/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java
diff --git a/common/src/main/java/org/geysermc/floodgate/util/Utils.java b/core/src/main/java/org/geysermc/floodgate/util/Utils.java
similarity index 100%
rename from common/src/main/java/org/geysermc/floodgate/util/Utils.java
rename to core/src/main/java/org/geysermc/floodgate/util/Utils.java
diff --git a/common/src/main/resources/config.yml b/core/src/main/resources/config.yml
similarity index 100%
rename from common/src/main/resources/config.yml
rename to core/src/main/resources/config.yml
diff --git a/common/src/main/resources/proxy-config.yml b/core/src/main/resources/proxy-config.yml
similarity index 100%
rename from common/src/main/resources/proxy-config.yml
rename to core/src/main/resources/proxy-config.yml
diff --git a/database/mysql/pom.xml b/database/mysql/pom.xml
index 5976b661..36f8e857 100644
--- a/database/mysql/pom.xml
+++ b/database/mysql/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate.database</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>mysql</artifactId>
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.geysermc.floodgate</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>core</artifactId>
       <version>${parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/database/pom.xml b/database/pom.xml
index fb924344..d241562b 100644
--- a/database/pom.xml
+++ b/database/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.geysermc.floodgate.database</groupId>
diff --git a/database/sqlite/pom.xml b/database/sqlite/pom.xml
index 3ba2075b..a18ed23f 100644
--- a/database/sqlite/pom.xml
+++ b/database/sqlite/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate.database</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>sqlite</artifactId>
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.geysermc.floodgate</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>core</artifactId>
       <version>${parent.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 23280e36..85e8c649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.geysermc.floodgate</groupId>
   <artifactId>parent</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>floodgate</name>
@@ -27,7 +27,7 @@
 
   <modules>
     <module>api</module>
-    <module>common</module>
+    <module>core</module>
     <module>spigot</module>
     <module>bungee</module>
     <module>velocity</module>
diff --git a/spigot/pom.xml b/spigot/pom.xml
index 3a0707e5..3ff95438 100644
--- a/spigot/pom.xml
+++ b/spigot/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.geysermc.floodgate</groupId>
     <artifactId>parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>spigot</artifactId>
@@ -53,7 +53,7 @@
     <!-- end of hack -->
     <dependency>
       <groupId>org.geysermc.floodgate</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- the following dependencies are (also) relocated -->
diff --git a/velocity/pom.xml b/velocity/pom.xml
index acf1f604..fa5dcba1 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.geysermc.floodgate</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>velocity</artifactId>
@@ -22,7 +22,7 @@
   <dependencies>
     <dependency>
       <groupId>org.geysermc.floodgate</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>