diff --git a/assets/src/router/index.js b/assets/src/router/index.js
index a9b61cba..b1565952 100644
--- a/assets/src/router/index.js
+++ b/assets/src/router/index.js
@@ -1,12 +1,12 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import Login from '@/views/Login'
-import Main from '@/components/Main'
-import Files from '@/components/files/Files'
-import Users from '@/components/settings/Users'
-import User from '@/components/settings/User'
-import GlobalSettings from '@/components/settings/Global'
-import ProfileSettings from '@/components/settings/Profile'
+import Layout from '@/views/Layout'
+import Files from '@/views/Files'
+import Users from '@/views/Users'
+import User from '@/views/User'
+import GlobalSettings from '@/views/GlobalSettings'
+import ProfileSettings from '@/views/ProfileSettings'
 import error403 from '@/components/errors/403'
 import error404 from '@/components/errors/404'
 import error500 from '@/components/errors/500'
@@ -34,15 +34,9 @@ const router = new Router({
           })
       }
     },
-    {
-      path: '/',
-      redirect: {
-        path: '/files/'
-      }
-    },
     {
       path: '/*',
-      component: Main,
+      component: Layout,
       meta: {
         requiresAuth: true
       },
diff --git a/assets/src/components/files/Files.vue b/assets/src/views/Files.vue
similarity index 97%
rename from assets/src/components/files/Files.vue
rename to assets/src/views/Files.vue
index 203afa82..ea605b74 100644
--- a/assets/src/components/files/Files.vue
+++ b/assets/src/views/Files.vue
@@ -30,9 +30,9 @@
 import Forbidden from '@/components/errors/403'
 import NotFound from '@/components/errors/404'
 import InternalError from '@/components/errors/500'
-import Preview from './Preview'
-import Listing from './Listing'
-import Editor from './Editor'
+import Preview from '@/components/files/Preview'
+import Listing from '@/components/files/Listing'
+import Editor from '@/components/files/Editor'
 import api from '@/utils/api'
 import { mapGetters, mapState, mapMutations } from 'vuex'
 
diff --git a/assets/src/components/settings/Global.vue b/assets/src/views/GlobalSettings.vue
similarity index 100%
rename from assets/src/components/settings/Global.vue
rename to assets/src/views/GlobalSettings.vue
diff --git a/assets/src/components/Main.vue b/assets/src/views/Layout.vue
similarity index 84%
rename from assets/src/components/Main.vue
rename to assets/src/views/Layout.vue
index b09a5598..dc0af7a6 100644
--- a/assets/src/components/Main.vue
+++ b/assets/src/views/Layout.vue
@@ -10,13 +10,13 @@
 </template>
 
 <script>
-import Search from './Search'
-import Sidebar from './Sidebar'
-import Prompts from './prompts/Prompts'
-import SiteHeader from './Header'
+import Search from '@/components/Search'
+import Sidebar from '@/components/Sidebar'
+import Prompts from '@/components/prompts/Prompts'
+import SiteHeader from '@/components/Header'
 
 export default {
-  name: 'main',
+  name: 'layout',
   components: {
     Search,
     Sidebar,
diff --git a/assets/src/components/settings/Profile.vue b/assets/src/views/ProfileSettings.vue
similarity index 100%
rename from assets/src/components/settings/Profile.vue
rename to assets/src/views/ProfileSettings.vue
diff --git a/assets/src/components/settings/User.vue b/assets/src/views/User.vue
similarity index 100%
rename from assets/src/components/settings/User.vue
rename to assets/src/views/User.vue
diff --git a/assets/src/components/settings/Users.vue b/assets/src/views/Users.vue
similarity index 100%
rename from assets/src/components/settings/Users.vue
rename to assets/src/views/Users.vue