diff --git a/proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java b/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java
similarity index 87%
rename from proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java
rename to api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java
index 2cd0c2804..2adcd5739 100644
--- a/proxy/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/AbstractReconnectHandler.java
@@ -1,13 +1,11 @@
-package net.md_5.bungee.reconnect;
+package net.md_5.bungee.api;
 
 import com.google.common.base.Preconditions;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.ReconnectHandler;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
-public abstract class AbstractReconnectManager implements ReconnectHandler
+public abstract class AbstractReconnectHandler implements ReconnectHandler
 {
 
     @Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 9b10346a7..8b18164b0 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -51,7 +51,7 @@ import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
 import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
 import net.md_5.bungee.protocol.packet.PacketFEPing;
 import net.md_5.bungee.protocol.packet.PacketFFKick;
-import net.md_5.bungee.reconnect.AbstractReconnectManager;
+import net.md_5.bungee.api.AbstractReconnectHandler;
 
 @RequiredArgsConstructor
 public class InitialHandler extends PacketHandler implements PendingConnection
@@ -133,7 +133,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
 
     private void respondToPing()
     {
-        ServerInfo forced = AbstractReconnectManager.getForcedHost( this );
+        ServerInfo forced = AbstractReconnectHandler.getForcedHost( this );
         final String motd = ( forced != null ) ? forced.getMotd() : listener.getMotd();
 
         Callback<ServerPing> pingBack = new Callback<ServerPing>()
@@ -354,7 +354,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
             server = bungee.getReconnectHandler().getServer( userCon );
         } else
         {
-            server = AbstractReconnectManager.getForcedHost( this );
+            server = AbstractReconnectHandler.getForcedHost( this );
         }
         userCon.connect( server, true );
 
diff --git a/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java b/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java
index 2c7a219be..6f036b73f 100644
--- a/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/reconnect/YamlReconnectHandler.java
@@ -1,5 +1,6 @@
 package net.md_5.bungee.reconnect;
 
+import net.md_5.bungee.api.AbstractReconnectHandler;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -16,7 +17,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.error.YAMLException;
 
-public class YamlReconnectHandler extends AbstractReconnectManager
+public class YamlReconnectHandler extends AbstractReconnectHandler
 {
 
     private final Yaml yaml = new Yaml();