diff --git a/src/controllers/addserver.js b/src/controllers/auth/addserver.js
similarity index 100%
rename from src/controllers/addserver.js
rename to src/controllers/auth/addserver.js
diff --git a/src/controllers/forgotpassword.js b/src/controllers/auth/forgotpassword.js
similarity index 100%
rename from src/controllers/forgotpassword.js
rename to src/controllers/auth/forgotpassword.js
diff --git a/src/controllers/forgotpasswordpin.js b/src/controllers/auth/forgotpasswordpin.js
similarity index 100%
rename from src/controllers/forgotpasswordpin.js
rename to src/controllers/auth/forgotpasswordpin.js
diff --git a/src/controllers/loginpage.js b/src/controllers/auth/login.js
similarity index 100%
rename from src/controllers/loginpage.js
rename to src/controllers/auth/login.js
diff --git a/src/controllers/selectserver.js b/src/controllers/auth/selectserver.js
similarity index 100%
rename from src/controllers/selectserver.js
rename to src/controllers/auth/selectserver.js
diff --git a/src/controllers/nowplayingpage.js b/src/controllers/playback/nowplayingpage.js
similarity index 100%
rename from src/controllers/nowplayingpage.js
rename to src/controllers/playback/nowplayingpage.js
diff --git a/src/controllers/videoosd.js b/src/controllers/playback/videoosd.js
similarity index 100%
rename from src/controllers/videoosd.js
rename to src/controllers/playback/videoosd.js
diff --git a/src/controllers/wizardremoteaccess.js b/src/controllers/wizard/access.js
similarity index 100%
rename from src/controllers/wizardremoteaccess.js
rename to src/controllers/wizard/access.js
diff --git a/src/controllers/wizardfinishpage.js b/src/controllers/wizard/finish.js
similarity index 100%
rename from src/controllers/wizardfinishpage.js
rename to src/controllers/wizard/finish.js
diff --git a/src/controllers/wizardsettings.js b/src/controllers/wizard/settings.js
similarity index 100%
rename from src/controllers/wizardsettings.js
rename to src/controllers/wizard/settings.js
diff --git a/src/controllers/wizardstart.js b/src/controllers/wizard/start.js
similarity index 100%
rename from src/controllers/wizardstart.js
rename to src/controllers/wizard/start.js
diff --git a/src/controllers/wizarduserpage.js b/src/controllers/wizard/user.js
similarity index 100%
rename from src/controllers/wizarduserpage.js
rename to src/controllers/wizard/user.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 87f55650f..0e4544bb6 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -29,40 +29,40 @@ define([
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "selectserver"
+        controller: "auth/selectserver"
     });
     defineRoute({
         path: "/addserver.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "addserver"
+        controller: "auth/addserver"
     });
     defineRoute({
         path: "/login.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "loginpage"
+        controller: "auth/login"
     });
     defineRoute({
         path: "/forgotpassword.html",
         anonymous: true,
         startup: true,
-        controller: "forgotpassword"
+        controller: "auth/forgotpassword"
     });
     defineRoute({
         path: "/forgotpasswordpin.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "forgotpasswordpin"
+        controller: "auth/forgotpasswordpin"
     });
 
     // playback
     defineRoute({
         path: "/nowplaying.html",
-        controller: "nowplayingpage",
+        controller: "playback/nowplaying",
         autoFocus: false,
         transition: "fade",
         fullscreen: true,
@@ -72,7 +72,7 @@ define([
     defineRoute({
         path: "/videoosd.html",
         transition: "fade",
-        controller: "videoosd",
+        controller: "playback/videoosd",
         autoFocus: false,
         type: "video-osd",
         supportsThemeMedia: true,
@@ -401,13 +401,13 @@ define([
         path: "/wizardremoteaccess.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardremoteaccess"
+        controller: "wizard/access"
     });
     defineRoute({
         path: "/wizardfinish.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardfinishpage"
+        controller: "wizard/finish"
     });
     defineRoute({
         path: "/wizardlibrary.html",
@@ -419,17 +419,17 @@ define([
         path: "/wizardsettings.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardsettings"
+        controller: "wizard/settings"
     });
     defineRoute({
         path: "/wizardstart.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardstart"
+        controller: "wizard/start"
     });
     defineRoute({
         path: "/wizarduser.html",
-        controller: "wizarduserpage",
+        controller: "wizard/user",
         autoFocus: false,
         anonymous: true
     });