diff --git a/src/App.vue b/src/App.vue
index 11027ab7..02a4bc58 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -262,7 +262,7 @@
 	import authTypes from './models/authTypes'
 
 	import swEvents from './ServiceWorker/events'
-	import Notification from './components/global/notification'
+	import Notification from './components/misc/notification'
 	import {CURRENT_LIST, IS_FULLPAGE, ONLINE} from './store/mutation-types'
 
 	export default {
diff --git a/src/components/global/colorPicker.vue b/src/components/input/colorPicker.vue
similarity index 100%
rename from src/components/global/colorPicker.vue
rename to src/components/input/colorPicker.vue
diff --git a/src/components/global/easymde.vue b/src/components/input/easymde.vue
similarity index 97%
rename from src/components/global/easymde.vue
rename to src/components/input/easymde.vue
index 4c42f510..5b95cfb3 100644
--- a/src/components/global/easymde.vue
+++ b/src/components/input/easymde.vue
@@ -76,7 +76,7 @@
 </script>
 
 <style lang="scss">
-    @import '~easymde/dist/easymde.min.css';
+    @import '../../../node_modules/easymde/dist/easymde.min.css';
 
     .CodeMirror {
         padding: 0;
diff --git a/src/components/global/fancycheckbox.vue b/src/components/input/fancycheckbox.vue
similarity index 100%
rename from src/components/global/fancycheckbox.vue
rename to src/components/input/fancycheckbox.vue
diff --git a/src/components/lists/settings/background.vue b/src/components/list/partials/background-settings.vue
similarity index 99%
rename from src/components/lists/settings/background.vue
rename to src/components/list/partials/background-settings.vue
index 34389300..cefbb725 100644
--- a/src/components/lists/settings/background.vue
+++ b/src/components/list/partials/background-settings.vue
@@ -71,7 +71,7 @@
 	import {CURRENT_LIST} from '../../../store/mutation-types'
 
 	export default {
-		name: 'background',
+		name: 'background-settings',
 		data() {
 			return {
 				backgroundSearchTerm: '',
diff --git a/src/components/lists/reusable/filters.vue b/src/components/list/partials/filters.vue
similarity index 98%
rename from src/components/lists/reusable/filters.vue
rename to src/components/list/partials/filters.vue
index 5db34108..46f15759 100644
--- a/src/components/lists/reusable/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import Fancycheckbox from '../../global/fancycheckbox'
+	import Fancycheckbox from '../../input/fancycheckbox'
 	import flatPickr from 'vue-flatpickr-component'
 	import 'flatpickr/dist/flatpickr.css'
 
diff --git a/src/components/global/notification.vue b/src/components/misc/notification.vue
similarity index 100%
rename from src/components/global/notification.vue
rename to src/components/misc/notification.vue
diff --git a/src/components/global/user.vue b/src/components/misc/user.vue
similarity index 100%
rename from src/components/global/user.vue
rename to src/components/misc/user.vue
diff --git a/src/components/modal/Modal.vue b/src/components/modal/modal.vue
similarity index 100%
rename from src/components/modal/Modal.vue
rename to src/components/modal/modal.vue
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 288afab7..d7928b40 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -139,14 +139,14 @@
 	import TaskService from '../../services/task'
 	import TaskModel from '../../models/task'
 	import priorities from '../../models/priorities'
-	import PrioritySelect from './reusable/prioritySelect'
-	import PercentDoneSelect from './reusable/percentDoneSelect'
-	import EditLabels from './reusable/editLabels'
-	import EditAssignees from './reusable/editAssignees'
-	import RelatedTasks from './reusable/relatedTasks'
-	import RepeatAfter from './reusable/repeatAfter'
-	import Reminders from './reusable/reminders'
-	import ColorPicker from '../global/colorPicker'
+	import PrioritySelect from './partials/prioritySelect'
+	import PercentDoneSelect from './partials/percentDoneSelect'
+	import EditLabels from './partials/editLabels'
+	import EditAssignees from './partials/editAssignees'
+	import RelatedTasks from './partials/relatedTasks'
+	import RepeatAfter from './partials/repeatAfter'
+	import Reminders from './partials/reminders'
+	import ColorPicker from '../input/colorPicker'
 
 	export default {
 		name: 'edit-task',
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 7fe580ba..627dcfa1 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -136,7 +136,7 @@
 	import TaskService from '../../services/task'
 	import TaskModel from '../../models/task'
 	import priorities from '../../models/priorities'
-	import PriorityLabel from './reusable/priorityLabel'
+	import PriorityLabel from './partials/priorityLabel'
 	import TaskCollectionService from '../../services/taskCollection'
 
 	export default {
diff --git a/src/components/tasks/helpers/taskList.js b/src/components/tasks/mixins/taskList.js
similarity index 100%
rename from src/components/tasks/helpers/taskList.js
rename to src/components/tasks/mixins/taskList.js
diff --git a/src/components/tasks/reusable/attachments.vue b/src/components/tasks/partials/attachments.vue
similarity index 99%
rename from src/components/tasks/reusable/attachments.vue
rename to src/components/tasks/partials/attachments.vue
index c93a805b..9e432000 100644
--- a/src/components/tasks/reusable/attachments.vue
+++ b/src/components/tasks/partials/attachments.vue
@@ -78,7 +78,7 @@
 <script>
 	import AttachmentService from '../../../services/attachment'
 	import AttachmentModel from '../../../models/attachment'
-	import User from '../../global/user'
+	import User from '../../misc/user'
 
 	export default {
 		name: 'attachments',
diff --git a/src/components/tasks/reusable/comments.vue b/src/components/tasks/partials/comments.vue
similarity index 100%
rename from src/components/tasks/reusable/comments.vue
rename to src/components/tasks/partials/comments.vue
diff --git a/src/components/tasks/reusable/date-table-cell.vue b/src/components/tasks/partials/date-table-cell.vue
similarity index 100%
rename from src/components/tasks/reusable/date-table-cell.vue
rename to src/components/tasks/partials/date-table-cell.vue
diff --git a/src/components/tasks/reusable/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
similarity index 98%
rename from src/components/tasks/reusable/editAssignees.vue
rename to src/components/tasks/partials/editAssignees.vue
index af24995e..1d2cd7d5 100644
--- a/src/components/tasks/reusable/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -39,7 +39,7 @@
 	import UserModel from '../../../models/user'
 	import ListUserService from '../../../services/listUsers'
 	import TaskAssigneeService from '../../../services/taskAssignee'
-	import User from '../../global/user'
+	import User from '../../misc/user'
 
 	export default {
 		name: 'editAssignees',
diff --git a/src/components/tasks/reusable/editLabels.vue b/src/components/tasks/partials/editLabels.vue
similarity index 100%
rename from src/components/tasks/reusable/editLabels.vue
rename to src/components/tasks/partials/editLabels.vue
diff --git a/src/components/tasks/reusable/labels.vue b/src/components/tasks/partials/labels.vue
similarity index 100%
rename from src/components/tasks/reusable/labels.vue
rename to src/components/tasks/partials/labels.vue
diff --git a/src/components/tasks/reusable/listSearch.vue b/src/components/tasks/partials/listSearch.vue
similarity index 100%
rename from src/components/tasks/reusable/listSearch.vue
rename to src/components/tasks/partials/listSearch.vue
diff --git a/src/components/tasks/reusable/percentDoneSelect.vue b/src/components/tasks/partials/percentDoneSelect.vue
similarity index 100%
rename from src/components/tasks/reusable/percentDoneSelect.vue
rename to src/components/tasks/partials/percentDoneSelect.vue
diff --git a/src/components/tasks/reusable/priorityLabel.vue b/src/components/tasks/partials/priorityLabel.vue
similarity index 100%
rename from src/components/tasks/reusable/priorityLabel.vue
rename to src/components/tasks/partials/priorityLabel.vue
diff --git a/src/components/tasks/reusable/prioritySelect.vue b/src/components/tasks/partials/prioritySelect.vue
similarity index 100%
rename from src/components/tasks/reusable/prioritySelect.vue
rename to src/components/tasks/partials/prioritySelect.vue
diff --git a/src/components/tasks/reusable/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue
similarity index 100%
rename from src/components/tasks/reusable/relatedTasks.vue
rename to src/components/tasks/partials/relatedTasks.vue
diff --git a/src/components/tasks/reusable/reminders.vue b/src/components/tasks/partials/reminders.vue
similarity index 100%
rename from src/components/tasks/reusable/reminders.vue
rename to src/components/tasks/partials/reminders.vue
diff --git a/src/components/tasks/reusable/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
similarity index 96%
rename from src/components/tasks/reusable/repeatAfter.vue
rename to src/components/tasks/partials/repeatAfter.vue
index f18d48cc..460a1f7e 100644
--- a/src/components/tasks/reusable/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-	import Fancycheckbox from '../../global/fancycheckbox'
+	import Fancycheckbox from '../../input/fancycheckbox'
 
 	export default {
 		name: 'repeatAfter',
diff --git a/src/components/tasks/reusable/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
similarity index 97%
rename from src/components/tasks/reusable/singleTaskInList.vue
rename to src/components/tasks/partials/singleTaskInList.vue
index d3c72477..3ce9a661 100644
--- a/src/components/tasks/reusable/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -41,8 +41,8 @@
 	import PriorityLabel from './priorityLabel'
 	import TaskService from '../../../services/task'
 	import Labels from './labels'
-	import User from '../../global/user'
-	import Fancycheckbox from '../../global/fancycheckbox'
+	import User from '../../misc/user'
+	import Fancycheckbox from '../../input/fancycheckbox'
 
 	export default {
 		name: 'singleTaskInList',
diff --git a/src/components/tasks/reusable/sort.vue b/src/components/tasks/partials/sort.vue
similarity index 100%
rename from src/components/tasks/reusable/sort.vue
rename to src/components/tasks/partials/sort.vue
diff --git a/src/main.js b/src/main.js
index 142c8554..687cd7ac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,7 @@ if(window.API_URL.substr(window.API_URL.length - 1, window.API_URL.length) === '
 }
 
 // Register the modal
-import Modal from './components/modal/Modal'
+import Modal from './components/modal/modal'
 Vue.component('modal', Modal)
 
 // Add CSS
diff --git a/src/router/index.js b/src/router/index.js
index d0ba2a56..b70b6c1a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,40 +1,41 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
-import HomeComponent from '@/components/Home'
-import NotFoundComponent from '@/components/404'
+import HomeComponent from '../views/Home'
+import NotFoundComponent from '../views/404'
 // User Handling
-import LoginComponent from '@/components/user/Login'
-import RegisterComponent from '@/components/user/Register'
-import PasswordResetComponent from '@/components/user/PasswordReset'
-import GetPasswordResetComponent from '@/components/user/RequestPasswordReset'
-import UserSettingsComponent from '@/components/user/Settings'
+import LoginComponent from '../views/user/Login'
+import RegisterComponent from '../views/user/Register'
+import PasswordResetComponent from '../views/user/PasswordReset'
+import GetPasswordResetComponent from '../views/user/RequestPasswordReset'
+import UserSettingsComponent from '../views/user/Settings'
 // List Handling
-import NewListComponent from '@/components/lists/NewList'
-import EditListComponent from '@/components/lists/EditList'
-import ShowTasksInRangeComponent from '@/components/tasks/ShowTasksInRange'
-import LinkShareAuthComponent from '../components/sharing/linkSharingAuth'
-import TaskDetailViewModal from '../components/tasks/TaskDetailViewModal'
-import TaskDetailView from '../components/tasks/TaskDetailView'
+import NewListComponent from '../views/list/NewList'
+import EditListComponent from '../views/list/EditList'
+// Tasks
+import ShowTasksInRangeComponent from '../views/tasks/ShowTasksInRange'
+import LinkShareAuthComponent from '../views/sharing/LinkSharingAuth'
+import TaskDetailViewModal from '../views/tasks/TaskDetailViewModal'
+import TaskDetailView from '../views/tasks/TaskDetailView'
 // Namespace Handling
-import NewNamespaceComponent from '@/components/namespaces/NewNamespace'
-import EditNamespaceComponent from '@/components/namespaces/EditNamespace'
-import ListNamespaces from '../components/namespaces/ListNamespaces'
+import NewNamespaceComponent from '../views/namespaces/NewNamespace'
+import EditNamespaceComponent from '../views/namespaces/EditNamespace'
+import ListNamespaces from '../views/namespaces/ListNamespaces'
 // Team Handling
-import ListTeamsComponent from '@/components/teams/ListTeams'
-import EditTeamComponent from '@/components/teams/EditTeam'
-import NewTeamComponent from '@/components/teams/NewTeam'
+import ListTeamsComponent from '../views/teams/ListTeams'
+import EditTeamComponent from '../views/teams/EditTeam'
+import NewTeamComponent from '../views/teams/NewTeam'
 // Label Handling
-import ListLabelsComponent from '@/components/labels/ListLabels'
+import ListLabelsComponent from '../views/labels/ListLabels'
 // Migration
-import MigrationComponent from '../components/migrator/migrate'
-import MigrateServiceComponent from '../components/migrator/migrate-service'
+import MigrationComponent from '../views/migrator/Migrate'
+import MigrateServiceComponent from '../views/migrator/MigrateService'
 // List Views
-import ShowListComponent from '../components/lists/ShowList'
-import Kanban from '../components/lists/views/Kanban'
-import List from '../components/lists/views/List'
-import Gantt from '../components/lists/views/Gantt'
-import Table from '../components/lists/views/Table'
+import ShowListComponent from '../views/list/ShowList'
+import Kanban from '../views/list/views/Kanban'
+import List from '../views/list/views/List'
+import Gantt from '../views/list/views/Gantt'
+import Table from '../views/list/views/Table'
 
 Vue.use(Router)
 
diff --git a/src/components/404.vue b/src/views/404.vue
similarity index 100%
rename from src/components/404.vue
rename to src/views/404.vue
diff --git a/src/components/Home.vue b/src/views/Home.vue
similarity index 100%
rename from src/components/Home.vue
rename to src/views/Home.vue
diff --git a/src/components/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
similarity index 98%
rename from src/components/labels/ListLabels.vue
rename to src/views/labels/ListLabels.vue
index 307a8795..c75b0ebf 100644
--- a/src/components/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -97,7 +97,7 @@
 
 	import LabelService from '../../services/label'
 	import LabelModel from '../../models/label'
-	import ColorPicker from '../global/colorPicker'
+	import ColorPicker from '../../components/input/colorPicker'
 
 	export default {
 		name: 'ListLabels',
diff --git a/src/components/lists/EditList.vue b/src/views/list/EditList.vue
similarity index 94%
rename from src/components/lists/EditList.vue
rename to src/views/list/EditList.vue
index b0171b5d..4ebcf8ef 100644
--- a/src/components/lists/EditList.vue
+++ b/src/views/list/EditList.vue
@@ -128,15 +128,15 @@
 
 <script>
 	import router from '../../router'
-	import manageSharing from '../sharing/userTeam'
-	import LinkSharing from '../sharing/linkSharing'
+	import manageSharing from '../../components/sharing/userTeam'
+	import LinkSharing from '../../components/sharing/linkSharing'
 
 	import ListModel from '../../models/list'
 	import ListService from '../../services/list'
-	import Fancycheckbox from '../global/fancycheckbox'
-	import Background from './settings/background'
+	import Fancycheckbox from '../../components/input/fancycheckbox'
+	import Background from '../../components/list/partials/background-settings'
 	import {CURRENT_LIST} from '../../store/mutation-types'
-	import ColorPicker from '../global/colorPicker'
+	import ColorPicker from '../../components/input/colorPicker'
 
 	export default {
 		name: 'EditList',
diff --git a/src/components/lists/NewList.vue b/src/views/list/NewList.vue
similarity index 100%
rename from src/components/lists/NewList.vue
rename to src/views/list/NewList.vue
diff --git a/src/components/lists/ShowList.vue b/src/views/list/ShowList.vue
similarity index 100%
rename from src/components/lists/ShowList.vue
rename to src/views/list/ShowList.vue
diff --git a/src/components/lists/views/Gantt.vue b/src/views/list/views/Gantt.vue
similarity index 94%
rename from src/components/lists/views/Gantt.vue
rename to src/views/list/views/Gantt.vue
index ef250d93..0b12c1c4 100644
--- a/src/components/lists/views/Gantt.vue
+++ b/src/views/list/views/Gantt.vue
@@ -60,9 +60,9 @@
 </template>
 
 <script>
-	import GanttChart from '../../tasks/gantt-component'
+	import GanttChart from '../../../components/tasks/gantt-component'
 	import flatPickr from 'vue-flatpickr-component'
-	import Fancycheckbox from '../../global/fancycheckbox'
+	import Fancycheckbox from '../../../components/input/fancycheckbox'
 	import {saveListView} from '../../../helpers/saveListView'
 
 	export default {
diff --git a/src/components/lists/views/Kanban.vue b/src/views/list/views/Kanban.vue
similarity index 98%
rename from src/components/lists/views/Kanban.vue
rename to src/views/list/views/Kanban.vue
index ebd26b5f..cdf09395 100644
--- a/src/components/lists/views/Kanban.vue
+++ b/src/views/list/views/Kanban.vue
@@ -196,9 +196,9 @@
 	import BucketModel from '../../../models/bucket'
 
 	import {Container, Draggable} from 'vue-smooth-dnd'
-	import PriorityLabel from '../../tasks/reusable/priorityLabel'
-	import User from '../../global/user'
-	import Labels from '../../tasks/reusable/labels'
+	import PriorityLabel from '../../../components/tasks/partials/priorityLabel'
+	import User from '../../../components/misc/user'
+	import Labels from '../../../components/tasks/partials/labels'
 
 	import {filterObject} from '../../../helpers/filterObject'
 	import {applyDrag} from '../../../helpers/applyDrag'
diff --git a/src/components/lists/views/List.vue b/src/views/list/views/List.vue
similarity index 95%
rename from src/components/lists/views/List.vue
rename to src/views/list/views/List.vue
index 65abb33c..6859f883 100644
--- a/src/components/lists/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -154,12 +154,12 @@
 
 <script>
 	import TaskService from '../../../services/task'
-	import EditTask from '../../tasks/edit-task'
+	import EditTask from '../../../components/tasks/edit-task'
 	import TaskModel from '../../../models/task'
-	import SingleTaskInList from '../../tasks/reusable/singleTaskInList'
-	import taskList from '../../tasks/helpers/taskList'
+	import SingleTaskInList from '../../../components/tasks/partials/singleTaskInList'
+	import taskList from '../../../components/tasks/mixins/taskList'
 	import {saveListView} from '../../../helpers/saveListView'
-	import Filters from '../reusable/filters'
+	import Filters from '../../../components/list/partials/filters'
 
 	export default {
 		name: 'List',
diff --git a/src/components/lists/views/Table.vue b/src/views/list/views/Table.vue
similarity index 94%
rename from src/components/lists/views/Table.vue
rename to src/views/list/views/Table.vue
index e3df2f84..a8754a3c 100644
--- a/src/components/lists/views/Table.vue
+++ b/src/views/list/views/Table.vue
@@ -160,15 +160,15 @@
 </template>
 
 <script>
-	import taskList from '../../tasks/helpers/taskList'
-	import User from '../../global/user'
-	import PriorityLabel from '../../tasks/reusable/priorityLabel'
-	import Labels from '../../tasks/reusable/labels'
-	import DateTableCell from '../../tasks/reusable/date-table-cell'
-	import Fancycheckbox from '../../global/fancycheckbox'
-	import Sort from '../../tasks/reusable/sort'
+	import taskList from '../../../components/tasks/mixins/taskList'
+	import User from '../../../components/misc/user'
+	import PriorityLabel from '../../../components/tasks/partials/priorityLabel'
+	import Labels from '../../../components/tasks/partials/labels'
+	import DateTableCell from '../../../components/tasks/partials/date-table-cell'
+	import Fancycheckbox from '../../../components/input/fancycheckbox'
+	import Sort from '../../../components/tasks/partials/sort'
 	import {saveListView} from '../../../helpers/saveListView'
-	import Filters from '../reusable/filters'
+	import Filters from '../../../components/list/partials/filters'
 
 	export default {
 		name: 'Table',
diff --git a/src/components/migrator/migrate.vue b/src/views/migrator/Migrate.vue
similarity index 100%
rename from src/components/migrator/migrate.vue
rename to src/views/migrator/Migrate.vue
diff --git a/src/components/migrator/migrate-service.vue b/src/views/migrator/MigrateService.vue
similarity index 90%
rename from src/components/migrator/migrate-service.vue
rename to src/views/migrator/MigrateService.vue
index 02902727..bb781a5a 100644
--- a/src/components/migrator/migrate-service.vue
+++ b/src/views/migrator/MigrateService.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-	import Migration from './migration'
+	import Migration from '../../components/migrator/migration'
 	import router from '../../router'
 
 	export default {
diff --git a/src/components/namespaces/EditNamespace.vue b/src/views/namespaces/EditNamespace.vue
similarity index 96%
rename from src/components/namespaces/EditNamespace.vue
rename to src/views/namespaces/EditNamespace.vue
index 85979970..46f49adc 100644
--- a/src/components/namespaces/EditNamespace.vue
+++ b/src/views/namespaces/EditNamespace.vue
@@ -103,12 +103,12 @@
 
 <script>
 	import router from '../../router'
-	import manageSharing from '../sharing/userTeam'
+	import manageSharing from '../../components/sharing/userTeam'
 
 	import NamespaceService from '../../services/namespace'
 	import NamespaceModel from '../../models/namespace'
-	import Fancycheckbox from '../global/fancycheckbox'
-	import ColorPicker from '../global/colorPicker'
+	import Fancycheckbox from '../../components/input/fancycheckbox'
+	import ColorPicker from '../../components/input/colorPicker'
 
 	export default {
 		name: "EditNamespace",
diff --git a/src/components/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
similarity index 97%
rename from src/components/namespaces/ListNamespaces.vue
rename to src/views/namespaces/ListNamespaces.vue
index 292e100c..b6df21cf 100644
--- a/src/components/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -51,7 +51,7 @@
 <script>
 	import {mapState} from 'vuex'
 	import ListService from '../../services/list'
-	import Fancycheckbox from '../global/fancycheckbox'
+	import Fancycheckbox from '../../components/input/fancycheckbox'
 
 	export default {
 		name: 'ListNamespaces',
diff --git a/src/components/namespaces/NewNamespace.vue b/src/views/namespaces/NewNamespace.vue
similarity index 100%
rename from src/components/namespaces/NewNamespace.vue
rename to src/views/namespaces/NewNamespace.vue
diff --git a/src/components/sharing/linkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue
similarity index 96%
rename from src/components/sharing/linkSharingAuth.vue
rename to src/views/sharing/LinkSharingAuth.vue
index e108c12f..8732e4f4 100644
--- a/src/components/sharing/linkSharingAuth.vue
+++ b/src/views/sharing/LinkSharingAuth.vue
@@ -12,7 +12,7 @@
 	import router from '../../router'
 
 	export default {
-		name: 'linkSharingAuth',
+		name: 'LinkSharingAuth',
 		data() {
 			return {
 				hash: '',
diff --git a/src/components/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
similarity index 97%
rename from src/components/tasks/ShowTasks.vue
rename to src/views/tasks/ShowTasks.vue
index f717e2cf..d90c8c2f 100644
--- a/src/components/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -16,7 +16,7 @@
 </template>
 <script>
 	import TaskService from '../../services/task'
-	import SingleTaskInList from './reusable/singleTaskInList'
+	import SingleTaskInList from '../../components/tasks/partials/singleTaskInList'
 	import {HAS_TASKS} from '../../store/mutation-types'
 
 	export default {
diff --git a/src/components/tasks/ShowTasksInRange.vue b/src/views/tasks/ShowTasksInRange.vue
similarity index 100%
rename from src/components/tasks/ShowTasksInRange.vue
rename to src/views/tasks/ShowTasksInRange.vue
diff --git a/src/components/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
similarity index 95%
rename from src/components/tasks/TaskDetailView.vue
rename to src/views/tasks/TaskDetailView.vue
index 1d8de57b..a1f28015 100644
--- a/src/components/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -313,23 +313,23 @@
 <script>
 	import TaskService from '../../services/task'
 	import TaskModel from '../../models/task'
-	import relationKinds from '../../models/relationKinds'
+	import relationKinds from '../../models/relationKinds.json'
 
-	import priorites from '../../models/priorities'
+	import priorites from '../../models/priorities.json'
 
 	import flatPickr from 'vue-flatpickr-component'
 	import 'flatpickr/dist/flatpickr.css'
-	import PrioritySelect from './reusable/prioritySelect'
-	import PercentDoneSelect from './reusable/percentDoneSelect'
-	import EditLabels from './reusable/editLabels'
-	import EditAssignees from './reusable/editAssignees'
-	import Attachments from './reusable/attachments'
-	import RelatedTasks from './reusable/relatedTasks'
-	import RepeatAfter from './reusable/repeatAfter'
-	import Reminders from './reusable/reminders'
-	import Comments from './reusable/comments'
+	import PrioritySelect from '../../components/tasks/partials/prioritySelect'
+	import PercentDoneSelect from '../../components/tasks/partials/percentDoneSelect'
+	import EditLabels from '../../components/tasks/partials/editLabels'
+	import EditAssignees from '../../components/tasks/partials/editAssignees'
+	import Attachments from '../../components/tasks/partials/attachments'
+	import RelatedTasks from '../../components/tasks/partials/relatedTasks'
+	import RepeatAfter from '../../components/tasks/partials/repeatAfter'
+	import Reminders from '../../components/tasks/partials/reminders'
+	import Comments from '../../components/tasks/partials/comments'
 	import router from '../../router'
-	import ListSearch from './reusable/listSearch'
+	import ListSearch from '../../components/tasks/partials/listSearch'
 
 	export default {
 		name: 'TaskDetailView',
diff --git a/src/components/tasks/TaskDetailViewModal.vue b/src/views/tasks/TaskDetailViewModal.vue
similarity index 100%
rename from src/components/tasks/TaskDetailViewModal.vue
rename to src/views/tasks/TaskDetailViewModal.vue
diff --git a/src/components/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
similarity index 100%
rename from src/components/teams/EditTeam.vue
rename to src/views/teams/EditTeam.vue
diff --git a/src/components/teams/ListTeams.vue b/src/views/teams/ListTeams.vue
similarity index 100%
rename from src/components/teams/ListTeams.vue
rename to src/views/teams/ListTeams.vue
diff --git a/src/components/teams/NewTeam.vue b/src/views/teams/NewTeam.vue
similarity index 100%
rename from src/components/teams/NewTeam.vue
rename to src/views/teams/NewTeam.vue
diff --git a/src/components/user/Login.vue b/src/views/user/Login.vue
similarity index 100%
rename from src/components/user/Login.vue
rename to src/views/user/Login.vue
diff --git a/src/components/user/PasswordReset.vue b/src/views/user/PasswordReset.vue
similarity index 100%
rename from src/components/user/PasswordReset.vue
rename to src/views/user/PasswordReset.vue
diff --git a/src/components/user/Register.vue b/src/views/user/Register.vue
similarity index 100%
rename from src/components/user/Register.vue
rename to src/views/user/Register.vue
diff --git a/src/components/user/RequestPasswordReset.vue b/src/views/user/RequestPasswordReset.vue
similarity index 100%
rename from src/components/user/RequestPasswordReset.vue
rename to src/views/user/RequestPasswordReset.vue
diff --git a/src/components/user/Settings.vue b/src/views/user/Settings.vue
similarity index 100%
rename from src/components/user/Settings.vue
rename to src/views/user/Settings.vue