diff --git a/src/controllers/dashboard/dlna/dlnaprofile.js b/src/controllers/dashboard/dlna/profile.js
similarity index 100%
rename from src/controllers/dashboard/dlna/dlnaprofile.js
rename to src/controllers/dashboard/dlna/profile.js
diff --git a/src/controllers/dashboard/dlna/dlnaprofiles.js b/src/controllers/dashboard/dlna/profiles.js
similarity index 100%
rename from src/controllers/dashboard/dlna/dlnaprofiles.js
rename to src/controllers/dashboard/dlna/profiles.js
diff --git a/src/controllers/dashboard/dlna/dlnasettings.js b/src/controllers/dashboard/dlna/settings.js
similarity index 100%
rename from src/controllers/dashboard/dlna/dlnasettings.js
rename to src/controllers/dashboard/dlna/settings.js
diff --git a/src/controllers/dashboard/medialibrarypage.js b/src/controllers/dashboard/mediaLibrary.js
similarity index 100%
rename from src/controllers/dashboard/medialibrarypage.js
rename to src/controllers/dashboard/mediaLibrary.js
diff --git a/src/controllers/dashboard/metadataimagespage.js b/src/controllers/dashboard/metadataImages.js
similarity index 100%
rename from src/controllers/dashboard/metadataimagespage.js
rename to src/controllers/dashboard/metadataImages.js
diff --git a/src/controllers/dashboard/playbackconfiguration.js b/src/controllers/dashboard/playback.js
similarity index 100%
rename from src/controllers/dashboard/playbackconfiguration.js
rename to src/controllers/dashboard/playback.js
diff --git a/src/controllers/dashboard/streamingsettings.js b/src/controllers/dashboard/streaming.js
similarity index 100%
rename from src/controllers/dashboard/streamingsettings.js
rename to src/controllers/dashboard/streaming.js
diff --git a/src/controllers/useredit.js b/src/controllers/dashboard/users/useredit.js
similarity index 100%
rename from src/controllers/useredit.js
rename to src/controllers/dashboard/users/useredit.js
diff --git a/src/controllers/userlibraryaccess.js b/src/controllers/dashboard/users/userlibraryaccess.js
similarity index 100%
rename from src/controllers/userlibraryaccess.js
rename to src/controllers/dashboard/users/userlibraryaccess.js
diff --git a/src/controllers/usernew.js b/src/controllers/dashboard/users/usernew.js
similarity index 100%
rename from src/controllers/usernew.js
rename to src/controllers/dashboard/users/usernew.js
diff --git a/src/controllers/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
similarity index 100%
rename from src/controllers/userparentalcontrol.js
rename to src/controllers/dashboard/users/userparentalcontrol.js
diff --git a/src/controllers/userpasswordpage.js b/src/controllers/dashboard/users/userpasswordpage.js
similarity index 100%
rename from src/controllers/userpasswordpage.js
rename to src/controllers/dashboard/users/userpasswordpage.js
diff --git a/src/controllers/userprofilespage.js b/src/controllers/dashboard/users/userprofilespage.js
similarity index 100%
rename from src/controllers/userprofilespage.js
rename to src/controllers/dashboard/users/userprofilespage.js
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemDetails.js
similarity index 100%
rename from src/controllers/itemdetailpage.js
rename to src/controllers/itemDetails.js
diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile.js
index 0f4f2c7bc2..fd7d1e32cc 100644
--- a/src/controllers/user/profile.js
+++ b/src/controllers/user/profile.js
@@ -1,4 +1,4 @@
-define(['controllers/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) {
+define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) {
     'use strict';
 
     function reloadUser(page) {
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index adb859d5c9..6f13711b66 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -131,13 +131,13 @@ define([
         path: '/dlnaprofile.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/dlna/dlnaprofile'
+        controller: 'dashboard/dlna/profile'
     });
     defineRoute({
         path: '/dlnaprofiles.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/dlna/dlnaprofiles'
+        controller: 'dashboard/dlna/profiles'
     });
     defineRoute({
         path: '/addplugin.html',
@@ -149,7 +149,7 @@ define([
         path: '/library.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/medialibrarypage'
+        controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
         path: '/librarydisplay.html',
@@ -161,7 +161,7 @@ define([
         path: '/dlnasettings.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/dlna/dlnasettings'
+        controller: 'dashboard/dlna/settings'
     });
     defineRoute({
         path: '/edititemmetadata.html',
@@ -183,7 +183,7 @@ define([
         path: '/metadataimages.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/metadataimagespage'
+        controller: 'dashboard/metadataImages'
     });
     defineRoute({
         path: '/metadatanfo.html',
@@ -207,7 +207,7 @@ define([
         path: '/playbackconfiguration.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/playbackconfiguration'
+        controller: 'dashboard/playback'
     });
     defineRoute({
         path: '/availableplugins.html',
@@ -235,7 +235,7 @@ define([
     });
     defineRoute({
         path: '/itemdetails.html',
-        controller: 'itemdetailpage',
+        controller: 'itemDetails',
         autoFocus: false,
         transition: 'fade'
     });
@@ -314,7 +314,7 @@ define([
         path: '/streamingsettings.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/streamingsettings'
+        controller: 'dashboard/streaming'
     });
     defineRoute({
         path: '/tv.html',
@@ -327,36 +327,36 @@ define([
         path: '/useredit.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'useredit'
+        controller: 'dashboard/users/useredit'
     });
     defineRoute({
         path: '/userlibraryaccess.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'userlibraryaccess'
+        controller: 'dashboard/users/userlibraryaccess'
     });
     defineRoute({
         path: '/usernew.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'usernew'
+        controller: 'dashboard/users/usernew'
     });
     defineRoute({
         path: '/userparentalcontrol.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'userparentalcontrol'
+        controller: 'dashboard/users/userparentalcontrol'
     });
     defineRoute({
         path: '/userpassword.html',
         autoFocus: false,
-        controller: 'userpasswordpage'
+        controller: 'dashboard/users/userpasswordpage'
     });
     defineRoute({
         path: '/userprofiles.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'userprofilespage'
+        controller: 'dashboard/users/userprofilespage'
     });
 
     defineRoute({
@@ -375,7 +375,7 @@ define([
         path: '/wizardlibrary.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'dashboard/medialibrarypage'
+        controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
         path: '/wizardsettings.html',