diff --git a/_assets/src/components/Files.vue b/_assets/src/components/Files.vue
deleted file mode 100644
index 508e8b1d..00000000
--- a/_assets/src/components/Files.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <div>Files</div>
-</template>
-
-<script>
-export default {
-  name: 'files'
-}
-</script>
diff --git a/_assets/src/components/Listing.vue b/_assets/src/components/Listing.vue
index ce37f556..ecbe823b 100644
--- a/_assets/src/components/Listing.vue
+++ b/_assets/src/components/Listing.vue
@@ -69,8 +69,8 @@
 <script>
 import {mapState} from 'vuex'
 import Item from './ListingItem'
-import webdav from '../utils/webdav'
-import page from '../utils/page'
+import webdav from '@/utils/webdav'
+import page from '@/utils/page'
 
 export default {
   name: 'listing',
diff --git a/_assets/src/components/ListingItem.vue b/_assets/src/components/ListingItem.vue
index 35e64d07..5afc3a30 100644
--- a/_assets/src/components/ListingItem.vue
+++ b/_assets/src/components/ListingItem.vue
@@ -28,8 +28,8 @@
 import { mapMutations, mapGetters, mapState } from 'vuex'
 import filesize from 'filesize'
 import moment from 'moment'
-import webdav from '../utils/webdav.js'
-import page from '../utils/page.js'
+import webdav from '@/utils/webdav.js'
+import page from '@/utils/page.js'
 
 export default {
   name: 'item',
@@ -107,7 +107,7 @@ export default {
       return false
     },
     open: function (event) {
-      page.open(this.url)
+      this.$router.push({path: this.url})
     }
   }
 }
diff --git a/_assets/src/components/Main.vue b/_assets/src/components/Main.vue
index 7b454fd4..eb6036fa 100644
--- a/_assets/src/components/Main.vue
+++ b/_assets/src/components/Main.vue
@@ -77,20 +77,20 @@ import Help from './Help'
 import Preview from './Preview'
 import Listing from './Listing'
 import Editor from './Editor'
-import InfoButton from './InfoButton'
-import InfoPrompt from './InfoPrompt'
-import DeleteButton from './DeleteButton'
-import DeletePrompt from './DeletePrompt'
-import RenameButton from './RenameButton'
-import RenamePrompt from './RenamePrompt'
-import UploadButton from './UploadButton'
-import DownloadButton from './DownloadButton'
-import DownloadPrompt from './DownloadPrompt'
-import SwitchButton from './SwitchViewButton'
-import MoveButton from './MoveButton'
-import MovePrompt from './MovePrompt'
-import NewFilePrompt from './NewFilePrompt'
-import NewDirPrompt from './NewDirPrompt'
+import InfoButton from './buttons/InfoButton'
+import InfoPrompt from './prompts/InfoPrompt'
+import DeleteButton from './buttons/DeleteButton'
+import DeletePrompt from './prompts/DeletePrompt'
+import RenameButton from './buttons/RenameButton'
+import RenamePrompt from './prompts/RenamePrompt'
+import UploadButton from './buttons/UploadButton'
+import DownloadButton from './buttons/DownloadButton'
+import DownloadPrompt from './prompts/DownloadPrompt'
+import SwitchButton from './buttons/SwitchViewButton'
+import MoveButton from './buttons/MoveButton'
+import MovePrompt from './prompts/MovePrompt'
+import NewFilePrompt from './prompts/NewFilePrompt'
+import NewDirPrompt from './prompts/NewDirPrompt'
 import css from '@/utils/css'
 import auth from '@/utils/auth'
 import api from '@/utils/api'
@@ -162,7 +162,18 @@ export default {
     })
   },
   beforeRouteUpdate (to, from, next) {
-    console.log('hey')
+    this.$store.commit('resetSelected')
+    this.$store.commit('multiple', false)
+
+    api.fetch(to.params[0])
+    .then(() => {
+      next()
+    })
+    .catch(error => {
+      // TODO: 404, 403 and 500!
+      console.log(error)
+      window.alert('Something went wrong. Please reload.')
+    })
   },
   mounted () {
     updateColumnSizes()
diff --git a/_assets/src/components/Preview.vue b/_assets/src/components/Preview.vue
index deb5b0be..c825beae 100644
--- a/_assets/src/components/Preview.vue
+++ b/_assets/src/components/Preview.vue
@@ -31,10 +31,10 @@
 <script>
 import { mapState } from 'vuex'
 import page from '../utils/page'
-import InfoButton from './InfoButton'
-import DeleteButton from './DeleteButton'
-import RenameButton from './RenameButton'
-import DownloadButton from './DownloadButton'
+import InfoButton from './buttons/InfoButton'
+import DeleteButton from './buttons/DeleteButton'
+import RenameButton from './buttons/RenameButton'
+import DownloadButton from './buttons/DownloadButton'
 
 export default {
   name: 'preview',
diff --git a/_assets/src/components/DeleteButton.vue b/_assets/src/components/buttons/DeleteButton.vue
similarity index 100%
rename from _assets/src/components/DeleteButton.vue
rename to _assets/src/components/buttons/DeleteButton.vue
diff --git a/_assets/src/components/DownloadButton.vue b/_assets/src/components/buttons/DownloadButton.vue
similarity index 100%
rename from _assets/src/components/DownloadButton.vue
rename to _assets/src/components/buttons/DownloadButton.vue
diff --git a/_assets/src/components/InfoButton.vue b/_assets/src/components/buttons/InfoButton.vue
similarity index 100%
rename from _assets/src/components/InfoButton.vue
rename to _assets/src/components/buttons/InfoButton.vue
diff --git a/_assets/src/components/MoveButton.vue b/_assets/src/components/buttons/MoveButton.vue
similarity index 100%
rename from _assets/src/components/MoveButton.vue
rename to _assets/src/components/buttons/MoveButton.vue
diff --git a/_assets/src/components/RenameButton.vue b/_assets/src/components/buttons/RenameButton.vue
similarity index 100%
rename from _assets/src/components/RenameButton.vue
rename to _assets/src/components/buttons/RenameButton.vue
diff --git a/_assets/src/components/SwitchViewButton.vue b/_assets/src/components/buttons/SwitchViewButton.vue
similarity index 100%
rename from _assets/src/components/SwitchViewButton.vue
rename to _assets/src/components/buttons/SwitchViewButton.vue
diff --git a/_assets/src/components/UploadButton.vue b/_assets/src/components/buttons/UploadButton.vue
similarity index 100%
rename from _assets/src/components/UploadButton.vue
rename to _assets/src/components/buttons/UploadButton.vue
diff --git a/_assets/src/components/DeletePrompt.vue b/_assets/src/components/prompts/DeletePrompt.vue
similarity index 96%
rename from _assets/src/components/DeletePrompt.vue
rename to _assets/src/components/prompts/DeletePrompt.vue
index 55453d35..87ab86f8 100644
--- a/_assets/src/components/DeletePrompt.vue
+++ b/_assets/src/components/prompts/DeletePrompt.vue
@@ -12,8 +12,8 @@
 
 <script>
 import {mapGetters, mapMutations, mapState} from 'vuex'
-import webdav from '../utils/webdav'
-import page from '../utils/page'
+import webdav from '@/utils/webdav'
+import page from '@/utils/page'
 
 export default {
   name: 'delete-prompt',
diff --git a/_assets/src/components/DownloadPrompt.vue b/_assets/src/components/prompts/DownloadPrompt.vue
similarity index 100%
rename from _assets/src/components/DownloadPrompt.vue
rename to _assets/src/components/prompts/DownloadPrompt.vue
diff --git a/_assets/src/components/InfoPrompt.vue b/_assets/src/components/prompts/InfoPrompt.vue
similarity index 100%
rename from _assets/src/components/InfoPrompt.vue
rename to _assets/src/components/prompts/InfoPrompt.vue
diff --git a/_assets/src/components/MovePrompt.vue b/_assets/src/components/prompts/MovePrompt.vue
similarity index 98%
rename from _assets/src/components/MovePrompt.vue
rename to _assets/src/components/prompts/MovePrompt.vue
index c8003658..e71ba187 100644
--- a/_assets/src/components/MovePrompt.vue
+++ b/_assets/src/components/prompts/MovePrompt.vue
@@ -18,8 +18,8 @@
 
 <script>
 import { mapState } from 'vuex'
-import page from '../utils/page'
-import webdav from '../utils/webdav'
+import page from '@/utils/page'
+import webdav from '@/utils/webdav'
 
 export default {
   name: 'move-prompt',
diff --git a/_assets/src/components/NewDirPrompt.vue b/_assets/src/components/prompts/NewDirPrompt.vue
similarity index 94%
rename from _assets/src/components/NewDirPrompt.vue
rename to _assets/src/components/prompts/NewDirPrompt.vue
index 0eb88c9a..15331924 100644
--- a/_assets/src/components/NewDirPrompt.vue
+++ b/_assets/src/components/prompts/NewDirPrompt.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script>
-import page from '../utils/page'
-import webdav from '../utils/webdav'
+import page from '@/utils/page'
+import webdav from '@/utils/webdav'
 
 export default {
   name: 'new-dir-prompt',
diff --git a/_assets/src/components/NewFilePrompt.vue b/_assets/src/components/prompts/NewFilePrompt.vue
similarity index 94%
rename from _assets/src/components/NewFilePrompt.vue
rename to _assets/src/components/prompts/NewFilePrompt.vue
index 905c3043..cb272d09 100644
--- a/_assets/src/components/NewFilePrompt.vue
+++ b/_assets/src/components/prompts/NewFilePrompt.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script>
-import page from '../utils/page'
-import webdav from '../utils/webdav'
+import page from '@/utils/page'
+import webdav from '@/utils/webdav'
 
 export default {
   name: 'new-file-prompt',
diff --git a/_assets/src/components/RenamePrompt.vue b/_assets/src/components/prompts/RenamePrompt.vue
similarity index 96%
rename from _assets/src/components/RenamePrompt.vue
rename to _assets/src/components/prompts/RenamePrompt.vue
index c4190d9d..765807b5 100644
--- a/_assets/src/components/RenamePrompt.vue
+++ b/_assets/src/components/prompts/RenamePrompt.vue
@@ -12,8 +12,8 @@
 
 <script>
 import { mapState } from 'vuex'
-import page from '../utils/page'
-import webdav from '../utils/webdav'
+import page from '@/utils/page'
+import webdav from '@/utils/webdav'
 
 export default {
   name: 'rename-prompt',
diff --git a/_assets/src/router/index.js b/_assets/src/router/index.js
index 25f0fd78..19e9a228 100644
--- a/_assets/src/router/index.js
+++ b/_assets/src/router/index.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import Login from '@/components/Login'
-import Files from '@/components/Files'
 import Main from '@/components/Main'
 import auth from '@/utils/auth.js'
 
@@ -35,8 +34,7 @@ const router = new Router({
       children: [
         {
           path: '/files*',
-          name: 'Files',
-          component: Files
+          name: 'Files'
         },
         {
           path: '/*',
diff --git a/_assets/src/utils/api.js b/_assets/src/utils/api.js
index 0074aecd..08291eb7 100644
--- a/_assets/src/utils/api.js
+++ b/_assets/src/utils/api.js
@@ -10,7 +10,6 @@ function fetch (url) {
       if (request.status === 200) {
         let req = JSON.parse(request.responseText)
         store.commit('updateRequest', req)
-        console.log(req)
         document.title = req.name
         resolve()
       } else {
diff --git a/_assets/src/utils/page.js b/_assets/src/utils/page.js
index affcf24a..2649a592 100644
--- a/_assets/src/utils/page.js
+++ b/_assets/src/utils/page.js
@@ -1,36 +1,3 @@
-import store from '../store/store'
-
-function open (url, history) {
-  // Reset info
-  store.commit('resetSelected')
-  store.commit('multiple', false)
-
-  let request = new window.XMLHttpRequest()
-  request.open('GET', url, true)
-  request.setRequestHeader('Accept', 'application/json')
-
-  request.onload = () => {
-    if (request.status === 200) {
-      let req = JSON.parse(request.responseText)
-      store.commit('updateRequest', req)
-
-      if (history) {
-        window.history.pushState({
-          name: req.data.name,
-          url: url
-        }, req.data.name, url)
-
-        document.title = req.data.name
-      }
-    } else {
-      console.log(request.responseText)
-    }
-  }
-
-  request.onerror = (error) => { console.log(error) }
-  request.send()
-}
-
 function removeLastDir (url) {
   var arr = url.split('/')
   if (arr.pop() === '') {
@@ -41,11 +8,5 @@ function removeLastDir (url) {
 }
 
 export default {
-  reload: () => {
-    open(window.location.pathname, false)
-  },
-  open: (url) => {
-    open(url, true)
-  },
   removeLastDir: removeLastDir
 }
diff --git a/file.go b/file.go
index 5fa4e353..19ce8aa4 100644
--- a/file.go
+++ b/file.go
@@ -83,7 +83,7 @@ func getInfo(url *url.URL, c *FileManager, u *User) (*file, error) {
 	var err error
 
 	i := &file{
-		URL:         c.RootURL() + "/files" + url.Path,
+		URL:         "/files" + url.Path,
 		VirtualPath: url.Path,
 		Path:        filepath.Join(string(u.FileSystem), url.Path),
 	}