diff --git a/resources/assets/scripts/router.js b/resources/assets/scripts/router.js
index 395c43bc..f3996eb0 100644
--- a/resources/assets/scripts/router.js
+++ b/resources/assets/scripts/router.js
@@ -9,6 +9,15 @@ import Dashboard from './components/dashboard/Dashboard';
 import Account from './components/dashboard/Account';
 import ResetPassword from './components/auth/ResetPassword';
 import User from './models/user';
+import {
+    Server,
+    ServerAllocations,
+    ServerConsole, ServerDatabases,
+    ServerFiles,
+    ServerSchedules,
+    ServerSettings,
+    ServerSubusers
+} from './components/server';
 
 const routes = [
     {name: 'login', path: '/auth/login', component: Login},
@@ -28,13 +37,16 @@ const routes = [
     {name: 'account.api', path: '/account/api', component: Account},
     {name: 'account.security', path: '/account/security', component: Account},
 
-    {
-        name: 'server',
-        path: '/server/:id',
-        // component: Server,
-        // children: [
-        //     { path: 'files', component: ServerFileManager }
-        // ],
+    { path: '/server/:id', component: Server,
+        children: [
+            { name: 'server', path: '', component: ServerConsole },
+            { name: 'server-files', path: 'files', component: ServerFiles },
+            { name: 'server-subusers', path: 'subusers', component: ServerSubusers },
+            { name: 'server-schedules', path: 'schedules', component: ServerSchedules },
+            { name: 'server-databases', path: 'databases', component: ServerDatabases },
+            { name: 'server-allocations', path: 'allocations', component: ServerAllocations },
+            { name: 'server-settings', path: 'settings', component: ServerSettings },
+        ]
     }
 ];
 
diff --git a/resources/assets/scripts/routes.js b/resources/assets/scripts/routes.js
deleted file mode 100644
index b5501f02..00000000
--- a/resources/assets/scripts/routes.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Base Vuejs Templates
-import Login from './components/auth/Login';
-import Dashboard from './components/dashboard/Dashboard';
-import Account from './components/dashboard/Account';
-import ResetPassword from './components/auth/ResetPassword';
-import {
-    Server,
-    ServerAllocations,
-    ServerConsole,
-    ServerDatabases,
-    ServerFiles,
-    ServerSchedules,
-    ServerSettings,
-    ServerSubusers
-} from "./components/server";
-
-export const routes = [
-    { name: 'login', path: '/auth/login', component: Login },
-    { name: 'forgot-password', path: '/auth/password', component: Login },
-    { name: 'checkpoint', path: '/auth/checkpoint', component: Login },
-    {
-        name: 'reset-password',
-        path: '/auth/password/reset/:token',
-        component: ResetPassword,
-        props: function (route) {
-            return { token: route.params.token, email: route.query.email || '' };
-        }
-    },
-
-    { name : 'dashboard', path: '/', component: Dashboard },
-    { name : 'account', path: '/account', component: Account },
-    { name : 'account.api', path: '/account/api', component: Account },
-    { name : 'account.security', path: '/account/security', component: Account },
-
-    { path: '/server/:serverID', component: Server,
-        children: [
-            { name: 'server', path: '', component: ServerConsole },
-            { name: 'server-files', path: 'files', component: ServerFiles },
-            { name: 'server-subusers', path: 'subusers', component: ServerSubusers },
-            { name: 'server-schedules', path: 'schedules', component: ServerSchedules },
-            { name: 'server-databases', path: 'databases', component: ServerDatabases },
-            { name: 'server-allocations', path: 'allocations', component: ServerAllocations },
-            { name: 'server-settings', path: 'settings', component: ServerSettings },
-        ]
-    }
-];