diff --git a/router/java/src/net/i2p/router/admin/AdminListener.java b/apps/admin/java/src/net/i2p/router/admin/AdminListener.java
similarity index 100%
rename from router/java/src/net/i2p/router/admin/AdminListener.java
rename to apps/admin/java/src/net/i2p/router/admin/AdminListener.java
diff --git a/router/java/src/net/i2p/router/admin/AdminManager.java b/apps/admin/java/src/net/i2p/router/admin/AdminManager.java
similarity index 100%
rename from router/java/src/net/i2p/router/admin/AdminManager.java
rename to apps/admin/java/src/net/i2p/router/admin/AdminManager.java
diff --git a/router/java/src/net/i2p/router/admin/AdminRunner.java b/apps/admin/java/src/net/i2p/router/admin/AdminRunner.java
similarity index 100%
rename from router/java/src/net/i2p/router/admin/AdminRunner.java
rename to apps/admin/java/src/net/i2p/router/admin/AdminRunner.java
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java
index 5216c3d58..f7aa13064 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java
@@ -6,7 +6,6 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 
 import net.i2p.router.RouterContext;
-import net.i2p.router.admin.StatsGenerator;
 
 public class OldConsoleHelper extends HelperBase {
     public OldConsoleHelper() {}
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
similarity index 99%
rename from router/java/src/net/i2p/router/admin/StatsGenerator.java
rename to apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
index ce7c31613..3838245f5 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
@@ -1,4 +1,4 @@
-package net.i2p.router.admin;
+package net.i2p.router.web;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index 6dd7282b0..467338eb2 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -6,7 +6,6 @@ import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.Hash;
-import net.i2p.router.admin.AdminManager;
 import net.i2p.router.client.ClientManagerFacadeImpl;
 import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
 import net.i2p.router.peermanager.Calculator;
@@ -35,7 +34,6 @@ import net.i2p.util.KeyRing;
  */
 public class RouterContext extends I2PAppContext {
     private Router _router;
-    private AdminManager _adminManager;
     private ClientManagerFacade _clientManagerFacade;
     private ClientMessagePool _clientMessagePool;
     private JobQueue _jobQueue;
@@ -91,7 +89,6 @@ public class RouterContext extends I2PAppContext {
         return envProps;
     }
     public void initAll() {
-        //_adminManager = new AdminManager(this);
         if ("false".equals(getProperty("i2p.dummyClientFacade", "false")))
             _clientManagerFacade = new ClientManagerFacadeImpl(this);
         else
@@ -149,11 +146,6 @@ public class RouterContext extends I2PAppContext {
     /** convenience method for querying the router's ident */
     public Hash routerHash() { return _router.getRouterInfo().getIdentity().getHash(); }
 
-    /**
-     * Controls a basic admin interface
-     *
-     */
-    public AdminManager adminManager() { return _adminManager; }
     /**
      * How are we coordinating clients for the router?
      */