diff --git a/src/views/MainView/AppDiagnosticInfo.vue b/src/components/AppDiagnosticInfo.vue
similarity index 97%
rename from src/views/MainView/AppDiagnosticInfo.vue
rename to src/components/AppDiagnosticInfo.vue
index 9cb1d8c..201baf8 100644
--- a/src/views/MainView/AppDiagnosticInfo.vue
+++ b/src/components/AppDiagnosticInfo.vue
@@ -27,7 +27,7 @@
 
 <script>
 import CloseIcon from '@/components/svg/close'
-import { version } from '../../../package.json'
+import { version } from '../../package.json'
 
 export default {
   name: 'AppDiagnosticInfo',
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue b/src/components/Chart.vue
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue
rename to src/components/Chart.vue
diff --git a/src/components/CheckBox.vue b/src/components/Common/CheckBox.vue
similarity index 100%
rename from src/components/CheckBox.vue
rename to src/components/Common/CheckBox.vue
diff --git a/src/components/IconButton.vue b/src/components/Common/IconButton.vue
similarity index 97%
rename from src/components/IconButton.vue
rename to src/components/Common/IconButton.vue
index e7bb6ed..c93987a 100644
--- a/src/components/IconButton.vue
+++ b/src/components/Common/IconButton.vue
@@ -23,7 +23,7 @@
 
 <script>
 import tooltipMixin from '@/tooltipMixin'
-import LoadingIndicator from '@/components/LoadingIndicator'
+import LoadingIndicator from '@/components/Common/LoadingIndicator'
 
 export default {
   name: 'SideBarButton',
diff --git a/src/components/LoadingDialog.vue b/src/components/Common/LoadingDialog.vue
similarity index 97%
rename from src/components/LoadingDialog.vue
rename to src/components/Common/LoadingDialog.vue
index f0029f3..78fe087 100644
--- a/src/components/LoadingDialog.vue
+++ b/src/components/Common/LoadingDialog.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import LoadingIndicator from '@/components/LoadingIndicator'
+import LoadingIndicator from '@/components/Common/LoadingIndicator'
 import CloseIcon from '@/components/svg/close'
 
 export default {
diff --git a/src/components/LoadingIndicator.vue b/src/components/Common/LoadingIndicator.vue
similarity index 100%
rename from src/components/LoadingIndicator.vue
rename to src/components/Common/LoadingIndicator.vue
diff --git a/src/components/Logs.vue b/src/components/Common/Logs.vue
similarity index 96%
rename from src/components/Logs.vue
rename to src/components/Common/Logs.vue
index 790b757..cf6537b 100644
--- a/src/components/Logs.vue
+++ b/src/components/Common/Logs.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import LoadingIndicator from '@/components/LoadingIndicator'
+import LoadingIndicator from '@/components/Common/LoadingIndicator'
 
 export default {
   name: 'Logs',
diff --git a/src/components/SqlTable/Pager.vue b/src/components/Common/Pager.vue
similarity index 100%
rename from src/components/SqlTable/Pager.vue
rename to src/components/Common/Pager.vue
diff --git a/src/components/Splitpanes/index.vue b/src/components/Common/Splitpanes/index.vue
similarity index 100%
rename from src/components/Splitpanes/index.vue
rename to src/components/Common/Splitpanes/index.vue
diff --git a/src/components/Splitpanes/splitter.js b/src/components/Common/Splitpanes/splitter.js
similarity index 100%
rename from src/components/Splitpanes/splitter.js
rename to src/components/Common/Splitpanes/splitter.js
diff --git a/src/components/TextField.vue b/src/components/Common/TextField.vue
similarity index 100%
rename from src/components/TextField.vue
rename to src/components/Common/TextField.vue
diff --git a/src/components/CsvJsonImport/index.vue b/src/components/CsvJsonImport/index.vue
index 88bde4e..a35f417 100644
--- a/src/components/CsvJsonImport/index.vue
+++ b/src/components/CsvJsonImport/index.vue
@@ -102,11 +102,11 @@
 <script>
 import csv from '@/lib/csv'
 import CloseIcon from '@/components/svg/close'
-import TextField from '@/components/TextField'
+import TextField from '@/components/Common/TextField'
 import DelimiterSelector from './DelimiterSelector'
-import CheckBox from '@/components/CheckBox'
+import CheckBox from '@/components/Common/CheckBox'
 import SqlTable from '@/components/SqlTable'
-import Logs from '@/components/Logs'
+import Logs from '@/components/Common/Logs'
 import time from '@/lib/utils/time'
 import fIo from '@/lib/utils/fileIo'
 import events from '@/lib/utils/events'
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/index.vue b/src/components/DataView.vue
similarity index 96%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/index.vue
rename to src/components/DataView.vue
index 334328e..c09e30c 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/DataView/index.vue
+++ b/src/components/DataView.vue
@@ -113,11 +113,11 @@
 </template>
 
 <script>
-import Chart from './Chart/index.vue'
-import Pivot from './Pivot/index.vue'
-import Graph from './Graph/index.vue'
-import SideToolBar from '../SideToolBar'
-import IconButton from '@/components/IconButton'
+import Chart from '@/components/Chart.vue'
+import Pivot from '@/components/Pivot'
+import Graph from '@/components/Graph/index.vue'
+import SideToolBar from '@/components/SideToolBar'
+import IconButton from '@/components/Common/IconButton'
 import ChartIcon from '@/components/svg/chart'
 import PivotIcon from '@/components/svg/pivot'
 import GraphIcon from '@/components/svg/graph.vue'
@@ -127,7 +127,7 @@ import ExportToSvgIcon from '@/components/svg/exportToSvg'
 import PngIcon from '@/components/svg/png'
 import ClipboardIcon from '@/components/svg/clipboard'
 import cIo from '@/lib/utils/clipboardIo'
-import loadingDialog from '@/components/LoadingDialog.vue'
+import loadingDialog from '@/components/Common/LoadingDialog.vue'
 import time from '@/lib/utils/time'
 import events from '@/lib/utils/events'
 
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/Graph/index.vue b/src/components/Graph/index.vue
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/Graph/index.vue
rename to src/components/Graph/index.vue
diff --git a/src/views/MainView/MainMenu.vue b/src/components/MainMenu.vue
similarity index 99%
rename from src/views/MainView/MainMenu.vue
rename to src/components/MainMenu.vue
index 6aeb898..5f26af5 100644
--- a/src/views/MainView/MainMenu.vue
+++ b/src/components/MainMenu.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import TextField from '@/components/TextField'
+import TextField from '@/components/Common/TextField'
 import CloseIcon from '@/components/svg/close'
 import storedInquiries from '@/lib/storedInquiries'
 import AppDiagnosticInfo from './AppDiagnosticInfo'
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue b/src/components/Pivot/PivotUi/PivotSortBtn.vue
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
rename to src/components/Pivot/PivotUi/PivotSortBtn.vue
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue b/src/components/Pivot/PivotUi/index.vue
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
rename to src/components/Pivot/PivotUi/index.vue
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue b/src/components/Pivot/index.vue
similarity index 99%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue
rename to src/components/Pivot/index.vue
index 5a718cd..f960950 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue
+++ b/src/components/Pivot/index.vue
@@ -33,7 +33,7 @@ import 'pivottable'
 import 'pivottable/dist/pivot.css'
 import PivotUi from './PivotUi/index.vue'
 import pivotHelper from './pivotHelper'
-import Chart from '@/views/MainView/Workspace/Tabs/Tab/DataView/Chart'
+import Chart from '@/components/Chart'
 import chartHelper from '@/lib/chartHelper'
 import events from '@/lib/utils/events'
 import plotly from 'plotly.js'
diff --git a/src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.js b/src/components/Pivot/pivotHelper.js
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.js
rename to src/components/Pivot/pivotHelper.js
diff --git a/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue b/src/components/RunResult/Record/RowNavigator.vue
similarity index 96%
rename from src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
rename to src/components/RunResult/Record/RowNavigator.vue
index 09c9b12..a0ebb5b 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/RowNavigator.vue
+++ b/src/components/RunResult/Record/RowNavigator.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import IconButton from '@/components/IconButton'
+import IconButton from '@/components/Common/IconButton'
 import ArrowIcon from '@/components/svg/arrow'
 import EdgeArrowIcon from '@/components/svg/edgeArrow'
 
diff --git a/src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/index.vue b/src/components/RunResult/Record/index.vue
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/RunResult/Record/index.vue
rename to src/components/RunResult/Record/index.vue
diff --git a/src/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue b/src/components/RunResult/ValueViewer.vue
similarity index 99%
rename from src/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue
rename to src/components/RunResult/ValueViewer.vue
index 3412166..078fa6f 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue
+++ b/src/components/RunResult/ValueViewer.vue
@@ -57,7 +57,7 @@ import 'codemirror/addon/fold/foldgutter.css'
 import 'codemirror/addon/fold/brace-fold.js'
 import 'codemirror/theme/neo.css'
 import cIo from '@/lib/utils/clipboardIo'
-import Logs from '@/components/Logs'
+import Logs from '@/components/Common/Logs'
 
 export default {
   components: {
diff --git a/src/views/MainView/Workspace/Tabs/Tab/RunResult/index.vue b/src/components/RunResult/index.vue
similarity index 96%
rename from src/views/MainView/Workspace/Tabs/Tab/RunResult/index.vue
rename to src/components/RunResult/index.vue
index e6b3e01..6b2d460 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/RunResult/index.vue
+++ b/src/components/RunResult/index.vue
@@ -135,21 +135,21 @@
 </template>
 
 <script>
-import Logs from '@/components/Logs'
-import SqlTable from '@/components/SqlTable/index.vue'
-import LoadingIndicator from '@/components/LoadingIndicator'
-import SideToolBar from '../SideToolBar'
-import Splitpanes from '@/components/Splitpanes'
+import Logs from '@/components/Common/Logs'
+import SqlTable from '@/components/SqlTable'
+import LoadingIndicator from '@/components/Common/LoadingIndicator'
+import SideToolBar from '@/components/SideToolBar'
+import Splitpanes from '@/components/Common/Splitpanes'
 import ExportToCsvIcon from '@/components/svg/exportToCsv'
 import ClipboardIcon from '@/components/svg/clipboard'
 import ViewCellValueIcon from '@/components/svg/viewCellValue'
 import RowIcon from '@/components/svg/row'
-import IconButton from '@/components/IconButton'
+import IconButton from '@/components/Common/IconButton'
 import csv from '@/lib/csv'
 import fIo from '@/lib/utils/fileIo'
 import cIo from '@/lib/utils/clipboardIo'
 import time from '@/lib/utils/time'
-import loadingDialog from '@/components/LoadingDialog'
+import loadingDialog from '@/components/Common/LoadingDialog'
 import events from '@/lib/utils/events'
 import ValueViewer from './ValueViewer'
 import Record from './Record/index.vue'
diff --git a/src/views/MainView/Workspace/Schema/TableDescription.vue b/src/components/Schema/TableDescription.vue
similarity index 100%
rename from src/views/MainView/Workspace/Schema/TableDescription.vue
rename to src/components/Schema/TableDescription.vue
diff --git a/src/views/MainView/Workspace/Schema/index.vue b/src/components/Schema/index.vue
similarity index 98%
rename from src/views/MainView/Workspace/Schema/index.vue
rename to src/components/Schema/index.vue
index 5558827..9f23990 100644
--- a/src/views/MainView/Workspace/Schema/index.vue
+++ b/src/components/Schema/index.vue
@@ -35,7 +35,7 @@
 import fIo from '@/lib/utils/fileIo'
 import events from '@/lib/utils/events'
 import TableDescription from './TableDescription'
-import TextField from '@/components/TextField'
+import TextField from '@/components/Common/TextField'
 import TreeChevron from '@/components/svg/treeChevron'
 import DbUploader from '@/components/DbUploader'
 import ExportIcon from '@/components/svg/export'
diff --git a/src/views/MainView/Workspace/Tabs/Tab/SideToolBar.vue b/src/components/SideToolBar.vue
similarity index 96%
rename from src/views/MainView/Workspace/Tabs/Tab/SideToolBar.vue
rename to src/components/SideToolBar.vue
index a695b77..7f40308 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/SideToolBar.vue
+++ b/src/components/SideToolBar.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import IconButton from '@/components/IconButton'
+import IconButton from '@/components/Common/IconButton'
 import TableIcon from '@/components/svg/table'
 import SqlEditorIcon from '@/components/svg/sqlEditor'
 import DataViewIcon from '@/components/svg/dataView'
diff --git a/src/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.js b/src/components/SqlEditor/hint.js
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.js
rename to src/components/SqlEditor/hint.js
diff --git a/src/views/MainView/Workspace/Tabs/Tab/SqlEditor/index.vue b/src/components/SqlEditor/index.vue
similarity index 97%
rename from src/views/MainView/Workspace/Tabs/Tab/SqlEditor/index.vue
rename to src/components/SqlEditor/index.vue
index ffb4e08..9db15af 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/SqlEditor/index.vue
+++ b/src/components/SqlEditor/index.vue
@@ -34,7 +34,7 @@ import 'codemirror/theme/neo.css'
 import 'codemirror/addon/hint/show-hint.css'
 import 'codemirror/addon/display/autorefresh.js'
 import SideToolBar from '../SideToolBar'
-import IconButton from '@/components/IconButton'
+import IconButton from '@/components/Common/IconButton'
 import RunIcon from '@/components/svg/run'
 
 export default {
diff --git a/src/components/SqlTable/index.vue b/src/components/SqlTable.vue
similarity index 99%
rename from src/components/SqlTable/index.vue
rename to src/components/SqlTable.vue
index c2c83cf..eef6958 100644
--- a/src/components/SqlTable/index.vue
+++ b/src/components/SqlTable.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import Pager from './Pager.vue'
+import Pager from '@/components/Common/Pager.vue'
 
 export default {
   name: 'SqlTable',
diff --git a/src/views/MainView/Workspace/Tabs/Tab/index.vue b/src/components/Tab.vue
similarity index 95%
rename from src/views/MainView/Workspace/Tabs/Tab/index.vue
rename to src/components/Tab.vue
index 296efac..c7c4a70 100644
--- a/src/views/MainView/Workspace/Tabs/Tab/index.vue
+++ b/src/components/Tab.vue
@@ -64,10 +64,10 @@
 </template>
 
 <script>
-import Splitpanes from '@/components/Splitpanes'
-import SqlEditor from './SqlEditor'
-import DataView from './DataView'
-import RunResult from './RunResult'
+import Splitpanes from '@/components/Common/Splitpanes'
+import SqlEditor from '@/components/SqlEditor'
+import DataView from '@/components/DataView'
+import RunResult from '@/components/RunResult'
 import { nextTick, computed } from 'vue'
 
 import events from '@/lib/utils/events'
diff --git a/src/views/MainView/Workspace/Tabs/index.vue b/src/components/Tabs.vue
similarity index 100%
rename from src/views/MainView/Workspace/Tabs/index.vue
rename to src/components/Tabs.vue
diff --git a/src/views/MainView/Inquiries/svg/copy.vue b/src/components/svg/copy.vue
similarity index 100%
rename from src/views/MainView/Inquiries/svg/copy.vue
rename to src/components/svg/copy.vue
diff --git a/src/views/MainView/Inquiries/svg/delete.vue b/src/components/svg/delete.vue
similarity index 100%
rename from src/views/MainView/Inquiries/svg/delete.vue
rename to src/components/svg/delete.vue
diff --git a/src/views/MainView/Inquiries/svg/rename.vue b/src/components/svg/rename.vue
similarity index 100%
rename from src/views/MainView/Inquiries/svg/rename.vue
rename to src/components/svg/rename.vue
diff --git a/src/router.js b/src/router.js
index f8cd172..4c2ff8f 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,6 +1,6 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
-import Workspace from '@/views/MainView/Workspace'
-import Inquiries from '@/views/MainView/Inquiries'
+import Workspace from '@/views/Workspace'
+import Inquiries from '@/views/Inquiries'
 import Welcome from '@/views/Welcome'
 import MainView from '@/views/MainView'
 import LoadView from '@/views/LoadView'
diff --git a/src/views/MainView/Inquiries/index.vue b/src/views/Inquiries.vue
similarity index 98%
rename from src/views/MainView/Inquiries/index.vue
rename to src/views/Inquiries.vue
index 893a177..e95a8af 100644
--- a/src/views/MainView/Inquiries/index.vue
+++ b/src/views/Inquiries.vue
@@ -184,14 +184,14 @@
 </template>
 
 <script>
-import RenameIcon from './svg/rename'
-import CopyIcon from './svg/copy'
+import RenameIcon from '@/components/svg/rename'
+import CopyIcon from '@/components/svg/copy'
 import ExportIcon from '@/components/svg/export'
-import DeleteIcon from './svg/delete'
+import DeleteIcon from '@/components/svg/delete'
 import CloseIcon from '@/components/svg/close'
-import TextField from '@/components/TextField'
-import CheckBox from '@/components/CheckBox'
-import LoadingIndicator from '@/components/LoadingIndicator'
+import TextField from '@/components/Common/TextField'
+import CheckBox from '@/components/Common/CheckBox'
+import LoadingIndicator from '@/components/Common/LoadingIndicator'
 import tooltipMixin from '@/tooltipMixin'
 import storedInquiries from '@/lib/storedInquiries'
 import eventBus from '@/lib/eventBus'
diff --git a/src/views/LoadView.vue b/src/views/LoadView.vue
index c3c2874..a990191 100644
--- a/src/views/LoadView.vue
+++ b/src/views/LoadView.vue
@@ -15,7 +15,7 @@
 <script>
 import fu from '@/lib/utils/fileIo'
 import database from '@/lib/database'
-import Logs from '@/components/Logs'
+import Logs from '@/components/Common/Logs'
 import events from '@/lib/utils/events'
 
 export default {
diff --git a/src/views/MainView/index.vue b/src/views/MainView.vue
similarity index 91%
rename from src/views/MainView/index.vue
rename to src/views/MainView.vue
index bd2c307..96fa14f 100644
--- a/src/views/MainView/index.vue
+++ b/src/views/MainView.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import MainMenu from './MainMenu'
+import MainMenu from '@/components/MainMenu'
 import '@/assets/styles/scrollbars.css'
 
 export default {
diff --git a/src/views/MainView/Workspace/index.vue b/src/views/Workspace.vue
similarity index 94%
rename from src/views/MainView/Workspace/index.vue
rename to src/views/Workspace.vue
index 36c9344..4dac91c 100644
--- a/src/views/MainView/Workspace/index.vue
+++ b/src/views/Workspace.vue
@@ -17,9 +17,9 @@
 </template>
 
 <script>
-import Splitpanes from '@/components/Splitpanes'
-import Schema from './Schema'
-import Tabs from './Tabs'
+import Splitpanes from '@/components/Common/Splitpanes'
+import Schema from '@/components/Schema'
+import Tabs from '@/components/Tabs'
 import events from '@/lib/utils/events'
 
 export default {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js b/tests/components/Chart.spec.js
similarity index 98%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
rename to tests/components/Chart.spec.js
index d17357b..20efbb2 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
+++ b/tests/components/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/MainView/Workspace/Tabs/Tab/DataView/Chart/index.vue'
+import Chart from '@/components/Chart.vue'
 import chartHelper from '@/lib/chartHelper'
 import * as dereference from 'react-chart-editor/lib/lib/dereference'
 import fIo from '@/lib/utils/fileIo'
@@ -128,6 +128,8 @@ describe('Chart.vue', () => {
     expect(plot.scrollWidth).not.to.equal(initialPlotWidth)
     expect(plot.scrollHeight).not.to.equal(initialPlotHeight)
 
+    container.style.width = 'unset'
+    container.style.height = 'unset'
     wrapper.unmount()
   })
 
diff --git a/tests/components/CheckBox.spec.js b/tests/components/Common/CheckBox.spec.js
similarity index 97%
rename from tests/components/CheckBox.spec.js
rename to tests/components/Common/CheckBox.spec.js
index 80cab49..8bec142 100644
--- a/tests/components/CheckBox.spec.js
+++ b/tests/components/Common/CheckBox.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import CheckBox from '@/components/CheckBox'
+import CheckBox from '@/components/Common/CheckBox'
 
 describe('CheckBox', () => {
   it('unchecked by default', () => {
diff --git a/tests/components/LoadingIndicator.spec.js b/tests/components/Common/LoadingIndicator.spec.js
similarity index 92%
rename from tests/components/LoadingIndicator.spec.js
rename to tests/components/Common/LoadingIndicator.spec.js
index 86cc59e..9d1eb56 100644
--- a/tests/components/LoadingIndicator.spec.js
+++ b/tests/components/Common/LoadingIndicator.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import LoadingIndicator from '@/components/LoadingIndicator'
+import LoadingIndicator from '@/components/Common/LoadingIndicator'
 
 describe('LoadingIndicator.vue', () => {
   it('Calculates animation class', async () => {
diff --git a/tests/components/Logs.spec.js b/tests/components/Common/Logs.spec.js
similarity index 98%
rename from tests/components/Logs.spec.js
rename to tests/components/Common/Logs.spec.js
index 4343244..51389ca 100644
--- a/tests/components/Logs.spec.js
+++ b/tests/components/Common/Logs.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import Logs from '@/components/Logs'
+import Logs from '@/components/Common/Logs'
 import { nextTick } from 'vue'
 
 let place
diff --git a/tests/components/SqlTable/Pager.spec.js b/tests/components/Common/Pager.spec.js
similarity index 93%
rename from tests/components/SqlTable/Pager.spec.js
rename to tests/components/Common/Pager.spec.js
index a1e4d79..297da70 100644
--- a/tests/components/SqlTable/Pager.spec.js
+++ b/tests/components/Common/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/SqlTable/Pager'
+import Pager from '@/components/Common/Pager'
 
 describe('Pager.vue', () => {
   afterEach(() => {
diff --git a/tests/components/Splitpanes/Splitpanes.spec.js b/tests/components/Common/Splitpanes/Splitpanes.spec.js
similarity index 99%
rename from tests/components/Splitpanes/Splitpanes.spec.js
rename to tests/components/Common/Splitpanes/Splitpanes.spec.js
index fbd9dc7..0d8b3e7 100644
--- a/tests/components/Splitpanes/Splitpanes.spec.js
+++ b/tests/components/Common/Splitpanes/Splitpanes.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import Splitpanes from '@/components/Splitpanes'
+import Splitpanes from '@/components/Common/Splitpanes'
 import { nextTick } from 'vue'
 
 describe('Splitpanes.vue', () => {
diff --git a/tests/components/Splitpanes/splitter.spec.js b/tests/components/Common/Splitpanes/splitter.spec.js
similarity index 97%
rename from tests/components/Splitpanes/splitter.spec.js
rename to tests/components/Common/Splitpanes/splitter.spec.js
index a7ca9aa..8eae938 100644
--- a/tests/components/Splitpanes/splitter.spec.js
+++ b/tests/components/Common/Splitpanes/splitter.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import splitter from '@/components/Splitpanes/splitter'
+import splitter from '@/components/Common/Splitpanes/splitter'
 
 describe('splitter.js', () => {
   afterEach(() => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/DataView.spec.js b/tests/components/DataView.spec.js
similarity index 99%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/DataView.spec.js
rename to tests/components/DataView.spec.js
index 61e52cd..05dfc2e 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/DataView.spec.js
+++ b/tests/components/DataView.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import DataView from '@/views/MainView/Workspace/Tabs/Tab/DataView/index.vue'
+import DataView from '@/components/DataView.vue'
 import sinon from 'sinon'
 import { nextTick } from 'vue'
 import cIo from '@/lib/utils/clipboardIo'
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Graph/Graph.spec.js b/tests/components/Graph/Graph.spec.js
similarity index 99%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/Graph/Graph.spec.js
rename to tests/components/Graph/Graph.spec.js
index 2e3198b..2298921 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Graph/Graph.spec.js
+++ b/tests/components/Graph/Graph.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { mount, flushPromises } from '@vue/test-utils'
-import Graph from '@/views/MainView/Workspace/Tabs/Tab/DataView/Graph/index.vue'
+import Graph from '@/components/Graph/index.vue'
 
 function getPixels(canvas) {
   const context = canvas.getContext('webgl2')
diff --git a/tests/views/MainView/MainMenu.spec.js b/tests/components/MainMenu.spec.js
similarity index 99%
rename from tests/views/MainView/MainMenu.spec.js
rename to tests/components/MainMenu.spec.js
index 81cbd1c..88ac3d7 100644
--- a/tests/views/MainView/MainMenu.spec.js
+++ b/tests/components/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/MainView/MainMenu'
+import MainMenu from '@/components/MainMenu'
 import storedInquiries from '@/lib/storedInquiries'
 import { nextTick } from 'vue'
 import eventBus from '@/lib/eventBus'
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js b/tests/components/Pivot/Pivot.spec.js
similarity index 99%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
rename to tests/components/Pivot/Pivot.spec.js
index 478adab..48f4ffe 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/Pivot.spec.js
+++ b/tests/components/Pivot/Pivot.spec.js
@@ -1,11 +1,11 @@
 import { expect } from 'chai'
 import { mount, flushPromises } from '@vue/test-utils'
-import Pivot from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/index.vue'
+import Pivot from '@/components/Pivot/index.vue'
 import chartHelper from '@/lib/chartHelper'
 import fIo from '@/lib/utils/fileIo'
 import $ from 'jquery'
 import sinon from 'sinon'
-import pivotHelper from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper'
+import pivotHelper from '@/components/Pivot/pivotHelper'
 
 describe('Pivot.vue', () => {
   let container
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js b/tests/components/Pivot/PivotUi/PivotSortBtn.spec.js
similarity index 89%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
rename to tests/components/Pivot/PivotUi/PivotSortBtn.spec.js
index 2bfe979..1cecc39 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.spec.js
+++ b/tests/components/Pivot/PivotUi/PivotSortBtn.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import PivotSortBtn from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn'
+import PivotSortBtn from '@/components/Pivot/PivotUi/PivotSortBtn'
 
 describe('PivotSortBtn.vue', () => {
   it('switches order', async () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js b/tests/components/Pivot/PivotUi/PivotUi.spec.js
similarity index 98%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
rename to tests/components/Pivot/PivotUi/PivotUi.spec.js
index 10fc4a9..8a01f71 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotUi.spec.js
+++ b/tests/components/Pivot/PivotUi/PivotUi.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import PivotUi from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/PivotUi'
+import PivotUi from '@/components/Pivot/PivotUi'
 
 describe('PivotUi.vue', () => {
   it('returns value when settings changed', async () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js b/tests/components/Pivot/pivotHelper.spec.js
similarity index 96%
rename from tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
rename to tests/components/Pivot/pivotHelper.spec.js
index 8846d91..550772b 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper.spec.js
+++ b/tests/components/Pivot/pivotHelper.spec.js
@@ -3,7 +3,7 @@ import {
   _getDataSources,
   getPivotCanvas,
   getPivotHtml
-} from '@/views/MainView/Workspace/Tabs/Tab/DataView/Pivot/pivotHelper'
+} from '@/components/Pivot/pivotHelper'
 
 describe('pivotHelper.js', () => {
   it('_getDataSources returns data sources', () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/RunResult/Record.spec.js b/tests/components/RunResult/Record.spec.js
similarity index 98%
rename from tests/views/MainView/Workspace/Tabs/Tab/RunResult/Record.spec.js
rename to tests/components/RunResult/Record.spec.js
index 66a5d5e..60e27ba 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/RunResult/Record.spec.js
+++ b/tests/components/RunResult/Record.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import Record from '@/views/MainView/Workspace/Tabs/Tab/RunResult/Record'
+import Record from '@/components/RunResult/Record'
 
 describe('Record.vue', () => {
   it('shows record with selected cell', async () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/RunResult/RunResult.spec.js b/tests/components/RunResult/RunResult.spec.js
similarity index 99%
rename from tests/views/MainView/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
rename to tests/components/RunResult/RunResult.spec.js
index 956cf4f..dc8bcb7 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/RunResult/RunResult.spec.js
+++ b/tests/components/RunResult/RunResult.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import RunResult from '@/views/MainView/Workspace/Tabs/Tab/RunResult'
+import RunResult from '@/components/RunResult'
 import csv from '@/lib/csv'
 import sinon from 'sinon'
 import { nextTick } from 'vue'
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js b/tests/components/RunResult/ValueViewer.spec.js
similarity index 96%
rename from tests/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
rename to tests/components/RunResult/ValueViewer.spec.js
index 3de0313..6c53f35 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.spec.js
+++ b/tests/components/RunResult/ValueViewer.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount } from '@vue/test-utils'
-import ValueViewer from '@/views/MainView/Workspace/Tabs/Tab/RunResult/ValueViewer.vue'
+import ValueViewer from '@/components/RunResult/ValueViewer.vue'
 import sinon from 'sinon'
 
 describe('ValueViewer.vue', () => {
diff --git a/tests/views/MainView/Workspace/Schema/Schema.spec.js b/tests/components/Schema/Schema.spec.js
similarity index 97%
rename from tests/views/MainView/Workspace/Schema/Schema.spec.js
rename to tests/components/Schema/Schema.spec.js
index cd81a80..2316e0e 100644
--- a/tests/views/MainView/Workspace/Schema/Schema.spec.js
+++ b/tests/components/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/MainView/Workspace/Schema'
-import TableDescription from '@/views/MainView/Workspace/Schema/TableDescription'
+import Schema from '@/components/Schema'
+import TableDescription from '@/components/Schema/TableDescription'
 import database from '@/lib/database'
 import fIo from '@/lib/utils/fileIo'
 import csv from '@/lib/csv'
diff --git a/tests/views/MainView/Workspace/Schema/TableDescription.spec.js b/tests/components/Schema/TableDescription.spec.js
similarity index 94%
rename from tests/views/MainView/Workspace/Schema/TableDescription.spec.js
rename to tests/components/Schema/TableDescription.spec.js
index 4e7e8c0..9ab6998 100644
--- a/tests/views/MainView/Workspace/Schema/TableDescription.spec.js
+++ b/tests/components/Schema/TableDescription.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import TableDescription from '@/views/MainView/Workspace/Schema/TableDescription'
+import TableDescription from '@/components/Schema/TableDescription'
 
 describe('TableDescription.vue', () => {
   it('Initially the columns are hidden and table name is rendered', () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js b/tests/components/SqlEditor/SqlEditor.spec.js
similarity index 95%
rename from tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
rename to tests/components/SqlEditor/SqlEditor.spec.js
index 92fead5..3417e10 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
+++ b/tests/components/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/MainView/Workspace/Tabs/Tab/SqlEditor'
+import SqlEditor from '@/components/SqlEditor'
 import { nextTick } from 'vue'
 
 describe('SqlEditor.vue', () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.spec.js b/tests/components/SqlEditor/hint.spec.js
similarity index 98%
rename from tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
rename to tests/components/SqlEditor/hint.spec.js
index 75d2969..38ba292 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
+++ b/tests/components/SqlEditor/hint.spec.js
@@ -1,9 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import state from '@/store/state'
-import showHint, {
-  getHints
-} from '@/views/MainView/Workspace/Tabs/Tab/SqlEditor/hint'
+import showHint, { getHints } from '@/components/SqlEditor/hint'
 import CM from 'codemirror'
 
 describe('hint.js', () => {
diff --git a/tests/views/MainView/Workspace/Tabs/Tab/Tab.spec.js b/tests/components/Tab.spec.js
similarity index 99%
rename from tests/views/MainView/Workspace/Tabs/Tab/Tab.spec.js
rename to tests/components/Tab.spec.js
index c3cfb70..6379ebe 100644
--- a/tests/views/MainView/Workspace/Tabs/Tab/Tab.spec.js
+++ b/tests/components/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/MainView/Workspace/Tabs/Tab'
+import Tab from '@/components/Tab'
 import { nextTick } from 'vue'
 
 let place
diff --git a/tests/views/MainView/Workspace/Tabs/Tabs.spec.js b/tests/components/Tabs.spec.js
similarity index 99%
rename from tests/views/MainView/Workspace/Tabs/Tabs.spec.js
rename to tests/components/Tabs.spec.js
index b7637a5..dc73a98 100644
--- a/tests/views/MainView/Workspace/Tabs/Tabs.spec.js
+++ b/tests/components/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/MainView/Workspace/Tabs'
+import Tabs from '@/components/Tabs'
 import eventBus from '@/lib/eventBus'
 import { nextTick } from 'vue'
 import cIo from '@/lib/utils/clipboardIo'
diff --git a/tests/views/MainView/Inquiries/Inquiries.spec.js b/tests/views/Inquiries.spec.js
similarity index 99%
rename from tests/views/MainView/Inquiries/Inquiries.spec.js
rename to tests/views/Inquiries.spec.js
index 0eef60b..676ba91 100644
--- a/tests/views/MainView/Inquiries/Inquiries.spec.js
+++ b/tests/views/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/MainView/Inquiries'
+import Inquiries from '@/views/Inquiries'
 import storedInquiries from '@/lib/storedInquiries'
 import mutations from '@/store/mutations'
 import actions from '@/store/actions'
diff --git a/tests/views/MainView/Workspace/Workspace.spec.js b/tests/views/Workspace.spec.js
similarity index 96%
rename from tests/views/MainView/Workspace/Workspace.spec.js
rename to tests/views/Workspace.spec.js
index fcf55d7..f7a295d 100644
--- a/tests/views/MainView/Workspace/Workspace.spec.js
+++ b/tests/views/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/MainView/Workspace'
+import Workspace from '@/views/Workspace'
 
 describe('Workspace.vue', () => {
   it('Creates a tab with example if schema is empty', () => {