diff --git a/package.json b/package.json
index 36ac58dafa..28e45663ec 100644
--- a/package.json
+++ b/package.json
@@ -189,8 +189,8 @@
           "src/controllers/dashboard/users/userparentalcontrol.js",
           "src/controllers/dashboard/users/userpasswordpage.js",
           "src/controllers/dashboard/users/userprofilespage.js",
-          "src/controllers/playback/nowplaying.js",
-          "src/controllers/playback/videoosd.js",
+          "src/controllers/playback/queue/index.js",
+          "src/controllers/playback/video/index.js",
           "src/controllers/searchpage.js",
           "src/controllers/shows/episodes.js",
           "src/controllers/shows/tvgenres.js",
@@ -199,18 +199,18 @@
           "src/controllers/shows/tvshows.js",
           "src/controllers/shows/tvstudios.js",
           "src/controllers/shows/tvupcoming.js",
-          "src/controllers/user/display.js",
-          "src/controllers/user/home.js",
-          "src/controllers/user/menu.js",
-          "src/controllers/user/playback.js",
-          "src/controllers/user/profile.js",
-          "src/controllers/user/subtitles.js",
-          "src/controllers/user/subtitles.js",
-          "src/controllers/wizard/finish.js",
-          "src/controllers/wizard/remoteaccess.js",
-          "src/controllers/wizard/settings.js",
-          "src/controllers/wizard/start.js",
-          "src/controllers/wizard/user.js",
+          "src/controllers/user/display/index.js",
+          "src/controllers/user/home/index.js",
+          "src/controllers/user/menu/index.js",
+          "src/controllers/user/playback/index.js",
+          "src/controllers/user/profile/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/wizard/finish/index.js",
+          "src/controllers/wizard/remote/index.js",
+          "src/controllers/wizard/settings/index.js",
+          "src/controllers/wizard/start/index.js",
+          "src/controllers/wizard/user/index.js",
           "src/elements/emby-button/emby-button.js",
           "src/elements/emby-button/paper-icon-button-light.js",
           "src/elements/emby-checkbox/emby-checkbox.js",
diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 8054279c92..7af7ed4a95 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -16,7 +16,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             show('/settings/settings.html');
         },
         showNowPlaying: function () {
-            show('/nowplaying.html');
+            show('queue');
         }
     };
 
diff --git a/src/nowplaying.html b/src/controllers/playback/queue/index.html
similarity index 100%
rename from src/nowplaying.html
rename to src/controllers/playback/queue/index.html
diff --git a/src/controllers/playback/nowplaying.js b/src/controllers/playback/queue/index.js
similarity index 100%
rename from src/controllers/playback/nowplaying.js
rename to src/controllers/playback/queue/index.js
diff --git a/src/videoosd.html b/src/controllers/playback/video/index.html
similarity index 100%
rename from src/videoosd.html
rename to src/controllers/playback/video/index.html
diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/video/index.js
similarity index 100%
rename from src/controllers/playback/videoosd.js
rename to src/controllers/playback/video/index.js
diff --git a/src/mypreferencesdisplay.html b/src/controllers/user/display/index.html
similarity index 100%
rename from src/mypreferencesdisplay.html
rename to src/controllers/user/display/index.html
diff --git a/src/controllers/user/display.js b/src/controllers/user/display/index.js
similarity index 100%
rename from src/controllers/user/display.js
rename to src/controllers/user/display/index.js
diff --git a/src/mypreferenceshome.html b/src/controllers/user/home/index.html
similarity index 100%
rename from src/mypreferenceshome.html
rename to src/controllers/user/home/index.html
diff --git a/src/controllers/user/home.js b/src/controllers/user/home/index.js
similarity index 100%
rename from src/controllers/user/home.js
rename to src/controllers/user/home/index.js
diff --git a/src/mypreferencesmenu.html b/src/controllers/user/menu/index.html
similarity index 100%
rename from src/mypreferencesmenu.html
rename to src/controllers/user/menu/index.html
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu/index.js
similarity index 100%
rename from src/controllers/user/menu.js
rename to src/controllers/user/menu/index.js
diff --git a/src/mypreferencesplayback.html b/src/controllers/user/playback/index.html
similarity index 100%
rename from src/mypreferencesplayback.html
rename to src/controllers/user/playback/index.html
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback/index.js
similarity index 100%
rename from src/controllers/user/playback.js
rename to src/controllers/user/playback/index.js
diff --git a/src/myprofile.html b/src/controllers/user/profile/index.html
similarity index 100%
rename from src/myprofile.html
rename to src/controllers/user/profile/index.html
diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile/index.js
similarity index 100%
rename from src/controllers/user/profile.js
rename to src/controllers/user/profile/index.js
diff --git a/src/mypreferencessubtitles.html b/src/controllers/user/subtitles/index.html
similarity index 100%
rename from src/mypreferencessubtitles.html
rename to src/controllers/user/subtitles/index.html
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles/index.js
similarity index 100%
rename from src/controllers/user/subtitles.js
rename to src/controllers/user/subtitles/index.js
diff --git a/src/wizardfinish.html b/src/controllers/wizard/finish/index.html
similarity index 100%
rename from src/wizardfinish.html
rename to src/controllers/wizard/finish/index.html
diff --git a/src/controllers/wizard/finish.js b/src/controllers/wizard/finish/index.js
similarity index 100%
rename from src/controllers/wizard/finish.js
rename to src/controllers/wizard/finish/index.js
diff --git a/src/wizardremoteaccess.html b/src/controllers/wizard/remote/index.html
similarity index 100%
rename from src/wizardremoteaccess.html
rename to src/controllers/wizard/remote/index.html
diff --git a/src/controllers/wizard/remoteaccess.js b/src/controllers/wizard/remote/index.js
similarity index 100%
rename from src/controllers/wizard/remoteaccess.js
rename to src/controllers/wizard/remote/index.js
diff --git a/src/wizardsettings.html b/src/controllers/wizard/settings/index.html
similarity index 100%
rename from src/wizardsettings.html
rename to src/controllers/wizard/settings/index.html
diff --git a/src/controllers/wizard/settings.js b/src/controllers/wizard/settings/index.js
similarity index 100%
rename from src/controllers/wizard/settings.js
rename to src/controllers/wizard/settings/index.js
diff --git a/src/wizardstart.html b/src/controllers/wizard/start/index.html
similarity index 100%
rename from src/wizardstart.html
rename to src/controllers/wizard/start/index.html
diff --git a/src/controllers/wizard/start.js b/src/controllers/wizard/start/index.js
similarity index 100%
rename from src/controllers/wizard/start.js
rename to src/controllers/wizard/start/index.js
diff --git a/src/wizarduser.html b/src/controllers/wizard/user/index.html
similarity index 100%
rename from src/wizarduser.html
rename to src/controllers/wizard/user/index.html
diff --git a/src/controllers/wizard/user.js b/src/controllers/wizard/user/index.js
similarity index 100%
rename from src/controllers/wizard/user.js
rename to src/controllers/wizard/user/index.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index ab12b53abf..d446312e5f 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -61,40 +61,46 @@ define([
     });
 
     defineRoute({
-        path: '/mypreferencesmenu.html',
+        alias: '/mypreferencesmenu.html',
+        path: '/controllers/user/menu/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/menu'
+        controller: 'user/menu/index'
     });
     defineRoute({
-        path: '/myprofile.html',
+        alias: '/myprofile.html',
+        path: '/controllers/user/profile/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/profile'
+        controller: 'user/profile/index'
     });
     defineRoute({
-        path: '/mypreferencesdisplay.html',
+        alias: '/mypreferencesdisplay.html',
+        path: '/controllers/user/display/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/display'
+        controller: 'user/display/index'
     });
     defineRoute({
-        path: '/mypreferenceshome.html',
+        alias: '/mypreferenceshome.html',
+        path: '/controllers/user/home/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/home'
+        controller: 'user/home/index'
     });
     defineRoute({
-        path: '/mypreferencesplayback.html',
+        alias: '/mypreferencesplayback.html',
+        path: '/controllers/user/playback/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/playback'
+        controller: 'user/playback/index'
     });
     defineRoute({
-        path: '/mypreferencessubtitles.html',
+        alias: '/mypreferencessubtitles.html',
+        path: '/controllers/user/subtitles/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/subtitles'
+        controller: 'user/subtitles/index'
     });
 
     defineRoute({
@@ -367,16 +373,18 @@ define([
     });
 
     defineRoute({
-        path: '/wizardremoteaccess.html',
+        alias: '/wizardremoteaccess.html',
+        path: '/controllers/wizard/remote/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/remoteaccess'
+        controller: 'wizard/remote/index'
     });
     defineRoute({
-        path: '/wizardfinish.html',
+        alias: '/wizardfinish.html',
+        path: '/controllers/wizard/finish/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/finish'
+        controller: 'wizard/finish/index'
     });
     defineRoute({
         path: '/wizardlibrary.html',
@@ -385,28 +393,32 @@ define([
         controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
-        path: '/wizardsettings.html',
+        alias: '/wizardsettings.html',
+        path: '/controllers/wizard/settings/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/settings'
+        controller: 'wizard/settings/index'
     });
     defineRoute({
-        path: '/wizardstart.html',
+        alias: '/wizardstart.html',
+        path: '/controllers/wizard/start/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/start'
+        controller: 'wizard/start/index'
     });
     defineRoute({
-        path: '/wizarduser.html',
-        controller: 'wizard/user',
+        alias: '/wizarduser.html',
+        path: '/controllers/wizard/user/index.html',
+        controller: 'wizard/user/index',
         autoFocus: false,
         anonymous: true
     });
 
     defineRoute({
-        path: '/videoosd.html',
+        alias: '/video',
+        path: '/controllers/playback/video/index.html',
         transition: 'fade',
-        controller: 'playback/videoosd',
+        controller: 'playback/video/index',
         autoFocus: false,
         type: 'video-osd',
         supportsThemeMedia: true,
@@ -414,8 +426,9 @@ define([
         enableMediaControl: false
     });
     defineRoute({
-        path: '/nowplaying.html',
-        controller: 'playback/nowplaying',
+        alias: '/queue',
+        path: '/controllers/playback/queue/index.html',
+        controller: 'playback/queue/index',
         autoFocus: false,
         transition: 'fade',
         fullscreen: true,
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 6e1af0c493..a3c72c35dd 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -890,7 +890,7 @@ var AppInfo = {};
             };
 
             appRouter.showVideoOsd = function () {
-                return Dashboard.navigate('videoosd.html');
+                return Dashboard.navigate('video');
             };
 
             appRouter.showSelectServer = function () {