diff --git a/assets/src/components/Login.vue b/assets/src/components/Login.vue
index 62a642f8..6bf322d1 100644
--- a/assets/src/components/Login.vue
+++ b/assets/src/components/Login.vue
@@ -3,10 +3,10 @@
     <form @submit="submit">
       <img src="../assets/logo.svg" alt="File Manager">
       <h1>File Manager</h1>
-      <div v-if="wrong" class="wrong">Wrong credentials</div>
-      <input type="text" v-model="username" placeholder="Username">
-      <input type="password" v-model="password" placeholder="Password">
-      <input type="submit" value="Login">
+      <div v-if="wrong" class="wrong">{{ $t("login.wrongCredentials") }}</div>
+      <input type="text" v-model="username" :placeholder="$t('login.username')">
+      <input type="password" v-model="password" :placeholder="$t('login.password')">
+      <input type="submit" :value="$t('login.submit')">
     </form>
   </div>
 </template>
diff --git a/assets/src/components/Sidebar.vue b/assets/src/components/Sidebar.vue
index cd462a94..bb4f6898 100644
--- a/assets/src/components/Sidebar.vue
+++ b/assets/src/components/Sidebar.vue
@@ -2,7 +2,7 @@
   <nav :class="{active}">
     <router-link class="action" to="/files/" aria-label="My Files" title="My Files">
       <i class="material-icons">folder</i>
-      <span>My Files</span>
+      <span>{{ $t('My Files') }}</span>
     </router-link>
 
     <div v-if="user.allowNew">
@@ -65,6 +65,7 @@ export default {
   computed: {
     ...mapState(['user', 'plugins']),
     active () {
+      console.log(this.$i18n)
       return this.$store.state.show === 'sidebar'
     }
   },
diff --git a/assets/src/components/Editor.vue b/assets/src/components/files/Editor.vue
similarity index 100%
rename from assets/src/components/Editor.vue
rename to assets/src/components/files/Editor.vue
diff --git a/assets/src/components/Files.vue b/assets/src/components/files/Files.vue
similarity index 97%
rename from assets/src/components/Files.vue
rename to assets/src/components/files/Files.vue
index d36b07e7..911eb755 100644
--- a/assets/src/components/Files.vue
+++ b/assets/src/components/files/Files.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script>
-import Forbidden from './errors/403'
-import NotFound from './errors/404'
-import InternalError from './errors/500'
+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'
diff --git a/assets/src/components/Listing.vue b/assets/src/components/files/Listing.vue
similarity index 100%
rename from assets/src/components/Listing.vue
rename to assets/src/components/files/Listing.vue
diff --git a/assets/src/components/ListingItem.vue b/assets/src/components/files/ListingItem.vue
similarity index 100%
rename from assets/src/components/ListingItem.vue
rename to assets/src/components/files/ListingItem.vue
diff --git a/assets/src/components/Preview.vue b/assets/src/components/files/Preview.vue
similarity index 94%
rename from assets/src/components/Preview.vue
rename to assets/src/components/files/Preview.vue
index 142cf2ba..51c9d01a 100644
--- a/assets/src/components/Preview.vue
+++ b/assets/src/components/files/Preview.vue
@@ -35,10 +35,10 @@
 import { mapState } from 'vuex'
 import url from '@/utils/url'
 import api from '@/utils/api'
-import InfoButton from './buttons/Info'
-import DeleteButton from './buttons/Delete'
-import RenameButton from './buttons/Rename'
-import DownloadButton from './buttons/Download'
+import InfoButton from '@/components/buttons/Info'
+import DeleteButton from '@/components/buttons/Delete'
+import RenameButton from '@/components/buttons/Rename'
+import DownloadButton from '@/components/buttons/Download'
 
 export default {
   name: 'preview',
diff --git a/assets/src/components/GlobalSettings.vue b/assets/src/components/settings/Global.vue
similarity index 98%
rename from assets/src/components/GlobalSettings.vue
rename to assets/src/components/settings/Global.vue
index 0c852b94..8e79ed7a 100644
--- a/assets/src/components/GlobalSettings.vue
+++ b/assets/src/components/settings/Global.vue
@@ -4,7 +4,7 @@
 
     <ul>
       <li><router-link to="/settings/profile">Go to Profile Settings</router-link></li>
-      <li><router-link to="/users">Go to User Management</router-link></li>
+      <li><router-link to="/settings/users">Go to User Management</router-link></li>
     </ul>
 
     <form @submit="savePlugin" v-if="plugins.length > 0">
diff --git a/assets/src/components/ProfileSettings.vue b/assets/src/components/settings/Profile.vue
similarity index 100%
rename from assets/src/components/ProfileSettings.vue
rename to assets/src/components/settings/Profile.vue
diff --git a/assets/src/components/User.vue b/assets/src/components/settings/User.vue
similarity index 100%
rename from assets/src/components/User.vue
rename to assets/src/components/settings/User.vue
diff --git a/assets/src/components/Users.vue b/assets/src/components/settings/Users.vue
similarity index 87%
rename from assets/src/components/Users.vue
rename to assets/src/components/settings/Users.vue
index 71ce0c53..ba1a3dff 100644
--- a/assets/src/components/Users.vue
+++ b/assets/src/components/settings/Users.vue
@@ -14,7 +14,7 @@
         <td>{{ user.username }}</td>
         <td><i v-if="user.admin" class="material-icons">done</i><i v-else class="material-icons">close</i></td>
         <td>{{ user.filesystem }}</td>
-        <td><router-link :to="'/users/' + user.ID"><i class="material-icons">mode_edit</i></router-link></td>
+        <td><router-link :to="'/settigns/users/' + user.ID"><i class="material-icons">mode_edit</i></router-link></td>
       </tr>
 
     </table>
diff --git a/assets/src/i18n/en.json b/assets/src/i18n/en.json
new file mode 100644
index 00000000..b2027635
--- /dev/null
+++ b/assets/src/i18n/en.json
@@ -0,0 +1,8 @@
+{
+  "login": {
+    "wrongCredentials": "Wrong credentials",
+    "username": "Username",
+    "password": "Password",
+    "submit": "Login"
+  }
+}
diff --git a/assets/src/i18n/index.js b/assets/src/i18n/index.js
new file mode 100644
index 00000000..c39130f6
--- /dev/null
+++ b/assets/src/i18n/index.js
@@ -0,0 +1,14 @@
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import en from './en.json'
+import pt from './pt.json'
+
+Vue.use(VueI18n)
+
+export default new VueI18n({
+  locale: 'en',
+  messages: {
+    'en': en,
+    'pt': pt
+  }
+})
diff --git a/assets/src/i18n/pt.json b/assets/src/i18n/pt.json
new file mode 100644
index 00000000..33b332c7
--- /dev/null
+++ b/assets/src/i18n/pt.json
@@ -0,0 +1,8 @@
+{
+  "login": {
+    "wrongCredentials": "Credenciais erradas",
+    "username": "Nome de utilizador",
+    "password": "Palavra-passe",
+    "submit": "Entrar"
+  }
+}
diff --git a/assets/src/main.js b/assets/src/main.js
index 47008899..33c69173 100644
--- a/assets/src/main.js
+++ b/assets/src/main.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import App from './App'
 import store from './store'
 import router from './router'
+import i18n from './i18n'
 
 Vue.config.productionTip = true
 
@@ -10,6 +11,7 @@ new Vue({
   el: '#app',
   store,
   router,
+  i18n,
   template: '<App/>',
   components: { App }
 })
diff --git a/assets/src/router/index.js b/assets/src/router/index.js
index f990afb8..f2090541 100644
--- a/assets/src/router/index.js
+++ b/assets/src/router/index.js
@@ -2,11 +2,11 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import Login from '@/components/Login'
 import Main from '@/components/Main'
-import Files from '@/components/Files'
-import Users from '@/components/Users'
-import User from '@/components/User'
-import GlobalSettings from '@/components/GlobalSettings'
-import ProfileSettings from '@/components/ProfileSettings'
+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 error403 from '@/components/errors/403'
 import error404 from '@/components/errors/404'
 import error500 from '@/components/errors/500'
@@ -96,13 +96,13 @@ const router = new Router({
           }
         },
         {
-          path: '/users/',
+          path: '/settings/users/',
           redirect: {
             path: '/users'
           }
         },
         {
-          path: '/users/*',
+          path: '/settings/users/*',
           name: 'User',
           component: User,
           meta: {
diff --git a/package.json b/package.json
index ea2e169a..ee7acff0 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "moment": "^2.18.1",
     "normalize.css": "^7.0.0",
     "vue": "^2.3.3",
+    "vue-i18n": "^7.1.0",
     "vue-router": "^2.7.0",
     "vuex": "^2.3.1"
   },