diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 615ac3f5..b3bcb6c1 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -32,12 +32,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>net.sf.jopt-simple</groupId>
-            <artifactId>jopt-simple</artifactId>
-            <version>4.9</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 2db37850..af3536bc 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -84,6 +84,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.sf.jopt-simple</groupId>
+            <artifactId>jopt-simple</artifactId>
+            <version>4.9</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
deleted file mode 100644
index 9d51608d..00000000
--- a/proxy/src/main/java/Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.command.ConsoleCommandSender;
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-/**
- *
- * @author michael
- */
-public class Test
-{
-
-    public static void main(String[] args) throws Exception
-    {
-        BungeeCord bungee = new BungeeCord();
-        ProxyServer.setInstance( bungee );
-        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
-        bungee.start();
-
-        while ( bungee.isRunning )
-        {
-            String line = bungee.getConsoleReader().readLine( ">" );
-            if ( line != null )
-            {
-                if ( !bungee.getPluginManager().dispatchCommand( ConsoleCommandSender.getInstance(), line ) )
-                {
-                    bungee.getConsole().sendMessage( ChatColor.RED + "Command not found" );
-                }
-            }
-        }
-    }
-}
diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
similarity index 96%
rename from bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
rename to proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index b6b2ceef..c38b8fc2 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -30,7 +30,7 @@ public class BungeeCordLauncher
 
         if ( options.has( "version" ) )
         {
-            System.out.println( Bootstrap.class.getPackage().getImplementationVersion() );
+            System.out.println( BungeeCord.class.getPackage().getImplementationVersion() );
             return;
         }