diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js
index a9897b1664..397a02b64d 100644
--- a/packages/builder/rollup.config.js
+++ b/packages/builder/rollup.config.js
@@ -60,6 +60,10 @@ export default {
           find: "builderStore",
           replacement: path.resolve(projectRootDir, "src/builderStore"),
         },
+        {
+          find: "stores",
+          replacement: path.resolve(projectRootDir, "src/stores"),
+        },
         {
           find: "constants",
           replacement: path.resolve(projectRootDir, "src/constants"),
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index f53fc66a01..a728b6d795 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -4,7 +4,7 @@ import { store } from "builderStore"
 import {
   tables as tablesStore,
   queries as queriesStores,
-} from "builderStore/store/backend/"
+} from "stores/backend/"
 import { findComponentPath } from "./storeUtils"
 import { makePropSafe } from "@budibase/string-templates"
 import { TableNames } from "../constants"
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 58717050dc..ac78f1a829 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -15,7 +15,7 @@ import {
   queries,
   database,
   tables,
-} from "builderStore/store/backend/"
+} from "stores/backend/"
 
 import { fetchComponentLibDefinitions } from "../loadComponentLibraries"
 import api from "../api"
diff --git a/packages/builder/src/builderStore/store/screenTemplates/index.js b/packages/builder/src/builderStore/store/screenTemplates/index.js
index 38ae434753..6f068674bf 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/index.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/index.js
@@ -24,7 +24,7 @@ export default (frontendState, tables) => {
   })
 
   const fromScratch = enrichTemplate(createFromScratchScreen)
-  const tableTemplates = allTemplates(tables).map(enrichTemplate)
+  const tableTemplates = allTemplates(tables.list).map(enrichTemplate)
   return [
     fromScratch,
     ...tableTemplates.sort((templateA, templateB) => {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
index 318d54943f..99b843ebc6 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
@@ -1,7 +1,7 @@
 <script>
   import { processStringSync } from "@budibase/string-templates"
   import { get } from "lodash/fp"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
 
   export let block
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index d827cfdee8..49d0132728 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { automationStore } from "builderStore"
-  import { database } from 'builderStore/store/backend/'
+  import { database } from 'stores/backend/'
   import { goto } from "@sveltech/routify"
   import { notifier } from "builderStore/store/notifications"
   import { Input, ModalContent } from "@budibase/bbui"
diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index d53d7779c1..cf5560ed26 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,7 +1,7 @@
 <script>    
   import { goto } from "@sveltech/routify"
   import { automationStore } from "builderStore"
-  import { database } from 'builderStore/store/backend/'
+  import { database } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu } from "@budibase/bbui"
   import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 3d80251441..6a33666eaf 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import { Select } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "./AutomationBindingPanel.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
index 3d22e2c09c..682dd23800 100644
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import { automationStore } from "builderStore"
-  import { database } from 'builderStore/store/backend/'
+  import { database } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
   import { Button, Modal } from "@budibase/bbui"
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index d3c14d5cf0..d1176eb9cb 100644
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 0ec5cb728e..e4e0a538cf 100644
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { automationStore } from "builderStore"
-  import { database } from 'builderStore/store/backend/'
+  import { database } from 'stores/backend/'
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { ModalContent } from "@budibase/bbui"
   import { onMount, onDestroy } from "svelte"
diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index b13ad14cef..ac4830d57e 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables, views } from 'builderStore/store/backend/'
+  import { tables, views } from 'stores/backend/'
 
   import CreateRowButton from "./buttons/CreateRowButton.svelte"
   import CreateColumnButton from "./buttons/CreateColumnButton.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
index 40863476ee..c4b5a4a3a9 100644
--- a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
@@ -1,7 +1,7 @@
 <script>
   import api from "builderStore/api"
   import Table from "./Table.svelte"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
 
   export let tableId
   export let rowId
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index 751b3afa7f..c20f6b2f52 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import api from "builderStore/api"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
 
   import Table from "./Table.svelte"
   import CalculateButton from "./buttons/CalculateButton.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index ac3550d5b5..c8a4e62d18 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { TextButton, Popover } from "@budibase/bbui"
-  import { permissions } from 'builderStore/store/backend/'
+  import { permissions } from 'stores/backend/'
   import ManageAccessPopover from "../popovers/ManageAccessPopover.svelte"
 
   export let resourceId
diff --git a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
index 784272c534..8267c2f7d4 100644
--- a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
+++ b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { roles } from 'builderStore/store/backend/'
+  import { roles } from 'stores/backend/'
 
   export let roleId
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index d965bbaeaf..6c74252614 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -9,7 +9,7 @@
     Radio,
   } from "@budibase/bbui"
   import { cloneDeep } from "lodash/fp"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
 
   import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
   import {
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index d1fb8771a9..004a8d2470 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables, rows } from 'builderStore/store/backend/'
+  import { tables, rows } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import RowFieldControl from "../RowFieldControl.svelte"
   import * as api from "../api"
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 9d020f7c6e..c251595011 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { tables, rows } from 'builderStore/store/backend/'
-  import { roles } from 'builderStore/store/backend/'
+  import { tables, rows } from 'stores/backend/'
+  import { roles } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import RowFieldControl from "../RowFieldControl.svelte"
   import * as backendApi from "../api"
diff --git a/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte b/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte
index dc20a65562..29824d4933 100644
--- a/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { rows } from 'builderStore/store/backend/'
+  import { rows } from 'stores/backend/'
   import * as api from "../api"
   import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index adfbb127b8..5ce62c37cc 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -4,7 +4,7 @@
   import api from "builderStore/api"
   import { notifier } from "builderStore/store/notifications"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
-  import { roles } from 'builderStore/store/backend/'
+  import { roles } from 'stores/backend/'
 
   let basePermissions = []
   let selectedRole = {}
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
index 170c5fb18b..c1bfed4609 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button, Select } from "@budibase/bbui"
   
-  import { tables, views } from 'builderStore/store/backend/'
+  import { tables, views } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
 
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
index 9be42fecbe..b0915e978f 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Button, Input } from "@budibase/bbui"
   import { goto } from "@sveltech/routify"
-  import { views as viewsStore } from 'builderStore/store/backend/'
-  import { tables } from 'builderStore/store/backend/'
+  import { views as viewsStore } from 'stores/backend/'
+  import { tables } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
 
diff --git a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
index 55b30c788d..141afebd96 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Button, Input, Select, DatePicker } from "@budibase/bbui"
-  import { tables, views } from 'builderStore/store/backend/'
+  import { tables, views } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
 
diff --git a/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
index 87d76de44a..86b050b4f6 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Button, Select } from "@budibase/bbui"
-  import { tables, views } from 'builderStore/store/backend/'
+  import { tables, views } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { FIELDS } from "constants/backend"
 
diff --git a/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte
index 6d1a0c947c..b3650fd988 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { roles, permissions as permissionsStore } from 'builderStore/store/backend/'
+  import { roles, permissions as permissionsStore } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { Button, Label, Input, Select, Spacer } from "@budibase/bbui"
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index f101bee181..78a1e8167f 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from "svelte"
   import { goto } from "@sveltech/routify"
-  import { database, datasources, queries } from 'builderStore/store/backend/'
+  import { database, datasources, queries } from 'stores/backend/'
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
index c162ab73dc..f27238c804 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { datasources } from 'builderStore/store/backend/'
+  import { datasources } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { Input, Label, ModalContent } from "@budibase/bbui"
   import TableIntegrationMenu from "../TableIntegrationMenu/index.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index ca0442e3c7..53ad3b90d6 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { datasources } from 'builderStore/store/backend/'
+  import { datasources } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 15e3b96a47..4e7f430a1c 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { tables, views, database } from 'builderStore/store/backend/'
+  import { tables, views, database } from 'stores/backend/'
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 2259f6d5de..aa3e6149ca 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "@sveltech/routify"
   import { store } from "builderStore"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { Input, Label, ModalContent, Toggle } from "@budibase/bbui"
   import TableDataImport from "../TableDataImport.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 70ea11f759..108b61d168 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { store, allScreens } from "builderStore"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu, Button, Input } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
index a3a31e9b6f..2afa9a9950 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { views } from 'builderStore/store/backend/'
+  import { views } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu, Button, Input } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 7c5e4c9e65..32f0b74ca9 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import api from "builderStore/api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
   import { capitalise } from "../../helpers"
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index a14dfbce6d..1d0d44c1fe 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -7,7 +7,7 @@
     selectedAccessRole,
     screenSearchString,
   } from "builderStore"
-  import { roles } from 'builderStore/store/backend/'
+  import { roles } from 'stores/backend/'
   import { FrontendTypes } from "constants"
   import ComponentNavigationTree from "components/design/NavigationPanel/ComponentNavigationTree/index.svelte"
   import Layout from "components/design/NavigationPanel/Layout.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
index 05d1d04ad6..2361f58340 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { store, allScreens } from "builderStore"
-  import { tables } from 'builderStore/store/backend/'
-  import { roles } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
+  import { roles } from 'stores/backend/'
   import { Input, Select, ModalContent, Toggle } from "@budibase/bbui"
   import getTemplates from "builderStore/store/screenTemplates"
   import analytics from "analytics"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
index c02fb322ca..8fcd25cee3 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
@@ -10,8 +10,8 @@
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { store, currentAsset } from "builderStore"
-  import { tables as tablesStore, queries as queriesStore } from 'builderStore/store/backend/'
-  import { datasources, integrations } from 'builderStore/store/backend/'
+  import { tables as tablesStore, queries as queriesStore } from 'stores/backend/'
+  import { datasources, integrations } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import ParameterBuilder from "components/integration/QueryParameterBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
index bb60eff64c..cd870558b3 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Spacer } from "@budibase/bbui"
   import { store, currentAsset } from "builderStore"
-  import { datasources, integrations, queries } from 'builderStore/store/backend/'
+  import { datasources, integrations, queries } from 'stores/backend/'
   import { getBindableProperties } from "builderStore/dataBinding"
   import ParameterBuilder from "components/integration/QueryParameterBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
index 29f89c47df..2fbe5820ae 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { roles } from 'builderStore/store/backend/'
+  import { roles } from 'stores/backend/'
 
   export let value
 </script>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
index bde14adcb1..75a0a740f8 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
 
   export let value
 </script>
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index ebdeb997b4..063bbf2309 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -15,7 +15,7 @@
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import ExternalDataSourceTable from "components/backend/DataTable/ExternalDataSourceTable.svelte"
   import ParameterBuilder from "components/integration/QueryParameterBuilder.svelte"
-  import { datasources, integrations } from 'builderStore/store/backend/'
+  import { datasources, integrations } from 'stores/backend/'
 
   const PREVIEW_HEADINGS = [
     {
diff --git a/packages/builder/src/components/settings/tabs/APIKeys.svelte b/packages/builder/src/components/settings/tabs/APIKeys.svelte
index 546f24c106..e48af500dc 100644
--- a/packages/builder/src/components/settings/tabs/APIKeys.svelte
+++ b/packages/builder/src/components/settings/tabs/APIKeys.svelte
@@ -2,7 +2,7 @@
   import { Input, Label, TextButton } from "@budibase/bbui"
   import api from "builderStore/api"
   import { notifier } from "builderStore/store/notifications"
-  import { database } from 'builderStore/store/backend/'
+  import { database } from 'stores/backend/'
   import analytics from "analytics"
 
   let keys = { budibase: "" }
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index dcc19e16c1..67df37de01 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -1,6 +1,6 @@
 <script>
   import { store, automationStore } from "builderStore"
-  import { roles } from 'builderStore/store/backend/'
+  import { roles } from 'stores/backend/'
   import { Button } from "@budibase/bbui"
   import SettingsLink from "components/settings/Link.svelte"
   import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte"
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
index 331b8a2fb6..2db2999363 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params } from "@sveltech/routify"
-  import { queries } from "builderStore/store/backend/"
+  import { queries } from "stores/backend/"
 
   if ($params.query) {
     const query = $queries.list.find(
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
index 8fc21249b7..99da9acd38 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params } from "@sveltech/routify"
-  import { database, queries } from 'builderStore/store/backend/'
+  import { database, queries } from 'stores/backend/'
   import QueryInterface from "components/integration/QueryViewer.svelte"
 
   async function fetchQueryConfig() {
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
index 83a5d11706..8902fc45de 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params } from "@sveltech/routify"
-  import { datasources } from 'builderStore/store/backend/'
+  import { datasources } from 'stores/backend/'
 
   if ($params.selectedDatasource) {
     const datasource = $datasources.list.find(
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
index d1fd1ae6c7..50a2346530 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto, beforeUrlChange } from "@sveltech/routify"
   import { Button, Heading, Body, Spacer } from "@budibase/bbui"
-  import { datasources, integrations, queries } from 'builderStore/store/backend/'
+  import { datasources, integrations, queries } from 'stores/backend/'
   import { notifier } from "builderStore/store/notifications"
   import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte"
   import ICONS from "components/backend/DatasourceNavigator/icons"
diff --git a/packages/builder/src/pages/[application]/data/datasource/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
index 948a73d241..e2433862c0 100644
--- a/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { datasources } from 'builderStore/store/backend/'
+  import { datasources } from 'stores/backend/'
   import { goto, leftover } from "@sveltech/routify"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte
index 2d72709750..18cc4e7bfc 100644
--- a/packages/builder/src/pages/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { datasources, tables } from 'builderStore/store/backend/'
+    import { datasources, tables } from 'stores/backend/'
     import { goto } from "@sveltech/routify"
     import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
index 348cdbf67a..eb0d4c5dc2 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params } from "@sveltech/routify"
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
 
   if ($params.selectedTable) {
     const table = $tables.list.find(
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
index 866a505e60..5641c8af11 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import TableDataTable from "components/backend/DataTable/DataTable.svelte"
-  import { tables, database } from 'builderStore/store/backend/'
+  import { tables, database } from 'stores/backend/'
 </script>
 
 {#if $database?._id && $tables?.selected?.name}
diff --git a/packages/builder/src/pages/[application]/data/table/_layout.svelte b/packages/builder/src/pages/[application]/data/table/_layout.svelte
index f94954b840..1a542d9ad8 100644
--- a/packages/builder/src/pages/[application]/data/table/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/table/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import { goto, leftover } from "@sveltech/routify"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte
index a3c67cb0db..1293621fb7 100644
--- a/packages/builder/src/pages/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'builderStore/store/backend/'
+  import { tables } from 'stores/backend/'
   import { goto } from "@sveltech/routify"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
index c85615c0d3..e85180254b 100644
--- a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params } from "@sveltech/routify"
-  import { tables, views } from 'builderStore/store/backend/'
+  import { tables, views } from 'stores/backend/'
 
   if ($params.selectedView) {
     let view
diff --git a/packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte b/packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte
index f18f6742b0..1e51512c7c 100644
--- a/packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import ViewDataTable from "components/backend/DataTable/ViewDataTable"
-  import { views, database } from 'builderStore/store/backend/'
+  import { views, database } from 'stores/backend/'
 
   $: selectedView = $views.selected
 </script>
diff --git a/packages/builder/src/builderStore/store/backend/database.js b/packages/builder/src/stores/backend/database.js
similarity index 100%
rename from packages/builder/src/builderStore/store/backend/database.js
rename to packages/builder/src/stores/backend/database.js
diff --git a/packages/builder/src/builderStore/store/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
similarity index 94%
rename from packages/builder/src/builderStore/store/backend/datasources.js
rename to packages/builder/src/stores/backend/datasources.js
index 3fb54dd624..0f30695ea3 100644
--- a/packages/builder/src/builderStore/store/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -1,8 +1,8 @@
 import { writable } from "svelte/store"
 import { queries } from "./"
-import api from "../../api"
+import api from "builderStore/api"
 
-function createDatasourcesStore() {
+export function createDatasourcesStore(_api = api) {
   const { subscribe, update, set } = writable({
     list: [],
     selected: null,
diff --git a/packages/builder/src/builderStore/store/backend/index.js b/packages/builder/src/stores/backend/index.js
similarity index 100%
rename from packages/builder/src/builderStore/store/backend/index.js
rename to packages/builder/src/stores/backend/index.js
diff --git a/packages/builder/src/builderStore/store/backend/integrations.js b/packages/builder/src/stores/backend/integrations.js
similarity index 100%
rename from packages/builder/src/builderStore/store/backend/integrations.js
rename to packages/builder/src/stores/backend/integrations.js
diff --git a/packages/builder/src/builderStore/store/backend/permissions.js b/packages/builder/src/stores/backend/permissions.js
similarity index 90%
rename from packages/builder/src/builderStore/store/backend/permissions.js
rename to packages/builder/src/stores/backend/permissions.js
index 70070f9072..6669ef3270 100644
--- a/packages/builder/src/builderStore/store/backend/permissions.js
+++ b/packages/builder/src/stores/backend/permissions.js
@@ -1,7 +1,8 @@
 import { writable } from "svelte/store"
-import api from "../../api"
+import api from "builderStore/api"
 
-function createPermissionStore() {
+
+export function createPermissionStore() {
   const { subscribe, set } = writable([])
 
   return {
diff --git a/packages/builder/src/builderStore/store/backend/queries.js b/packages/builder/src/stores/backend/queries.js
similarity index 96%
rename from packages/builder/src/builderStore/store/backend/queries.js
rename to packages/builder/src/stores/backend/queries.js
index ff2eda67ff..8bda870179 100644
--- a/packages/builder/src/builderStore/store/backend/queries.js
+++ b/packages/builder/src/stores/backend/queries.js
@@ -1,8 +1,9 @@
 import { writable, get } from "svelte/store"
 import { datasources, integrations } from "./"
-import api from "../../api"
+import api from "builderStore/api"
 
-function createQueriesStore() {
+
+export function createQueriesStore() {
   const { subscribe, set, update } = writable({ list: [], selected: null })
 
   return {
diff --git a/packages/builder/src/builderStore/store/backend/roles.js b/packages/builder/src/stores/backend/roles.js
similarity index 89%
rename from packages/builder/src/builderStore/store/backend/roles.js
rename to packages/builder/src/stores/backend/roles.js
index 1d353e433f..146ba9fbd8 100644
--- a/packages/builder/src/builderStore/store/backend/roles.js
+++ b/packages/builder/src/stores/backend/roles.js
@@ -1,7 +1,8 @@
 import { writable } from "svelte/store"
-import api from "../../api"
+import api from "builderStore/api"
 
-function createRolesStore() {
+
+export function createRolesStore() {
   const { subscribe, set } = writable([])
 
   return {
diff --git a/packages/builder/src/builderStore/store/backend/rows.js b/packages/builder/src/stores/backend/rows.js
similarity index 88%
rename from packages/builder/src/builderStore/store/backend/rows.js
rename to packages/builder/src/stores/backend/rows.js
index c16941925c..e3872d5873 100644
--- a/packages/builder/src/builderStore/store/backend/rows.js
+++ b/packages/builder/src/stores/backend/rows.js
@@ -1,7 +1,7 @@
 import { writable, get } from "svelte/store"
 import { views } from "./"
 
-function createRowsStore() {
+export function createRowsStore() {
   const { subscribe } = writable([])
 
   return {
diff --git a/packages/builder/src/builderStore/store/backend/tables.js b/packages/builder/src/stores/backend/tables.js
similarity index 97%
rename from packages/builder/src/builderStore/store/backend/tables.js
rename to packages/builder/src/stores/backend/tables.js
index 74fd19bef9..c13a3d46ce 100644
--- a/packages/builder/src/builderStore/store/backend/tables.js
+++ b/packages/builder/src/stores/backend/tables.js
@@ -1,9 +1,10 @@
 import { writable, get } from "svelte/store"
 import { views } from "./"
 import { cloneDeep } from "lodash/fp"
-import api from "../../api"
+import api from "builderStore/api"
 
-function createTablesStore() {
+
+export function createTablesStore() {
   const store = writable({
     list: [],
     selected: {},
diff --git a/packages/builder/src/stores/backend/tests/database.spec.js b/packages/builder/src/stores/backend/tests/database.spec.js
new file mode 100644
index 0000000000..ccaf9c0570
--- /dev/null
+++ b/packages/builder/src/stores/backend/tests/database.spec.js
@@ -0,0 +1,26 @@
+import { database } from "../"
+
+describe("Backend DataSources Store", () => {
+
+  let state;
+  let unsub;
+
+  beforeEach(() => {
+    unsub = database.subscribe(s => state = s);
+  })
+  afterEach(() => {
+    unsub()
+  })
+
+  it("initialises correctly", () => {
+    expect(state.list, [])
+  })
+})
+
+const api = {
+    post: () => ({}),
+    get: () => ({}),
+    patch: () => ({}),
+    delete: () => ({}),
+    put: () => ({}),
+  }
\ No newline at end of file
diff --git a/packages/builder/src/stores/backend/tests/datasources.spec.js b/packages/builder/src/stores/backend/tests/datasources.spec.js
new file mode 100644
index 0000000000..02c90d134c
--- /dev/null
+++ b/packages/builder/src/stores/backend/tests/datasources.spec.js
@@ -0,0 +1,24 @@
+import { get } from 'svelte/store'
+import { createDatasourcesStore } from "../datasources"
+
+const mockApi = {
+  post: () => ({}),
+  get: () => ({}),
+  patch: () => ({}),
+  delete: () => ({}),
+  put: () => ({}),
+}
+
+
+describe("Automation Data Object", () => {
+  let store
+
+  beforeEach(() => {
+    store = createDatasourcesStore(mockApi)
+  })
+
+  it("Inits properly", () => {
+    const value = get(store)
+    expect(value).toBe(true)
+  })
+})
diff --git a/packages/builder/src/builderStore/store/backend/views.js b/packages/builder/src/stores/backend/views.js
similarity index 93%
rename from packages/builder/src/builderStore/store/backend/views.js
rename to packages/builder/src/stores/backend/views.js
index 7a97a9d325..5cd3c60267 100644
--- a/packages/builder/src/builderStore/store/backend/views.js
+++ b/packages/builder/src/stores/backend/views.js
@@ -1,8 +1,8 @@
 import { writable, get } from "svelte/store"
 import { tables } from "./"
-import api from "../../api"
+import api from "builderStore/api"
 
-function createViewsStore() {
+export function createViewsStore() {
   const { subscribe, update } = writable({
     list: [],
     selected: null,
diff --git a/packages/builder/tests/stores/backend.spec.js b/packages/builder/tests/stores/backend.spec.js
deleted file mode 100644
index e69de29bb2..0000000000