diff --git a/api/pom.xml b/api/pom.xml
index cf923879..0c45e316 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -19,6 +19,12 @@
     <description>API implemented by the Elastic Portal Suite</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.4</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-config</artifactId>
diff --git a/proxy/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
similarity index 92%
rename from proxy/src/main/java/net/md_5/bungee/Util.java
rename to api/src/main/java/net/md_5/bungee/Util.java
index a68f8da8..143a29e9 100644
--- a/proxy/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -1,12 +1,7 @@
 package net.md_5.bungee;
 
 import com.google.common.base.Joiner;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import net.md_5.bungee.api.ChatColor;
 
 /**
  * Series of utility classes to perform various operations.
diff --git a/proxy/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java b/api/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java
similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java
rename to api/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java
diff --git a/proxy/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java b/api/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java
similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java
rename to api/src/main/java/net/md_5/bungee/chat/ComponentSerializer.java
diff --git a/proxy/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java b/api/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java
similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java
rename to api/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java
diff --git a/proxy/src/main/java/net/md_5/bungee/chat/TranslatableComponentSerializer.java b/api/src/main/java/net/md_5/bungee/chat/TranslatableComponentSerializer.java
similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/chat/TranslatableComponentSerializer.java
rename to api/src/main/java/net/md_5/bungee/chat/TranslatableComponentSerializer.java
diff --git a/proxy/src/main/java/net/md_5/bungee/command/PlayerCommand.java b/api/src/main/java/net/md_5/bungee/command/PlayerCommand.java
similarity index 96%
rename from proxy/src/main/java/net/md_5/bungee/command/PlayerCommand.java
rename to api/src/main/java/net/md_5/bungee/command/PlayerCommand.java
index 1d41f642..c9f95766 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/PlayerCommand.java
+++ b/api/src/main/java/net/md_5/bungee/command/PlayerCommand.java
@@ -9,6 +9,10 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;
 
+/**
+ * @deprecated internal use only
+ */
+@Deprecated
 public abstract class PlayerCommand extends Command implements TabExecutor
 {
 
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 82fa9556..aa555ecd 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -23,12 +23,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.2.4</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-http</artifactId>