diff --git a/karma.conf.js b/karma.conf.js
index f6a38b1..64520e2 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -141,7 +141,7 @@ module.exports = function (config) {
             ]
           },
           {
-            test: /\.worker\.js$/,
+            test: /worker\.js$/,
             loader: 'worker-loader'
           },
           {
diff --git a/src/ascii.js b/src/components/DbUploader/DelimiterSelector/ascii.js
similarity index 100%
rename from src/ascii.js
rename to src/components/DbUploader/DelimiterSelector/ascii.js
diff --git a/src/components/DelimiterSelector.vue b/src/components/DbUploader/DelimiterSelector/index.vue
similarity index 99%
rename from src/components/DelimiterSelector.vue
rename to src/components/DbUploader/DelimiterSelector/index.vue
index f2b49a1..9e1ec20 100644
--- a/src/components/DelimiterSelector.vue
+++ b/src/components/DbUploader/DelimiterSelector/index.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import ascii from '@/ascii'
+import ascii from './ascii'
 import DropDownChevron from '@/components/svg/dropDownChevron'
 import ClearIcon from '@/components/svg/clear'
 
diff --git a/src/csv.js b/src/components/DbUploader/csv.js
similarity index 100%
rename from src/csv.js
rename to src/components/DbUploader/csv.js
diff --git a/src/components/DbUploader.vue b/src/components/DbUploader/index.vue
similarity index 98%
rename from src/components/DbUploader.vue
rename to src/components/DbUploader/index.vue
index cce3422..4889ee7 100644
--- a/src/components/DbUploader.vue
+++ b/src/components/DbUploader/index.vue
@@ -127,17 +127,17 @@
 </template>
 
 <script>
-import fu from '@/file.utils'
-import csv from '@/csv'
+import fu from '@/lib/utils/fileIo'
+import csv from './csv'
 import CloseIcon from '@/components/svg/close'
 import TextField from '@/components/TextField'
-import DelimiterSelector from '@/components/DelimiterSelector'
+import DelimiterSelector from './DelimiterSelector'
 import CheckBox from '@/components/CheckBox'
 import SqlTable from '@/components/SqlTable'
 import Logs from '@/components/Logs'
 import ChangeDbIcon from '@/components/svg/changeDb'
-import time from '@/time'
-import database from '@/database'
+import time from '@/lib/utils/time'
+import database from '@/lib/database'
 
 const csvMimeTypes = [
   'text/csv',
diff --git a/src/components/Splitpanes.vue b/src/components/Splitpanes/index.vue
similarity index 99%
rename from src/components/Splitpanes.vue
rename to src/components/Splitpanes/index.vue
index 1f8cbcb..985a48d 100644
--- a/src/components/Splitpanes.vue
+++ b/src/components/Splitpanes/index.vue
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import splitter from '@/splitter'
+import splitter from './splitter'
 
 export default {
   name: 'Splitpanes',
diff --git a/src/splitter.js b/src/components/Splitpanes/splitter.js
similarity index 100%
rename from src/splitter.js
rename to src/components/Splitpanes/splitter.js
diff --git a/src/components/Pager.vue b/src/components/SqlTable/Pager.vue
similarity index 100%
rename from src/components/Pager.vue
rename to src/components/SqlTable/Pager.vue
diff --git a/src/components/SqlTable.vue b/src/components/SqlTable/index.vue
similarity index 98%
rename from src/components/SqlTable.vue
rename to src/components/SqlTable/index.vue
index 4bc9027..4c637e7 100644
--- a/src/components/SqlTable.vue
+++ b/src/components/SqlTable/index.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import Pager from '@/components/Pager'
+import Pager from './Pager'
 
 export default {
   name: 'SqlTable',
diff --git a/src/components/svg/changeDb.vue b/src/components/svg/changeDb.vue
index 4ce9149..7218d6b 100644
--- a/src/components/svg/changeDb.vue
+++ b/src/components/svg/changeDb.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'changeDbIcon',
diff --git a/src/components/svg/export.vue b/src/components/svg/export.vue
index 4847056..34b4d17 100644
--- a/src/components/svg/export.vue
+++ b/src/components/svg/export.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'ExportIcon',
diff --git a/src/components/svg/hint.vue b/src/components/svg/hint.vue
index 70a2fc2..57a1648 100644
--- a/src/components/svg/hint.vue
+++ b/src/components/svg/hint.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'HintIcon',
diff --git a/src/sql.js b/src/lib/database/_sql.js
similarity index 97%
rename from src/sql.js
rename to src/lib/database/_sql.js
index 5482833..9f95e17 100644
--- a/src/sql.js
+++ b/src/lib/database/_sql.js
@@ -1,5 +1,5 @@
 import initSqlJs from 'sql.js/dist/sql-wasm.js'
-import dbUtils from '@/db.utils'
+import dbUtils from './_statements'
 
 let SQL = null
 const sqlModuleReady = initSqlJs().then(sqlModule => { SQL = sqlModule })
diff --git a/src/db.utils.js b/src/lib/database/_statements.js
similarity index 100%
rename from src/db.utils.js
rename to src/lib/database/_statements.js
diff --git a/src/db.worker.js b/src/lib/database/_worker.js
similarity index 96%
rename from src/db.worker.js
rename to src/lib/database/_worker.js
index 3395468..057fde8 100644
--- a/src/db.worker.js
+++ b/src/lib/database/_worker.js
@@ -1,5 +1,5 @@
 import registerPromiseWorker from 'promise-worker/register'
-import Sql from '@/sql'
+import Sql from './_sql'
 
 const sqlReady = Sql.build()
 
diff --git a/src/database.js b/src/lib/database/index.js
similarity index 98%
rename from src/database.js
rename to src/lib/database/index.js
index aeb06df..fae3c1d 100644
--- a/src/database.js
+++ b/src/lib/database/index.js
@@ -1,8 +1,8 @@
 import sqliteParser from 'sqlite-parser'
-import fu from '@/file.utils'
+import fu from '@/lib/utils/fileIo'
 // We can import workers like so because of worker-loader:
 // https://webpack.js.org/loaders/worker-loader/
-import Worker from '@/db.worker.js'
+import Worker from './_worker.js'
 
 // Use promise-worker in order to turn worker into the promise based one:
 // https://github.com/nolanlawson/promise-worker
diff --git a/src/storedQueries.js b/src/lib/storedQueries.js
similarity index 98%
rename from src/storedQueries.js
rename to src/lib/storedQueries.js
index ad9dcce..f3f8bfb 100644
--- a/src/storedQueries.js
+++ b/src/lib/storedQueries.js
@@ -1,5 +1,5 @@
 import { nanoid } from 'nanoid'
-import fu from '@/file.utils'
+import fu from '@/lib/utils/fileIo'
 
 export default {
   getStoredQueries () {
diff --git a/src/file.utils.js b/src/lib/utils/fileIo.js
similarity index 100%
rename from src/file.utils.js
rename to src/lib/utils/fileIo.js
diff --git a/src/time.js b/src/lib/utils/time.js
similarity index 100%
rename from src/time.js
rename to src/lib/utils/time.js
diff --git a/src/main.js b/src/main.js
index 0426b3d..9601429 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
-import App from './App.vue'
-import router from './router'
-import store from './store'
+import App from '@/App.vue'
+import router from '@/router'
+import store from '@/store'
 import { VuePlugin } from 'vuera'
 import VModal from 'vue-js-modal'
 
@@ -13,7 +13,7 @@ import '@/assets/styles/tooltips.css'
 import '@/assets/styles/messages.css'
 
 if (!['localhost', '127.0.0.1'].includes(location.hostname)) {
-  import('../registerServiceWorker') // eslint-disable-line no-unused-expressions
+  import('./registerServiceWorker') // eslint-disable-line no-unused-expressions
 }
 
 Vue.use(VuePlugin)
diff --git a/registerServiceWorker.js b/src/registerServiceWorker.js
similarity index 100%
rename from registerServiceWorker.js
rename to src/registerServiceWorker.js
diff --git a/src/router/index.js b/src/router.js
similarity index 67%
rename from src/router/index.js
rename to src/router.js
index 288a074..cf80201 100644
--- a/src/router/index.js
+++ b/src/router.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import Editor from '@/views/Editor'
-import MyQueries from '@/views/MyQueries'
-import Home from '@/views/Home'
-import MainView from '@/views/MainView'
+import Editor from '@/views/Main/Editor'
+import MyQueries from '@/views/Main/MyQueries'
+import Welcome from '@/views/Welcome'
+import Main from '@/views/Main'
 
 Vue.use(VueRouter)
 
@@ -11,12 +11,12 @@ const routes = [
   {
     path: '/',
     name: 'Welcome',
-    component: Home
+    component: Welcome
   },
   {
     path: '/',
-    name: 'MainView',
-    component: MainView,
+    name: 'Main',
+    component: Main,
     children: [
       {
         path: '/editor',
diff --git a/src/store/actions.js b/src/store/actions.js
new file mode 100644
index 0000000..abba11e
--- /dev/null
+++ b/src/store/actions.js
@@ -0,0 +1,30 @@
+import { nanoid } from 'nanoid'
+
+export default {
+  async addTab ({ state }, data) {
+    const tab = data ? JSON.parse(JSON.stringify(data)) : {}
+    // If no data then create a new blank one...
+    // No data.id means to create new tab, but not blank,
+    // e.g. with 'select * from csv_import' query after csv import
+    if (!data || !data.id) {
+      tab.id = nanoid()
+      tab.name = null
+      tab.tempName = state.untitledLastIndex
+        ? `Untitled ${state.untitledLastIndex}`
+        : 'Untitled'
+      tab.isUnsaved = true
+    } else {
+      tab.isUnsaved = false
+    }
+
+    // add new tab only if was not already opened
+    if (!state.tabs.some(openedTab => openedTab.id === tab.id)) {
+      state.tabs.push(tab)
+      if (!tab.name) {
+        state.untitledLastIndex += 1
+      }
+    }
+
+    return tab.id
+  }
+}
diff --git a/src/store/index.js b/src/store/index.js
index c82331c..e0e93b7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,112 +1,11 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { nanoid } from 'nanoid'
+import state from '@/store/state'
+import mutations from '@/store/mutations'
+import actions from '@/store/actions'
 
 Vue.use(Vuex)
 
-export const state = {
-  schema: null,
-  dbFile: null,
-  dbName: null,
-  tabs: [],
-  currentTab: null,
-  currentTabId: null,
-  untitledLastIndex: 0,
-  predefinedQueries: [],
-  db: null
-}
-
-export const mutations = {
-  setDb (state, db) {
-    if (state.db) {
-      state.db.shutDown()
-    }
-    state.db = db
-  },
-  saveSchema (state, { dbName, schema }) {
-    state.dbName = dbName
-    state.schema = schema
-  },
-
-  updateTab (state, { index, name, id, query, chart, isUnsaved }) {
-    const tab = state.tabs[index]
-    const oldId = tab.id
-
-    if (id && state.currentTabId === oldId) {
-      state.currentTabId = id
-    }
-
-    if (id) { tab.id = id }
-    if (name) { tab.name = name }
-    if (query) { tab.query = query }
-    if (chart) { tab.chart = chart }
-    if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
-    if (!isUnsaved) {
-      // Saved query is not predefined
-      delete tab.isPredefined
-    }
-
-    Vue.set(state.tabs, index, tab)
-  },
-  deleteTab (state, index) {
-    // If closing tab is the current opened
-    if (state.tabs[index].id === state.currentTabId) {
-      if (index < state.tabs.length - 1) {
-        state.currentTabId = state.tabs[index + 1].id
-      } else if (index > 0) {
-        state.currentTabId = state.tabs[index - 1].id
-      } else {
-        state.currentTabId = null
-        state.currentTab = null
-        state.untitledLastIndex = 0
-      }
-    }
-    state.tabs.splice(index, 1)
-  },
-  setCurrentTabId (state, id) {
-    state.currentTabId = id
-  },
-  setCurrentTab (state, tab) {
-    state.currentTab = tab
-  },
-  updatePredefinedQueries (state, queries) {
-    if (Array.isArray(queries)) {
-      state.predefinedQueries = queries
-    } else {
-      state.predefinedQueries = [queries]
-    }
-  }
-}
-
-export const actions = {
-  async addTab ({ state }, data) {
-    const tab = data ? JSON.parse(JSON.stringify(data)) : {}
-    // If no data then create a new blank one...
-    // No data.id means to create new tab, but not blank,
-    // e.g. with 'select * from csv_import' query after csv import
-    if (!data || !data.id) {
-      tab.id = nanoid()
-      tab.name = null
-      tab.tempName = state.untitledLastIndex
-        ? `Untitled ${state.untitledLastIndex}`
-        : 'Untitled'
-      tab.isUnsaved = true
-    } else {
-      tab.isUnsaved = false
-    }
-
-    // add new tab only if was not already opened
-    if (!state.tabs.some(openedTab => openedTab.id === tab.id)) {
-      state.tabs.push(tab)
-      if (!tab.name) {
-        state.untitledLastIndex += 1
-      }
-    }
-
-    return tab.id
-  }
-}
-
 export default new Vuex.Store({
   state,
   mutations,
diff --git a/src/store/mutations.js b/src/store/mutations.js
new file mode 100644
index 0000000..51f2e35
--- /dev/null
+++ b/src/store/mutations.js
@@ -0,0 +1,63 @@
+import Vue from 'vue'
+
+export default {
+  setDb (state, db) {
+    if (state.db) {
+      state.db.shutDown()
+    }
+    state.db = db
+  },
+  saveSchema (state, { dbName, schema }) {
+    state.dbName = dbName
+    state.schema = schema
+  },
+
+  updateTab (state, { index, name, id, query, chart, isUnsaved }) {
+    const tab = state.tabs[index]
+    const oldId = tab.id
+
+    if (id && state.currentTabId === oldId) {
+      state.currentTabId = id
+    }
+
+    if (id) { tab.id = id }
+    if (name) { tab.name = name }
+    if (query) { tab.query = query }
+    if (chart) { tab.chart = chart }
+    if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
+    if (!isUnsaved) {
+      // Saved query is not predefined
+      delete tab.isPredefined
+    }
+
+    Vue.set(state.tabs, index, tab)
+  },
+  deleteTab (state, index) {
+    // If closing tab is the current opened
+    if (state.tabs[index].id === state.currentTabId) {
+      if (index < state.tabs.length - 1) {
+        state.currentTabId = state.tabs[index + 1].id
+      } else if (index > 0) {
+        state.currentTabId = state.tabs[index - 1].id
+      } else {
+        state.currentTabId = null
+        state.currentTab = null
+        state.untitledLastIndex = 0
+      }
+    }
+    state.tabs.splice(index, 1)
+  },
+  setCurrentTabId (state, id) {
+    state.currentTabId = id
+  },
+  setCurrentTab (state, tab) {
+    state.currentTab = tab
+  },
+  updatePredefinedQueries (state, queries) {
+    if (Array.isArray(queries)) {
+      state.predefinedQueries = queries
+    } else {
+      state.predefinedQueries = [queries]
+    }
+  }
+}
diff --git a/src/store/state.js b/src/store/state.js
new file mode 100644
index 0000000..2c2754a
--- /dev/null
+++ b/src/store/state.js
@@ -0,0 +1,11 @@
+export default {
+  schema: null,
+  dbFile: null,
+  dbName: null,
+  tabs: [],
+  currentTab: null,
+  currentTabId: null,
+  untitledLastIndex: 0,
+  predefinedQueries: [],
+  db: null
+}
diff --git a/src/mixins/tooltips.js b/src/tooltipMixin.js
similarity index 100%
rename from src/mixins/tooltips.js
rename to src/tooltipMixin.js
diff --git a/src/components/TableDescription.vue b/src/views/Main/Editor/Schema/TableDescription.vue
similarity index 100%
rename from src/components/TableDescription.vue
rename to src/views/Main/Editor/Schema/TableDescription.vue
diff --git a/src/components/Schema.vue b/src/views/Main/Editor/Schema/index.vue
similarity index 97%
rename from src/components/Schema.vue
rename to src/views/Main/Editor/Schema/index.vue
index 4c0cfad..375b2c7 100644
--- a/src/components/Schema.vue
+++ b/src/views/Main/Editor/Schema/index.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import TableDescription from '@/components/TableDescription'
+import TableDescription from './TableDescription'
 import TextField from '@/components/TextField'
 import TreeChevron from '@/components/svg/treeChevron'
 import DbUploader from '@/components/DbUploader'
diff --git a/src/chart.js b/src/views/Main/Editor/Tabs/Tab/Chart/chartHelper.js
similarity index 100%
rename from src/chart.js
rename to src/views/Main/Editor/Tabs/Tab/Chart/chartHelper.js
diff --git a/src/components/Chart.vue b/src/views/Main/Editor/Tabs/Tab/Chart/index.vue
similarity index 89%
rename from src/components/Chart.vue
rename to src/views/Main/Editor/Tabs/Tab/Chart/index.vue
index a85848a..167ac12 100644
--- a/src/components/Chart.vue
+++ b/src/views/Main/Editor/Tabs/Tab/Chart/index.vue
@@ -28,7 +28,7 @@ import plotly from 'plotly.js/dist/plotly'
 import 'react-chart-editor/lib/react-chart-editor.min.css'
 
 import PlotlyEditor from 'react-chart-editor'
-import chart from '@/chart'
+import chartHelper from './chartHelper'
 import dereference from 'react-chart-editor/lib/lib/dereference'
 
 export default {
@@ -49,10 +49,10 @@ export default {
   },
   computed: {
     dataSources () {
-      return chart.getDataSourcesFromSqlResult(this.sqlResult)
+      return chartHelper.getDataSourcesFromSqlResult(this.sqlResult)
     },
     dataSourceOptions () {
-      return chart.getOptionsFromDataSources(this.dataSources)
+      return chartHelper.getOptionsFromDataSources(this.dataSources)
     }
   },
   watch: {
@@ -71,7 +71,7 @@ export default {
       this.$emit('update')
     },
     getChartStateForSave () {
-      return chart.getChartStateForSave(this.state, this.dataSources)
+      return chartHelper.getChartStateForSave(this.state, this.dataSources)
     }
   }
 }
diff --git a/src/hint.js b/src/views/Main/Editor/Tabs/Tab/SqlEditor/hint.js
similarity index 65%
rename from src/hint.js
rename to src/views/Main/Editor/Tabs/Tab/SqlEditor/hint.js
index 8f35137..e1e7d8a 100644
--- a/src/hint.js
+++ b/src/views/Main/Editor/Tabs/Tab/SqlEditor/hint.js
@@ -2,7 +2,6 @@ import CM from 'codemirror'
 import 'codemirror/addon/hint/show-hint.js'
 import 'codemirror/addon/hint/sql-hint.js'
 import store from '@/store'
-import { debounce } from 'debounce'
 
 export function getHints (cm, options) {
   const token = cm.getTokenAt(cm.getCursor()).string.toUpperCase()
@@ -27,23 +26,20 @@ const hintOptions = {
   },
   get defaultTable () {
     const schema = store.state.schema
-    return schema.length === 1 ? schema[0].name : null
+    return schema && schema.length === 1 ? schema[0].name : null
   },
   completeSingle: false,
   completeOnSingleClick: true,
   alignWithWord: false
 }
 
-export default {
-  show: debounce(function (editor) {
-    // Don't show autocomplete after a space or semicolon or in string literals
-    const token = editor.getTokenAt(editor.getCursor())
-    const ch = token.string.slice(-1)
-    const tokenType = token.type
-    if (tokenType === 'string' || !ch || ch === ' ' || ch === ';') {
-      return
-    }
-
-    CM.showHint(editor, getHints, hintOptions)
-  }, 400)
+export default function showHint (editor) {
+  // Don't show autocomplete after a space or semicolon or in string literals
+  const token = editor.getTokenAt(editor.getCursor())
+  const ch = token.string.slice(-1)
+  const tokenType = token.type
+  if (tokenType === 'string' || !ch || ch === ' ' || ch === ';') {
+    return
+  }
+  CM.showHint(editor, getHints, hintOptions)
 }
diff --git a/src/components/SqlEditor.vue b/src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue
similarity index 91%
rename from src/components/SqlEditor.vue
rename to src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue
index 22830c0..01ea7e1 100644
--- a/src/components/SqlEditor.vue
+++ b/src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue
@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import hint from '@/hint'
+import showHint from './hint'
+import { debounce } from 'debounce'
 import { codemirror } from 'vue-codemirror'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/mode/sql/sql.js'
@@ -38,7 +39,7 @@ export default {
     }
   },
   methods: {
-    onChange: hint.show
+    onChange: debounce(showHint, 400)
   }
 }
 </script>
diff --git a/src/components/ViewSwitcher.vue b/src/views/Main/Editor/Tabs/Tab/ViewSwitcher.vue
similarity index 100%
rename from src/components/ViewSwitcher.vue
rename to src/views/Main/Editor/Tabs/Tab/ViewSwitcher.vue
diff --git a/src/components/Tab.vue b/src/views/Main/Editor/Tabs/Tab/index.vue
similarity index 97%
rename from src/components/Tab.vue
rename to src/views/Main/Editor/Tabs/Tab/index.vue
index 037e60a..f748571 100644
--- a/src/components/Tab.vue
+++ b/src/views/Main/Editor/Tabs/Tab/index.vue
@@ -50,10 +50,10 @@
 
 <script>
 import SqlTable from '@/components/SqlTable'
-import SqlEditor from '@/components/SqlEditor'
 import Splitpanes from '@/components/Splitpanes'
-import ViewSwitcher from '@/components/ViewSwitcher'
-import Chart from '@/components/Chart'
+import SqlEditor from './SqlEditor'
+import ViewSwitcher from './ViewSwitcher'
+import Chart from './Chart'
 
 export default {
   name: 'Tab',
diff --git a/src/components/Tabs.vue b/src/views/Main/Editor/Tabs/index.vue
similarity index 99%
rename from src/components/Tabs.vue
rename to src/views/Main/Editor/Tabs/index.vue
index 9ded1da..f081332 100644
--- a/src/components/Tabs.vue
+++ b/src/views/Main/Editor/Tabs/index.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import Tab from '@/components/Tab'
+import Tab from './Tab'
 import CloseIcon from '@/components/svg/close'
 
 export default {
diff --git a/src/views/Editor.vue b/src/views/Main/Editor/index.vue
similarity index 94%
rename from src/views/Editor.vue
rename to src/views/Main/Editor/index.vue
index d9210bc..9e64cbe 100644
--- a/src/views/Editor.vue
+++ b/src/views/Main/Editor/index.vue
@@ -23,8 +23,8 @@
 
 <script>
 import Splitpanes from '@/components/Splitpanes'
-import Schema from '@/components/Schema'
-import Tabs from '@/components/Tabs'
+import Schema from './Schema'
+import Tabs from './Tabs'
 import DbUploader from '@/components/DbUploader'
 
 export default {
diff --git a/src/components/MainMenu.vue b/src/views/Main/MainMenu.vue
similarity index 99%
rename from src/components/MainMenu.vue
rename to src/views/Main/MainMenu.vue
index 98c2a7d..a2f282c 100644
--- a/src/components/MainMenu.vue
+++ b/src/views/Main/MainMenu.vue
@@ -62,7 +62,7 @@
 <script>
 import TextField from '@/components/TextField'
 import CloseIcon from '@/components/svg/close'
-import storedQueries from '@/storedQueries'
+import storedQueries from '@/lib/storedQueries'
 
 export default {
   name: 'MainMenu',
diff --git a/src/views/MyQueries.vue b/src/views/Main/MyQueries/index.vue
similarity index 98%
rename from src/views/MyQueries.vue
rename to src/views/Main/MyQueries/index.vue
index 994107d..da3bd21 100644
--- a/src/views/MyQueries.vue
+++ b/src/views/Main/MyQueries/index.vue
@@ -141,16 +141,16 @@
 </template>
 
 <script>
-import RenameIcon from '@/components/svg/rename'
-import CopyIcon from '@/components/svg/copy'
+import RenameIcon from './svg/rename'
+import CopyIcon from './svg/copy'
 import ExportIcon from '@/components/svg/export'
-import DeleteIcon from '@/components/svg/delete'
+import DeleteIcon from './svg/delete'
 import CloseIcon from '@/components/svg/close'
 import TextField from '@/components/TextField'
 import CheckBox from '@/components/CheckBox'
-import tooltipMixin from '@/mixins/tooltips'
-import storedQueries from '@/storedQueries'
-import fu from '@/file.utils'
+import tooltipMixin from '@/tooltipMixin'
+import storedQueries from '@/lib/storedQueries'
+import fu from '@/lib/utils/fileIo'
 
 export default {
   name: 'MyQueries',
diff --git a/src/components/svg/copy.vue b/src/views/Main/MyQueries/svg/copy.vue
similarity index 96%
rename from src/components/svg/copy.vue
rename to src/views/Main/MyQueries/svg/copy.vue
index c87286d..dfa8d71 100644
--- a/src/components/svg/copy.vue
+++ b/src/views/Main/MyQueries/svg/copy.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'CopyIcon',
diff --git a/src/components/svg/delete.vue b/src/views/Main/MyQueries/svg/delete.vue
similarity index 95%
rename from src/components/svg/delete.vue
rename to src/views/Main/MyQueries/svg/delete.vue
index 8ad2804..785a00b 100644
--- a/src/components/svg/delete.vue
+++ b/src/views/Main/MyQueries/svg/delete.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'DeleteIcon',
diff --git a/src/components/svg/rename.vue b/src/views/Main/MyQueries/svg/rename.vue
similarity index 95%
rename from src/components/svg/rename.vue
rename to src/views/Main/MyQueries/svg/rename.vue
index a085e22..e3795ec 100644
--- a/src/components/svg/rename.vue
+++ b/src/views/Main/MyQueries/svg/rename.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'RenameIcon',
diff --git a/src/views/MainView.vue b/src/views/Main/index.vue
similarity index 84%
rename from src/views/MainView.vue
rename to src/views/Main/index.vue
index 6508856..c62b2c5 100644
--- a/src/views/MainView.vue
+++ b/src/views/Main/index.vue
@@ -8,11 +8,11 @@
 </template>
 
 <script>
-import MainMenu from '@/components/MainMenu'
+import MainMenu from './MainMenu'
 import '@/assets/styles/scrollbars.css'
 
 export default {
-  name: 'MainView',
+  name: 'Main',
   components: { MainMenu }
 }
 </script>
diff --git a/src/views/Home.vue b/src/views/Welcome.vue
similarity index 97%
rename from src/views/Home.vue
rename to src/views/Welcome.vue
index 2356fc3..23e4c60 100644
--- a/src/views/Home.vue
+++ b/src/views/Welcome.vue
@@ -14,7 +14,7 @@
 import DbUploader from '@/components/DbUploader'
 
 export default {
-  name: 'Home',
+  name: 'Welcome',
   components: { DbUploader }
 }
 </script>
diff --git a/tests/components/DbUploader.spec.js b/tests/components/DbUploader/DbUploader.spec.js
similarity index 99%
rename from tests/components/DbUploader.spec.js
rename to tests/components/DbUploader/DbUploader.spec.js
index 7b929d4..b26006e 100644
--- a/tests/components/DbUploader.spec.js
+++ b/tests/components/DbUploader/DbUploader.spec.js
@@ -2,10 +2,10 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import Vuex from 'vuex'
 import { shallowMount, mount } from '@vue/test-utils'
-import DbUploader from '@/components/DbUploader.vue'
-import fu from '@/file.utils'
-import database from '@/database'
-import csv from '@/csv'
+import DbUploader from '@/components/DbUploader'
+import fu from '@/lib/utils/fileIo'
+import database from '@/lib/database'
+import csv from '@/components/DbUploader/csv'
 
 describe('DbUploader.vue', () => {
   let state = {}
diff --git a/tests/components/DelimiterSelector.spec.js b/tests/components/DbUploader/DelimiterSelector/DelimiterSelector.spec.js
similarity index 97%
rename from tests/components/DelimiterSelector.spec.js
rename to tests/components/DbUploader/DelimiterSelector/DelimiterSelector.spec.js
index df78c44..3e37428 100644
--- a/tests/components/DelimiterSelector.spec.js
+++ b/tests/components/DbUploader/DelimiterSelector/DelimiterSelector.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount, shallowMount } from '@vue/test-utils'
-import DelimiterSelector from '@/components/DelimiterSelector'
+import DelimiterSelector from '@/components/DbUploader/DelimiterSelector'
 
 describe('DelimiterSelector', async () => {
   it('shows the name of value', async () => {
diff --git a/tests/csv.spec.js b/tests/components/DbUploader/csv.spec.js
similarity index 98%
rename from tests/csv.spec.js
rename to tests/components/DbUploader/csv.spec.js
index 9684c46..f6e315f 100644
--- a/tests/csv.spec.js
+++ b/tests/components/DbUploader/csv.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import csv from '@/csv'
+import csv from '@/components/DbUploader/csv'
 import Papa from 'papaparse'
 
 describe('csv.js', () => {
diff --git a/tests/components/LoadingIndicator.spec.js b/tests/components/LoadingIndicator.spec.js
index b1a80da..ce3a60c 100644
--- a/tests/components/LoadingIndicator.spec.js
+++ b/tests/components/LoadingIndicator.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import LoadingIndicator from '@/components/LoadingIndicator.vue'
+import LoadingIndicator from '@/components/LoadingIndicator'
 
 describe('LoadingIndicator.vue', () => {
   it('Calculates animation class', async () => {
diff --git a/tests/components/Logs.spec.js b/tests/components/Logs.spec.js
index 99264d8..6fa1f4e 100644
--- a/tests/components/Logs.spec.js
+++ b/tests/components/Logs.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import Logs from '@/components/Logs.vue'
+import Logs from '@/components/Logs'
 
 let place
 describe('Logs.vue', () => {
diff --git a/tests/components/Splitpanes.spec.js b/tests/components/Splitpanes/Splitpanes.spec.js
similarity index 99%
rename from tests/components/Splitpanes.spec.js
rename to tests/components/Splitpanes/Splitpanes.spec.js
index 7facf00..94524ea 100644
--- a/tests/components/Splitpanes.spec.js
+++ b/tests/components/Splitpanes/Splitpanes.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import Splitpanes from '@/components/Splitpanes.vue'
+import Splitpanes from '@/components/Splitpanes'
 
 describe('Splitpanes.vue', () => {
   it('renders correctly - vertical', () => {
diff --git a/tests/splitter.spec.js b/tests/components/Splitpanes/splitter.spec.js
similarity index 98%
rename from tests/splitter.spec.js
rename to tests/components/Splitpanes/splitter.spec.js
index 21581e9..5290652 100644
--- a/tests/splitter.spec.js
+++ b/tests/components/Splitpanes/splitter.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import splitter from '@/splitter'
+import splitter from '@/components/Splitpanes/splitter'
 
 describe('splitter.js', () => {
   afterEach(() => {
diff --git a/tests/components/Pager.spec.js b/tests/components/SqlTable/Pager.spec.js
similarity index 94%
rename from tests/components/Pager.spec.js
rename to tests/components/SqlTable/Pager.spec.js
index 1dc5da7..071ec62 100644
--- a/tests/components/Pager.spec.js
+++ b/tests/components/SqlTable/Pager.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount } from '@vue/test-utils'
-import Pager from '@/components/Pager.vue'
+import Pager from '@/components/SqlTable/Pager'
 
 describe('Pager.vue', () => {
   afterEach(() => {
diff --git a/tests/sql.spec.js b/tests/lib/database/_sql.spec.js
similarity index 98%
rename from tests/sql.spec.js
rename to tests/lib/database/_sql.spec.js
index 5324d99..23c64f5 100644
--- a/tests/sql.spec.js
+++ b/tests/lib/database/_sql.spec.js
@@ -2,14 +2,14 @@ import chai from 'chai'
 import sinon from 'sinon'
 import chaiAsPromised from 'chai-as-promised'
 import initSqlJs from 'sql.js'
-import Sql from '@/sql'
+import Sql from '@/lib/database/_sql'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 chai.should()
 
 const getSQL = initSqlJs()
 
-describe('sql.js', () => {
+describe('_sql.js', () => {
   afterEach(() => {
     sinon.restore()
   })
diff --git a/tests/db.utils.spec.js b/tests/lib/database/_statements.spec.js
similarity index 91%
rename from tests/db.utils.spec.js
rename to tests/lib/database/_statements.spec.js
index 63f81ad..03d12a7 100644
--- a/tests/db.utils.spec.js
+++ b/tests/lib/database/_statements.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
-import dbUtils from '@/db.utils'
+import dbUtils from '@/lib/database/_statements'
 
-describe('db.utils.js', () => {
+describe('_statements.js', () => {
   it('generateChunks', () => {
     const arr = ['1', '2', '3', '4', '5']
     const size = 2
diff --git a/tests/database.spec.js b/tests/lib/database/database.spec.js
similarity index 99%
rename from tests/database.spec.js
rename to tests/lib/database/database.spec.js
index f247fbb..9a0f124 100644
--- a/tests/database.spec.js
+++ b/tests/lib/database/database.spec.js
@@ -2,8 +2,8 @@ import chai from 'chai'
 import sinon from 'sinon'
 import chaiAsPromised from 'chai-as-promised'
 import initSqlJs from 'sql.js'
-import database from '@/database'
-import fu from '@/file.utils'
+import database from '@/lib/database'
+import fu from '@/lib/utils/fileIo'
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
diff --git a/tests/storedQueries.spec.js b/tests/lib/storedQueries.spec.js
similarity index 98%
rename from tests/storedQueries.spec.js
rename to tests/lib/storedQueries.spec.js
index e3d5fd7..221111e 100644
--- a/tests/storedQueries.spec.js
+++ b/tests/lib/storedQueries.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import storedQueries from '@/storedQueries.js'
-import fu from '@/file.utils'
+import storedQueries from '@/lib/storedQueries'
+import fu from '@/lib/utils/fileIo'
 
 describe('storedQueries.js', () => {
   beforeEach(() => {
diff --git a/tests/file.utils.spec.js b/tests/lib/utils/fileIo.spec.js
similarity index 98%
rename from tests/file.utils.spec.js
rename to tests/lib/utils/fileIo.spec.js
index d46071d..5063704 100644
--- a/tests/file.utils.spec.js
+++ b/tests/lib/utils/fileIo.spec.js
@@ -1,8 +1,8 @@
 import { expect } from 'chai'
-import fu from '@/file.utils'
+import fu from '@/lib/utils/fileIo'
 import sinon from 'sinon'
 
-describe('file.utils.js', () => {
+describe('fileIo.js', () => {
   afterEach(() => {
     sinon.restore()
   })
diff --git a/tests/time.spec.js b/tests/lib/utils/time.spec.js
similarity index 95%
rename from tests/time.spec.js
rename to tests/lib/utils/time.spec.js
index 051d761..d33b7c9 100644
--- a/tests/time.spec.js
+++ b/tests/lib/utils/time.spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai'
-import time from '@/time'
+import time from '@/lib/utils/time'
 
 describe('time.js', () => {
   it('getPeriod', () => {
diff --git a/tests/store/actions.spec.js b/tests/store/actions.spec.js
new file mode 100644
index 0000000..6e626fd
--- /dev/null
+++ b/tests/store/actions.spec.js
@@ -0,0 +1,67 @@
+import { expect } from 'chai'
+import actions from '@/store/actions'
+
+const { addTab } = actions
+
+describe('actions', () => {
+  it('addTab adds new blank tab', async () => {
+    const state = {
+      tabs: [],
+      untitledLastIndex: 0
+    }
+
+    const id = await addTab({ state })
+    expect(state.tabs[0].id).to.eql(id)
+    expect(state.tabs[0].name).to.eql(null)
+    expect(state.tabs[0].tempName).to.eql('Untitled')
+    expect(state.tabs[0].isUnsaved).to.eql(true)
+    expect(state.untitledLastIndex).to.equal(1)
+  })
+
+  it('addTab adds tab from saved queries', async () => {
+    const state = {
+      tabs: [],
+      untitledLastIndex: 0
+    }
+    const tab = {
+      id: 1,
+      name: 'test',
+      tempName: null,
+      query: 'SELECT * from foo',
+      chart: {},
+      isUnsaved: false
+    }
+    await addTab({ state }, tab)
+    expect(state.tabs[0]).to.eql(tab)
+    expect(state.untitledLastIndex).to.equal(0)
+  })
+
+  it("addTab doesn't add anything when the query is already opened", async () => {
+    const tab1 = {
+      id: 1,
+      name: 'test',
+      tempName: null,
+      query: 'SELECT * from foo',
+      chart: {},
+      isUnsaved: false
+    }
+
+    const tab2 = {
+      id: 2,
+      name: 'bar',
+      tempName: null,
+      query: 'SELECT * from bar',
+      chart: {},
+      isUnsaved: false
+    }
+
+    const state = {
+      tabs: [tab1, tab2],
+      untitledLastIndex: 0
+    }
+
+    await addTab({ state }, tab1)
+    expect(state.tabs).to.have.lengthOf(2)
+    expect(state.untitledLastIndex).to.equal(0)
+  })
+})
diff --git a/tests/store.spec.js b/tests/store/mutations.spec.js
similarity index 83%
rename from tests/store.spec.js
rename to tests/store/mutations.spec.js
index f8e7e46..964d7a3 100644
--- a/tests/store.spec.js
+++ b/tests/store/mutations.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import { mutations, actions } from '@/store'
+import mutations from '@/store/mutations'
 const {
   saveSchema,
   updateTab,
@@ -11,8 +11,6 @@ const {
   setDb
 } = mutations
 
-const { addTab } = actions
-
 describe('mutations', () => {
   it('setDb', () => {
     const state = {
@@ -376,66 +374,3 @@ describe('mutations', () => {
     expect(state.predefinedQueries).to.eql(queries)
   })
 })
-
-describe('actions', () => {
-  it('addTab adds new blank tab', async () => {
-    const state = {
-      tabs: [],
-      untitledLastIndex: 0
-    }
-
-    const id = await addTab({ state })
-    expect(state.tabs[0].id).to.eql(id)
-    expect(state.tabs[0].name).to.eql(null)
-    expect(state.tabs[0].tempName).to.eql('Untitled')
-    expect(state.tabs[0].isUnsaved).to.eql(true)
-    expect(state.untitledLastIndex).to.equal(1)
-  })
-
-  it('addTab adds tab from saved queries', async () => {
-    const state = {
-      tabs: [],
-      untitledLastIndex: 0
-    }
-    const tab = {
-      id: 1,
-      name: 'test',
-      tempName: null,
-      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
-    }
-    await addTab({ state }, tab)
-    expect(state.tabs[0]).to.eql(tab)
-    expect(state.untitledLastIndex).to.equal(0)
-  })
-
-  it("addTab doesn't add anything when the query is already opened", async () => {
-    const tab1 = {
-      id: 1,
-      name: 'test',
-      tempName: null,
-      query: 'SELECT * from foo',
-      chart: {},
-      isUnsaved: false
-    }
-
-    const tab2 = {
-      id: 2,
-      name: 'bar',
-      tempName: null,
-      query: 'SELECT * from bar',
-      chart: {},
-      isUnsaved: false
-    }
-
-    const state = {
-      tabs: [tab1, tab2],
-      untitledLastIndex: 0
-    }
-
-    await addTab({ state }, tab1)
-    expect(state.tabs).to.have.lengthOf(2)
-    expect(state.untitledLastIndex).to.equal(0)
-  })
-})
diff --git a/tests/tooltips.spec.js b/tests/tooltipMixin.spec.js
similarity index 94%
rename from tests/tooltips.spec.js
rename to tests/tooltipMixin.spec.js
index 277f4c9..3854f27 100644
--- a/tests/tooltips.spec.js
+++ b/tests/tooltipMixin.spec.js
@@ -1,8 +1,8 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import tooltipMixin from '@/mixins/tooltips.js'
+import tooltipMixin from '@/tooltipMixin'
 
-describe('tooltips.js', () => {
+describe('tooltipMixin.js', () => {
   it('tooltip is hidden in initial', () => {
     const component = {
       template: '<div :style="tooltipStyle"></div>',
diff --git a/tests/components/Schema.spec.js b/tests/views/MainView/Editor/Schema/Schema.spec.js
similarity index 96%
rename from tests/components/Schema.spec.js
rename to tests/views/MainView/Editor/Schema/Schema.spec.js
index f4fcd9a..f1cc707 100644
--- a/tests/components/Schema.spec.js
+++ b/tests/views/MainView/Editor/Schema/Schema.spec.js
@@ -2,8 +2,8 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, createLocalVue } from '@vue/test-utils'
 import Vuex from 'vuex'
-import Schema from '@/components/Schema.vue'
-import TableDescription from '@/components/TableDescription.vue'
+import Schema from '@/views/Main/Editor/Schema'
+import TableDescription from '@/views/Main/Editor/Schema/TableDescription'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/tests/components/TableDescription.spec.js b/tests/views/MainView/Editor/Schema/TableDescription.spec.js
similarity index 94%
rename from tests/components/TableDescription.spec.js
rename to tests/views/MainView/Editor/Schema/TableDescription.spec.js
index a59c613..d26080e 100644
--- a/tests/components/TableDescription.spec.js
+++ b/tests/views/MainView/Editor/Schema/TableDescription.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import TableDescription from '@/components/TableDescription.vue'
+import TableDescription from '@/views/Main/Editor/Schema/TableDescription'
 
 describe('TableDescription.vue', () => {
   it('Initially the columns are hidden and table name is rendered', () => {
diff --git a/tests/components/Chart.spec.js b/tests/views/MainView/Editor/Tabs/Tab/Chart/Chart.spec.js
similarity index 89%
rename from tests/components/Chart.spec.js
rename to tests/views/MainView/Editor/Tabs/Tab/Chart/Chart.spec.js
index 88d7541..115cb3d 100644
--- a/tests/components/Chart.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tab/Chart/Chart.spec.js
@@ -1,8 +1,8 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, shallowMount } from '@vue/test-utils'
-import Chart from '@/components/Chart.vue'
-import chart from '@/chart.js'
+import Chart from '@/views/Main/Editor/Tabs/Tab/Chart'
+import chartHelper from '@/views/Main/Editor/Tabs/Tab/Chart/chartHelper'
 import * as dereference from 'react-chart-editor/lib/lib/dereference'
 
 describe('Chart.vue', () => {
@@ -14,7 +14,7 @@ describe('Chart.vue', () => {
     // mount the component
     const wrapper = shallowMount(Chart)
     const vm = wrapper.vm
-    const stub = sinon.stub(chart, 'getChartStateForSave').returns('result')
+    const stub = sinon.stub(chartHelper, 'getChartStateForSave').returns('result')
     const chartData = vm.getChartStateForSave()
     expect(stub.calledOnceWith(vm.state, vm.dataSources)).to.equal(true)
     expect(chartData).to.equal('result')
diff --git a/tests/chart.spec.js b/tests/views/MainView/Editor/Tabs/Tab/Chart/chartHelper.spec.js
similarity index 80%
rename from tests/chart.spec.js
rename to tests/views/MainView/Editor/Tabs/Tab/Chart/chartHelper.spec.js
index eddf5e1..5cc94d5 100644
--- a/tests/chart.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tab/Chart/chartHelper.spec.js
@@ -1,9 +1,9 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import * as chart from '@/chart'
+import * as chartHelper from '@/views/Main/Editor/Tabs/Tab/Chart/chartHelper'
 import * as dereference from 'react-chart-editor/lib/lib/dereference'
 
-describe('chart.js', () => {
+describe('chartHelper.js', () => {
   afterEach(() => {
     sinon.restore()
   })
@@ -17,7 +17,7 @@ describe('chart.js', () => {
       ]
     }
 
-    const ds = chart.getDataSourcesFromSqlResult(sqlResult)
+    const ds = chartHelper.getDataSourcesFromSqlResult(sqlResult)
     expect(ds).to.eql({
       id: [1, 2],
       name: ['foo', 'bar']
@@ -30,7 +30,7 @@ describe('chart.js', () => {
       name: ['foo', 'bar']
     }
 
-    const ds = chart.getOptionsFromDataSources(dataSources)
+    const ds = chartHelper.getOptionsFromDataSources(dataSources)
     expect(ds).to.eql([
       { value: 'id', label: 'id' },
       { value: 'name', label: 'name' }
@@ -53,7 +53,7 @@ describe('chart.js', () => {
     sinon.stub(dereference, 'default')
     sinon.spy(JSON, 'parse')
 
-    const ds = chart.getChartStateForSave(state, dataSources)
+    const ds = chartHelper.getChartStateForSave(state, dataSources)
 
     expect(dereference.default.calledOnce).to.equal(true)
 
diff --git a/tests/components/SqlEditor.spec.js b/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/SqlEditor.spec.js
similarity index 69%
rename from tests/components/SqlEditor.spec.js
rename to tests/views/MainView/Editor/Tabs/Tab/SqlEditor/SqlEditor.spec.js
index c144d8b..6661074 100644
--- a/tests/components/SqlEditor.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/SqlEditor.spec.js
@@ -1,11 +1,12 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import SqlEditor from '@/components/SqlEditor.vue'
+import SqlEditor from '@/views/Main/Editor/Tabs/Tab/SqlEditor'
 
 describe('SqlEditor.vue', () => {
   it('Emits input event when a query is changed', async () => {
     const wrapper = mount(SqlEditor)
     await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
     expect(wrapper.emitted('input')[0]).to.eql(['SELECT * FROM foo'])
+    // Take a pause to keep proper state in debounced '@/views/Main/Editor/Tabs/Tab/SqlEditor/hint'
   })
 })
diff --git a/tests/hint.spec.js b/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
similarity index 89%
rename from tests/hint.spec.js
rename to tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
index e79d14c..e08483c 100644
--- a/tests/hint.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import { state } from '@/store'
-import hint, { getHints } from '@/hint'
+import state from '@/store/state'
+import showHint, { getHints } from '@/views/Main/Editor/Tabs/Tab/SqlEditor/hint'
 import CM from 'codemirror'
 
 describe('hint.js', () => {
@@ -40,9 +40,7 @@ describe('hint.js', () => {
       getCursor: sinon.stub()
     }
 
-    const clock = sinon.useFakeTimers()
-    hint.show(editor)
-    clock.tick(500)
+    showHint(editor)
 
     expect(CM.showHint.called).to.equal(true)
     expect(CM.showHint.firstCall.args[2].tables).to.eql({
@@ -77,10 +75,7 @@ describe('hint.js', () => {
       getCursor: sinon.stub()
     }
 
-    const clock = sinon.useFakeTimers()
-    hint.show(editor)
-    clock.tick(500)
-
+    showHint(editor)
     expect(CM.showHint.firstCall.args[2].defaultTable).to.equal('foo')
   })
 
@@ -97,10 +92,7 @@ describe('hint.js', () => {
       getCursor: sinon.stub()
     }
 
-    const clock = sinon.useFakeTimers()
-    hint.show(editor)
-    clock.tick(500)
-
+    showHint(editor)
     expect(CM.showHint.called).to.equal(false)
   })
 
@@ -117,10 +109,7 @@ describe('hint.js', () => {
       getCursor: sinon.stub()
     }
 
-    const clock = sinon.useFakeTimers()
-    hint.show(editor)
-    clock.tick(500)
-
+    showHint(editor)
     expect(CM.showHint.called).to.equal(false)
   })
 
@@ -137,10 +126,7 @@ describe('hint.js', () => {
       getCursor: sinon.stub()
     }
 
-    const clock = sinon.useFakeTimers()
-    hint.show(editor)
-    clock.tick(500)
-
+    showHint(editor)
     expect(CM.showHint.called).to.equal(false)
   })
 
@@ -218,10 +204,7 @@ describe('hint.js', () => {
       getCursor: sinon.stub()
     }
 
-    const clock = sinon.useFakeTimers()
-    hint.show(editor)
-    clock.tick(500)
-
+    showHint(editor)
     expect(CM.showHint.called).to.equal(true)
     expect(CM.showHint.firstCall.args[2].tables).to.eql({})
   })
diff --git a/tests/components/Tab.spec.js b/tests/views/MainView/Editor/Tabs/Tab/Tab.spec.js
similarity index 98%
rename from tests/components/Tab.spec.js
rename to tests/views/MainView/Editor/Tabs/Tab/Tab.spec.js
index 9afc61f..eb45db2 100644
--- a/tests/components/Tab.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tab/Tab.spec.js
@@ -1,9 +1,9 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount } from '@vue/test-utils'
-import { mutations } from '@/store'
+import mutations from '@/store/mutations'
 import Vuex from 'vuex'
-import Tab from '@/components/Tab.vue'
+import Tab from '@/views/Main/Editor/Tabs/Tab'
 
 describe('Tab.vue', () => {
   afterEach(() => {
diff --git a/tests/components/Tabs.spec.js b/tests/views/MainView/Editor/Tabs/Tabs.spec.js
similarity index 99%
rename from tests/components/Tabs.spec.js
rename to tests/views/MainView/Editor/Tabs/Tabs.spec.js
index 6d45c9f..479f4f6 100644
--- a/tests/components/Tabs.spec.js
+++ b/tests/views/MainView/Editor/Tabs/Tabs.spec.js
@@ -1,9 +1,9 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { shallowMount, mount, createWrapper } from '@vue/test-utils'
-import { mutations } from '@/store'
+import mutations from '@/store/mutations'
 import Vuex from 'vuex'
-import Tabs from '@/components/Tabs.vue'
+import Tabs from '@/views/Main/Editor/Tabs'
 
 describe('Tabs.vue', () => {
   afterEach(() => {
diff --git a/tests/components/MainMenu.spec.js b/tests/views/MainView/MainMenu.spec.js
similarity index 99%
rename from tests/components/MainMenu.spec.js
rename to tests/views/MainView/MainMenu.spec.js
index c4693db..82108b5 100644
--- a/tests/components/MainMenu.spec.js
+++ b/tests/views/MainView/MainMenu.spec.js
@@ -2,8 +2,8 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, shallowMount, createWrapper } from '@vue/test-utils'
 import Vuex from 'vuex'
-import MainMenu from '@/components/MainMenu.vue'
-import storedQueries from '@/storedQueries.js'
+import MainMenu from '@/views/Main/MainMenu'
+import storedQueries from '@/lib/storedQueries'
 
 let wrapper = null
 
diff --git a/tests/views/MyQueries.spec.js b/tests/views/MainView/MyQueries/MyQueries.spec.js
similarity index 99%
rename from tests/views/MyQueries.spec.js
rename to tests/views/MainView/MyQueries/MyQueries.spec.js
index 1c364a3..78bb427 100644
--- a/tests/views/MyQueries.spec.js
+++ b/tests/views/MainView/MyQueries/MyQueries.spec.js
@@ -2,10 +2,10 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, shallowMount } from '@vue/test-utils'
 import Vuex from 'vuex'
-import MyQueries from '@/views/MyQueries.vue'
-import storedQueries from '@/storedQueries'
-import { mutations } from '@/store'
-import fu from '@/file.utils'
+import MyQueries from '@/views/Main/MyQueries'
+import storedQueries from '@/lib/storedQueries'
+import mutations from '@/store/mutations'
+import fu from '@/lib/utils/fileIo'
 
 describe('MyQueries.vue', () => {
   afterEach(() => {
diff --git a/vue.config.js b/vue.config.js
index 23c6577..5064960 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,11 +31,11 @@ module.exports = {
 
     config.module
       .rule('worker')
-      .test(/\.worker\.js$/)
+      .test(/worker\.js$/)
       .use('worker-loader')
       .loader('worker-loader')
       .end()
 
-    config.module.rule('js').exclude.add(/\.worker\.js$/)
+    config.module.rule('js').exclude.add(/worker\.js$/)
   }
 }