diff --git a/.eslintrc.js b/.eslintrc.cjs
similarity index 90%
rename from .eslintrc.js
rename to .eslintrc.cjs
index d5d36c3..d84ca75 100644
--- a/.eslintrc.js
+++ b/.eslintrc.cjs
@@ -13,7 +13,8 @@ module.exports = {
     'vue/multi-word-component-names': 'off',
     'vue/no-mutating-props': 'warn',
     'vue/no-reserved-component-names': 'warn',
-    'vue/no-v-model-argument': 'off'
+    'vue/no-v-model-argument': 'off',
+    'vue/require-default-prop': 'off'
   },
   overrides: [
     {
diff --git a/src/App.vue b/src/App.vue
index 7fad681..34dcd14 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,9 +11,6 @@ import { ModalsContainer } from 'vue-final-modal'
 
 export default {
   components: { ModalsContainer },
-  created() {
-    this.$store.commit('setInquiries', storedInquiries.getStoredInquiries())
-  },
   computed: {
     inquiries() {
       return this.$store.state.inquiries
@@ -26,6 +23,9 @@ export default {
         storedInquiries.updateStorage(this.inquiries)
       }
     }
+  },
+  created() {
+    this.$store.commit('setInquiries', storedInquiries.getStoredInquiries())
   }
 }
 </script>
diff --git a/src/components/CsvJsonImport/DelimiterSelector/index.vue b/src/components/CsvJsonImport/DelimiterSelector/index.vue
index 84db0f6..e332c2e 100644
--- a/src/components/CsvJsonImport/DelimiterSelector/index.vue
+++ b/src/components/CsvJsonImport/DelimiterSelector/index.vue
@@ -8,18 +8,18 @@
     >
       <div class="value">
         <input
-          :class="{ filled: filled }"
           ref="delimiterInput"
+          v-model="inputValue"
+          :class="{ filled: filled }"
           type="text"
           maxlength="1"
-          v-model="inputValue"
-          @click.stop
           :disabled="disabled"
+          @click.stop
         />
         <div class="name">{{ getSymbolName(modelValue) }}</div>
       </div>
       <div class="controls" @click.stop>
-        <clear-icon @click="clear" :disabled="disabled" />
+        <clear-icon :disabled="disabled" @click="clear" />
         <drop-down-chevron
           :disabled="disabled"
           @click="!disabled && (showOptions = !showOptions)"
@@ -30,8 +30,8 @@
       <div
         v-for="(option, index) in options"
         :key="index"
-        @click="chooseOption(option)"
         class="option"
+        @click="chooseOption(option)"
       >
         <pre>{{ option }}</pre>
         <div>{{ getSymbolName(option) }}</div>
@@ -47,9 +47,13 @@ import ClearIcon from '@/components/svg/clear'
 
 export default {
   name: 'DelimiterSelector',
-  props: ['modelValue', 'width', 'disabled'],
-  emits: ['update:modelValue'],
   components: { DropDownChevron, ClearIcon },
+  props: {
+    modelValue: String,
+    width: String,
+    disabled: Boolean
+  },
+  emits: ['update:modelValue'],
   data() {
     return {
       showOptions: false,
@@ -84,7 +88,7 @@ export default {
       this.inputValue = option
       this.showOptions = false
     },
-    onContainerClick(event) {
+    onContainerClick() {
       this.$refs.delimiterInput.focus()
     },
 
diff --git a/src/components/CsvJsonImport/index.vue b/src/components/CsvJsonImport/index.vue
index d92d464..df72779 100644
--- a/src/components/CsvJsonImport/index.vue
+++ b/src/components/CsvJsonImport/index.vue
@@ -4,20 +4,20 @@
     class="dialog"
     content-class="import-modal"
     scrollable
-    :clickToClose="false"
+    :click-to-close="false"
   >
     <div class="dialog-header">
       {{ typeName }} import
-      <close-icon @click="cancelImport" :disabled="disableDialog" />
+      <close-icon :disabled="disableDialog" @click="cancelImport" />
     </div>
     <div class="dialog-body">
       <text-field
-        label="Table name"
+        id="csv-json-table-name"
         v-model="tableName"
+        label="Table name"
         width="484px"
         :disabled="disableDialog"
         :error-msg="tableNameError"
-        id="csv-json-table-name"
       />
       <div v-if="!isJson && !isNdJson" class="chars">
         <delimiter-selector
@@ -28,27 +28,27 @@
           @input="preview"
         />
         <text-field
+          id="quote-char"
+          v-model="quoteChar"
           label="Quote char"
           hint="The character used to quote fields."
-          v-model="quoteChar"
           width="93px"
           :disabled="disableDialog"
           class="char-input"
-          id="quote-char"
           @input="preview"
         />
         <text-field
+          id="escape-char"
+          v-model="escapeChar"
           label="Escape char"
           hint='
             The character used to escape the quote character within a field
             (e.g. "column with ""quotes"" in text").
           '
           max-hint-width="242px"
-          v-model="escapeChar"
           width="93px"
           :disabled="disableDialog"
           class="char-input"
-          id="escape-char"
           @input="preview"
         />
       </div>
@@ -70,28 +70,28 @@
     </div>
     <div class="dialog-buttons-container">
       <button
+        id="import-cancel"
         class="secondary"
         :disabled="disableDialog"
         @click="cancelImport"
-        id="import-cancel"
       >
         Cancel
       </button>
       <button
         v-show="!importCompleted"
+        id="import-start"
         class="primary"
         :disabled="disableDialog || disableImport"
         @click="loadToDb(file)"
-        id="import-start"
       >
         Import
       </button>
       <button
         v-show="importCompleted"
+        id="import-finish"
         class="primary"
         :disabled="disableDialog"
         @click="finish"
-        id="import-finish"
       >
         Finish
       </button>
diff --git a/src/components/DbUploader.vue b/src/components/DbUploader.vue
index 45603b8..6154a16 100644
--- a/src/components/DbUploader.vue
+++ b/src/components/DbUploader.vue
@@ -63,6 +63,10 @@ import events from '@/lib/utils/events'
 
 export default {
   name: 'DbUploader',
+  components: {
+    ChangeDbIcon,
+    CsvJsonImport
+  },
   props: {
     type: {
       type: String,
@@ -79,10 +83,6 @@ export default {
     }
   },
   emits: [],
-  components: {
-    ChangeDbIcon,
-    CsvJsonImport
-  },
   data() {
     return {
       state: '',
diff --git a/src/components/IconButton.vue b/src/components/IconButton.vue
index 3cbb532..e7bb6ed 100644
--- a/src/components/IconButton.vue
+++ b/src/components/IconButton.vue
@@ -12,9 +12,9 @@
     </div>
     <span
       v-if="tooltip"
+      ref="tooltip"
       class="icon-tooltip"
       :style="tooltipStyle"
-      ref="tooltip"
     >
       {{ tooltip }}
     </span>
@@ -27,10 +27,16 @@ import LoadingIndicator from '@/components/LoadingIndicator'
 
 export default {
   name: 'SideBarButton',
-  props: ['active', 'disabled', 'tooltip', 'tooltipPosition', 'loading'],
-  emits: ['click'],
   components: { LoadingIndicator },
   mixins: [tooltipMixin],
+  props: {
+    active: Boolean,
+    disabled: Boolean,
+    tooltip: String,
+    tooltipPosition: String,
+    loading: Boolean
+  },
+  emits: ['click'],
   methods: {
     onClick() {
       this.hideTooltip()
diff --git a/src/components/LoadingDialog.vue b/src/components/LoadingDialog.vue
index f594aa4..dd57c17 100644
--- a/src/components/LoadingDialog.vue
+++ b/src/components/LoadingDialog.vue
@@ -2,13 +2,13 @@
   <modal
     :modal-id="name"
     class="dialog"
-    :clickToClose="false"
-    :contentTransition="{ name: 'loading-dialog' }"
-    :overlayTransition="{ name: 'loading-dialog' }"
+    :click-to-close="false"
+    :content-transition="{ name: 'loading-dialog' }"
+    :overlay-transition="{ name: 'loading-dialog' }"
   >
     <div class="dialog-header">
       {{ title }}
-      <close-icon @click="$emit('cancel')" :disabled="loading" />
+      <close-icon :disabled="loading" @click="$emit('cancel')" />
     </div>
     <div class="dialog-body">
       <div v-if="loading" class="loading-dialog-body">
@@ -49,7 +49,8 @@ import LoadingIndicator from '@/components/LoadingIndicator'
 import CloseIcon from '@/components/svg/close'
 
 export default {
-  name: 'loadingDialog',
+  name: 'LoadingDialog',
+  components: { LoadingIndicator, CloseIcon },
   props: {
     loadingMsg: String,
     successMsg: String,
@@ -66,7 +67,6 @@ export default {
       }
     }
   },
-  components: { LoadingIndicator, CloseIcon },
   methods: {
     cancel() {
       this.$emit('cancel')
diff --git a/src/components/Logs.vue b/src/components/Logs.vue
index acde1b2..790b757 100644
--- a/src/components/Logs.vue
+++ b/src/components/Logs.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="logs-container" ref="logsContainer">
+  <div ref="logsContainer" class="logs-container">
     <div v-for="(msg, index) in messages" :key="index" class="msg">
       <img v-if="msg.type === 'error'" src="~@/assets/images/error.svg" />
       <img
@@ -21,10 +21,10 @@
 import LoadingIndicator from '@/components/LoadingIndicator'
 
 export default {
-  name: 'logs',
-  props: ['messages'],
-  emits: [],
+  name: 'Logs',
   components: { LoadingIndicator },
+  props: { messages: Array },
+  emits: [],
   watch: {
     'messages.length': 'scrollToBottom'
   },
diff --git a/src/components/Splitpanes/index.vue b/src/components/Splitpanes/index.vue
index 856ab8c..5f5f53b 100644
--- a/src/components/Splitpanes/index.vue
+++ b/src/components/Splitpanes/index.vue
@@ -8,13 +8,13 @@
     ]"
   >
     <div
-      class="movable-splitter"
       ref="movableSplitter"
+      class="movable-splitter"
       :style="movableSplitterStyle"
     />
     <div
-      class="splitpanes-pane"
       ref="left"
+      class="splitpanes-pane"
       :size="paneBefore.size"
       max-size="30"
       :style="styles.before"
@@ -64,7 +64,7 @@
       </div>
     </div>
     <!-- splitter end -->
-    <div class="splitpanes-pane" ref="right" :style="styles.after">
+    <div ref="right" class="splitpanes-pane" :style="styles.after">
       <slot name="right-pane" />
     </div>
   </div>
@@ -158,6 +158,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.container = this.$refs.container
+  },
 
   methods: {
     bindEvents() {
@@ -242,9 +245,6 @@ export default {
         this.paneAfter.size = this.beforeMinimising.after
       }
     }
-  },
-  mounted() {
-    this.container = this.$refs.container
   }
 }
 </script>
diff --git a/src/components/SqlTable/Pager.vue b/src/components/SqlTable/Pager.vue
index 5c3e936..511dc4f 100644
--- a/src/components/SqlTable/Pager.vue
+++ b/src/components/SqlTable/Pager.vue
@@ -1,5 +1,6 @@
 <template>
   <paginate
+    v-model="page"
     :page-count="pageCount"
     :page-range="5"
     :margin-pages="1"
@@ -13,7 +14,6 @@
     next-link-class="paginator-next"
     prev-link-class="paginator-prev"
     disabled-class="paginator-disabled"
-    v-model="page"
   />
 </template>
 
@@ -23,7 +23,10 @@ import Paginate from 'vuejs-paginate-next'
 export default {
   name: 'Pager',
   components: { Paginate },
-  props: ['pageCount', 'modelValue'],
+  props: {
+    pageCount: Number,
+    modelValue: Number
+  },
   emits: ['update:modelValue'],
   data() {
     return {
diff --git a/src/components/SqlTable/index.vue b/src/components/SqlTable/index.vue
index be4a75e..5eaaad2 100644
--- a/src/components/SqlTable/index.vue
+++ b/src/components/SqlTable/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <div class="rounded-bg">
-      <div class="header-container" ref="header-container">
+      <div ref="header-container" class="header-container">
         <div>
           <div
             v-for="(th, index) in header"
+            :key="index"
             class="fixed-header"
             :style="{ width: `${th.width}px` }"
-            :key="index"
             :title="th.name"
           >
             {{ th.name }}
@@ -15,8 +15,8 @@
         </div>
       </div>
       <div
-        class="table-container"
         ref="table-container"
+        class="table-container"
         @scroll="onScrollTable"
       >
         <table
@@ -36,11 +36,11 @@
             <tr v-for="rowIndex in currentPageData.count" :key="rowIndex">
               <td
                 v-for="(col, colIndex) in columns"
+                :key="colIndex"
                 :data-col="colIndex"
                 :data-row="pageSize * (currentPage - 1) + rowIndex - 1"
                 :data-isNull="isNull(getCellValue(col, rowIndex))"
                 :data-isBlob="isBlob(getCellValue(col, rowIndex))"
-                :key="colIndex"
                 :aria-selected="false"
                 @click="onCellClick"
               >
@@ -61,8 +61,8 @@
       </div>
       <pager
         v-show="pageCount > 1"
-        :page-count="pageCount"
         v-model="currentPage"
+        :page-count="pageCount"
       />
     </div>
   </div>
@@ -125,6 +125,15 @@ export default {
       }
     }
   },
+  watch: {
+    currentPageData() {
+      this.calculateHeadersWidth()
+      this.selectCell(null)
+    },
+    dataSet() {
+      this.currentPage = 1
+    }
+  },
   mounted() {
     this.resizeObserver = new ResizeObserver(this.calculateHeadersWidth)
     this.resizeObserver.observe(this.$refs.table)
@@ -140,6 +149,9 @@ export default {
       }
     }
   },
+  beforeUnmount() {
+    this.resizeObserver.unobserve(this.$refs.table)
+  },
   methods: {
     isBlob(value) {
       return value && ArrayBuffer.isView(value)
@@ -252,18 +264,6 @@ export default {
         this.selectCell(newCell)
       }
     }
-  },
-  beforeUnmount() {
-    this.resizeObserver.unobserve(this.$refs.table)
-  },
-  watch: {
-    currentPageData() {
-      this.calculateHeadersWidth()
-      this.selectCell(null)
-    },
-    dataSet() {
-      this.currentPage = 1
-    }
   }
 }
 </script>
diff --git a/src/components/TextField.vue b/src/components/TextField.vue
index 0bd0e18..0be3e74 100644
--- a/src/components/TextField.vue
+++ b/src/components/TextField.vue
@@ -6,8 +6,8 @@
     >
       {{ label }}
       <hint-icon
-        class="hint"
         v-if="hint"
+        class="hint"
         :hint="hint"
         :max-width="maxHintWidth || '149px'"
       />
@@ -28,18 +28,19 @@
 <script>
 import HintIcon from '@/components/svg/hint'
 export default {
-  name: 'textField',
-  props: [
-    'placeholder',
-    'label',
-    'errorMsg',
-    'modelValue',
-    'width',
-    'hint',
-    'maxHintWidth',
-    'disabled'
-  ],
-  components: { HintIcon }
+  name: 'TextField',
+  components: { HintIcon },
+  props: {
+    placeholder: String,
+    label: String,
+    errorMsg: String,
+    modelValue: String,
+    width: String,
+    hint: String,
+    maxHintWidth: String,
+    disabled: Boolean
+  },
+  emits: ['update:modelValue']
 }
 </script>
 
diff --git a/src/components/svg/addTable.vue b/src/components/svg/addTable.vue
index 195450e..87ab15e 100644
--- a/src/components/svg/addTable.vue
+++ b/src/components/svg/addTable.vue
@@ -33,7 +33,7 @@
         </clipPath>
       </defs>
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+    <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
       Add new table from CSV, JSON or NDJSON
     </span>
   </span>
@@ -45,7 +45,7 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
   name: 'AddTableIcon',
   mixins: [tooltipMixin],
-  props: ['tooltip'],
+  props: { tooltip: String },
   emits: ['click'],
   methods: {
     onClick() {
diff --git a/src/components/svg/changeDb.vue b/src/components/svg/changeDb.vue
index a8a5d1c..a368987 100644
--- a/src/components/svg/changeDb.vue
+++ b/src/components/svg/changeDb.vue
@@ -21,7 +21,7 @@
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+    <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
       Load another database, CSV, JSON or NDJSON
     </span>
   </div>
@@ -31,7 +31,7 @@
 import tooltipMixin from '@/tooltipMixin'
 
 export default {
-  name: 'changeDbIcon',
+  name: 'ChangeDbIcon',
   mixins: [tooltipMixin],
   emits: ['click'],
   methods: {
diff --git a/src/components/svg/clear.vue b/src/components/svg/clear.vue
index cd53f44..f270373 100644
--- a/src/components/svg/clear.vue
+++ b/src/components/svg/clear.vue
@@ -23,7 +23,7 @@
 <script>
 export default {
   name: 'ClearIcon',
-  props: ['disabled']
+  props: { disabled: Boolean }
 }
 </script>
 
diff --git a/src/components/svg/close.vue b/src/components/svg/close.vue
index b5fceb2..17f383c 100644
--- a/src/components/svg/close.vue
+++ b/src/components/svg/close.vue
@@ -1,12 +1,12 @@
 <template>
   <svg
-    @click.stop="$emit('click')"
     :class="['icon', { disabled: disabled }]"
     :width="size"
     :height="size"
     viewBox="0 0 14 14"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
+    @click.stop="$emit('click')"
   >
     <path
       d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14
diff --git a/src/components/svg/dropDownChevron.vue b/src/components/svg/dropDownChevron.vue
index 41a59e0..7d502ce 100644
--- a/src/components/svg/dropDownChevron.vue
+++ b/src/components/svg/dropDownChevron.vue
@@ -17,7 +17,7 @@
 <script>
 export default {
   name: 'DropDownChevron',
-  props: ['disabled']
+  props: { disabled: Boolean }
 }
 </script>
 
diff --git a/src/components/svg/export.vue b/src/components/svg/export.vue
index 10cd5ec..e32fa4d 100644
--- a/src/components/svg/export.vue
+++ b/src/components/svg/export.vue
@@ -17,7 +17,7 @@
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+    <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
       {{ tooltip }}
     </span>
   </span>
@@ -29,7 +29,10 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
   name: 'ExportIcon',
   mixins: [tooltipMixin],
-  props: ['tooltip', 'tooltipPosition'],
+  props: {
+    tooltip: String,
+    tooltipPosition: String
+  },
   emits: ['click'],
   methods: {
     onClick() {
diff --git a/src/components/svg/hint.vue b/src/components/svg/hint.vue
index 653b48f..0deae2a 100644
--- a/src/components/svg/hint.vue
+++ b/src/components/svg/hint.vue
@@ -34,9 +34,9 @@
       />
     </svg>
     <span
+      ref="tooltip"
       class="icon-tooltip"
       :style="{ ...tooltipStyle, maxWidth: maxWidth }"
-      ref="tooltip"
     >
       {{ hint }}
     </span>
@@ -48,9 +48,12 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'HintIcon',
-  props: ['hint', 'maxWidth'],
-  emits: ['click'],
   mixins: [tooltipMixin],
+  props: {
+    hint: String,
+    maxWidth: String
+  },
+  emits: ['click'],
   methods: {
     onClick() {
       this.hideTooltip()
diff --git a/src/components/svg/treeChevron.vue b/src/components/svg/treeChevron.vue
index c4e87d7..819487b 100644
--- a/src/components/svg/treeChevron.vue
+++ b/src/components/svg/treeChevron.vue
@@ -18,7 +18,7 @@
 
 <script>
 export default {
-  name: 'treeChevron',
+  name: 'TreeChevron',
   props: {
     expanded: {
       type: Boolean,
diff --git a/src/router.js b/src/router.js
index b0fc2c6..a776084 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,8 +1,8 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
-import Workspace from '@/views/Main/Workspace'
-import Inquiries from '@/views/Main/Inquiries'
+import Workspace from '@/views/MainView/Workspace'
+import Inquiries from '@/views/MainView/Inquiries'
 import Welcome from '@/views/Welcome'
-import Main from '@/views/Main'
+import MainView from '@/views/MainView'
 import LoadView from '@/views/LoadView'
 import store from '@/store'
 import database from '@/lib/database'
@@ -15,8 +15,8 @@ const routes = [
   },
   {
     path: '/',
-    name: 'Main',
-    component: Main,
+    name: 'MainView',
+    component: MainView,
     children: [
       {
         path: '/workspace',
diff --git a/src/views/Main/AppDiagnosticInfo.vue b/src/views/MainView/AppDiagnosticInfo.vue
similarity index 96%
rename from src/views/Main/AppDiagnosticInfo.vue
rename to src/views/MainView/AppDiagnosticInfo.vue
index e5452a0..cbd855a 100644
--- a/src/views/Main/AppDiagnosticInfo.vue
+++ b/src/views/MainView/AppDiagnosticInfo.vue
@@ -15,7 +15,7 @@
           {{ item.name }}
           <div class="divider" />
           <div class="options">
-            <div v-for="(opt, index) in item.info" :key="index">
+            <div v-for="(opt, optIndex) in item.info" :key="optIndex">
               {{ opt }}
             </div>
           </div>
diff --git a/src/views/Main/Inquiries/index.vue b/src/views/MainView/Inquiries/index.vue
similarity index 99%
rename from src/views/Main/Inquiries/index.vue
rename to src/views/MainView/Inquiries/index.vue
index 2e7e2a4..41b1f3a 100644
--- a/src/views/Main/Inquiries/index.vue
+++ b/src/views/MainView/Inquiries/index.vue
@@ -1,22 +1,22 @@
 <template>
   <div id="my-inquiries-container">
-    <div id="start-guide" v-if="allInquiries.length === 0">
+    <div v-if="allInquiries.length === 0" id="start-guide">
       You don't have saved inquiries so far.
       <span class="link" @click="emitCreateTabEvent">Create</span>
       the one from scratch or
-      <span @click="importInquiries" class="link">import</span> from a file.
+      <span class="link" @click="importInquiries">import</span> from a file.
     </div>
     <div
-      id="loading-predefined-status"
       v-if="$store.state.loadingPredefinedInquiries"
+      id="loading-predefined-status"
     >
       <loading-indicator />
       Loading predefined inquiries...
     </div>
     <div
+      v-show="allInquiries.length > 0"
       id="my-inquiries-content"
       ref="my-inquiries-content"
-      v-show="allInquiries.length > 0"
     >
       <div id="my-inquiries-toolbar">
         <div id="toolbar-buttons">
@@ -28,17 +28,17 @@
             Import
           </button>
           <button
+            v-show="selectedInquiriesCount > 0"
             id="toolbar-btns-export"
             class="toolbar"
-            v-show="selectedInquiriesCount > 0"
             @click="exportSelectedInquiries()"
           >
             Export
           </button>
           <button
+            v-show="selectedNotPredefinedCount > 0"
             id="toolbar-btns-delete"
             class="toolbar"
-            v-show="selectedNotPredefinedCount > 0"
             @click="showDeleteDialog(selectedInquiriesIds)"
           >
             Delete
@@ -46,9 +46,9 @@
         </div>
         <div id="toolbar-search">
           <text-field
+            v-model="filter"
             placeholder="Search inquiry by name"
             width="300px"
-            v-model="filter"
           />
         </div>
       </div>
@@ -60,7 +60,7 @@
       <div v-show="showedInquiries.length > 0" class="rounded-bg">
         <div class="header-container">
           <div>
-            <div class="fixed-header" ref="name-th">
+            <div ref="name-th" class="fixed-header">
               <check-box
                 ref="mainCheckBox"
                 theme="light"
@@ -99,9 +99,9 @@
                     >
                       Predefined
                       <span
+                        ref="tooltip"
                         class="icon-tooltip"
                         :style="tooltipStyle"
-                        ref="tooltip"
                       >
                         Predefined inquiries come from the server. These
                         inquiries can’t be deleted or renamed.
@@ -121,9 +121,9 @@
                       />
                       <copy-icon @click="duplicateInquiry(index)" />
                       <export-icon
-                        @click="exportToFile([inquiry], `${inquiry.name}.json`)"
                         tooltip="Export inquiry to file"
                         tooltip-position="top-left"
+                        @click="exportToFile([inquiry], `${inquiry.name}.json`)"
                       />
                       <delete-icon
                         v-if="!inquiry.isPredefined"
@@ -147,9 +147,9 @@
       </div>
       <div class="dialog-body">
         <text-field
+          v-model="newName"
           label="New inquiry name"
           :error-msg="errorMsg"
-          v-model="newName"
           width="100%"
         />
       </div>
diff --git a/src/views/Main/Inquiries/svg/copy.vue b/src/views/MainView/Inquiries/svg/copy.vue
similarity index 94%
rename from src/views/Main/Inquiries/svg/copy.vue
rename to src/views/MainView/Inquiries/svg/copy.vue
index 3e4720e..0085a3d 100644
--- a/src/views/Main/Inquiries/svg/copy.vue
+++ b/src/views/MainView/Inquiries/svg/copy.vue
@@ -20,7 +20,7 @@
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+    <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
       Duplicate inquiry
     </span>
   </span>
@@ -31,8 +31,8 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'CopyIcon',
-  emits: ['click'],
   mixins: [tooltipMixin],
+  emits: ['click'],
   methods: {
     onClick() {
       this.hideTooltip()
diff --git a/src/views/Main/Inquiries/svg/delete.vue b/src/views/MainView/Inquiries/svg/delete.vue
similarity index 94%
rename from src/views/Main/Inquiries/svg/delete.vue
rename to src/views/MainView/Inquiries/svg/delete.vue
index edd6e22..c9bee02 100644
--- a/src/views/Main/Inquiries/svg/delete.vue
+++ b/src/views/MainView/Inquiries/svg/delete.vue
@@ -18,7 +18,7 @@
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+    <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
       Delete inquiry
     </span>
   </span>
@@ -29,8 +29,8 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'DeleteIcon',
-  emits: ['click'],
   mixins: [tooltipMixin],
+  emits: ['click'],
   methods: {
     onClick() {
       this.hideTooltip()
diff --git a/src/views/Main/Inquiries/svg/rename.vue b/src/views/MainView/Inquiries/svg/rename.vue
similarity index 93%
rename from src/views/Main/Inquiries/svg/rename.vue
rename to src/views/MainView/Inquiries/svg/rename.vue
index 650d118..1344c34 100644
--- a/src/views/Main/Inquiries/svg/rename.vue
+++ b/src/views/MainView/Inquiries/svg/rename.vue
@@ -18,7 +18,7 @@
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+    <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
       Rename inquiry
     </span>
   </span>
@@ -29,8 +29,8 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'RenameIcon',
-  emits: ['click'],
   mixins: [tooltipMixin],
+  emits: ['click'],
   methods: {
     onClick() {
       this.hideTooltip()
diff --git a/src/views/Main/MainMenu.vue b/src/views/MainView/MainMenu.vue
similarity index 100%
rename from src/views/Main/MainMenu.vue
rename to src/views/MainView/MainMenu.vue
index 6c2aed0..e6da49f 100644
--- a/src/views/Main/MainMenu.vue
+++ b/src/views/MainView/MainMenu.vue
@@ -10,8 +10,8 @@
     </div>
     <div id="nav-buttons">
       <button
-        id="save-btn"
         v-show="currentInquiry && $route.path === '/workspace'"
+        id="save-btn"
         class="primary"
         :disabled="isSaved"
         @click="checkInquiryBeforeSave"
@@ -37,9 +37,9 @@
           modifications will be saved as a new inquiry. Enter the name for it.
         </div>
         <text-field
+          v-model="name"
           label="Inquiry name"
           :error-msg="errorMsg"
-          v-model="name"
           width="100%"
         />
       </div>
diff --git a/src/views/Main/Workspace/Schema/TableDescription.vue b/src/views/MainView/Workspace/Schema/TableDescription.vue
similarity index 88%
rename from src/views/Main/Workspace/Schema/TableDescription.vue
rename to src/views/MainView/Workspace/Schema/TableDescription.vue
index 10d8ea9..e9ce5ee 100644
--- a/src/views/Main/Workspace/Schema/TableDescription.vue
+++ b/src/views/MainView/Workspace/Schema/TableDescription.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div @click="colVisible = !colVisible" class="table-name">
+    <div class="table-name" @click="colVisible = !colVisible">
       <tree-chevron :expanded="colVisible" />
       {{ name }}
     </div>
@@ -19,7 +19,10 @@ import TreeChevron from '@/components/svg/treeChevron'
 export default {
   name: 'TableDescription',
   components: { TreeChevron },
-  props: ['name', 'columns'],
+  props: {
+    name: String,
+    columns: Array
+  },
   data() {
     return {
       colVisible: false
diff --git a/src/views/Main/Workspace/Schema/index.vue b/src/views/MainView/Workspace/Schema/index.vue
similarity index 95%
rename from src/views/Main/Workspace/Schema/index.vue
rename to src/views/MainView/Workspace/Schema/index.vue
index f9b0615..8b9498d 100644
--- a/src/views/Main/Workspace/Schema/index.vue
+++ b/src/views/MainView/Workspace/Schema/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div id="schema-container">
     <div id="schema-filter">
-      <text-field placeholder="Search table" width="100%" v-model="filter" />
+      <text-field v-model="filter" placeholder="Search table" width="100%" />
     </div>
     <div id="db">
-      <div @click="schemaVisible = !schemaVisible" class="db-name">
+      <div class="db-name" @click="schemaVisible = !schemaVisible">
         <tree-chevron v-show="schema.length > 0" :expanded="schemaVisible" />
         {{ dbName }}
       </div>
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue b/src/views/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue
similarity index 90%
rename from src/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue
index 735837c..0a3d230 100644
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="chart-container" ref="chartContainer">
-    <div class="warning chart-warning" v-show="!dataSources && visible">
+  <div ref="chartContainer" class="chart-container">
+    <div v-show="!dataSources && visible" class="warning chart-warning">
       There is no data to build a chart. Run your SQL query and make sure the
       result is not empty.
     </div>
@@ -10,17 +10,17 @@
     >
       <PlotlyEditor
         v-show="visible"
+        ref="plotlyEditor"
         :data="state.data"
         :layout="state.layout"
         :frames="state.frames"
         :config="config"
-        :dataSources="dataSources"
-        :dataSourceOptions="dataSourceOptions"
+        :data-sources="dataSources"
+        :data-source-options="dataSourceOptions"
         :plotly="plotly"
-        :useResizeHandler="useResizeHandler"
+        :use-resize-handler="useResizeHandler"
         :debug="true"
-        :advancedTraceTypeSelector="true"
-        ref="plotlyEditor"
+        :advanced-trace-type-selector="true"
         @update="update"
         @render="onRender"
       />
@@ -40,17 +40,17 @@ import events from '@/lib/utils/events'
 
 export default {
   name: 'Chart',
-  props: [
-    'dataSources',
-    'initOptions',
-    'importToPngEnabled',
-    'importToSvgEnabled',
-    'forPivot'
-  ],
-  emits: ['update:importToSvgEnabled', 'update', 'loadingImageCompleted'],
   components: {
     PlotlyEditor: applyPureReactInVue(ReactPlotlyEditorWithPlotRef)
   },
+  props: {
+    dataSources: Object,
+    initOptions: Object,
+    importToPngEnabled: Boolean,
+    importToSvgEnabled: Boolean,
+    forPivot: Boolean
+  },
+  emits: ['update:importToSvgEnabled', 'update', 'loadingImageCompleted'],
   data() {
     return {
       plotly,
@@ -74,6 +74,16 @@ export default {
       return chartHelper.getOptionsFromDataSources(this.dataSources)
     }
   },
+  watch: {
+    dataSources() {
+      // we need to update state.data in order to update the graph
+      // https://github.com/plotly/react-chart-editor/issues/948
+      if (this.dataSources) {
+        dereference.default(this.state.data, this.dataSources)
+        this.updatePlotly()
+      }
+    }
+  },
   created() {
     // https://github.com/plotly/plotly.js/issues/4555
     plotly.setPlotConfig({
@@ -113,21 +123,11 @@ export default {
   beforeUnmount() {
     this.resizeObserver.unobserve(this.$refs.chartContainer)
   },
-  watch: {
-    dataSources() {
-      // we need to update state.data in order to update the graph
-      // https://github.com/plotly/react-chart-editor/issues/948
-      if (this.dataSources) {
-        dereference.default(this.state.data, this.dataSources)
-        this.updatePlotly()
-      }
-    }
-  },
   methods: {
     async handleResize() {
       this.updatePlotly()
     },
-    onRender(data, layout, frames) {
+    onRender() {
       // TODO: check changes and enable Save button if needed
     },
     update(data, layout, frames) {
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
similarity index 96%
rename from src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
rename to src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
index 18166f2..404dabc 100644
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
@@ -14,11 +14,14 @@ import SortIcon from '@/components/svg/sort'
 
 export default {
   name: 'PivotSortBtn',
-  props: ['direction', 'modelValue'],
-  emits: ['update:modelValue'],
   components: {
     SortIcon
   },
+  props: {
+    direction: String,
+    modelValue: String
+  },
+  emits: ['update:modelValue'],
   methods: {
     changeSorting() {
       if (this.modelValue === 'key_a_to_z') {
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
similarity index 93%
rename from src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
index f00e1bd..f3f8c5b 100644
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
@@ -4,12 +4,12 @@
       <div class="row">
         <label>Columns</label>
         <multiselect
-          class="sqliteviz-select cols"
           v-model="cols"
+          class="sqliteviz-select cols"
           :options="colsToSelect"
           :disabled="colsToSelect.length === 0"
           :multiple="true"
-          :hideSelected="true"
+          :hide-selected="true"
           :close-on-select="true"
           :show-labels="false"
           :max="colsToSelect.length"
@@ -26,18 +26,18 @@
             <span class="no-results">No Results</span>
           </template>
         </multiselect>
-        <pivot-sort-btn class="sort-btn" direction="col" v-model="colOrder" />
+        <pivot-sort-btn v-model="colOrder" class="sort-btn" direction="col" />
       </div>
 
       <div class="row">
         <label>Rows</label>
         <multiselect
-          class="sqliteviz-select rows"
           v-model="rows"
+          class="sqliteviz-select rows"
           :options="rowsToSelect"
           :disabled="rowsToSelect.length === 0"
           :multiple="true"
-          :hideSelected="true"
+          :hide-selected="true"
           :close-on-select="true"
           :show-labels="false"
           :max="rowsToSelect.length"
@@ -55,20 +55,20 @@
             <span class="no-results">No Results</span>
           </template>
         </multiselect>
-        <pivot-sort-btn class="sort-btn" direction="row" v-model="rowOrder" />
+        <pivot-sort-btn v-model="rowOrder" class="sort-btn" direction="row" />
       </div>
 
       <div class="row aggregator">
         <label>Aggregator</label>
         <multiselect
-          class="sqliteviz-select short aggregator"
           v-model="aggregator"
+          class="sqliteviz-select short aggregator"
           :options="aggregators"
           label="name"
           track-by="name"
           :close-on-select="true"
           :show-labels="false"
-          :hideSelected="true"
+          :hide-selected="true"
           :option-height="29"
           open-direction="bottom"
           placeholder="Choose a function"
@@ -79,28 +79,28 @@
         </multiselect>
 
         <multiselect
-          class="sqliteviz-select aggr-arg"
           v-show="valCount > 0"
           v-model="val1"
+          class="sqliteviz-select aggr-arg"
           :options="keyNames"
           :disabled="keyNames.length === 0"
           :close-on-select="true"
           :show-labels="false"
-          :hideSelected="true"
+          :hide-selected="true"
           :option-height="29"
           open-direction="bottom"
           placeholder="Choose an argument"
         />
 
         <multiselect
-          class="sqliteviz-select aggr-arg"
           v-show="valCount > 1"
           v-model="val2"
+          class="sqliteviz-select aggr-arg"
           :options="keyNames"
           :disabled="keyNames.length === 0"
           :close-on-select="true"
           :show-labels="false"
-          :hideSelected="true"
+          :hide-selected="true"
           :option-height="29"
           open-direction="bottom"
           placeholder="Choose a second argument"
@@ -110,15 +110,15 @@
       <div class="row">
         <label>View</label>
         <multiselect
-          class="sqliteviz-select short renderer"
           v-model="renderer"
+          class="sqliteviz-select short renderer"
           :options="renderers"
           label="name"
           track-by="name"
           :close-on-select="true"
           :allow-empty="false"
           :show-labels="false"
-          :hideSelected="true"
+          :hide-selected="true"
           :option-height="29"
           open-direction="bottom"
           placeholder="Choose a view"
@@ -129,7 +129,7 @@
         </multiselect>
       </div>
     </div>
-    <span @click="collapsed = !collapsed" class="switcher">
+    <span class="switcher" @click="collapsed = !collapsed">
       {{ collapsed ? 'Show pivot settings' : 'Hide pivot settings' }}
     </span>
   </div>
@@ -147,13 +147,16 @@ import {
 } from '../pivotHelper'
 
 export default {
-  name: 'pivotUi',
-  props: ['keyNames', 'modelValue'],
-  emits: ['update:modelValue', 'update'],
+  name: 'PivotUi',
   components: {
     Multiselect,
     PivotSortBtn
   },
+  props: {
+    keyNames: Array,
+    modelValue: Object
+  },
+  emits: ['update:modelValue', 'update'],
   data() {
     const aggregatorName =
       (this.modelValue && this.modelValue.aggregatorName) || 'Count'
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue
similarity index 95%
rename from src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue
index dad90d7..9868d31 100644
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue
@@ -1,25 +1,25 @@
 <template>
   <div class="pivot-container">
-    <div class="warning pivot-warning" v-show="!dataSources">
+    <div v-show="!dataSources" class="warning pivot-warning">
       There is no data to build a pivot. Run your SQL query and make sure the
       result is not empty.
     </div>
     <pivot-ui
-      :key-names="columns"
       v-model="pivotOptions"
+      :key-names="columns"
       @update="$emit('update')"
     />
     <div ref="pivotOutput" class="pivot-output" />
     <div
-      ref="customChartOutput"
       v-show="viewCustomChart"
+      ref="customChartOutput"
       class="custom-chart-output"
     >
       <chart
         ref="customChart"
         v-bind="customChartComponentProps"
         @update="$emit('update')"
-        @loadingImageCompleted="$emit('loadingImageCompleted')"
+        @loading-image-completed="$emit('loadingImageCompleted')"
       />
     </div>
   </div>
@@ -32,28 +32,28 @@ import 'pivottable'
 import 'pivottable/dist/pivot.css'
 import PivotUi from './PivotUi'
 import pivotHelper from './pivotHelper'
-import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import Chart from '@/views/MainView/Workspace/Tabs/Tab/DataView/Chart'
 import chartHelper from '@/lib/chartHelper'
 import events from '@/lib/utils/events'
 
 export default {
-  name: 'pivot',
-  props: [
-    'dataSources',
-    'initOptions',
-    'importToPngEnabled',
-    'importToSvgEnabled'
-  ],
+  name: 'Pivot',
+  components: {
+    PivotUi,
+    Chart
+  },
+  props: {
+    dataSources: Object,
+    initOptions: Object,
+    importToPngEnabled: Boolean,
+    importToSvgEnabled: Boolean
+  },
   emits: [
     'loadingImageCompleted',
     'update',
     'update:importToSvgEnabled',
     'update:importToPngEnabled'
   ],
-  components: {
-    PivotUi,
-    Chart
-  },
   data() {
     return {
       resizeObserver: null,
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.js b/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.js
similarity index 100%
rename from src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.js
rename to src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.js
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue b/src/views/MainView/Workspace/Tabs/Tab/DataView/index.vue
similarity index 94%
rename from src/views/Main/Workspace/Tabs/Tab/DataView/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/DataView/index.vue
index 8661b92..103a64e 100644
--- a/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/DataView/index.vue
@@ -3,30 +3,30 @@
     <div class="data-view-panel-content">
       <component
         :is="mode"
-        :init-options="mode === initMode ? initOptions : undefined"
-        :data-sources="dataSource"
+        ref="viewComponent"
         v-model:import-to-png-enabled="importToPngEnabled"
         v-model:import-to-svg-enabled="importToSvgEnabled"
-        @loadingImageCompleted="loadingImage = false"
-        ref="viewComponent"
+        :init-options="mode === initMode ? initOptions : undefined"
+        :data-sources="dataSource"
+        @loading-image-completed="loadingImage = false"
         @update="$emit('update')"
       />
     </div>
-    <side-tool-bar panel="dataView" @switchTo="$emit('switchTo', $event)">
+    <side-tool-bar panel="dataView" @switch-to="$emit('switchTo', $event)">
       <icon-button
         :active="mode === 'chart'"
-        @click="mode = 'chart'"
         tooltip="Switch to chart"
         tooltip-position="top-left"
+        @click="mode = 'chart'"
       >
         <chart-icon />
       </icon-button>
       <icon-button
         ref="pivotBtn"
         :active="mode === 'pivot'"
-        @click="mode = 'pivot'"
         tooltip="Switch to pivot"
         tooltip-position="top-left"
+        @click="mode = 'pivot'"
       >
         <pivot-icon />
       </icon-button>
@@ -72,9 +72,9 @@
     </side-tool-bar>
 
     <loading-dialog
-      loadingMsg="Rendering the visualisation..."
-      successMsg="Image is ready"
-      actionBtnName="Copy"
+      loading-msg="Rendering the visualisation..."
+      success-msg="Image is ready"
+      action-btn-name="Copy"
       name="prepareCopy"
       title="Copy to clipboard"
       :loading="preparingCopy"
@@ -102,8 +102,6 @@ import events from '@/lib/utils/events'
 
 export default {
   name: 'DataView',
-  props: ['dataSource', 'initOptions', 'initMode'],
-  emits: ['update', 'switchTo'],
   components: {
     Chart,
     Pivot,
@@ -117,6 +115,12 @@ export default {
     ClipboardIcon,
     loadingDialog
   },
+  props: {
+    dataSource: Object,
+    initOptions: Object,
+    initMode: String
+  },
+  emits: ['update', 'switchTo'],
   data() {
     return {
       mode: this.initMode || 'chart',
diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue b/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
similarity index 97%
rename from src/views/Main/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
rename to src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
index 596d365..5e5fe06 100644
--- a/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
@@ -53,7 +53,8 @@ export default {
   props: {
     modelValue: Number,
     total: Number
-  }
+  },
+  emits: ['update:modelValue']
 }
 </script>
 
diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue b/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/index.vue
similarity index 100%
rename from src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/index.vue
index 4f165d9..c6865b4 100644
--- a/src/views/Main/Workspace/Tabs/Tab/RunResult/Record/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/index.vue
@@ -21,11 +21,11 @@
               {{ col }}
             </th>
             <td
+              :key="index"
               :data-col="index"
               :data-row="currentRowIndex"
               :data-isNull="isNull(getCellValue(col))"
               :data-isBlob="isBlob(getCellValue(col))"
-              :key="index"
               :aria-selected="false"
               @click="onCellClick"
             >
@@ -75,16 +75,6 @@ export default {
       return this.dataSet.values[this.columns[0]].length
     }
   },
-  mounted() {
-    const col = this.selectedColumnIndex
-    const row = this.currentRowIndex
-    const cell = this.$refs.table.querySelector(
-      `td[data-col="${col}"][data-row="${row}"]`
-    )
-    if (cell) {
-      this.selectCell(cell)
-    }
-  },
   watch: {
     async currentRowIndex() {
       await nextTick()
@@ -95,6 +85,16 @@ export default {
       }
     }
   },
+  mounted() {
+    const col = this.selectedColumnIndex
+    const row = this.currentRowIndex
+    const cell = this.$refs.table.querySelector(
+      `td[data-col="${col}"][data-row="${row}"]`
+    )
+    if (cell) {
+      this.selectCell(cell)
+    }
+  },
   methods: {
     isBlob(value) {
       return value && ArrayBuffer.isView(value)
diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult/ValueViewer.vue b/src/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue
similarity index 100%
rename from src/views/Main/Workspace/Tabs/Tab/RunResult/ValueViewer.vue
rename to src/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue
diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue b/src/views/MainView/Workspace/Tabs/Tab/RunResult/index.vue
similarity index 94%
rename from src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/RunResult/index.vue
index 31c280f..4d01950 100644
--- a/src/views/Main/Workspace/Tabs/Tab/RunResult/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/RunResult/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="run-result-panel" ref="runResultPanel">
+  <div ref="runResultPanel" class="run-result-panel">
     <component
       :is="viewValuePanelVisible ? 'splitpanes' : 'div'"
       :before="{ size: 50, max: 100 }"
@@ -17,11 +17,11 @@
         :id="'run-result-result-set-' + tab.id"
         class="result-set-container"
       />
-      <template #right-pane v-if="viewValuePanelVisible">
+      <template v-if="viewValuePanelVisible" #right-pane>
         <div class="value-viewer-container">
           <value-viewer
             v-show="selectedCell"
-            :cellValue="
+            :cell-value="
               selectedCell
                 ? result.values[result.columns[selectedCell.dataset.col]][
                     selectedCell.dataset.row
@@ -36,7 +36,7 @@
       </template>
     </component>
 
-    <side-tool-bar @switchTo="$emit('switchTo', $event)" panel="table">
+    <side-tool-bar panel="table" @switch-to="$emit('switchTo', $event)">
       <icon-button
         :disabled="!result"
         tooltip="Export result set to CSV file"
@@ -80,9 +80,9 @@
     </side-tool-bar>
 
     <loading-dialog
-      loadingMsg="Building CSV..."
-      successMsg="CSV is ready"
-      actionBtnName="Copy"
+      loading-msg="Building CSV..."
+      success-msg="CSV is ready"
+      action-btn-name="Copy"
       name="prepareCSVCopy"
       title="Copy to clipboard"
       :loading="preparingCopy"
@@ -113,21 +113,21 @@
           v-if="result && !viewRecord"
           :data-set="result"
           :time="time"
-          :pageSize="pageSize"
+          :page-size="pageSize"
           :page="defaultPage"
           :selected-cell-coordinates="defaultSelectedCell"
           class="straight"
-          @updateSelectedCell="onUpdateSelectedCell"
+          @update-selected-cell="onUpdateSelectedCell"
         />
 
         <record
-          ref="recordView"
           v-if="result && viewRecord"
+          ref="recordView"
           :data-set="result"
           :time="time"
           :selected-column-index="selectedCell ? +selectedCell.dataset.col : 0"
-          :rowIndex="selectedCell ? +selectedCell.dataset.row : 0"
-          @updateSelectedCell="onUpdateSelectedCell"
+          :row-index="selectedCell ? +selectedCell.dataset.row : 0"
+          @update-selected-cell="onUpdateSelectedCell"
         />
       </div>
     </teleport>
@@ -156,6 +156,21 @@ import Record from './Record/index.vue'
 
 export default {
   name: 'RunResult',
+  components: {
+    SqlTable,
+    LoadingIndicator,
+    Logs,
+    SideToolBar,
+    ExportToCsvIcon,
+    IconButton,
+    ClipboardIcon,
+    ViewCellValueIcon,
+    RowIcon,
+    loadingDialog,
+    ValueViewer,
+    Record,
+    Splitpanes
+  },
   props: {
     tab: Object,
     result: Object,
@@ -178,21 +193,6 @@ export default {
       enableTeleport: this.$store.state.isWorkspaceVisible
     }
   },
-  components: {
-    SqlTable,
-    LoadingIndicator,
-    Logs,
-    SideToolBar,
-    ExportToCsvIcon,
-    IconButton,
-    ClipboardIcon,
-    ViewCellValueIcon,
-    RowIcon,
-    loadingDialog,
-    ValueViewer,
-    Record,
-    Splitpanes
-  },
   computed: {
     resultSetTeleportTarget() {
       if (!this.enableTeleport) {
@@ -207,6 +207,12 @@ export default {
       return base + tabIdPostfix
     }
   },
+  watch: {
+    result() {
+      this.defaultSelectedCell = null
+      this.selectedCell = null
+    }
+  },
   activated() {
     this.enableTeleport = true
   },
@@ -221,12 +227,6 @@ export default {
   beforeUnmount() {
     this.resizeObserver.unobserve(this.$refs.runResultPanel)
   },
-  watch: {
-    result() {
-      this.defaultSelectedCell = null
-      this.selectedCell = null
-    }
-  },
   methods: {
     handleResize() {
       this.calculatePageSize()
diff --git a/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue b/src/views/MainView/Workspace/Tabs/Tab/SideToolBar.vue
similarity index 92%
rename from src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue
rename to src/views/MainView/Workspace/Tabs/Tab/SideToolBar.vue
index 2ed757b..10e9881 100644
--- a/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/SideToolBar.vue
@@ -30,7 +30,7 @@
       <data-view-icon />
     </icon-button>
 
-    <div class="side-tool-bar-divider" v-if="$slots.default" />
+    <div v-if="$slots.default" class="side-tool-bar-divider" />
 
     <slot />
   </div>
@@ -44,14 +44,16 @@ import DataViewIcon from '@/components/svg/dataView'
 
 export default {
   name: 'SideToolBar',
-  props: ['panel'],
-  emits: ['switchTo'],
   components: {
     IconButton,
     SqlEditorIcon,
     DataViewIcon,
     TableIcon
-  }
+  },
+  props: {
+    panel: String
+  },
+  emits: ['switchTo']
 }
 </script>
 
diff --git a/src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js b/src/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.js
similarity index 100%
rename from src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js
rename to src/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.js
diff --git a/src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue b/src/views/MainView/Workspace/Tabs/Tab/SqlEditor/index.vue
similarity index 94%
rename from src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/SqlEditor/index.vue
index 0e48881..d3df1ce 100644
--- a/src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/SqlEditor/index.vue
@@ -9,7 +9,7 @@
         @change="onChange"
       />
     </div>
-    <side-tool-bar panel="sqlEditor" @switchTo="$emit('switchTo', $event)">
+    <side-tool-bar panel="sqlEditor" @switch-to="$emit('switchTo', $event)">
       <icon-button
         ref="runBtn"
         :disabled="runDisabled"
@@ -39,14 +39,14 @@ import RunIcon from '@/components/svg/run'
 
 export default {
   name: 'SqlEditor',
-  props: ['modelValue', 'isGettingResults'],
-  emits: ['update:modelValue', 'run', 'switchTo'],
   components: {
     Codemirror,
     SideToolBar,
     IconButton,
     RunIcon
   },
+  props: { modelValue: String, isGettingResults: Boolean },
+  emits: ['update:modelValue', 'run', 'switchTo'],
   data() {
     return {
       query: this.modelValue,
diff --git a/src/views/Main/Workspace/Tabs/Tab/index.vue b/src/views/MainView/Workspace/Tabs/Tab/index.vue
similarity index 94%
rename from src/views/Main/Workspace/Tabs/Tab/index.vue
rename to src/views/MainView/Workspace/Tabs/Tab/index.vue
index eef6c1e..dc7cf66 100644
--- a/src/views/Main/Workspace/Tabs/Tab/index.vue
+++ b/src/views/MainView/Workspace/Tabs/Tab/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tab-content-container" v-show="isActive">
+  <div v-show="isActive" class="tab-content-container">
     <splitpanes
       class="query-results-splitter"
       horizontal
@@ -26,7 +26,7 @@
         ref="sqlEditor"
         v-model="tab.query"
         :is-getting-results="tab.isGettingResults"
-        @switchTo="onSwitchView('sqlEditor', $event)"
+        @switch-to="onSwitchView('sqlEditor', $event)"
         @run="tab.execute()"
       />
     </teleport>
@@ -42,7 +42,7 @@
         :is-getting-results="tab.isGettingResults"
         :error="tab.error"
         :time="tab.time"
-        @switchTo="onSwitchView('table', $event)"
+        @switch-to="onSwitchView('table', $event)"
       />
     </teleport>
 
@@ -52,11 +52,11 @@
       :disabled="!enableTeleport"
     >
       <data-view
+        ref="dataView"
         :data-source="(tab.result && tab.result.values) || null"
         :init-options="tab.viewOptions"
         :init-mode="tab.viewType"
-        ref="dataView"
-        @switchTo="onSwitchView('dataView', $event)"
+        @switch-to="onSwitchView('dataView', $event)"
         @update="onDataViewUpdate"
       />
     </teleport>
@@ -74,16 +74,16 @@ import events from '@/lib/utils/events'
 
 export default {
   name: 'Tab',
-  props: {
-    tab: Object
-  },
-  emits: [],
   components: {
     SqlEditor,
     DataView,
     RunResult,
     Splitpanes
   },
+  props: {
+    tab: Object
+  },
+  emits: [],
   data() {
     return {
       topPaneSize: this.tab.maximize
diff --git a/src/views/Main/Workspace/Tabs/index.vue b/src/views/MainView/Workspace/Tabs/index.vue
similarity index 98%
rename from src/views/Main/Workspace/Tabs/index.vue
rename to src/views/MainView/Workspace/Tabs/index.vue
index 8c6ad6b..72cd3ba 100644
--- a/src/views/Main/Workspace/Tabs/index.vue
+++ b/src/views/MainView/Workspace/Tabs/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div id="tabs">
-    <div id="tabs-header" v-if="tabs.length > 0">
+    <div v-if="tabs.length > 0" id="tabs-header">
       <div
         v-for="(tab, index) in tabs"
         :key="index"
-        @click="selectTab(tab.id)"
         :class="[{ 'tab-selected': tab.id === selectedTabId }, 'tab']"
+        @click="selectTab(tab.id)"
       >
         <div class="tab-name">
           <span v-show="!tab.isSaved" class="star">*</span>
@@ -69,11 +69,11 @@ import CloseIcon from '@/components/svg/close'
 import eventBus from '@/lib/eventBus'
 
 export default {
-  emits: [],
   components: {
     Tab,
     CloseIcon
   },
+  emits: [],
   data() {
     return {
       closingTab: null
diff --git a/src/views/Main/Workspace/index.vue b/src/views/MainView/Workspace/index.vue
similarity index 100%
rename from src/views/Main/Workspace/index.vue
rename to src/views/MainView/Workspace/index.vue
diff --git a/src/views/Main/index.vue b/src/views/MainView/index.vue
similarity index 96%
rename from src/views/Main/index.vue
rename to src/views/MainView/index.vue
index 35c4a87..bd2c307 100644
--- a/src/views/Main/index.vue
+++ b/src/views/MainView/index.vue
@@ -14,7 +14,7 @@ import MainMenu from './MainMenu'
 import '@/assets/styles/scrollbars.css'
 
 export default {
-  name: 'Main',
+  name: 'MainView',
   components: { MainMenu }
 }
 </script>
diff --git a/tests/views/Main/Inquiries/Inquiries.spec.js b/tests/views/MainView/Inquiries/Inquiries.spec.js
similarity index 99%
rename from tests/views/Main/Inquiries/Inquiries.spec.js
rename to tests/views/MainView/Inquiries/Inquiries.spec.js
index 30e3999..0eef60b 100644
--- a/tests/views/Main/Inquiries/Inquiries.spec.js
+++ b/tests/views/MainView/Inquiries/Inquiries.spec.js
@@ -2,7 +2,7 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, shallowMount } from '@vue/test-utils'
 import { createStore } from 'vuex'
-import Inquiries from '@/views/Main/Inquiries'
+import Inquiries from '@/views/MainView/Inquiries'
 import storedInquiries from '@/lib/storedInquiries'
 import mutations from '@/store/mutations'
 import actions from '@/store/actions'
diff --git a/tests/views/Main/MainMenu.spec.js b/tests/views/MainView/MainMenu.spec.js
similarity index 99%
rename from tests/views/Main/MainMenu.spec.js
rename to tests/views/MainView/MainMenu.spec.js
index 40c0562..8752e12 100644
--- a/tests/views/Main/MainMenu.spec.js
+++ b/tests/views/MainView/MainMenu.spec.js
@@ -2,7 +2,7 @@ import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, shallowMount } from '@vue/test-utils'
 import { createStore } from 'vuex'
-import MainMenu from '@/views/Main/MainMenu'
+import MainMenu from '@/views/MainView/MainMenu'
 import storedInquiries from '@/lib/storedInquiries'
 import { nextTick } from 'vue'
 import eventBus from '@/lib/eventBus'
diff --git a/tests/views/Main/Workspace/Schema/Schema.spec.js b/tests/views/MainView/Workspace/Schema/Schema.spec.js
similarity index 97%
rename from tests/views/Main/Workspace/Schema/Schema.spec.js
rename to tests/views/MainView/Workspace/Schema/Schema.spec.js
index 102549f..cd81a80 100644
--- a/tests/views/Main/Workspace/Schema/Schema.spec.js
+++ b/tests/views/MainView/Workspace/Schema/Schema.spec.js
@@ -4,8 +4,8 @@ import { mount } from '@vue/test-utils'
 import { createStore } from 'vuex'
 import actions from '@/store/actions'
 import mutations from '@/store/mutations'
-import Schema from '@/views/Main/Workspace/Schema'
-import TableDescription from '@/views/Main/Workspace/Schema/TableDescription'
+import Schema from '@/views/MainView/Workspace/Schema'
+import TableDescription from '@/views/MainView/Workspace/Schema/TableDescription'
 import database from '@/lib/database'
 import fIo from '@/lib/utils/fileIo'
 import csv from '@/lib/csv'
diff --git a/tests/views/Main/Workspace/Schema/TableDescription.spec.js b/tests/views/MainView/Workspace/Schema/TableDescription.spec.js
similarity index 94%
rename from tests/views/Main/Workspace/Schema/TableDescription.spec.js
rename to tests/views/MainView/Workspace/Schema/TableDescription.spec.js
index 1d29d18..4e7e8c0 100644
--- a/tests/views/Main/Workspace/Schema/TableDescription.spec.js
+++ b/tests/views/MainView/Workspace/Schema/TableDescription.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import TableDescription from '@/views/Main/Workspace/Schema/TableDescription'
+import TableDescription from '@/views/MainView/Workspace/Schema/TableDescription'
 
 describe('TableDescription.vue', () => {
   it('Initially the columns are hidden and table name is rendered', () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
similarity index 98%
rename from tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
index 775d3c0..a70e720 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, flushPromises } from '@vue/test-utils'
-import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue'
+import Chart from '@/views/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue'
 import chartHelper from '@/lib/chartHelper'
 import * as dereference from 'react-chart-editor/lib/lib/dereference'
 import fIo from '@/lib/utils/fileIo'
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/DataView.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/DataView/DataView.spec.js
similarity index 99%
rename from tests/views/Main/Workspace/Tabs/Tab/DataView/DataView.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/DataView/DataView.spec.js
index caf06b9..843aa95 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/DataView.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/DataView/DataView.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import DataView from '@/views/Main/Workspace/Tabs/Tab/DataView'
+import DataView from '@/views/MainView/Workspace/Tabs/Tab/DataView'
 import sinon from 'sinon'
 import { nextTick } from 'vue'
 
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
similarity index 98%
rename from tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
index 6cab83c..5f20f07 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
@@ -1,11 +1,11 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import Pivot from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot'
+import Pivot from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot'
 import chartHelper from '@/lib/chartHelper'
 import fIo from '@/lib/utils/fileIo'
 import $ from 'jquery'
 import sinon from 'sinon'
-import pivotHelper from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper'
+import pivotHelper from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper'
 
 describe('Pivot.vue', () => {
   let container
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
similarity index 89%
rename from tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
index f65a593..2bfe979 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import PivotSortBtn from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn'
+import PivotSortBtn from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn'
 
 describe('PivotSortBtn.vue', () => {
   it('switches order', async () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
similarity index 98%
rename from tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
index 5d9e823..10fc4a9 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import PivotUi from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi'
+import PivotUi from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi'
 
 describe('PivotUi.vue', () => {
   it('returns value when settings changed', async () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
similarity index 96%
rename from tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
index c12e92a..8846d91 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
@@ -3,7 +3,7 @@ import {
   _getDataSources,
   getPivotCanvas,
   getPivotHtml
-} from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper'
+} from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper'
 
 describe('pivotHelper.js', () => {
   it('_getDataSources returns data sources', () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/RunResult/Record.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/RunResult/Record.spec.js
similarity index 98%
rename from tests/views/Main/Workspace/Tabs/Tab/RunResult/Record.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/RunResult/Record.spec.js
index 2f20cca..66a5d5e 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/RunResult/Record.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/RunResult/Record.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import Record from '@/views/Main/Workspace/Tabs/Tab/RunResult/Record'
+import Record from '@/views/MainView/Workspace/Tabs/Tab/RunResult/Record'
 
 describe('Record.vue', () => {
   it('shows record with selected cell', async () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/RunResult/RunResult.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
similarity index 99%
rename from tests/views/Main/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
index 6e9047c..f6e8d69 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import RunResult from '@/views/Main/Workspace/Tabs/Tab/RunResult'
+import RunResult from '@/views/MainView/Workspace/Tabs/Tab/RunResult'
 import csv from '@/lib/csv'
 import sinon from 'sinon'
 import { nextTick } from 'vue'
diff --git a/tests/views/Main/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
similarity index 96%
rename from tests/views/Main/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
index 67a3a96..3de0313 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import ValueViewer from '@/views/Main/Workspace/Tabs/Tab/RunResult/ValueViewer.vue'
+import ValueViewer from '@/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue'
 import sinon from 'sinon'
 
 describe('ValueViewer.vue', () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
similarity index 95%
rename from tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
index bbedf8d..92fead5 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
 import { createStore } from 'vuex'
-import SqlEditor from '@/views/Main/Workspace/Tabs/Tab/SqlEditor'
+import SqlEditor from '@/views/MainView/Workspace/Tabs/Tab/SqlEditor'
 import { nextTick } from 'vue'
 
 describe('SqlEditor.vue', () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
similarity index 98%
rename from tests/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
index 64bf2b8..75d2969 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
@@ -3,7 +3,7 @@ import sinon from 'sinon'
 import state from '@/store/state'
 import showHint, {
   getHints
-} from '@/views/Main/Workspace/Tabs/Tab/SqlEditor/hint'
+} from '@/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint'
 import CM from 'codemirror'
 
 describe('hint.js', () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/Tab.spec.js b/tests/views/MainView/Workspace/Tabs/Tab/Tab.spec.js
similarity index 99%
rename from tests/views/Main/Workspace/Tabs/Tab/Tab.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tab/Tab.spec.js
index 85ba9fe..c3cfb70 100644
--- a/tests/views/Main/Workspace/Tabs/Tab/Tab.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tab/Tab.spec.js
@@ -3,7 +3,7 @@ import sinon from 'sinon'
 import { mount } from '@vue/test-utils'
 import mutations from '@/store/mutations'
 import { createStore } from 'vuex'
-import Tab from '@/views/Main/Workspace/Tabs/Tab'
+import Tab from '@/views/MainView/Workspace/Tabs/Tab'
 import { nextTick } from 'vue'
 
 let place
diff --git a/tests/views/Main/Workspace/Tabs/Tabs.spec.js b/tests/views/MainView/Workspace/Tabs/Tabs.spec.js
similarity index 99%
rename from tests/views/Main/Workspace/Tabs/Tabs.spec.js
rename to tests/views/MainView/Workspace/Tabs/Tabs.spec.js
index 6ff8887..d830a28 100644
--- a/tests/views/Main/Workspace/Tabs/Tabs.spec.js
+++ b/tests/views/MainView/Workspace/Tabs/Tabs.spec.js
@@ -3,7 +3,7 @@ import sinon from 'sinon'
 import { shallowMount, mount } from '@vue/test-utils'
 import mutations from '@/store/mutations'
 import { createStore } from 'vuex'
-import Tabs from '@/views/Main/Workspace/Tabs'
+import Tabs from '@/views/MainView/Workspace/Tabs'
 import eventBus from '@/lib/eventBus'
 
 describe('Tabs.vue', () => {
diff --git a/tests/views/Main/Workspace/Workspace.spec.js b/tests/views/MainView/Workspace/Workspace.spec.js
similarity index 96%
rename from tests/views/Main/Workspace/Workspace.spec.js
rename to tests/views/MainView/Workspace/Workspace.spec.js
index 4c45b29..fcf55d7 100644
--- a/tests/views/Main/Workspace/Workspace.spec.js
+++ b/tests/views/MainView/Workspace/Workspace.spec.js
@@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils'
 import actions from '@/store/actions'
 import mutations from '@/store/mutations'
 import { createStore } from 'vuex'
-import Workspace from '@/views/Main/Workspace'
+import Workspace from '@/views/MainView/Workspace'
 
 describe('Workspace.vue', () => {
   it('Creates a tab with example if schema is empty', () => {