diff --git a/bootstrap/bungeecord/build.gradle.kts b/bootstrap/bungeecord/base/build.gradle.kts
similarity index 100%
rename from bootstrap/bungeecord/build.gradle.kts
rename to bootstrap/bungeecord/base/build.gradle.kts
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/BungeeHybridListener.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/BungeeHybridListener.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/BungeeHybridListener.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/BungeeHybridListener.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeCompressionDisabler.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeCompressionDisabler.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeCompressionDisabler.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeCompressionDisabler.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeConfiguration.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeConfiguration.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeConfiguration.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeConfiguration.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeDumpInfo.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeInjector.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeLogger.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeLogger.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeLogger.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeLogger.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeMain.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java
similarity index 96%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java
index 3c3853ed8..3110df8d3 100644
--- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java
+++ b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePingPassthrough.java
@@ -144,6 +144,16 @@ public class GeyserBungeePingPassthrough implements IGeyserPingPassthrough, List
             return false;
         }
 
+        @Override
+        public boolean isTransferred() {
+            return false;
+        }
+
+        @Override
+        public CompletableFuture<byte[]> retrieveCookie(String s) {
+            return null;
+        }
+
         @Override
         public InetSocketAddress getAddress() {
             return remote;
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeUpdateListener.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeUpdateListener.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeUpdateListener.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeUpdateListener.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSource.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSource.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSource.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/command/BungeeCommandSource.java
diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java b/bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java
similarity index 100%
rename from bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java
rename to bootstrap/bungeecord/base/src/main/java/org/geysermc/geyser/platform/bungeecord/command/GeyserBungeeCommandExecutor.java
diff --git a/bootstrap/bungeecord/src/main/resources/bungee.yml b/bootstrap/bungeecord/base/src/main/resources/bungee.yml
similarity index 100%
rename from bootstrap/bungeecord/src/main/resources/bungee.yml
rename to bootstrap/bungeecord/base/src/main/resources/bungee.yml
diff --git a/bootstrap/spigot/build.gradle.kts b/bootstrap/spigot/base/build.gradle.kts
similarity index 100%
rename from bootstrap/spigot/build.gradle.kts
rename to bootstrap/spigot/base/build.gradle.kts
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperLogger.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperLogger.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperLogger.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperLogger.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotCompressionDisabler.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotCompressionDisabler.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotCompressionDisabler.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotCompressionDisabler.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotConfiguration.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotConfiguration.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotConfiguration.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotConfiguration.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotDumpInfo.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotLogger.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotLogger.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotLogger.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotLogger.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotMain.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPingPassthrough.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotUpdateListener.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotUpdateListener.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotUpdateListener.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotUpdateListener.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotVersionChecker.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotVersionChecker.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotVersionChecker.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotVersionChecker.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/PaperAdventure.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/PaperAdventure.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/PaperAdventure.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/PaperAdventure.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/SpigotHybridChannelHandler.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/SpigotHybridChannelHandler.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/SpigotHybridChannelHandler.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/SpigotHybridChannelHandler.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserBrigadierSupport.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserBrigadierSupport.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserBrigadierSupport.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserBrigadierSupport.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserPaperCommandListener.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserPaperCommandListener.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserPaperCommandListener.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserPaperCommandListener.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandExecutor.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandManager.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandManager.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandManager.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/GeyserSpigotCommandManager.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSource.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSource.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSource.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/command/SpigotCommandSource.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserPistonListener.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/GeyserSpigotBlockPlaceListener.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotLegacyNativeWorldManager.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotNativeWorldManager.java
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java b/bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java
similarity index 100%
rename from bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java
rename to bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java
diff --git a/bootstrap/spigot/src/main/resources/plugin.yml b/bootstrap/spigot/base/src/main/resources/plugin.yml
similarity index 100%
rename from bootstrap/spigot/src/main/resources/plugin.yml
rename to bootstrap/spigot/base/src/main/resources/plugin.yml
diff --git a/bootstrap/velocity/build.gradle.kts b/bootstrap/velocity/base/build.gradle.kts
similarity index 100%
rename from bootstrap/velocity/build.gradle.kts
rename to bootstrap/velocity/base/build.gradle.kts
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityCompressionDisabler.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityCompressionDisabler.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityCompressionDisabler.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityCompressionDisabler.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityConfiguration.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityConfiguration.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityConfiguration.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityConfiguration.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityDumpInfo.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityLogger.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityLogger.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityLogger.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityLogger.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityMain.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPingPassthrough.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityUpdateListener.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityUpdateListener.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityUpdateListener.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityUpdateListener.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/command/GeyserVelocityCommandExecutor.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSource.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSource.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSource.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/command/VelocityCommandSource.java
diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/floodgate/FloodgateModule.java b/bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/floodgate/FloodgateModule.java
similarity index 100%
rename from bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/floodgate/FloodgateModule.java
rename to bootstrap/velocity/base/src/main/java/org/geysermc/geyser/platform/velocity/floodgate/FloodgateModule.java
diff --git a/build.gradle.kts b/build.gradle.kts
index 8011e96af..9fa1fe60f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,9 +21,12 @@ java {
 val platforms = setOf(
     projects.fabric,
     projects.bungeecord,
+    projects.bungeecordBase,
     projects.spigot,
+    projects.spigotBase,
     projects.standalone,
-    projects.velocity
+    projects.velocity,
+    projects.velocityBase
 ).map { it.dependencyProject }
 
 subprojects {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5b72faee1..21055bae5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -59,16 +59,23 @@ rootProject.name = "geyser-parent"
 
 include(":ap")
 include(":api")
-include(":bungeecord")
 include(":fabric")
-include(":spigot")
 include(":standalone")
-include(":velocity")
 include(":core")
 
 // Specify project dirs
-project(":bungeecord").projectDir = file("bootstrap/bungeecord")
-project(":fabric").projectDir = file("bootstrap/fabric")
-project(":spigot").projectDir = file("bootstrap/spigot")
 project(":standalone").projectDir = file("bootstrap/standalone")
-project(":velocity").projectDir = file("bootstrap/velocity")
\ No newline at end of file
+
+//todo see what's possible with fabric
+project(":fabric").projectDir = file("bootstrap/fabric")
+
+arrayOf("bungeecord", "spigot", "velocity").forEach { platform ->
+    arrayOf("base", "isolated").forEach {
+        var id = ":$platform-$it"
+        // isolated is the new default
+        if (id.endsWith("-isolated")) id = ":$platform"
+
+        include(id)
+        project(id).projectDir = file("bootstrap/$platform/$it")
+    }
+}