diff --git a/src/controllers/apikeys.js b/src/controllers/dashboard/apikeys.js
similarity index 100%
rename from src/controllers/apikeys.js
rename to src/controllers/dashboard/apikeys.js
diff --git a/src/controllers/device.js b/src/controllers/dashboard/devices/device.js
similarity index 100%
rename from src/controllers/device.js
rename to src/controllers/dashboard/devices/device.js
diff --git a/src/controllers/devices.js b/src/controllers/dashboard/devices/devices.js
similarity index 100%
rename from src/controllers/devices.js
rename to src/controllers/dashboard/devices/devices.js
diff --git a/src/controllers/dlnaprofile.js b/src/controllers/dashboard/dlna/dlnaprofile.js
similarity index 100%
rename from src/controllers/dlnaprofile.js
rename to src/controllers/dashboard/dlna/dlnaprofile.js
diff --git a/src/controllers/dlnaprofiles.js b/src/controllers/dashboard/dlna/dlnaprofiles.js
similarity index 100%
rename from src/controllers/dlnaprofiles.js
rename to src/controllers/dashboard/dlna/dlnaprofiles.js
diff --git a/src/controllers/dlnasettings.js b/src/controllers/dashboard/dlna/dlnasettings.js
similarity index 100%
rename from src/controllers/dlnasettings.js
rename to src/controllers/dashboard/dlna/dlnasettings.js
diff --git a/src/controllers/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
similarity index 100%
rename from src/controllers/encodingsettings.js
rename to src/controllers/dashboard/encodingsettings.js
diff --git a/src/controllers/librarydisplay.js b/src/controllers/dashboard/librarydisplay.js
similarity index 100%
rename from src/controllers/librarydisplay.js
rename to src/controllers/dashboard/librarydisplay.js
diff --git a/src/controllers/medialibrarypage.js b/src/controllers/dashboard/medialibrarypage.js
similarity index 100%
rename from src/controllers/medialibrarypage.js
rename to src/controllers/dashboard/medialibrarypage.js
diff --git a/src/controllers/metadataimagespage.js b/src/controllers/dashboard/metadataimagespage.js
similarity index 100%
rename from src/controllers/metadataimagespage.js
rename to src/controllers/dashboard/metadataimagespage.js
diff --git a/src/controllers/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js
similarity index 100%
rename from src/controllers/metadatanfo.js
rename to src/controllers/dashboard/metadatanfo.js
diff --git a/src/controllers/playbackconfiguration.js b/src/controllers/dashboard/playbackconfiguration.js
similarity index 100%
rename from src/controllers/playbackconfiguration.js
rename to src/controllers/dashboard/playbackconfiguration.js
diff --git a/src/controllers/serveractivity.js b/src/controllers/dashboard/serveractivity.js
similarity index 100%
rename from src/controllers/serveractivity.js
rename to src/controllers/dashboard/serveractivity.js
diff --git a/src/controllers/streamingsettings.js b/src/controllers/dashboard/streamingsettings.js
similarity index 100%
rename from src/controllers/streamingsettings.js
rename to src/controllers/dashboard/streamingsettings.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 9c3db58a7f..72c67e5b71 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -23,6 +23,35 @@ define([
 
     console.debug("defining core routes");
 
+    defineRoute({
+        path: "/addserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/addserver"
+    });
+    defineRoute({
+        path: "/selectserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/selectserver",
+        type: "selectserver"
+    });
+    defineRoute({
+        path: "/forgotpassword.html",
+        anonymous: true,
+        startup: true,
+        controller: "auth/forgotpassword"
+    });
+    defineRoute({
+        path: "/forgotpasswordpin.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/forgotpasswordpin"
+    });
+
     defineRoute({
         path: "/addplugin.html",
         autoFocus: false,
@@ -41,13 +70,6 @@ define([
         transition: "fade",
         controller: "user/profile"
     });
-    defineRoute({
-        path: "/addserver.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/addserver"
-    });
     defineRoute({
         path: "/mypreferencesdisplay.html",
         autoFocus: false,
@@ -95,31 +117,31 @@ define([
         path: "/devices.html",
         autoFocus: false,
         roles: "admin",
-        controller: "devices"
+        controller: "dashboard/devices/devices"
     });
     defineRoute({
         path: "/device.html",
         autoFocus: false,
         roles: "admin",
-        controller: "device"
+        controller: "dashboard/devices/device"
     });
     defineRoute({
         path: "/dlnaprofile.html",
         autoFocus: false,
         roles: "admin",
-        controller: "dlnaprofile"
+        controller: "dashboard/dlna/dlnaprofile"
     });
     defineRoute({
         path: "/dlnaprofiles.html",
         autoFocus: false,
         roles: "admin",
-        controller: "dlnaprofiles"
+        controller: "dashboard/dlna/dlnaprofiles"
     });
     defineRoute({
         path: "/dlnasettings.html",
         autoFocus: false,
         roles: "admin",
-        controller: "dlnasettings"
+        controller: "dashboard/dlna/dlnasettings"
     });
     defineRoute({
         path: "/edititemmetadata.html",
@@ -130,20 +152,7 @@ define([
         path: "/encodingsettings.html",
         autoFocus: false,
         roles: "admin",
-        controller: "encodingsettings"
-    });
-    defineRoute({
-        path: "/forgotpassword.html",
-        anonymous: true,
-        startup: true,
-        controller: "auth/forgotpassword"
-    });
-    defineRoute({
-        path: "/forgotpasswordpin.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/forgotpasswordpin"
+        controller: "dashboard/encodingsettings"
     });
     defineRoute({
         path: "/home.html",
@@ -158,11 +167,6 @@ define([
         controller: "list",
         transition: "fade"
     });
-    defineRoute({
-        path: "/index.html",
-        autoFocus: false,
-        isDefaultRoute: true
-    });
     defineRoute({
         path: "/itemdetails.html",
         controller: "itemdetailpage",
@@ -173,19 +177,13 @@ define([
         path: "/library.html",
         autoFocus: false,
         roles: "admin",
-        controller: "medialibrarypage"
+        controller: "dashboard/medialibrarypage"
     });
     defineRoute({
         path: "/librarydisplay.html",
         autoFocus: false,
         roles: "admin",
-        controller: "librarydisplay"
-    });
-    defineRoute({
-        path: "/librarysettings.html",
-        autoFocus: false,
-        roles: "admin",
-        controller: "librarysettings"
+        controller: "dashboard/librarydisplay"
     });
     defineRoute({
         path: "/livetv.html",
@@ -233,13 +231,13 @@ define([
         path: "/metadataimages.html",
         autoFocus: false,
         roles: "admin",
-        controller: "metadataimagespage"
+        controller: "dashboard/metadataimagespage"
     });
     defineRoute({
         path: "/metadatanfo.html",
         autoFocus: false,
         roles: "admin",
-        controller: "metadatanfo"
+        controller: "dashboard/metadatanfo"
     });
     defineRoute({
         path: "/movies.html",
@@ -265,20 +263,11 @@ define([
         autoFocus: false,
         roles: "admin"
     });
-    defineRoute({
-        path: "/nowplaying.html",
-        controller: "playback/nowplaying",
-        autoFocus: false,
-        transition: "fade",
-        fullscreen: true,
-        supportsThemeMedia: true,
-        enableMediaControl: false
-    });
     defineRoute({
         path: "/playbackconfiguration.html",
         autoFocus: false,
         roles: "admin",
-        controller: "playbackconfiguration"
+        controller: "dashboard/playbackconfiguration"
     });
     defineRoute({
         path: "/availableplugins.html",
@@ -308,31 +297,23 @@ define([
         path: "/search.html",
         controller: "searchpage"
     });
-    defineRoute({
-        path: "/selectserver.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/selectserver",
-        type: "selectserver"
-    });
     defineRoute({
         path: "/serveractivity.html",
         autoFocus: false,
         roles: "admin",
-        controller: "serveractivity"
+        controller: "dashboard/serveractivity"
     });
     defineRoute({
         path: "/apikeys.html",
         autoFocus: false,
         roles: "admin",
-        controller: "apikeys"
+        controller: "dashboard/apikeys"
     });
     defineRoute({
         path: "/streamingsettings.html",
         autoFocus: false,
         roles: "admin",
-        controller: "streamingsettings"
+        controller: "dashboard/streamingsettings"
     });
     defineRoute({
         path: "/tv.html",
@@ -423,6 +404,15 @@ define([
         fullscreen: true,
         enableMediaControl: false
     });
+    defineRoute({
+        path: "/nowplaying.html",
+        controller: "playback/nowplaying",
+        autoFocus: false,
+        transition: "fade",
+        fullscreen: true,
+        supportsThemeMedia: true,
+        enableMediaControl: false
+    });
     defineRoute({
         path: "/configurationpage",
         autoFocus: false,
@@ -436,4 +426,9 @@ define([
         isDefaultRoute: true,
         autoFocus: false
     });
+    defineRoute({
+        path: "/index.html",
+        autoFocus: false,
+        isDefaultRoute: true
+    });
 });