diff --git a/modules/info.py b/modules/info.py
deleted file mode 120000
index 0cc405209..000000000
--- a/modules/info.py
+++ /dev/null
@@ -1 +0,0 @@
-installed/router/info.py
\ No newline at end of file
diff --git a/modules/installed/router/pagekite.py b/modules/installed/pagekite/pagekite.py
similarity index 96%
rename from modules/installed/router/pagekite.py
rename to modules/installed/pagekite/pagekite.py
index 72d1da260..5bb4726da 100644
--- a/modules/installed/router/pagekite.py
+++ b/modules/installed/pagekite/pagekite.py
@@ -38,10 +38,10 @@ class PageKite(PagePlugin):
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
 
-        self.register_page("router.pagekite")
-        cfg.html_root.router.menu.add_item(
+        self.register_page("apps.pagekite")
+        cfg.html_root.apps.menu.add_item(
             _("Public Visibility (PageKite)"), "icon-flag",
-            "/router/pagekite", 50)
+            "/apps/pagekite", 50)
 
     @staticmethod
     @cherrypy.expose
@@ -51,7 +51,7 @@ class PageKite(PagePlugin):
         del kwargs  # Unused
 
         menu = {'title': _('PageKite'),
-                'items': [{'url': '/router/pagekite/configure',
+                'items': [{'url': '/apps/pagekite/configure',
                            'text': _('Configure PageKite')}]}
         sidebar_right = util.render_template(template='menu_block', menu=menu)
 
@@ -112,7 +112,7 @@ class Configure(PagePlugin):  # pylint: disable-msg=C0103
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
 
-        self.register_page("router.pagekite.configure")
+        self.register_page("apps.pagekite.configure")
 
     @cherrypy.expose
     @require()
diff --git a/modules/installed/router/templates/pagekite_configure.html b/modules/installed/pagekite/templates/pagekite_configure.html
similarity index 100%
rename from modules/installed/router/templates/pagekite_configure.html
rename to modules/installed/pagekite/templates/pagekite_configure.html
diff --git a/modules/installed/router/templates/pagekite_introduction.html b/modules/installed/pagekite/templates/pagekite_introduction.html
similarity index 96%
rename from modules/installed/router/templates/pagekite_introduction.html
rename to modules/installed/pagekite/templates/pagekite_introduction.html
index f6619c9a1..f22e1ec35 100644
--- a/modules/installed/router/templates/pagekite_introduction.html
+++ b/modules/installed/pagekite/templates/pagekite_introduction.html
@@ -49,7 +49,7 @@ there. In future, it might be possible to use your buddy's
 
 <p>
   <a class='btn btn-primary btn-lg'
-     href="{{ basehref }}/router/setup/pagekite/configure">Configure
+     href="{{ basehref }}/apps/pagekite/configure">Configure
      PageKite</a>
 </p>
 
diff --git a/modules/installed/router/info.py b/modules/installed/router/info.py
deleted file mode 100644
index cc9c5539a..000000000
--- a/modules/installed/router/info.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import cherrypy
-from plugin_mount import PagePlugin
-from modules.auth import require
-import util
-
-
-class Info(PagePlugin):
-    title = 'Info'
-    order = 10
-    url = 'info'
-
-    def __init__(self, *args, **kwargs):
-        self.register_page("router.info")
-
-    @cherrypy.expose
-    @require()
-    def index(self):
-        return util.render_template(title="Router Information", main="""
-<p>Eventually we will display a bunch of info, graphs and logs about
-the routing functions here.</p>
-""")
diff --git a/modules/installed/router/router.py b/modules/installed/router/router.py
deleted file mode 100644
index 22ca40107..000000000
--- a/modules/installed/router/router.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import cherrypy
-from django import forms
-from gettext import gettext as _
-from plugin_mount import PagePlugin
-from modules.auth import require
-import cfg
-import util
-
-
-class Router(PagePlugin):
-    """Router page"""
-    order = 9  # order of running init in PagePlugins
-
-    def __init__(self, *args, **kwargs):
-        PagePlugin.__init__(self, args, kwargs)
-
-        self.register_page('router')
-
-        self.menu = cfg.main_menu.add_item('Router', 'icon-retweet', '/router',
-                                           10)
-
-    @staticmethod
-    @cherrypy.expose
-    def index():
-        """This isn't an internal redirect, because we need the url to
-        reflect that we've moved down into the submenu hierarchy.
-        Otherwise, it's hard to know which menu portion to make active
-        or expand or contract."""
-        raise cherrypy.HTTPRedirect(cfg.server_dir + '/router/pagekite')
diff --git a/modules/pagekite.py b/modules/pagekite.py
index 2981955ca..d30c4701f 120000
--- a/modules/pagekite.py
+++ b/modules/pagekite.py
@@ -1 +1 @@
-installed/router/pagekite.py
\ No newline at end of file
+installed/pagekite/pagekite.py
\ No newline at end of file
diff --git a/modules/router.py b/modules/router.py
deleted file mode 120000
index 7239c9f3b..000000000
--- a/modules/router.py
+++ /dev/null
@@ -1 +0,0 @@
-installed/router/router.py
\ No newline at end of file