diff --git a/src/advancedDashboard/Administration/AttachedDevices.vue b/src/pages/advancedDashboard/Administration/AttachedDevices.vue
similarity index 100%
rename from src/advancedDashboard/Administration/AttachedDevices.vue
rename to src/pages/advancedDashboard/Administration/AttachedDevices.vue
diff --git a/src/advancedDashboard/Administration/BackupSettings.vue b/src/pages/advancedDashboard/Administration/BackupSettings.vue
similarity index 100%
rename from src/advancedDashboard/Administration/BackupSettings.vue
rename to src/pages/advancedDashboard/Administration/BackupSettings.vue
diff --git a/src/advancedDashboard/Administration/FirmwareUpdate.vue b/src/pages/advancedDashboard/Administration/FirmwareUpdate.vue
similarity index 100%
rename from src/advancedDashboard/Administration/FirmwareUpdate.vue
rename to src/pages/advancedDashboard/Administration/FirmwareUpdate.vue
diff --git a/src/advancedDashboard/Administration/Logs.vue b/src/pages/advancedDashboard/Administration/Logs.vue
similarity index 100%
rename from src/advancedDashboard/Administration/Logs.vue
rename to src/pages/advancedDashboard/Administration/Logs.vue
diff --git a/src/advancedDashboard/Administration/NetworkTime.vue b/src/pages/advancedDashboard/Administration/NetworkTime.vue
similarity index 100%
rename from src/advancedDashboard/Administration/NetworkTime.vue
rename to src/pages/advancedDashboard/Administration/NetworkTime.vue
diff --git a/src/advancedDashboard/Administration/Password.vue b/src/pages/advancedDashboard/Administration/Password.vue
similarity index 100%
rename from src/advancedDashboard/Administration/Password.vue
rename to src/pages/advancedDashboard/Administration/Password.vue
diff --git a/src/advancedDashboard/Configuration/BridgeSettings.vue b/src/pages/advancedDashboard/Configuration/BridgeSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/BridgeSettings.vue
rename to src/pages/advancedDashboard/Configuration/BridgeSettings.vue
diff --git a/src/advancedDashboard/Configuration/GuestNetwork.vue b/src/pages/advancedDashboard/Configuration/GuestNetwork.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/GuestNetwork.vue
rename to src/pages/advancedDashboard/Configuration/GuestNetwork.vue
diff --git a/src/advancedDashboard/Configuration/IPv6Settings.vue b/src/pages/advancedDashboard/Configuration/IPv6Settings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/IPv6Settings.vue
rename to src/pages/advancedDashboard/Configuration/IPv6Settings.vue
diff --git a/src/advancedDashboard/Configuration/LANSettings.vue b/src/pages/advancedDashboard/Configuration/LANSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/LANSettings.vue
rename to src/pages/advancedDashboard/Configuration/LANSettings.vue
diff --git a/src/advancedDashboard/Configuration/LEDSettings.vue b/src/pages/advancedDashboard/Configuration/LEDSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/LEDSettings.vue
rename to src/pages/advancedDashboard/Configuration/LEDSettings.vue
diff --git a/src/advancedDashboard/Configuration/PortFoward.vue b/src/pages/advancedDashboard/Configuration/PortFoward.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/PortFoward.vue
rename to src/pages/advancedDashboard/Configuration/PortFoward.vue
diff --git a/src/advancedDashboard/Configuration/QoSSettings.vue b/src/pages/advancedDashboard/Configuration/QoSSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/QoSSettings.vue
rename to src/pages/advancedDashboard/Configuration/QoSSettings.vue
diff --git a/src/advancedDashboard/Configuration/RouterMode.vue b/src/pages/advancedDashboard/Configuration/RouterMode.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/RouterMode.vue
rename to src/pages/advancedDashboard/Configuration/RouterMode.vue
diff --git a/src/advancedDashboard/Configuration/RouterSettings.vue b/src/pages/advancedDashboard/Configuration/RouterSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/RouterSettings.vue
rename to src/pages/advancedDashboard/Configuration/RouterSettings.vue
diff --git a/src/advancedDashboard/Configuration/StaticRoutes.vue b/src/pages/advancedDashboard/Configuration/StaticRoutes.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/StaticRoutes.vue
rename to src/pages/advancedDashboard/Configuration/StaticRoutes.vue
diff --git a/src/advancedDashboard/Configuration/TrafficMeter.vue b/src/pages/advancedDashboard/Configuration/TrafficMeter.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/TrafficMeter.vue
rename to src/pages/advancedDashboard/Configuration/TrafficMeter.vue
diff --git a/src/advancedDashboard/Configuration/UPnPSettings.vue b/src/pages/advancedDashboard/Configuration/UPnPSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/UPnPSettings.vue
rename to src/pages/advancedDashboard/Configuration/UPnPSettings.vue
diff --git a/src/advancedDashboard/Configuration/WANSettings.vue b/src/pages/advancedDashboard/Configuration/WANSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/WANSettings.vue
rename to src/pages/advancedDashboard/Configuration/WANSettings.vue
diff --git a/src/advancedDashboard/Configuration/WebServiceSettings.vue b/src/pages/advancedDashboard/Configuration/WebServiceSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/WebServiceSettings.vue
rename to src/pages/advancedDashboard/Configuration/WebServiceSettings.vue
diff --git a/src/advancedDashboard/Configuration/WirelessSettings.vue b/src/pages/advancedDashboard/Configuration/WirelessSettings.vue
similarity index 100%
rename from src/advancedDashboard/Configuration/WirelessSettings.vue
rename to src/pages/advancedDashboard/Configuration/WirelessSettings.vue
diff --git a/src/advancedDashboard/FileShare/FileShareSettings.vue b/src/pages/advancedDashboard/FileShare/FileShareSettings.vue
similarity index 100%
rename from src/advancedDashboard/FileShare/FileShareSettings.vue
rename to src/pages/advancedDashboard/FileShare/FileShareSettings.vue
diff --git a/src/advancedDashboard/FileShare/MediaServer.vue b/src/pages/advancedDashboard/FileShare/MediaServer.vue
similarity index 100%
rename from src/advancedDashboard/FileShare/MediaServer.vue
rename to src/pages/advancedDashboard/FileShare/MediaServer.vue
diff --git a/src/advancedDashboard/FileShare/NetworkFolders.vue b/src/pages/advancedDashboard/FileShare/NetworkFolders.vue
similarity index 100%
rename from src/advancedDashboard/FileShare/NetworkFolders.vue
rename to src/pages/advancedDashboard/FileShare/NetworkFolders.vue
diff --git a/src/advancedDashboard/Overview.vue b/src/pages/advancedDashboard/Overview.vue
similarity index 100%
rename from src/advancedDashboard/Overview.vue
rename to src/pages/advancedDashboard/Overview.vue
diff --git a/src/advancedDashboard/Security/AccessControl.vue b/src/pages/advancedDashboard/Security/AccessControl.vue
similarity index 100%
rename from src/advancedDashboard/Security/AccessControl.vue
rename to src/pages/advancedDashboard/Security/AccessControl.vue
diff --git a/src/advancedDashboard/Security/BlockService.vue b/src/pages/advancedDashboard/Security/BlockService.vue
similarity index 100%
rename from src/advancedDashboard/Security/BlockService.vue
rename to src/pages/advancedDashboard/Security/BlockService.vue
diff --git a/src/advancedDashboard/Security/BlockSites.vue b/src/pages/advancedDashboard/Security/BlockSites.vue
similarity index 100%
rename from src/advancedDashboard/Security/BlockSites.vue
rename to src/pages/advancedDashboard/Security/BlockSites.vue
diff --git a/src/advancedDashboard/Security/EmailSettings.vue b/src/pages/advancedDashboard/Security/EmailSettings.vue
similarity index 100%
rename from src/advancedDashboard/Security/EmailSettings.vue
rename to src/pages/advancedDashboard/Security/EmailSettings.vue
diff --git a/src/advancedDashboard/Security/Schedule.vue b/src/pages/advancedDashboard/Security/Schedule.vue
similarity index 100%
rename from src/advancedDashboard/Security/Schedule.vue
rename to src/pages/advancedDashboard/Security/Schedule.vue
diff --git a/src/basicDashboard/DeviceList.vue b/src/pages/basicDashboard/DeviceList.vue
similarity index 100%
rename from src/basicDashboard/DeviceList.vue
rename to src/pages/basicDashboard/DeviceList.vue
diff --git a/src/basicDashboard/FileShare.vue b/src/pages/basicDashboard/FileShare.vue
similarity index 100%
rename from src/basicDashboard/FileShare.vue
rename to src/pages/basicDashboard/FileShare.vue
diff --git a/src/basicDashboard/GuestNetwork.vue b/src/pages/basicDashboard/GuestNetwork.vue
similarity index 100%
rename from src/basicDashboard/GuestNetwork.vue
rename to src/pages/basicDashboard/GuestNetwork.vue
diff --git a/src/basicDashboard/InternetSetup.vue b/src/pages/basicDashboard/InternetSetup.vue
similarity index 100%
rename from src/basicDashboard/InternetSetup.vue
rename to src/pages/basicDashboard/InternetSetup.vue
diff --git a/src/basicDashboard/Overview.vue b/src/pages/basicDashboard/Overview.vue
similarity index 100%
rename from src/basicDashboard/Overview.vue
rename to src/pages/basicDashboard/Overview.vue
diff --git a/src/basicDashboard/QoS.vue b/src/pages/basicDashboard/QoS.vue
similarity index 100%
rename from src/basicDashboard/QoS.vue
rename to src/pages/basicDashboard/QoS.vue
diff --git a/src/basicDashboard/Wireless.vue b/src/pages/basicDashboard/Wireless.vue
similarity index 100%
rename from src/basicDashboard/Wireless.vue
rename to src/pages/basicDashboard/Wireless.vue