diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index 13fc40f3..73c430d5 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>net.md_5</groupId>
             <artifactId>bungeecord-internal</artifactId>
-            <version>1.9-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java
index ec7ce98e..34a5716b 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java
@@ -2,7 +2,7 @@ package net.ME1312.SubServers.Bungee;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiInfo;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiInfo;
 
 import java.security.Security;
 import java.text.SimpleDateFormat;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java
similarity index 96%
rename from SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommand.java
rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java
index 5b740086..df22e270 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommand.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java
@@ -1,4 +1,4 @@
-package net.ME1312.SubServers.Sync.Library.Compatibility;
+package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.md_5.bungee.api.plugin.Command;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommandWrapper.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
similarity index 97%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommandWrapper.java
rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
index af0ecd25..2f4dbbec 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommandWrapper.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
@@ -1,4 +1,4 @@
-package net.ME1312.SubServers.Bungee.Library.Compatibility;
+package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Galaxi;
 import net.ME1312.Galaxi.Library.Util;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiEventListener.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java
similarity index 89%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiEventListener.java
rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java
index 8699f8a9..df48a19c 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiEventListener.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java
@@ -1,9 +1,10 @@
-package net.ME1312.SubServers.Bungee.Library.Compatibility;
+package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Event.ConsoleInputEvent;
 import net.ME1312.Galaxi.Galaxi;
 import net.ME1312.Galaxi.Library.Event.ListenerOrder;
 import net.ME1312.Galaxi.Library.Event.Subscribe;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.SubProxy;
 
 /**
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java
similarity index 95%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiInfo.java
rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java
index 023dc111..7aeb69be 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiInfo.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java
@@ -1,4 +1,4 @@
-package net.ME1312.SubServers.Bungee.Library.Compatibility;
+package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
index ccfb7e7a..52a8791b 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
@@ -9,7 +9,7 @@ import net.ME1312.Galaxi.Library.NamedContainer;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
 import net.ME1312.SubData.Server.ClientHandler;
-import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiInfo;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiInfo;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Network.Packet.PacketCheckPermission;
 import net.md_5.bungee.BungeeCord;
@@ -31,7 +31,7 @@ import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiCommand.*;
+import static net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand.*;
 
 /**
  * Plugin Command Class
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
index 61c4b3fa..9dbd4625 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
@@ -15,7 +15,7 @@ import net.ME1312.SubServers.Bungee.Host.*;
 import net.ME1312.SubServers.Bungee.Library.*;
 import net.ME1312.Galaxi.Library.Config.YAMLConfig;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
-import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiCommand;
+import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand;
 import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Bungee.Library.Fallback.SmartReconnectHandler;
 import net.ME1312.SubServers.Bungee.Library.Updates.ConfigUpdater;
@@ -72,7 +72,7 @@ public final class SubProxy extends BungeeCord implements Listener {
     public SubProtocol subprotocol;
     public SubDataServer subdata = null;
     public SubServer sudo = null;
-    public static final Version version = Version.fromString("2.15a");
+    public static final Version version = Version.fromString("2.15a/rv2");
 
     public Proxy redis = null;
     public boolean canSudo = false;
@@ -233,7 +233,7 @@ public final class SubProxy extends BungeeCord implements Listener {
 
         subprotocol = SubProtocol.get();
         Logger.get("SubServers").info("Loading BungeeCord Libraries...");
-        if (isGalaxi) Util.reflect(net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiEventListener.class.getConstructor(SubProxy.class), this);
+        if (isGalaxi) Util.reflect(net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiEventListener.class.getConstructor(SubProxy.class), this);
     }
 
     /**
diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml
index d01d8e4e..6cc19135 100644
--- a/SubServers.Sync/pom.xml
+++ b/SubServers.Sync/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>net.md_5</groupId>
             <artifactId>bungeecord-internal</artifactId>
-            <version>1.9-SNAPSHOT</version>
+            <version>1.15-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
index 5b86aec6..6c42302f 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
@@ -9,7 +9,7 @@ import net.ME1312.SubData.Client.Library.DisconnectReason;
 import net.ME1312.SubServers.Sync.Event.*;
 import net.ME1312.Galaxi.Library.Config.YAMLConfig;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiCommand;
+import net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiCommand;
 import net.ME1312.SubServers.Sync.Library.Compatibility.Logger;
 import net.ME1312.SubServers.Sync.Library.Fallback.SmartReconnectHandler;
 import net.ME1312.SubServers.Sync.Library.Metrics;
@@ -57,7 +57,7 @@ public final class ExProxy extends BungeeCord implements Listener {
     public boolean redis = false;
     public final SubAPI api = new SubAPI(this);
     public SubProtocol subprotocol;
-    public static final Version version = Version.fromString("2.15a");
+    public static final Version version = Version.fromString("2.15a/rv2");
 
     public final boolean isPatched;
     public final boolean isGalaxi;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
index 803cb95b..fa2c77e6 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
@@ -2,7 +2,7 @@ package net.ME1312.SubServers.Sync;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiInfo;
+import net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiInfo;
 
 import java.security.Security;
 import java.text.SimpleDateFormat;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommand.java
similarity index 96%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommand.java
rename to SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommand.java
index bde77d7e..1a406aa7 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommand.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommand.java
@@ -1,4 +1,4 @@
-package net.ME1312.SubServers.Bungee.Library.Compatibility;
+package net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.md_5.bungee.api.plugin.Command;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommandWrapper.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
similarity index 97%
rename from SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommandWrapper.java
rename to SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
index 0bbdaccb..9e4d173e 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommandWrapper.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
@@ -1,4 +1,4 @@
-package net.ME1312.SubServers.Sync.Library.Compatibility;
+package net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Galaxi;
 import net.ME1312.Galaxi.Library.Util;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiInfo.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiInfo.java
similarity index 95%
rename from SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiInfo.java
rename to SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiInfo.java
index ba744eb3..074ea7ba 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiInfo.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiInfo.java
@@ -1,4 +1,4 @@
-package net.ME1312.SubServers.Sync.Library.Compatibility;
+package net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi;
 
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java
index 5a49572d..1882be8c 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java
@@ -10,7 +10,7 @@ import net.ME1312.Galaxi.Library.Container;
 import net.ME1312.Galaxi.Library.NamedContainer;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.Galaxi.Library.Version.Version;
-import net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiInfo;
+import net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiInfo;
 import net.ME1312.SubServers.Sync.Network.API.*;
 import net.ME1312.SubServers.Sync.Network.Packet.*;
 import net.ME1312.SubServers.Sync.Server.ServerImpl;
@@ -33,7 +33,7 @@ import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiCommand.*;
+import static net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiCommand.*;
 
 @SuppressWarnings("deprecation")
 public final class SubCommand extends CommandX {