diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index df18f4c17a..281d4a54e4 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -3,9 +3,9 @@ import {
   CookieUtils,
   Constants,
 } from "@budibase/frontend-core"
-import { appStore } from "./stores/frontend"
+import { appStore } from "stores/builder"
 import { get } from "svelte/store"
-import { auth } from "./stores/portal"
+import { auth } from "stores/portal"
 
 export const API = createAPIClient({
   attachHeaders: headers => {
diff --git a/packages/builder/src/builder/dataBinding.js b/packages/builder/src/builder/dataBinding.js
index 1f33b64b8c..b87fb9f7e0 100644
--- a/packages/builder/src/builder/dataBinding.js
+++ b/packages/builder/src/builder/dataBinding.js
@@ -5,19 +5,17 @@ import {
   findComponent,
   findComponentPath,
   getComponentSettings,
-} from "stores/frontend/components/utils"
+} from "stores/builder/components/utils"
 import {
   currentAsset,
   componentStore,
   screenStore,
   appStore,
   layoutStore,
-} from "stores/frontend"
-import {
   queries as queriesStores,
   tables as tablesStore,
   roles as rolesStore,
-} from "stores/backend"
+} from "stores/builder"
 import {
   makePropSafe,
   isJSBinding,
diff --git a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
index 6ca3e65d5d..caeb33cb14 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { selectedAutomation } from "stores/frontend"
+  import { selectedAutomation } from "stores/builder"
   import Flowchart from "./FlowChart/FlowChart.svelte"
 </script>
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index f950d91746..3a57d3d6ce 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -9,7 +9,7 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
index c18368b1b1..8732623dcf 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 "stores/backend"
+  import { tables } from "stores/builder"
 
   export let block
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index 8811306f05..94f4f246d6 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -3,7 +3,7 @@
     automationStore,
     selectedAutomation,
     automationHistoryStore,
-  } from "stores/frontend"
+  } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import FlowItem from "./FlowItem.svelte"
   import TestDataModal from "./TestDataModal.svelte"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index bd42a0a640..7309fc47ff 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import {
     Icon,
     Divider,
@@ -21,7 +21,7 @@
     TriggerStepID,
     Features,
   } from "constants/backend/automations"
-  import { permissions } from "stores/backend"
+  import { permissions } from "stores/builder"
 
   export let block
   export let testDataModal
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index 606a752d16..3ee21d33ce 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { Icon, Body, Detail, StatusLight } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
   import { createEventDispatcher } from "svelte"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 5f006d4cf9..ebefa58570 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -7,7 +7,7 @@
     Label,
     notifications,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
index fd18bf4da6..9270d8e39d 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Icon, Divider } from "@budibase/bbui"
   import TestDisplay from "./TestDisplay.svelte"
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
 
   export let automation
 </script>
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
index 585445a03a..9d946fe55d 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@@ -4,7 +4,7 @@
     automationStore,
     selectedAutomation,
     userSelectedResourceMap,
-  } from "stores/frontend"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
   import { notifications } from "@budibase/bbui"
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index ab53ff66b9..180e7a52bb 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import {
     Input,
diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index d6b96b1cad..1bc4b0f18e 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
index b25642e640..066065956c 100644
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
 
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index dbf9b6c186..874051768e 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -18,8 +18,7 @@
     Detail,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import { automationStore, selectedAutomation } from "stores/frontend"
-  import { tables } from "stores/backend"
+  import { automationStore, selectedAutomation, tables } from "stores/builder"
   import { environment, licensing } from "stores/portal"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index 162285fd73..7e36b9b63d 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button, Select, Input, Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { flags } from "stores/backend"
+  import { flags } from "stores/builder"
   const dispatch = createEventDispatcher()
 
   export let value
diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index 250d235266..0174542695 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { Select } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
index 5d4dcf857a..384067e3f2 100644
--- a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 289f2e20be..9d17e5c486 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 "stores/backend"
+  import { tables } from "stores/builder"
   import { Select, Checkbox } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import RowSelectorTypes from "./RowSelectorTypes.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index 1645ded66b..c278c7d0e3 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 "stores/backend"
+  import { tables } from "stores/builder"
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { TableNames } from "constants"
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 3859f6d435..768ef2776e 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 { Icon, notifications } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { ModalContent } from "@budibase/bbui"
   import { onMount, onDestroy } from "svelte"
diff --git a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
index 4e67a92443..f107acc315 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 "api"
   import Table from "./Table.svelte"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { notifications } from "@budibase/bbui"
 
   export let tableId
diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 1ff1b34a69..a16dbd453a 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -1,10 +1,10 @@
 <script>
-  import { datasources, tables, integrations } from "stores/backend"
+  import { datasources, tables, integrations } from "stores/builder"
   import EditRolesButton from "./buttons/EditRolesButton.svelte"
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
   import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
   import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index 6fcba8d418..684cbd6cf4 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 "api"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
 
   import Table from "./Table.svelte"
   import CalculateButton from "./buttons/CalculateButton.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
index 0c6a0cca9a..90046b2c02 100644
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
index 839c396614..80050edf45 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
   import CreateEditRelationshipModal from "../../Datasources/CreateEditRelationshipModal.svelte"
-  import { datasources } from "../../../../stores/backend"
+  import { datasources } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let table
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index 5c0b7df742..aa8eefe89c 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 { ActionButton, Modal } from "@budibase/bbui"
-  import { permissions } from "stores/backend"
+  import { permissions } from "stores/builder"
   import ManageAccessModal from "../modals/ManageAccessModal.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 4b4ce1622b..8c9b4e306b 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 "stores/backend"
+  import { roles } from "stores/builder"
 
   export let value
 
diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js
index 43e8dc721e..f5ff3caec4 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -1,5 +1,5 @@
 import { FIELDS } from "constants/backend"
-import { tables } from "stores/backend"
+import { tables } from "stores/builder"
 import { get as svelteGet } from "svelte/store"
 
 // currently supported level of relationship depth (server side)
diff --git a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
index 5487551137..1acf5e3efd 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
   import { FIELDS } from "constants/backend"
 
   const CALCULATIONS = [
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 9ebcf2a54c..fa8b7131dc 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -15,7 +15,7 @@
   } from "@budibase/bbui"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
   import {
     FIELDS,
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index 3643602e22..277fe63d6a 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { ModalContent, keepOpen, notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
   import { 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 c18ba313e0..e6da2dfa78 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,7 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
-  import { roles } from "stores/backend"
+  import { tables, roles } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
   import { API } from "api"
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index ad51cbbbbb..80f233d7f9 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 "api"
   import { notifications } from "@budibase/bbui"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
 
   const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "write" }
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
index b125e18b31..1c67da1ab8 100644
--- a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
@@ -10,7 +10,7 @@
     notifications,
     Icon,
   } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
 
   const CONDITIONS = [
     {
diff --git a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
index 59fc4a2c5d..d122013428 100644
--- a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, ModalContent, notifications } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
   import { FIELDS } from "constants/backend"
 
   export let view = {}
diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
index 161757c570..3207001f3d 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { PermissionSource } from "@budibase/types"
-  import { roles, permissions as permissionsStore } from "stores/backend"
+  import { roles, permissions as permissionsStore } from "stores/builder"
   import {
     Label,
     Input,
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
index 2f96a3d82a..eea64a4d9e 100644
--- a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { Input, notifications, ModalContent } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
 
   const { filter, sort, definition } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
index 9b8ffb1dde..55eb2475cf 100644
--- a/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, Popover, Heading, Body, Button } from "@budibase/bbui"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   let anchor
   let open = false
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 37bea4fb8c..2d64f59d33 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 { goto, isActive, params } from "@roxi/routify"
   import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
-  import { datasources, queries, tables, views, viewsV2 } from "stores/backend"
+  import { datasources, queries, tables, views, viewsV2 } from "stores/builder"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
@@ -13,7 +13,7 @@
   } from "helpers/data/utils"
   import IntegrationIcon from "./IntegrationIcon.svelte"
   import { TableNames } from "constants"
-  import { userSelectedResourceMap, database } from "stores/frontend"
+  import { userSelectedResourceMap, database } from "stores/builder"
 
   let openDataSources = []
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
index 2486942dea..88359c2782 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
@@ -16,7 +16,7 @@ import Firebase from "./Firebase.svelte"
 import Redis from "./Redis.svelte"
 import Snowflake from "./Snowflake.svelte"
 import Custom from "./Custom.svelte"
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { get } from "svelte/store"
 
 const ICONS = {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
index 9b1f76ba30..1de322c203 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
index 991e170a2e..6982a17714 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { get } from "svelte/store"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { Input, ModalContent, Modal } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index 344bfab4e4..169b9e4ec3 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 "@roxi/routify"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
index 64915d347f..d77c5cc8c0 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
@@ -2,7 +2,7 @@
   import { goto } from "@roxi/routify"
   import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
 
   export let query
 
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index f6621c1508..e0c4da3091 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -9,7 +9,7 @@
     Detail,
     Body,
   } from "@budibase/bbui"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
index 0dfb4ca796..d2682597d4 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
@@ -2,7 +2,7 @@
   import { Modal } from "@budibase/bbui"
   import { get } from "svelte/store"
   import CreateEditRelationship from "./CreateEditRelationship.svelte"
-  import { integrations, datasources } from "stores/backend"
+  import { integrations, datasources } from "stores/builder"
   import { integrationForDatasource } from "stores/selectors"
 
   export let datasource
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index 5c2ea9767c..e9bd06d69b 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
@@ -1,6 +1,6 @@
 import { derived, writable, get } from "svelte/store"
 import { keepOpen, notifications } from "@budibase/bbui"
-import { datasources, tables } from "stores/backend"
+import { datasources, tables } from "stores/builder"
 
 export const createTableSelectionStore = (integration, datasource) => {
   const tableNamesStore = writable([])
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 799eba0e90..9ed62c2b9e 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -1,12 +1,16 @@
 <script>
-  import { tables, views, viewsV2 } from "stores/backend"
+  import {
+    tables,
+    views,
+    viewsV2,
+    userSelectedResourceMap,
+    database,
+  } from "stores/builder"
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
   import { goto, isActive } from "@roxi/routify"
-  import { userSelectedResourceMap } from "stores/frontend"
-  import { database } from "stores/frontend/database"
 
   export let sourceId
   export let selectTable
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index e5227af409..7e62e70a21 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,9 +1,8 @@
 <script>
   import { goto, url } from "@roxi/routify"
-  import { tables } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { Input, Label, ModalContent, Layout } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
   import TableDataImport from "../TableDataImport.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 26071771d6..52bc10ff43 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -1,8 +1,7 @@
 <script>
   import { goto, params } from "@roxi/routify"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/backend"
-  import { screenStore } from "stores/frontend"
+  import { tables, datasources, screenStore } from "stores/builder"
   import {
     ActionMenu,
     Icon,
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
index 5e2b0102f8..30cc4451df 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { views, viewsV2 } from "stores/backend"
+  import { views, viewsV2 } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte
index 6036a33ce8..2d9f269e24 100644
--- a/packages/builder/src/components/commandPalette/CommandPalette.svelte
+++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte
@@ -15,9 +15,12 @@
     builderStore,
     sortedScreens,
     appStore,
-  } from "stores/frontend"
+    datasources,
+    queries,
+    tables,
+    views,
+  } from "stores/builder"
   import { themeStore } from "stores/portal"
-  import { datasources, queries, tables, views } from "stores/backend"
   import { getContext } from "svelte"
   import { Constants } from "@budibase/frontend-core"
 
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index d357a0a54d..54ddf8ad76 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 "stores/backend"
+  import { tables } from "stores/builder"
   import { API } from "api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
   import { capitalise } from "../../helpers"
diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index 2df61926e1..b7e9fe060d 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, FancySelect } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { licensing } from "stores/portal"
 
   import { Constants, RoleUtils } from "@budibase/frontend-core"
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index fdeb2e396c..0dae0fd4d3 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -8,7 +8,7 @@
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   export let panel = ClientBindingPanel
   export let value = ""
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 572d3ec8cc..0e1f939933 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -27,7 +27,7 @@
     appStore,
     deploymentStore,
     initialise,
-  } from "stores/frontend"
+  } from "stores/builder"
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
   import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
   import { goto } from "@roxi/routify"
diff --git a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
index 3ea5d1bc81..899d1659e8 100644
--- a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
+++ b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { ModalContent } from "@budibase/bbui"
   import { onMount } from "svelte"
   import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"
diff --git a/packages/builder/src/components/deploy/DeleteModal.svelte b/packages/builder/src/components/deploy/DeleteModal.svelte
index 13de02160e..855f6a0757 100644
--- a/packages/builder/src/components/deploy/DeleteModal.svelte
+++ b/packages/builder/src/components/deploy/DeleteModal.svelte
@@ -3,7 +3,7 @@
   import { goto } from "@roxi/routify"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { apps } from "stores/portal"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
   import { API } from "api"
 
   export const show = () => {
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index 14640a60de..dc97c81c22 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Input, Modal, notifications, ModalContent } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/frontend"
+  import { appStore, initialise } from "stores/builder"
   import { API } from "api"
 
   export let onComplete = () => {}
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index 8507c89735..0944512fe8 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -7,7 +7,7 @@
     Button,
     StatusLight,
   } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/frontend"
+  import { appStore, initialise } from "stores/builder"
   import { API } from "api"
 
   export function show() {
diff --git a/packages/builder/src/components/design/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
index 034b8307ba..0f235d4bad 100644
--- a/packages/builder/src/components/design/ScreenDetailsModal.svelte
+++ b/packages/builder/src/components/design/ScreenDetailsModal.svelte
@@ -2,7 +2,7 @@
   import { ModalContent, Input } from "@budibase/bbui"
   import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
   import { get } from "svelte/store"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
 
   export let onConfirm
   export let onCancel
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
index 372eb6e52e..fc66dbf136 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
index 286c12ec1d..c5da4b90cc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
index 1e79c51051..b8459ac0eb 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, Checkbox, Input, Body } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/backend"
+  import { tables, viewsV2 } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
index 7146fa5d7f..bd9564f51c 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -1,7 +1,6 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
-  import { tables, viewsV2 } from "stores/backend"
+  import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
   import {
     getContextProviderComponents,
     getSchemaForDatasourcePlus,
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index a085d86507..263a1193da 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Layout, Input, Checkbox } from "@budibase/bbui"
-  import { datasources, integrations, queries } from "stores/backend"
+  import { datasources, integrations, queries } from "stores/builder"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import {
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
index 4d4dfd79b6..7acf4dd6fc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
@@ -3,8 +3,8 @@
   import {
     findAllMatchingComponents,
     findComponent,
-  } from "stores/frontend/components/utils"
-  import { currentAsset } from "stores/frontend"
+  } from "stores/builder/components/utils"
+  import { currentAsset } from "stores/builder"
   import { onMount } from "svelte"
   import {
     getDatasourceForProvider,
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
index e01fcab4f3..4478f1bb16 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/backend"
+  import { tables, viewsV2 } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
index 66edac8240..86f454d6bc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
   import { onMount } from "svelte"
   import { Label, Checkbox, Select } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
index 3fe3a67f7a..0a347fc6bb 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "stores/frontend"
-  import { findAllMatchingComponents } from "stores/frontend/components/utils"
+  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "stores/builder/components/utils"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
index 3ee0c852e8..b9d365cad7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
index 0768c93843..9f9d91b682 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset } from "stores/frontend"
-  import { findAllMatchingComponents } from "stores/frontend/components/utils"
+  import { currentAsset } from "stores/builder"
+  import { findAllMatchingComponents } from "stores/builder/components/utils"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
index 5307bc81b9..573bec50e9 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -1,7 +1,6 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
-  import { tables, viewsV2 } from "stores/backend"
+  import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
   import {
     getContextProviderComponents,
     getSchemaForDatasourcePlus,
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
index c025fd03c1..59fd8d9aad 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
   import {
     getActionProviderComponents,
     buildFormSchema,
   } from "builder/dataBinding"
-  import { findComponent } from "stores/frontend/components/utils"
+  import { findComponent } from "stores/builder/components/utils"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index 46bf0361fa..0a52a693c3 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, Input, Checkbox, Icon, Body } from "@budibase/bbui"
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
index 2b97151b38..5e2f6e6c53 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
@@ -2,12 +2,12 @@
   import { Select, Label, Combobox } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import {
     getActionProviderComponents,
     buildFormSchema,
   } from "builder/dataBinding"
-  import { findComponent } from "stores/frontend/components/utils"
+  import { findComponent } from "stores/builder/components/utils"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
index 9acb1d46e8..dbb2487cb3 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
index 0c86a4f58e..e8da0f74df 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
@@ -1,6 +1,6 @@
 import * as ActionComponents from "./actions"
 import { get } from "svelte/store"
-import { appStore } from "stores/frontend"
+import { appStore } from "stores/builder"
 // @ts-ignore
 import ActionDefinitions from "./manifest.json"
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
index f3cddf3e09..3fad8288c7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -3,7 +3,7 @@
   import ButtonSetting from "./ButtonSetting.svelte"
   import { createEventDispatcher } from "svelte"
   import { Helpers } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
 
   export let componentBindings
   export let bindings
diff --git a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
index 39adb44a4d..e4e27a2fe5 100644
--- a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ColorPicker } from "@budibase/bbui"
-  import { themeStore } from "stores/frontend"
+  import { themeStore } from "stores/builder"
 
   export let value
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
index ea2ba4a923..f5167e3657 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
@@ -7,7 +7,7 @@
     Layout,
     Label,
   } from "@budibase/bbui"
-  import { themeStore } from "stores/frontend"
+  import { themeStore } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let column
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
index 42b7dc2b4b..0f75fa6870 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -7,7 +7,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { getFields } from "helpers/searchFields"
 
   export let componentInstance
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index 422199a1e0..464dfa98eb 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
-  import { currentAsset, componentStore } from "stores/frontend"
-  import { findComponentPath } from "stores/frontend/components/utils"
+  import { currentAsset, componentStore } from "stores/builder"
+  import { findComponentPath } from "stores/builder/components/utils"
 
   export let value
 
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index dcdb01ea99..aa0642cc7f 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -18,14 +18,16 @@
     notifications,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { currentAsset, componentStore } from "stores/frontend"
   import {
     tables as tablesStore,
     queries as queriesStore,
     viewsV2 as viewsV2Store,
     views as viewsStore,
-  } from "stores/backend"
-  import { datasources, integrations } from "stores/backend"
+    currentAsset,
+    componentStore,
+    datasources,
+    integrations,
+  } from "stores/builder"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index e1a9ada713..7bffef2195 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, Popover, Layout } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 2b895c4c53..2578c346e0 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -8,7 +8,7 @@
   } from "builder/dataBinding"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
-  import { selectedScreen, currentAsset, componentStore } from "stores/frontend"
+  import { selectedScreen, currentAsset, componentStore } from "stores/builder"
   import FieldSetting from "./FieldSetting.svelte"
   import { convertOldFieldFormat, getComponentForField } from "./utils"
 
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
index 8d5fb95e8f..afa40885bb 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
@@ -5,7 +5,7 @@
   import { cloneDeep } from "lodash/fp"
   import { runtimeToReadableBinding } from "builder/dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
 
   export let item
   export let componentBindings
diff --git a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
index 9e225dbbbc..c185f73963 100644
--- a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
index f11f278075..47e3598f4b 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -6,7 +6,7 @@
     getSchemaForDatasource,
   } from "builder/dataBinding"
   import FilterDrawer from "./FilterDrawer.svelte"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index 294a8251c2..3a7f1d73e4 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { getComponentFieldOptions } from "helpers/formFields"
 
   export let componentInstance
diff --git a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
index c379405b43..a7966eb671 100644
--- a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { layoutStore } from "stores/frontend"
+  import { layoutStore } from "stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index ee01d25451..c1b36a6375 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 3ca9abf8c5..f776656519 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -4,7 +4,7 @@
     readableToRuntimeBinding,
     runtimeToReadableBinding,
   } from "builder/dataBinding"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
   import { onDestroy } from "svelte"
 
   export let label = ""
diff --git a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
index 53f20ec482..1cfbbf5e62 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -1,11 +1,10 @@
 <script>
-  import { currentAsset } from "stores/frontend"
-  import { findClosestMatchingComponent } from "stores/frontend/components/utils"
+  import { findClosestMatchingComponent } from "stores/builder/components/utils"
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { tables } from "stores/backend"
+  import { tables, currentAsset } from "stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 
   export let componentInstance
diff --git a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
index 22382d92f4..26f79e757a 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
-  import { findClosestMatchingComponent } from "stores/frontend/components/utils"
+  import { currentAsset, componentStore } from "stores/builder"
+  import { findClosestMatchingComponent } from "stores/builder/components/utils"
   import { makeDatasourceFormComponents } from "builder/store/screenTemplates/utils/commonComponents"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
 
diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
index d1e326219b..5b5daac183 100644
--- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { RoleUtils } from "@budibase/frontend-core"
 
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
index 05b4058aa3..d5d42f1514 100644
--- a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
 
   export let value = null
 
diff --git a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
index ed9108dd82..b7633c1895 100644
--- a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
@@ -4,8 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
-  import { tables } from "stores/backend"
+  import { currentAsset, tables } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { getFields } from "helpers/searchFields"
 
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index d3ff0d1dcc..9f7382f410 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/components/design/settings/controls/TableSelect.svelte b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
index da50ad8c2a..7b73d0a7cf 100644
--- a/packages/builder/src/components/design/settings/controls/TableSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher, onMount } from "svelte"
-  import { tables as tablesStore, viewsV2 } from "stores/backend"
+  import { tables as tablesStore, viewsV2 } from "stores/builder"
 
   export let value
 
diff --git a/packages/builder/src/components/design/settings/controls/URLSelect.svelte b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
index 90e3fb001d..d087af95b0 100644
--- a/packages/builder/src/components/design/settings/controls/URLSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
   import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index 58b307c007..b9ccc24c44 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -10,8 +10,8 @@
     Input,
     DatePicker,
   } from "@budibase/bbui"
-  import { currentAsset, selectedComponent } from "stores/frontend"
-  import { findClosestMatchingComponent } from "stores/frontend/components/utils"
+  import { currentAsset, selectedComponent } from "stores/builder"
+  import { findClosestMatchingComponent } from "stores/builder/components/utils"
   import { getSchemaForDatasource } from "builder/dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index 3dc24983d3..05b336c3b3 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, notifications, Select } from "@budibase/bbui"
-  import { permissions, roles } from "stores/backend"
+  import { permissions, roles } from "stores/builder"
   import { Constants } from "@budibase/frontend-core"
 
   export let query
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 59a3289731..e0d7013459 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources, integrations, queries } from "stores/backend"
+  import { datasources, integrations, queries } from "stores/builder"
   import {
     Icon,
     Select,
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index cbcfa48e51..5bb6020ec7 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { datasources, flags, integrations, queries } from "stores/backend"
+  import { datasources, flags, integrations, queries } from "stores/builder"
   import { environment } from "stores/portal"
   import {
     Banner,
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index 86a548c436..34beccda6f 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -2,7 +2,7 @@
   import { Popover, Layout, Heading, Body, Button, Link } from "@budibase/bbui"
   import { TOURS } from "./tours.js"
   import { goto, layout, isActive } from "@roxi/routify"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   let popoverAnchor
   let popover
diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
index 698688d9cc..53553db1c8 100644
--- a/packages/builder/src/components/portal/onboarding/TourWrap.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
@@ -2,7 +2,7 @@
   import { tourHandler } from "./tourHandler"
   import { TOURS } from "./tours"
   import { onMount, onDestroy } from "svelte"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   export let tourStepKey
 
diff --git a/packages/builder/src/components/portal/onboarding/tourHandler.js b/packages/builder/src/components/portal/onboarding/tourHandler.js
index cbb967164e..acac21478e 100644
--- a/packages/builder/src/components/portal/onboarding/tourHandler.js
+++ b/packages/builder/src/components/portal/onboarding/tourHandler.js
@@ -1,4 +1,4 @@
-import { builderStore } from "stores/frontend"
+import { builderStore } from "stores/builder"
 import { get } from "svelte/store"
 
 const registerNode = async (node, tourStepKey) => {
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 3c4a3a5488..d589a68a83 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { builderStore } from "stores/frontend"
+import { builderStore } from "stores/builder"
 import { auth } from "stores/portal"
 import analytics from "analytics"
 import { OnboardingData, OnboardingDesign, OnboardingPublish } from "./steps"
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 09bd628d6a..b582232207 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -7,8 +7,7 @@
     ModalContent,
     Dropzone,
   } from "@budibase/bbui"
-  import { initialise as initialiseFrontend } from "stores/frontend"
-  import { initialise as initialiseBackend } from "stores/backend"
+  import { initialise } from "stores/builder"
   import { API } from "api"
   import { apps, admin, auth } from "stores/portal"
   import { onMount } from "svelte"
@@ -134,8 +133,7 @@
       // Select Correct Application/DB in prep for creating user
       const pkg = await API.fetchAppPackage(createdApp.instance._id)
 
-      await initialiseFrontend(pkg)
-      await initialiseBackend(pkg)
+      await initialise(pkg)
 
       // Update checklist - in case first app
       await admin.init()
diff --git a/packages/builder/src/components/start/ImportAppModal.svelte b/packages/builder/src/components/start/ImportAppModal.svelte
index 411e5fc739..4c88593514 100644
--- a/packages/builder/src/components/start/ImportAppModal.svelte
+++ b/packages/builder/src/components/start/ImportAppModal.svelte
@@ -9,7 +9,7 @@
     Body,
   } from "@budibase/bbui"
   import { API } from "api"
-  import { initialise } from "stores/frontend"
+  import { initialise } from "stores/builder"
 
   export let app
 
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
index aa22b65814..a626f10188 100644
--- a/packages/builder/src/helpers/formFields.js
+++ b/packages/builder/src/helpers/formFields.js
@@ -1,4 +1,4 @@
-import { findClosestMatchingComponent } from "stores/frontend/components/utils"
+import { findClosestMatchingComponent } from "stores/builder/components/utils"
 import {
   getDatasourceForProvider,
   getSchemaForDatasource,
diff --git a/packages/builder/src/helpers/searchFields.js b/packages/builder/src/helpers/searchFields.js
index a9c837d570..73e4f1aaa2 100644
--- a/packages/builder/src/helpers/searchFields.js
+++ b/packages/builder/src/helpers/searchFields.js
@@ -1,4 +1,4 @@
-import { tables } from "../stores/backend"
+import { tables } from "stores/builder"
 import { BannedSearchTypes } from "../constants/backend"
 import { get } from "svelte/store"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 3490b94c0d..d205e3d298 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -14,7 +14,7 @@
     Button,
     FancySelect,
   } from "@budibase/bbui"
-  import { builderStore, appStore } from "stores/frontend"
+  import { builderStore, appStore } from "stores/builder"
   import { groups, licensing, apps, users, auth, admin } from "stores/portal"
   import {
     fetchData,
@@ -28,7 +28,7 @@
   import RoleSelect from "components/common/RoleSelect.svelte"
   import UpgradeModal from "components/common/users/UpgradeModal.svelte"
   import { emailValidator } from "helpers/validation"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { fly } from "svelte/transition"
 
   let query = null
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
index efbbcf57c6..84cee40064 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
@@ -6,7 +6,7 @@
     themeStore,
     selectedScreen,
     appStore,
-  } from "stores/frontend"
+  } from "stores/builder"
   import { ProgressCircle } from "@budibase/bbui"
 
   $: route = $selectedScreen?.routing.route || "/"
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 57af165c2b..c7f8c98e73 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -1,14 +1,13 @@
 <script>
   import {
-    initialise as initFrontend,
-    reset as resetFrontend,
+    initialise,
+    reset,
     appStore,
     builderStore,
     previewStore,
     userStore,
     deploymentStore,
-  } from "stores/frontend"
-  import { initialise as initBackend } from "stores/backend"
+  } from "stores/builder"
   import { auth, apps } from "stores/portal"
   import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
   import {
@@ -48,11 +47,10 @@
 
   async function getPackage() {
     try {
-      resetFrontend()
+      reset()
 
       const pkg = await API.fetchAppPackage(application)
-      await initFrontend(pkg)
-      await initBackend()
+      await initialise(pkg)
 
       await apps.load()
       await deploymentStore.load()
@@ -120,7 +118,7 @@
   onDestroy(() => {
     // Run async on a slight delay to let other cleanup logic run without
     // being confused by the store wiping
-    setTimeout(resetFrontend, 10)
+    setTimeout(reset, 10)
   })
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
index 0e48a83cb5..9d5f716e0e 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { params } from "@roxi/routify"
 
   if ($params.automation) {
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
index bdf476750c..57a011d17f 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
@@ -11,7 +11,7 @@
     builderStore,
     automationStore,
     selectedAutomation,
-  } from "stores/frontend"
+  } from "stores/builder"
 
   $: automationId = $selectedAutomation?._id
   $: builderStore.selectResource(automationId)
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
index efe6cac91d..ffd9b5d34c 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
 
   $: {
     if ($automationStore.automations?.length) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
index d95d24f07d..3024fe1395 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import GoogleLogo from "assets/google-logo.png"
   import { auth } from "stores/portal"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
 
   export let disabled
   export let samePage
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
index 7bd87dd0f0..2134b94bbe 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
@@ -7,7 +7,7 @@
   import { get } from "svelte/store"
   import TableImportSelection from "components/backend/Datasources/TableImportSelection/index.svelte"
   import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { createOnGoogleAuthStore } from "./stores/onGoogleAuth.js"
   import { createDatasourceCreationStore } from "./stores/datasourceCreation.js"
   import { configFromIntegration } from "stores/selectors"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
index 717ecf5e4e..57dd5ee419 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
@@ -1,6 +1,6 @@
 import { derived } from "svelte/store"
 import { params } from "@roxi/routify"
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { IntegrationTypes } from "constants/backend"
 
 export const createOnGoogleAuthStore = () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
index 14db846c9a..f3e921c698 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
@@ -4,14 +4,14 @@ import { writable, get } from "svelte/store"
 // eslint-disable-next-line no-unused-vars
 import { params } from "@roxi/routify"
 // eslint-disable-next-line no-unused-vars
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { IntegrationTypes } from "constants/backend"
 
 vi.mock("@roxi/routify", () => ({
   params: vi.fn(),
 }))
 
-vi.mock("stores/backend", () => ({
+vi.mock("stores/builder", () => ({
   integrations: vi.fn(),
 }))
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 4f64edb34d..a221e90028 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -4,7 +4,7 @@
   import Panel from "components/design/Panel.svelte"
   import { isActive, redirect, goto, params } from "@roxi/routify"
   import BetaButton from "./_components/BetaButton.svelte"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
 
   $: {
     // If we ever don't have any data other than the users table, prompt the
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
index db59efd3a9..c4f0861f45 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
@@ -1,7 +1,7 @@
 <script>
   import { keepOpen, Modal, notifications } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
   import EditDatasourceConfigButton from "./EditDatasourceConfigButton.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
index a72359a950..87f90551a4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
index 7e28e8ec07..93f1e87672 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "@roxi/routify"
   import { Button, Table } from "@budibase/bbui"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import CapitaliseRenderer from "components/common/renderers/CapitaliseRenderer.svelte"
   import RestImportButton from "./RestImportButton.svelte"
   import Panel from "../Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
index 1a46ecb540..7c35e72fe8 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
@@ -5,7 +5,7 @@
     tables as tablesStore,
     integrations as integrationsStore,
     datasources as datasourcesStore,
-  } from "stores/backend"
+  } from "stores/builder"
   import { DatasourceFeature } from "@budibase/types"
   import { API } from "api"
   import Panel from "./Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
index f53215b8ce..83a8e13c9e 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
@@ -2,7 +2,7 @@
   import { get } from "svelte/store"
   import { isEqual } from "lodash"
   import { integrationForDatasource } from "stores/selectors"
-  import { integrations, datasources } from "stores/backend"
+  import { integrations, datasources } from "stores/builder"
   import { notifications, Button } from "@budibase/bbui"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
index 881b552438..612ea5fc35 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Button, Modal } from "@budibase/bbui"
-  import { integrations, tables } from "stores/backend"
+  import { integrations, tables } from "stores/builder"
   import CreateExternalTableModal from "./CreateExternalTableModal.svelte"
   import TableImportSelection from "components/backend/Datasources/TableImportSelection/index.svelte"
   import { integrationForDatasource } from "stores/selectors"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
index faa3611f5d..129b975309 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { goto } from "@roxi/routify"
   import { DB_TYPE_EXTERNAL } from "constants/backend"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
index dd5668d603..2d37c71999 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, Table, BoldRenderer, CodeRenderer } from "@budibase/bbui"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { goto } from "@roxi/routify"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
index ae1ab5394f..9303384c7d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
@@ -4,7 +4,7 @@
   import ViewDynamicVariables from "./ViewDynamicVariables.svelte"
   import { getEnvironmentBindings } from "builder/dataBinding"
   import { licensing } from "stores/portal"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import SaveDatasourceButton from "../SaveDatasourceButton.svelte"
   import Panel from "../Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
index d1e0877d33..417f750ab5 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
@@ -1,10 +1,9 @@
 <script>
   import { params } from "@roxi/routify"
-  import { datasources } from "stores/backend"
+  import { datasources, builderStore } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { builderStore } from "stores/frontend"
 
   $: datasourceId = $datasources.selectedDatasourceId
   $: builderStore.selectResource(datasourceId)
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index 090cffeb7e..338d45d3de 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Tabs, Tab, Heading, Body, Layout } from "@budibase/bbui"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import EditDatasourceConfig from "./_components/EditDatasourceConfig.svelte"
   import TablesPanel from "./_components/panels/Tables/index.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
index e878f15e76..2b059a36ed 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
@@ -2,12 +2,11 @@
   import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources, builderStore } from "stores/builder"
   import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
   import { BUDIBASE_INTERNAL_DB_ID, DB_TYPE_EXTERNAL } from "constants/backend"
   import { TableNames } from "constants"
-  import { builderStore } from "stores/frontend"
 
   let modal
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
index 8295f52a98..a3f561da98 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
@@ -2,11 +2,11 @@
   import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { goto } from "@roxi/routify"
   import { DEFAULT_BB_DATASOURCE_ID, DB_TYPE_EXTERNAL } from "constants/backend"
   import { onMount } from "svelte"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   let modal
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
index 347e1138d4..c77ff0dce9 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { redirect } from "@roxi/routify"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
index 9ccc9bffcf..ff9a27a14b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { redirect } from "@roxi/routify"
   import { TableNames } from "constants"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
 
   $: {
     if ($datasources.hasData) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
index b2aca33c6a..c07a9f563d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
@@ -4,7 +4,7 @@
     tables,
     datasources,
     sortedIntegrations as integrations,
-  } from "stores/backend"
+  } from "stores/builder"
 
   import { hasData } from "stores/selectors"
   import { notifications, Body, Icon, AbsTooltip } from "@budibase/bbui"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
index be5e3f1408..3ce882f5e3 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   $: queryId = $queries.selectedQueryId
   $: builderStore.selectResource(queryId)
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
index 787d934f34..eafdb32193 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
@@ -1,10 +1,10 @@
 <script>
-  import { queries, datasources } from "stores/backend"
+  import { queries, datasources } from "stores/builder"
   import QueryViewer from "components/integration/QueryViewer.svelte"
   import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
   import { IntegrationTypes } from "constants/backend"
   import { cloneDeep } from "lodash/fp"
-  import { database } from "stores/frontend/database"
+  import { database } from "stores/builder"
 
   $: query = $queries.selected
   $: editableQuery = cloneDeep(query)
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
index 6e53f69bcc..277970defa 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { redirect } from "@roxi/routify"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
index 35a68bd4de..dc9ff934f2 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
@@ -1,10 +1,9 @@
 <script>
   import { params, redirect } from "@roxi/routify"
-  import { datasources } from "stores/backend"
   import QueryViewer from "components/integration/QueryViewer.svelte"
   import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
   import { IntegrationTypes } from "constants/backend"
-  import { database } from "stores/frontend/database"
+  import { database, datasources } from "stores/builder"
 
   $: datasource = $datasources.list.find(ds => ds._id === $params.datasourceId)
   $: {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
index 05761959c1..505f2c5e43 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
   import { syncURLToState } from "helpers/urlStateSync"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   $: tableId = $tables.selectedTableId
   $: builderStore.selectResource(tableId)
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
index 2363c0875e..bdf1ba965f 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
@@ -1,7 +1,6 @@
 <script>
   import TableDataTable from "components/backend/DataTable/TableDataTable.svelte"
-  import { tables } from "stores/backend"
-  import { database } from "stores/frontend/database"
+  import { tables, database } from "stores/builder"
   import { Banner } from "@budibase/bbui"
 
   const verifyAutocolumns = table => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
index f513d8ceb9..3f21e48672 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { datasources, tables } from "stores/backend"
+  import { datasources, tables } from "stores/builder"
   import { redirect } from "@roxi/routify"
   import { TableNames } from "constants"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
index 0a2fc3c32d..623cd224db 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { views, viewsV2 } from "stores/backend"
+  import { views, viewsV2 } from "stores/builder"
   import { redirect } from "@roxi/routify"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
index 030897339f..9a8fe37387 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { views } from "stores/backend"
+  import { views } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   $: name = $views.selectedViewName
   $: builderStore.selectResource(name)
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
index 45fcea460e..b754ac819b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
@@ -1,7 +1,6 @@
 <script>
   import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte"
-  import { views } from "stores/backend"
-  import { database } from "stores/frontend/database"
+  import { views, database } from "stores/builder"
 
   $: selectedView = $views.selected
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
index 1a7aee2a56..0cbad24d76 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   $: id = $viewsV2.selectedViewId
   $: builderStore.selectResource(id)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
index f76d924123..7c53c4d5af 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@@ -4,13 +4,13 @@
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/frontend"
+  } from "stores/builder"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
   import ConditionalUISection from "./ConditionalUISection.svelte"
   import { notifications } from "@budibase/bbui"
-  import { getComponentText } from "stores/frontend/components/utils"
+  import { getComponentText } from "stores/builder/components/utils"
   import {
     getBindableProperties,
     getComponentBindableProperties,
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index 36dc3827a1..60855b23be 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -1,7 +1,7 @@
 <script>
   import { helpers } from "@budibase/shared-core"
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte"
   import EjectBlockButton from "components/design/settings/controls/EjectBlockButton.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
index dd64975f41..3dc80151ed 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
@@ -13,10 +13,10 @@
   import { generate } from "shortid"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { LuceneUtils, Constants } from "@budibase/frontend-core"
-  import { selectedComponent } from "stores/frontend"
+  import { selectedComponent } from "stores/builder"
   import { getComponentForSetting } from "components/design/settings/componentSettings"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import { getComponentSettings } from "stores/frontend/components/utils"
+  import { getComponentSettings } from "stores/builder/components/utils"
 
   export let conditions = []
   export let bindings = []
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
index b6f628abf6..bc71f8b696 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
@@ -6,7 +6,7 @@
     Button,
     notifications,
   } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
   import ConditionalUIDrawer from "./ConditionalUIDrawer.svelte"
 
   export let componentInstance
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
index 5eb41c2f04..dd13f118ad 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
@@ -6,7 +6,7 @@
     Button,
     notifications,
   } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/frontend"
+  import { selectedScreen, componentStore } from "stores/builder"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import {
     getBindableProperties,
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
index 4f45a89b96..a0a0686412 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
@@ -1,7 +1,7 @@
 <script>
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
 
   export let name
   export let properties
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte
index f4cda37080..ac6f32ccc8 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte
@@ -10,7 +10,7 @@
   import { flip } from "svelte/animate"
   import { dndzone } from "svelte-dnd-action"
   import { generate } from "shortid"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
 
   export let links = []
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte
index a25a149514..c664f50f10 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte
@@ -2,7 +2,7 @@
   import { Button, Drawer } from "@budibase/bbui"
   import NavigationLinksDrawer from "./LinksDrawer.svelte"
   import { cloneDeep } from "lodash/fp"
-  import { navigationStore } from "stores/frontend"
+  import { navigationStore } from "stores/builder"
 
   let drawer
   let links
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
index aafea25c80..7f118fb034 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
@@ -21,7 +21,7 @@
     selectedScreen,
     screenStore,
     navigationStore,
-  } from "stores/frontend"
+  } from "stores/builder"
   import { DefaultAppTheme } from "constants"
 
   const updateShowNavigation = async e => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
index 5690e09179..9c63ef4d13 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { notifications } from "@budibase/bbui"
-  import { themeStore, appStore } from "stores/frontend"
+  import { themeStore, appStore } from "stores/builder"
   import { Constants } from "@budibase/frontend-core"
 
   const onChangeTheme = async theme => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
index 9fb3dfb520..7f0fa8bfed 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
@@ -10,7 +10,7 @@
   } from "@budibase/bbui"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
-  import { selectedScreen, screenStore } from "stores/frontend"
+  import { selectedScreen, screenStore } from "stores/builder"
   import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
   import ButtonActionEditor from "components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
   import { getBindableProperties } from "builder/dataBinding"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
index c6b5cfbe1a..8b3128f852 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
@@ -7,7 +7,7 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { themeStore, appStore } from "stores/frontend"
+  import { themeStore, appStore } from "stores/builder"
   import { DefaultAppTheme } from "constants"
   import AppThemeSelect from "./AppThemeSelect.svelte"
   import ButtonRoundnessSelect from "./ButtonRoundnessSelect.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
index 22376c67a1..8a544eac86 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import GeneralPanel from "./GeneralPanel.svelte"
   import ThemePanel from "./ThemePanel.svelte"
-  import { selectedScreen } from "stores/frontend"
+  import { selectedScreen } from "stores/builder"
   import Panel from "components/design/Panel.svelte"
   import { capitalise } from "helpers"
   import { ActionButton, Layout } from "@budibase/bbui"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
index 98aae3b4be..1c919f2acd 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
@@ -1,13 +1,13 @@
 <script>
   import { syncURLToState } from "helpers/urlStateSync"
-  import { builderStore, screenStore, selectedScreen } from "stores/frontend"
+  import { builderStore, screenStore, selectedScreen } from "stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { findComponent } from "stores/frontend/components/utils"
+  import { findComponent } from "stores/builder/components/utils"
   import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
   import NavigationPanel from "./_components/Navigation/index.svelte"
   import ScreenSettingsPanel from "./_components/Screen/index.svelte"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
 
   $: componentId = $componentStore.selectedComponentId
   $: builderStore.selectResource(componentId)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
index f5319253e6..d6b948713f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
@@ -8,10 +8,10 @@
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/frontend"
+  } from "stores/builder"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
-  import { findComponentPath } from "stores/frontend/components/utils"
+  import { findComponentPath } from "stores/builder/components/utils"
 
   let searchString
   let searchRef
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
index 495d26f42d..8c00d03a27 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
   import AppPreview from "./AppPreview.svelte"
-  import { screenStore, appStore } from "stores/frontend"
+  import { screenStore, appStore } from "stores/builder"
   import UndoRedoControl from "components/common/UndoRedoControl.svelte"
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 53b760a665..7ccc86a218 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -10,7 +10,7 @@
     navigationStore,
     selectedScreen,
     currentAsset,
-  } from "stores/frontend"
+  } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
     ProgressCircle,
@@ -24,7 +24,7 @@
   import {
     findComponent,
     findComponentPath,
-  } from "stores/frontend/components/utils"
+  } from "stores/builder/components/utils"
   import { isActive, goto } from "@roxi/routify"
 
   let iframe
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte
index 62c6287e2d..da63eefcf3 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
   import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
 
   export let component
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
index 57878eb7a7..887afbf5bb 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
@@ -4,8 +4,8 @@
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/frontend"
-  import { findComponent } from "stores/frontend/components/utils"
+  } from "stores/builder"
+  import { findComponent } from "stores/builder/components/utils"
   import { goto, isActive } from "@roxi/routify"
   import { notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
index bc8ee01946..2082ec325e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
@@ -8,11 +8,11 @@
     userSelectedResourceMap,
     selectedComponent,
     selectedComponentPath,
-  } from "stores/frontend"
+  } from "stores/builder"
   import {
     findComponentPath,
     getComponentText,
-  } from "stores/frontend/components/utils"
+  } from "stores/builder/components/utils"
   import { get } from "svelte/store"
   import { dndStore } from "./dndStore"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte
index f3fbc1c3f0..ddb1630644 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
   import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
 
   export let component
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
index f107a11ed9..d48e6bdf81 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
@@ -2,8 +2,8 @@ import { writable, get } from "svelte/store"
 import {
   findComponentParent,
   findComponentPath,
-} from "stores/frontend/components/utils"
-import { selectedScreen, componentStore } from "stores/frontend"
+} from "stores/builder/components/utils"
+import { selectedScreen, componentStore } from "stores/builder"
 
 export const DropPosition = {
   ABOVE: "above",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
index 6f17babe5f..cd04963edd 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
@@ -6,7 +6,7 @@
     screenStore,
     componentStore,
     userSelectedResourceMap,
-  } from "stores/frontend"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import ComponentTree from "./ComponentTree.svelte"
   import { dndStore } from "./dndStore.js"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
index ffcc5eb7f1..9c0df03f12 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionGroup, ActionButton } from "@budibase/bbui"
-  import { previewStore } from "stores/frontend"
+  import { previewStore } from "stores/builder"
 </script>
 
 <ActionGroup compact quiet>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
index 8cbc372051..10576af68b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { screenStore, componentStore } from "stores/frontend"
+  import { screenStore, componentStore } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
     ActionMenu,
@@ -11,7 +11,7 @@
   } from "@budibase/bbui"
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
-  import { makeComponentUnique } from "stores/frontend/components/utils"
+  import { makeComponentUnique } from "stores/builder/components/utils"
 
   export let screenId
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
index 694abe444a..6efbe50130 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
@@ -1,7 +1,7 @@
 <script>
   import { RoleUtils } from "@budibase/frontend-core"
   import { Tooltip, StatusLight } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { Roles } from "constants/backend"
 
   export let roleId
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
index 623914cdfe..c7cc7dfd63 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
@@ -5,7 +5,7 @@
     sortedScreens,
     userSelectedResourceMap,
     screensHeight,
-  } from "stores/frontend"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import RoleIndicator from "./RoleIndicator.svelte"
   import DropdownMenu from "./DropdownMenu.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
index f27b578642..679601719d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
@@ -2,7 +2,7 @@
   import AppPanel from "./_components/AppPanel.svelte"
   import * as routify from "@roxi/routify"
   import { syncURLToState } from "helpers/urlStateSync"
-  import { screenStore, selectedScreen } from "stores/frontend"
+  import { screenStore, selectedScreen } from "stores/builder"
   import { onDestroy } from "svelte"
   import LeftPanel from "./_components/LeftPanel.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
index 25d35c474c..e71dba1280 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
 
   $redirect(`./${$screenStore.selectedScreenId}-screen`)
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
index 3897d9b139..d3b9db2cdf 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
@@ -4,10 +4,10 @@
   import ScreenRoleModal from "./ScreenRoleModal.svelte"
   import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
   import { Modal, notifications } from "@budibase/bbui"
-  import { screenStore, navigationStore } from "stores/frontend"
+  import { screenStore, navigationStore } from "stores/builder"
   import { get } from "svelte/store"
   import getTemplates from "builder/store/screenTemplates"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Roles } from "constants/backend"
   import { capitalise } from "helpers"
   import { goto } from "@roxi/routify"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
index b765deada1..3e77c7ab55 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Layout, notifications, Body } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import { IntegrationNames } from "constants"
   import { onMount } from "svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
index fec100452f..aed4405efd 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Select, ModalContent } from "@budibase/bbui"
   import { RoleUtils } from "@budibase/frontend-core"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { get } from "svelte/store"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
   import { onMount } from "svelte"
 
   export let onConfirm
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
index 22f2f8b391..895720657e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
@@ -5,7 +5,7 @@
   import tableImage from "./table.png"
   import gridImage from "./grid.png"
   import CreateScreenModal from "./CreateScreenModal.svelte"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
 
   export let onClose = null
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
index 271171ad7c..b9fca41695 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
 
   $: {
     if ($screenStore.screens.length > 0) {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/new.svelte b/packages/builder/src/pages/builder/app/[application]/design/new.svelte
index c281e36bea..a9af09a3a1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/new.svelte
@@ -1,6 +1,6 @@
 <script>
   import NewScreen from "./_components/NewScreen/index.svelte"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
   import { goto } from "@roxi/routify"
 
   $: onClose = getOnClose($screenStore)
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
index 90a721e86b..df6e616f6e 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
@@ -3,7 +3,7 @@
   import { Page, Layout, AbsTooltip, TooltipPosition } from "@budibase/bbui"
   import { url, isActive } from "@roxi/routify"
   import DeleteModal from "components/deploy/DeleteModal.svelte"
-  import { isOnlyUser } from "stores/frontend"
+  import { isOnlyUser } from "stores/builder"
   import { auth } from "stores/portal"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
index 078bd7469f..5e1b9e4296 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
@@ -11,7 +11,7 @@
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import TestDisplay from "components/automation/AutomationBuilder/TestDisplay.svelte"
   import { goto } from "@roxi/routify"
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
 
   export let history
   export let appId
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
index cff33418c0..ef3e358e38 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
@@ -12,7 +12,7 @@
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./_components/StatusRenderer.svelte"
   import HistoryDetailsPanel from "./_components/HistoryDetailsPanel.svelte"
-  import { automationStore, appStore } from "stores/frontend"
+  import { automationStore, appStore } from "stores/builder"
   import { createPaginationStore } from "helpers/pagination"
   import { getContext, onDestroy, onMount } from "svelte"
   import dayjs from "dayjs"
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
index c7f3f6a9bb..b23cda548f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
@@ -12,7 +12,7 @@
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CreateRestoreModal from "./CreateRestoreModal.svelte"
   import { createEventDispatcher } from "svelte"
-  import { isOnlyUser } from "stores/frontend"
+  import { isOnlyUser } from "stores/builder"
 
   export let row
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
index c6e828898a..bbf28b2fe8 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
@@ -14,7 +14,7 @@
     Table,
   } from "@budibase/bbui"
   import { backups, licensing, auth, admin } from "stores/portal"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
   import { createPaginationStore } from "helpers/pagination"
   import TimeAgoRenderer from "./_components/TimeAgoRenderer.svelte"
   import AppSizeRenderer from "./_components/AppSizeRenderer.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
index 162dc14339..f1d95da362 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
@@ -11,7 +11,7 @@
   } from "@budibase/bbui"
   import { AppStatus } from "constants"
   import { apps } from "stores/portal"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
 
   $: filteredApps = $apps.filter(app => app.devId == $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
index 731e4d427e..0ac2bc0d3f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
@@ -9,7 +9,7 @@
   } from "@budibase/bbui"
   import { AppStatus } from "constants"
   import { apps } from "stores/portal"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
   import ExportAppModal from "components/start/ExportAppModal.svelte"
   import ImportAppModal from "components/start/ImportAppModal.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
index 1a8038f308..06fe7e1456 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
@@ -10,7 +10,7 @@
     Icon,
   } from "@budibase/bbui"
   import { AppStatus } from "constants"
-  import { appStore, initialise } from "stores/frontend"
+  import { appStore, initialise } from "stores/builder"
   import { apps } from "stores/portal"
   import UpdateAppModal from "components/start/UpdateAppModal.svelte"
   import { API } from "api"
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
index 75814645c1..bd592fa308 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Layout, Heading, Body, Divider, Button } from "@budibase/bbui"
-  import { isOnlyUser, appStore } from "stores/frontend"
+  import { isOnlyUser, appStore } from "stores/builder"
   import VersionModal from "components/deploy/VersionModal.svelte"
 
   let versionModal
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 01fefe8697..672c4cb398 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -16,7 +16,7 @@
   import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
   import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte"
   import { sdk } from "@budibase/shared-core"
-  import { automationStore, initialise } from "stores/frontend"
+  import { automationStore, initialise } from "stores/builder"
   import { API } from "api"
   import { onMount } from "svelte"
   import { apps, auth, admin, licensing, environment } from "stores/portal"
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 2c2e41f232..0ddef9f1f1 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -5,7 +5,7 @@
   import { notifications } from "@budibase/bbui"
   import { SplitPage } from "@budibase/frontend-core"
   import { API } from "api"
-  import { database } from "stores/frontend/database"
+  import { database } from "stores/builder"
   import { auth, admin } from "stores/portal"
 
   let name = "My first app"
diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
index 4c1bb661fd..d03c62d528 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -12,7 +12,7 @@
   import { goto, url } from "@roxi/routify"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { Breadcrumb, Breadcrumbs } from "components/portal/page"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { apps, auth, features, groups } from "stores/portal"
   import { onMount, setContext } from "svelte"
   import AppNameTableRenderer from "../users/_components/AppNameTableRenderer.svelte"
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
index 3eb7f5c267..f657a722a3 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { keepOpen, Body, ModalContent, Select } from "@budibase/bbui"
   import { apps, groups } from "stores/portal"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import RoleSelect from "components/common/RoleSelect.svelte"
 
   export let group
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index ec10ec8316..1eb90ef4e5 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -19,7 +19,7 @@
   } from "@budibase/bbui"
   import { onMount, setContext } from "svelte"
   import { users, auth, groups, apps, licensing, features } from "stores/portal"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"
   import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
   import DeleteUserModal from "./_components/DeleteUserModal.svelte"
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
index e6821cba37..8304f36abb 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
   import { RoleUtils } from "@budibase/frontend-core"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { Constants } from "@budibase/frontend-core"
   import { capitalise } from "helpers"
 
diff --git a/packages/builder/src/stores/backend/index.js b/packages/builder/src/stores/backend/index.js
deleted file mode 100644
index f4c62eb565..0000000000
--- a/packages/builder/src/stores/backend/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { tables } from "./tables"
-import { views } from "./views"
-import { viewsV2 } from "./viewsV2"
-import { permissions } from "./permissions"
-import { roles } from "./roles"
-import { datasources } from "./datasources"
-import { integrations } from "./integrations"
-import { sortedIntegrations } from "./sortedIntegrations"
-import { queries } from "./queries"
-import { flags } from "./flags"
-
-export {
-  tables,
-  views,
-  viewsV2,
-  permissions,
-  roles,
-  datasources,
-  integrations,
-  sortedIntegrations,
-  queries,
-  flags,
-}
-
-export const initialise = async () => {
-  await datasources.init()
-  await integrations.init()
-  await queries.init()
-  await tables.init()
-  await roles.fetch()
-  await flags.fetch()
-}
diff --git a/packages/builder/src/stores/frontend/BudiStore.js b/packages/builder/src/stores/builder/BudiStore.js
similarity index 68%
rename from packages/builder/src/stores/frontend/BudiStore.js
rename to packages/builder/src/stores/builder/BudiStore.js
index 1d1651fb14..3d91938e3d 100644
--- a/packages/builder/src/stores/frontend/BudiStore.js
+++ b/packages/builder/src/stores/builder/BudiStore.js
@@ -1,7 +1,7 @@
 import { writable } from "svelte/store"
 
 export default class BudiStore {
-  constructor(init) {
+  constructor(init, opts) {
     const store = writable({
       ...init,
     })
@@ -23,5 +23,14 @@ export default class BudiStore {
      * *Store modification should be kept to a minimum
      */
     this.update = this.store.update
+
+    /**
+     * Optional debug mode to output the store updates to console
+     */
+    if (opts?.debug) {
+      this.subscribe(state => {
+        console.log(`${this.constructor.name}`, state)
+      })
+    }
   }
 }
diff --git a/packages/builder/src/stores/frontend/app.js b/packages/builder/src/stores/builder/app.js
similarity index 100%
rename from packages/builder/src/stores/frontend/app.js
rename to packages/builder/src/stores/builder/app.js
diff --git a/packages/builder/src/stores/frontend/automations.js b/packages/builder/src/stores/builder/automations.js
similarity index 99%
rename from packages/builder/src/stores/frontend/automations.js
rename to packages/builder/src/stores/builder/automations.js
index 1a0202f746..436e58cc29 100644
--- a/packages/builder/src/stores/frontend/automations.js
+++ b/packages/builder/src/stores/builder/automations.js
@@ -2,7 +2,7 @@ import { writable, get, derived } from "svelte/store"
 import { API } from "api"
 import { cloneDeep } from "lodash/fp"
 import { generate } from "shortid"
-import { createHistoryStore } from "stores/frontend/history"
+import { createHistoryStore } from "stores/builder/history"
 
 const initialAutomationState = {
   automations: [],
diff --git a/packages/builder/src/stores/frontend/builder.js b/packages/builder/src/stores/builder/builder.js
similarity index 89%
rename from packages/builder/src/stores/frontend/builder.js
rename to packages/builder/src/stores/builder/builder.js
index 16e3d0370b..250d4bd9c1 100644
--- a/packages/builder/src/stores/frontend/builder.js
+++ b/packages/builder/src/stores/builder/builder.js
@@ -1,4 +1,4 @@
-import { writable } from "svelte/store"
+import { writable, get } from "svelte/store"
 import { createBuilderWebsocket } from "./websocket.js"
 import { BuilderSocketEvent } from "@budibase/shared-core"
 import BudiStore from "./BudiStore"
@@ -18,6 +18,9 @@ export const INITIAL_BUILDER_STATE = {
 export class BuilderStore extends BudiStore {
   constructor() {
     super({ ...INITIAL_BUILDER_STATE })
+
+    this.destroyTourNode = this.destroyTourNode.bind(this)
+
     this.websocket
   }
 
@@ -99,13 +102,13 @@ export class BuilderStore extends BudiStore {
   }
 
   destroyTourNode(tourStepKey) {
-    if (this.tourNodes[tourStepKey]) {
+    const store = get(this.store)
+    if (store.tourNodes?.[tourStepKey]) {
+      const nodes = { ...store.tourNodes }
+      delete nodes[tourStepKey]
       this.update(state => ({
         ...state,
-        tourNodes: {
-          [tourStepKey]: _,
-          ...this.tourNodes,
-        },
+        tourNodes: nodes,
       }))
     }
   }
diff --git a/packages/builder/src/stores/frontend/components/index.js b/packages/builder/src/stores/builder/components/index.js
similarity index 99%
rename from packages/builder/src/stores/frontend/components/index.js
rename to packages/builder/src/stores/builder/components/index.js
index dc585756bc..bee300f834 100644
--- a/packages/builder/src/stores/frontend/components/index.js
+++ b/packages/builder/src/stores/builder/components/index.js
@@ -14,9 +14,9 @@ import {
   makeComponentUnique,
 } from "../components/utils"
 import { getComponentFieldOptions } from "helpers/formFields"
-import { tables } from "stores/backend"
+import { tables } from "stores/builder"
 import { selectedScreen } from "../screens"
-import { screenStore, appStore, previewStore } from "stores/frontend"
+import { screenStore, appStore, previewStore } from "stores/builder"
 import { buildFormSchema, getSchemaForDatasource } from "builder/dataBinding"
 import {
   BUDIBASE_INTERNAL_DB_ID,
@@ -89,10 +89,6 @@ export class ComponentStore extends BudiStore {
         ).map(component => component._id)
       }
     )
-
-    this.subscribe(state => {
-      console.log("debug ", state)
-    })
   }
 
   /**
diff --git a/packages/builder/src/stores/frontend/components/utils.js b/packages/builder/src/stores/builder/components/utils.js
similarity index 100%
rename from packages/builder/src/stores/frontend/components/utils.js
rename to packages/builder/src/stores/builder/components/utils.js
diff --git a/packages/builder/src/stores/frontend/database.js b/packages/builder/src/stores/builder/database.js
similarity index 100%
rename from packages/builder/src/stores/frontend/database.js
rename to packages/builder/src/stores/builder/database.js
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/builder/datasources.js
similarity index 100%
rename from packages/builder/src/stores/backend/datasources.js
rename to packages/builder/src/stores/builder/datasources.js
diff --git a/packages/builder/src/stores/frontend/deployments.js b/packages/builder/src/stores/builder/deployments.js
similarity index 100%
rename from packages/builder/src/stores/frontend/deployments.js
rename to packages/builder/src/stores/builder/deployments.js
diff --git a/packages/builder/src/stores/backend/flags.js b/packages/builder/src/stores/builder/flags.js
similarity index 100%
rename from packages/builder/src/stores/backend/flags.js
rename to packages/builder/src/stores/builder/flags.js
diff --git a/packages/builder/src/stores/frontend/history.js b/packages/builder/src/stores/builder/history.js
similarity index 100%
rename from packages/builder/src/stores/frontend/history.js
rename to packages/builder/src/stores/builder/history.js
diff --git a/packages/builder/src/stores/frontend/index.js b/packages/builder/src/stores/builder/index.js
similarity index 69%
rename from packages/builder/src/stores/frontend/index.js
rename to packages/builder/src/stores/builder/index.js
index e161ddb6e5..e63391f1e4 100644
--- a/packages/builder/src/stores/frontend/index.js
+++ b/packages/builder/src/stores/builder/index.js
@@ -24,6 +24,18 @@ import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
 import { deploymentStore } from "./deployments.js"
 import { database } from "./database.js"
 
+// Backend
+import { tables } from "./tables"
+import { views } from "./views"
+import { viewsV2 } from "./viewsV2"
+import { permissions } from "./permissions"
+import { roles } from "./roles"
+import { datasources } from "./datasources"
+import { integrations } from "./integrations"
+import { sortedIntegrations } from "./sortedIntegrations"
+import { queries } from "./queries"
+import { flags } from "./flags"
+
 export {
   layoutStore,
   database,
@@ -47,6 +59,16 @@ export {
   deploymentStore,
   selectedComponent,
   selectedComponentPath,
+  tables,
+  views,
+  viewsV2,
+  permissions,
+  roles,
+  datasources,
+  integrations,
+  sortedIntegrations,
+  queries,
+  flags,
 }
 
 export const reset = () => {
@@ -58,6 +80,21 @@ export const reset = () => {
   navigationStore.reset()
 }
 
+const refreshBuilderData = async () => {
+  await automationStore.actions.fetch()
+  await datasources.init()
+  await integrations.init()
+  await queries.init()
+  await tables.init()
+  await roles.fetch()
+  await flags.fetch()
+}
+
+const resetBuilderHistory = () => {
+  screenStore.history.reset()
+  automationHistoryStore.reset()
+}
+
 export const initialise = async pkg => {
   const { application } = pkg
 
@@ -80,9 +117,7 @@ export const initialise = async pkg => {
   // required for api comms
   database.syncAppDatabase(pkg)
 
-  await automationStore.actions.fetch()
+  resetBuilderHistory()
 
-  screenStore.history.reset()
-
-  automationHistoryStore.reset()
+  await refreshBuilderData()
 }
diff --git a/packages/builder/src/stores/backend/integrations.js b/packages/builder/src/stores/builder/integrations.js
similarity index 100%
rename from packages/builder/src/stores/backend/integrations.js
rename to packages/builder/src/stores/builder/integrations.js
diff --git a/packages/builder/src/stores/frontend/layouts.js b/packages/builder/src/stores/builder/layouts.js
similarity index 97%
rename from packages/builder/src/stores/frontend/layouts.js
rename to packages/builder/src/stores/builder/layouts.js
index 51fbb99588..dc57798c48 100644
--- a/packages/builder/src/stores/frontend/layouts.js
+++ b/packages/builder/src/stores/builder/layouts.js
@@ -1,5 +1,5 @@
 import { derived, get } from "svelte/store"
-import { componentStore } from "stores/frontend"
+import { componentStore } from "stores/builder"
 import BudiStore from "./BudiStore"
 import { API } from "api"
 
diff --git a/packages/builder/src/stores/frontend/navigation.js b/packages/builder/src/stores/builder/navigation.js
similarity index 97%
rename from packages/builder/src/stores/frontend/navigation.js
rename to packages/builder/src/stores/builder/navigation.js
index 744911d824..6d53a41019 100644
--- a/packages/builder/src/stores/frontend/navigation.js
+++ b/packages/builder/src/stores/builder/navigation.js
@@ -1,6 +1,6 @@
 import { get } from "svelte/store"
 import { API } from "api"
-import { appStore } from "stores/frontend"
+import { appStore } from "stores/builder"
 import BudiStore from "./BudiStore"
 
 export const INITIAL_NAVIGATION_STATE = {
diff --git a/packages/builder/src/stores/backend/permissions.js b/packages/builder/src/stores/builder/permissions.js
similarity index 100%
rename from packages/builder/src/stores/backend/permissions.js
rename to packages/builder/src/stores/builder/permissions.js
diff --git a/packages/builder/src/stores/frontend/preview.js b/packages/builder/src/stores/builder/preview.js
similarity index 100%
rename from packages/builder/src/stores/frontend/preview.js
rename to packages/builder/src/stores/builder/preview.js
diff --git a/packages/builder/src/stores/backend/queries.js b/packages/builder/src/stores/builder/queries.js
similarity index 100%
rename from packages/builder/src/stores/backend/queries.js
rename to packages/builder/src/stores/builder/queries.js
diff --git a/packages/builder/src/stores/backend/roles.js b/packages/builder/src/stores/builder/roles.js
similarity index 100%
rename from packages/builder/src/stores/backend/roles.js
rename to packages/builder/src/stores/builder/roles.js
diff --git a/packages/builder/src/stores/frontend/screens.js b/packages/builder/src/stores/builder/screens.js
similarity index 98%
rename from packages/builder/src/stores/frontend/screens.js
rename to packages/builder/src/stores/builder/screens.js
index ae29238785..e643433640 100644
--- a/packages/builder/src/stores/frontend/screens.js
+++ b/packages/builder/src/stores/builder/screens.js
@@ -2,15 +2,15 @@ import { derived, get } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
 import { Helpers } from "@budibase/bbui"
 import { RoleUtils, Utils } from "@budibase/frontend-core"
-import { findAllMatchingComponents } from "stores/frontend/components/utils"
+import { findAllMatchingComponents } from "stores/builder/components/utils"
 import {
   layoutStore,
   appStore,
   componentStore,
   navigationStore,
   selectedComponent,
-} from "stores/frontend"
-import { createHistoryStore } from "stores/frontend/history"
+} from "stores/builder"
+import { createHistoryStore } from "stores/builder/history"
 import { API } from "api"
 import BudiStore from "./BudiStore"
 
@@ -37,7 +37,7 @@ export class ScreenStore extends BudiStore {
     this.syncScreenData = this.syncScreenData.bind(this)
     this.updateSetting = this.updateSetting.bind(this)
     this.sequentialScreenPatch = this.sequentialScreenPatch.bind(this)
-    this.removeCustomLayout = this.removeCustomLayout(this)
+    this.removeCustomLayout = this.removeCustomLayout.bind(this)
 
     this.selected = derived(this.store, $store => {
       return get(this.store).screens.find(
diff --git a/packages/builder/src/stores/backend/sortedIntegrations.js b/packages/builder/src/stores/builder/sortedIntegrations.js
similarity index 100%
rename from packages/builder/src/stores/backend/sortedIntegrations.js
rename to packages/builder/src/stores/builder/sortedIntegrations.js
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/builder/tables.js
similarity index 100%
rename from packages/builder/src/stores/backend/tables.js
rename to packages/builder/src/stores/builder/tables.js
diff --git a/packages/builder/src/stores/frontend/tests/app.test.js b/packages/builder/src/stores/builder/tests/app.test.js
similarity index 96%
rename from packages/builder/src/stores/frontend/tests/app.test.js
rename to packages/builder/src/stores/builder/tests/app.test.js
index 372ae71d3c..e0e5d17ba6 100644
--- a/packages/builder/src/stores/frontend/tests/app.test.js
+++ b/packages/builder/src/stores/builder/tests/app.test.js
@@ -1,7 +1,6 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get } from "svelte/store"
-import { INITIAL_APP_META_STATE } from "stores/frontend/app"
-import { AppMetaStore } from "stores/frontend/app"
+import { INITIAL_APP_META_STATE, AppMetaStore } from "stores/builder/app"
 import {
   clientFeaturesResp,
   generateAppPackage,
diff --git a/packages/builder/src/stores/frontend/tests/builder.test.js b/packages/builder/src/stores/builder/tests/builder.test.js
similarity index 95%
rename from packages/builder/src/stores/frontend/tests/builder.test.js
rename to packages/builder/src/stores/builder/tests/builder.test.js
index 6e0bc608e3..eeb7cfe6e6 100644
--- a/packages/builder/src/stores/frontend/tests/builder.test.js
+++ b/packages/builder/src/stores/builder/tests/builder.test.js
@@ -1,6 +1,6 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get } from "svelte/store"
-import { INITIAL_BUILDER_STATE, BuilderStore } from "stores/frontend/builder"
+import { INITIAL_BUILDER_STATE, BuilderStore } from "stores/builder/builder"
 import { createBuilderWebsocket } from "../websocket.js"
 import { BuilderSocketEvent } from "@budibase/shared-core"
 
@@ -197,12 +197,10 @@ describe("Builder store", () => {
     const fakeNode = { name: "node" }
     ctx.test.builderStore.registerTourNode("sampleKey", fakeNode)
 
-    const registeredNodes = ctx.test.store.tourNodes
-
-    expect(registeredNodes).not.toBeNull()
-    expect(Object.keys(registeredNodes).length).toBe(1)
+    expect(ctx.test.store.tourNodes).not.toBeNull()
+    expect(Object.keys(ctx.test.store.tourNodes).length).toBe(1)
 
     ctx.test.builderStore.destroyTourNode("sampleKey")
-    expect(registeredNodes).toBe({})
+    expect(ctx.test.store.tourNodes).toStrictEqual({})
   })
 })
diff --git a/packages/builder/src/stores/builder/tests/component.test.js b/packages/builder/src/stores/builder/tests/component.test.js
new file mode 100644
index 0000000000..029d2cb3f3
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/component.test.js
@@ -0,0 +1,27 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import { get } from "svelte/store"
+import {
+  INITIAL_COMPONENTS_STATE,
+  ComponentStore,
+} from "stores/builder/components"
+
+describe("Component store", () => {
+  beforeEach(ctx => {
+    vi.clearAllMocks()
+    const componentStore = new ComponentStore()
+    ctx.test = {}
+    ctx.test = {
+      get store() {
+        return get(componentStore)
+      },
+      get $store() {
+        return get(componentStore) //store and $store
+      },
+      componentStore,
+    }
+  })
+
+  it("Create base component store with defaults", ctx => {
+    expect(ctx.test.store).toStrictEqual(INITIAL_COMPONENTS_STATE)
+  })
+})
diff --git a/packages/builder/src/stores/backend/tests/datasources.spec.js.disabled b/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/datasources.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
diff --git a/packages/builder/src/stores/backend/tests/fixtures/datasources.js b/packages/builder/src/stores/builder/tests/fixtures/datasources.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/datasources.js
rename to packages/builder/src/stores/builder/tests/fixtures/datasources.js
diff --git a/packages/builder/src/stores/frontend/tests/fixtures.js b/packages/builder/src/stores/builder/tests/fixtures/index.js
similarity index 95%
rename from packages/builder/src/stores/frontend/tests/fixtures.js
rename to packages/builder/src/stores/builder/tests/fixtures/index.js
index 4c8337cdf3..ba349d6ba8 100644
--- a/packages/builder/src/stores/frontend/tests/fixtures.js
+++ b/packages/builder/src/stores/builder/tests/fixtures/index.js
@@ -86,17 +86,13 @@ export const generateFakeRoutes = screens => {
   }
 }
 
-// Context
-// export const screenStoreFixture = test.extend({
-//   screamStore: createScreenStore(),
-// })
-
 export const generateAppPackage = ({
   plugins = 0,
   version = "1.0.0",
   upgradableVersion,
   revertableVersion,
   appValidation = true,
+  disableUserMetadata = true,
   name = "Test app",
   url = "/test-app",
 }) => {
@@ -107,8 +103,10 @@ export const generateAppPackage = ({
     .map(() => getPluginFixture())
 
   const features = {}
-  if (appValidation) {
-    features["componentValidation"] = true
+  features["componentValidation"] = appValidation
+
+  if (disableUserMetadata) {
+    features["disableUserMetadata"] = false
   }
 
   return {
diff --git a/packages/builder/src/stores/backend/tests/fixtures/queries.js b/packages/builder/src/stores/builder/tests/fixtures/queries.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/queries.js
rename to packages/builder/src/stores/builder/tests/fixtures/queries.js
diff --git a/packages/builder/src/stores/backend/tests/fixtures/roles.js b/packages/builder/src/stores/builder/tests/fixtures/roles.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/roles.js
rename to packages/builder/src/stores/builder/tests/fixtures/roles.js
diff --git a/packages/builder/src/stores/backend/tests/fixtures/tables.js b/packages/builder/src/stores/builder/tests/fixtures/tables.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/tables.js
rename to packages/builder/src/stores/builder/tests/fixtures/tables.js
diff --git a/packages/builder/src/stores/backend/tests/fixtures/views.js b/packages/builder/src/stores/builder/tests/fixtures/views.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/views.js
rename to packages/builder/src/stores/builder/tests/fixtures/views.js
diff --git a/packages/builder/src/stores/frontend/tests/history.test.js b/packages/builder/src/stores/builder/tests/history.test.js
similarity index 100%
rename from packages/builder/src/stores/frontend/tests/history.test.js
rename to packages/builder/src/stores/builder/tests/history.test.js
diff --git a/packages/builder/src/stores/frontend/tests/navigation.test.js b/packages/builder/src/stores/builder/tests/navigation.test.js
similarity index 97%
rename from packages/builder/src/stores/frontend/tests/navigation.test.js
rename to packages/builder/src/stores/builder/tests/navigation.test.js
index 589a8e7a5b..19a3361721 100644
--- a/packages/builder/src/stores/frontend/tests/navigation.test.js
+++ b/packages/builder/src/stores/builder/tests/navigation.test.js
@@ -4,8 +4,8 @@ import { API } from "api"
 import {
   INITIAL_NAVIGATION_STATE,
   NavigationStore,
-} from "stores/frontend/navigation"
-import { appStore } from "stores/frontend"
+} from "stores/builder/navigation"
+import { appStore } from "stores/builder"
 
 vi.mock("api", () => {
   return {
@@ -15,7 +15,7 @@ vi.mock("api", () => {
   }
 })
 
-vi.mock("stores/frontend", async () => {
+vi.mock("stores/builder", async () => {
   const mockAppStore = writable()
   const appStore = {
     subscribe: mockAppStore.subscribe,
diff --git a/packages/builder/src/stores/backend/tests/permissions.spec.js.disabled b/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/permissions.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
diff --git a/packages/builder/src/stores/backend/tests/queries.spec.js.disabled b/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/queries.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/queries.spec.js.disabled
diff --git a/packages/builder/src/stores/backend/tests/roles.spec.js.disabled b/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/roles.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/roles.spec.js.disabled
diff --git a/packages/builder/src/stores/frontend/tests/screens.test.js b/packages/builder/src/stores/builder/tests/screens.test.js
similarity index 98%
rename from packages/builder/src/stores/frontend/tests/screens.test.js
rename to packages/builder/src/stores/builder/tests/screens.test.js
index a9dc306cc4..0fd604b4f1 100644
--- a/packages/builder/src/stores/frontend/tests/screens.test.js
+++ b/packages/builder/src/stores/builder/tests/screens.test.js
@@ -2,8 +2,8 @@ import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get, writable } from "svelte/store"
 import { API } from "api"
 import { Constants } from "@budibase/frontend-core"
-import { componentStore, appStore } from "stores/frontend"
-import { INITIAL_SCREENS_STATE, ScreenStore } from "stores/frontend/screens"
+import { componentStore, appStore } from "stores/builder"
+import { INITIAL_SCREENS_STATE, ScreenStore } from "stores/builder/screens"
 import {
   getScreenFixture,
   getComponentFixture,
@@ -15,9 +15,10 @@ import {
 
 const COMP_PREFIX = "@budibase/standard-components"
 
-vi.mock("stores/frontend", async () => {
+vi.mock("stores/builder", async () => {
   const mockAppStore = writable()
   const mockComponentStore = writable()
+  const mockLayoutStore = writable()
 
   const componentStore = {
     getDefinition: vi.fn(),
@@ -40,10 +41,14 @@ vi.mock("stores/frontend", async () => {
     componentStore,
     appStore,
     navigationStore,
+    layoutStore: {
+      update: mockLayoutStore.update,
+      subscribe: mockComponentStore.subscribe,
+    },
   }
 })
 
-vi.mock("stores/frontend/components/utils", () => {
+vi.mock("stores/builder/components/utils", () => {
   return {
     findAllMatchingComponents: vi.fn().mockImplementation(() => {
       return []
diff --git a/packages/builder/src/stores/backend/sortedIntegrations.test.js b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
similarity index 92%
rename from packages/builder/src/stores/backend/sortedIntegrations.test.js
rename to packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
index db2323aae5..9b430b1621 100644
--- a/packages/builder/src/stores/backend/sortedIntegrations.test.js
+++ b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
@@ -1,15 +1,15 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { createSortedIntegrationsStore } from "./sortedIntegrations"
+import { createSortedIntegrationsStore } from "stores/builder/sortedIntegrations"
 import { DatasourceTypes } from "constants/backend"
 
 import { derived } from "svelte/store"
-import { integrations } from "stores/backend/integrations"
+import { integrations } from "stores/builder/integrations"
 
 vi.mock("svelte/store", () => ({
   derived: vi.fn(() => {}),
 }))
 
-vi.mock("stores/backend/integrations", () => ({ integrations: vi.fn() }))
+vi.mock("stores/builder/integrations", () => ({ integrations: vi.fn() }))
 
 const inputA = {
   nonRelationalA: {
diff --git a/packages/builder/src/stores/backend/tests/tables.spec.js.disabled b/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/tables.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/tables.spec.js.disabled
diff --git a/packages/builder/src/stores/frontend/theme.js b/packages/builder/src/stores/builder/theme.js
similarity index 100%
rename from packages/builder/src/stores/frontend/theme.js
rename to packages/builder/src/stores/builder/theme.js
diff --git a/packages/builder/src/stores/frontend/users.js b/packages/builder/src/stores/builder/users.js
similarity index 100%
rename from packages/builder/src/stores/frontend/users.js
rename to packages/builder/src/stores/builder/users.js
diff --git a/packages/builder/src/stores/backend/views.js b/packages/builder/src/stores/builder/views.js
similarity index 100%
rename from packages/builder/src/stores/backend/views.js
rename to packages/builder/src/stores/builder/views.js
diff --git a/packages/builder/src/stores/backend/viewsV2.js b/packages/builder/src/stores/builder/viewsV2.js
similarity index 100%
rename from packages/builder/src/stores/backend/viewsV2.js
rename to packages/builder/src/stores/builder/viewsV2.js
diff --git a/packages/builder/src/stores/frontend/websocket.js b/packages/builder/src/stores/builder/websocket.js
similarity index 96%
rename from packages/builder/src/stores/frontend/websocket.js
rename to packages/builder/src/stores/builder/websocket.js
index 4961707df3..c801e83a75 100644
--- a/packages/builder/src/stores/frontend/websocket.js
+++ b/packages/builder/src/stores/builder/websocket.js
@@ -6,8 +6,8 @@ import {
   themeStore,
   navigationStore,
   deploymentStore,
-} from "stores/frontend"
-import { datasources, tables } from "stores/backend"
+} from "stores/builder"
+import { datasources, tables } from "stores/builder"
 import { get } from "svelte/store"
 import { auth, apps } from "stores/portal"
 import { screenStore } from "./screens"