diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
index 37a1e07d73..112fa739c7 100644
--- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
+++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
@@ -37,7 +37,7 @@
     }
   }
 
-  export let overBackground
+  export let overBackground = false
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index f31f45bb84..866a28a4e6 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -3,7 +3,7 @@
   import { routes } from "../.routify/routes"
   import { NotificationDisplay, BannerDisplay } from "@budibase/bbui"
   import { parse, stringify } from "qs"
-  import LicensingOverlays from "components/portal/licensing/LicensingOverlays.svelte"
+  import LicensingOverlays from "@/components/portal/licensing/LicensingOverlays.svelte"
 
   const queryHandler = { parse, stringify }
 </script>
diff --git a/packages/builder/src/analytics/index.js b/packages/builder/src/analytics/index.js
index c9887aebc3..aa83f3c7ab 100644
--- a/packages/builder/src/analytics/index.js
+++ b/packages/builder/src/analytics/index.js
@@ -1,4 +1,4 @@
-import { API } from "api"
+import { API } from "@/api"
 import PosthogClient from "./PosthogClient"
 import { Events, EventSource } from "./constants"
 
diff --git a/packages/builder/src/api.ts b/packages/builder/src/api.ts
index 907354499f..e9e8b39e28 100644
--- a/packages/builder/src/api.ts
+++ b/packages/builder/src/api.ts
@@ -3,7 +3,7 @@ import {
   CookieUtils,
   Constants,
 } from "@budibase/frontend-core"
-import { appStore } from "stores/builder"
+import { appStore } from "@/stores/builder"
 import { get } from "svelte/store"
 import { auth, navigation } from "./stores/portal"
 
diff --git a/packages/builder/src/components/ContextMenu.svelte b/packages/builder/src/components/ContextMenu.svelte
index 37aacf06ed..3ff2a2b084 100644
--- a/packages/builder/src/components/ContextMenu.svelte
+++ b/packages/builder/src/components/ContextMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { contextMenuStore } from "stores/builder"
+  import { contextMenuStore } from "@/stores/builder"
   import { Popover, Menu, MenuItem } from "@budibase/bbui"
 
   let dropdown
diff --git a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
index 9952826be3..d775094126 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/builder"
+  import { selectedAutomation } from "@/stores/builder"
   import Flowchart from "./FlowChart/FlowChart.svelte"
 </script>
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte b/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
index b1a4f37f46..0b68d8e4b3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
@@ -9,7 +9,7 @@
   } from "svelte"
   import Logo from "assets/bb-emblem.svg?raw"
   import { Utils, memo } from "@budibase/frontend-core"
-  import { selectedAutomation, automationStore } from "stores/builder"
+  import { selectedAutomation, automationStore } from "@/stores/builder"
 
   // CSS classes that, on mouse down, will trigger the view drag behaviour
   export let draggableClasses = []
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 88201aa225..706c196fff 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -10,10 +10,10 @@
     Tag,
   } from "@budibase/bbui"
   import { AutomationActionStepId } from "@budibase/types"
-  import { automationStore, selectedAutomation } from "stores/builder"
-  import { admin, licensing } from "stores/portal"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
+  import { admin, licensing } from "@/stores/portal"
   import { externalActions } from "./ExternalActions"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
 
   export let block
   export let modal
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
index 8732623dcf..0a8ce505b8 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/builder"
+  import { tables } from "@/stores/builder"
 
   export let block
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte
index 0a87ea3815..779eaf415a 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
+  import FilterBuilder from "@/components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
   import {
     Drawer,
     DrawerContent,
@@ -14,11 +14,11 @@
     Modal,
     ModalContent,
   } from "@budibase/bbui"
-  import PropField from "components/automation/SetupPanel/PropField.svelte"
-  import AutomationBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
+  import PropField from "@/components/automation/SetupPanel/PropField.svelte"
+  import AutomationBindingPanel from "@/components/common/bindings/ServerBindingPanel.svelte"
   import FlowItemHeader from "./FlowItemHeader.svelte"
   import FlowItemActions from "./FlowItemActions.svelte"
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import { QueryUtils, Utils } from "@budibase/frontend-core"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher, getContext } from "svelte"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index 26a15a134a..01f0032e58 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -3,8 +3,8 @@
     automationStore,
     automationHistoryStore,
     selectedAutomation,
-  } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import TestDataModal from "./TestDataModal.svelte"
   import {
     notifications,
@@ -13,8 +13,8 @@
     Button,
     ActionButton,
   } from "@budibase/bbui"
-  import { ActionStepID } from "constants/backend/automations"
-  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
+  import { ActionStepID } from "@/constants/backend/automations"
+  import UndoRedoControl from "@/components/common/UndoRedoControl.svelte"
   import StepNode from "./StepNode.svelte"
   import { memo } from "@budibase/frontend-core"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 0e5a932aa0..95df59b249 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -4,7 +4,7 @@
     permissions,
     selectedAutomation,
     tables,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import {
     Icon,
     Divider,
@@ -16,16 +16,16 @@
   } from "@budibase/bbui"
   import { sdk } from "@budibase/shared-core"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
-  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
+  import CreateWebhookModal from "@/components/automation/Shared/CreateWebhookModal.svelte"
   import FlowItemHeader from "./FlowItemHeader.svelte"
-  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
-  import { ActionStepID, TriggerStepID } from "constants/backend/automations"
+  import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
+  import { ActionStepID, TriggerStepID } from "@/constants/backend/automations"
   import { AutomationStepType } from "@budibase/types"
   import FlowItemActions from "./FlowItemActions.svelte"
-  import DragHandle from "components/design/settings/controls/DraggableList/drag-handle.svelte"
+  import DragHandle from "@/components/design/settings/controls/DraggableList/drag-handle.svelte"
   import { getContext } from "svelte"
   import DragZone from "./DragZone.svelte"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
 
   export let block
   export let blockRef
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index 523f00b351..e81d6d0f5c 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import { Icon, Body, AbsTooltip, StatusLight } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
   import { createEventDispatcher } from "svelte"
-  import { Features } from "constants/backend/automations"
+  import { Features } from "@/constants/backend/automations"
 
   export let block
   export let open
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte
index a320973333..fbd49723be 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte
@@ -3,8 +3,8 @@
   import BranchNode from "./BranchNode.svelte"
   import { AutomationActionStepId } from "@budibase/types"
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { automationStore } from "stores/builder"
-  import { environment } from "stores/portal"
+  import { automationStore } from "@/stores/builder"
+  import { environment } from "@/stores/portal"
   import { cloneDeep } from "lodash"
   import { memo } from "@budibase/frontend-core"
   import { getContext, onMount } 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 eebd977e6c..ab73c6babb 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -6,7 +6,7 @@
     notifications,
     ActionButton,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
   import { AutomationEventType } from "@budibase/types"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
index fd7961e3b0..5cf0cfad74 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Icon, Divider, Tabs, Tab, Label } from "@budibase/bbui"
   import FlowItemHeader from "./FlowChart/FlowItemHeader.svelte"
-  import { ActionStepID } from "constants/backend/automations"
+  import { ActionStepID } from "@/constants/backend/automations"
   import { JsonView } from "@zerodevx/svelte-json-view"
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import { AutomationActionStepId } from "@budibase/types"
 
   export let automation
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
index d39d228717..780730729e 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, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
 
   export let automation
 </script>
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
index fa89ab9393..c44ba8a93a 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
@@ -4,12 +4,12 @@
     userSelectedResourceMap,
     automationStore,
     contextMenuStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { notifications, Icon } from "@budibase/bbui"
   import { sdk } from "@budibase/shared-core"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
-  import NavItem from "components/common/NavItem.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import UpdateAutomationModal from "@/components/automation/AutomationPanel/UpdateAutomationModal.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
 
   export let automation
   export let icon
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index a26efdf243..f84130f5e7 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -1,11 +1,11 @@
 <script>
   import CreateAutomationModal from "./CreateAutomationModal.svelte"
   import { Modal, notifications, Layout } from "@budibase/bbui"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import NavHeader from "@/components/common/NavHeader.svelte"
   import { onMount } from "svelte"
-  import { automationStore, tables } from "stores/builder"
+  import { automationStore, tables } from "@/stores/builder"
   import AutomationNavItem from "./AutomationNavItem.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "@/constants/backend/automations"
 
   export let modal
   export let webhookModal
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 35fdba970a..19cfa179f9 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import {
     notifications,
     Input,
@@ -11,7 +11,7 @@
     Icon,
     Label,
   } from "@budibase/bbui"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "@/constants/backend/automations"
 
   export let webhookModal
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
index 6ac7f84556..56aba711b4 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/builder"
+  import { automationStore } from "@/stores/builder"
   import {
     notifications,
     Icon,
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index ab01b56152..16183ea59a 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -20,9 +20,9 @@
     Icon,
   } from "@budibase/bbui"
 
-  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import { automationStore, tables } from "stores/builder"
-  import { environment } from "stores/portal"
+  import CreateWebhookModal from "@/components/automation/Shared/CreateWebhookModal.svelte"
+  import { automationStore, tables } from "@/stores/builder"
+  import { environment } from "@/stores/portal"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
   import {
     BindingSidePanel,
@@ -30,24 +30,27 @@
     DrawerBindableInput,
     ServerBindingPanel as AutomationBindingPanel,
     ModalBindableInput,
-  } from "components/common/bindings"
+  } from "@/components/common/bindings"
   import CodeEditorModal from "./CodeEditorModal.svelte"
   import QueryParamSelector from "./QueryParamSelector.svelte"
   import AutomationSelector from "./AutomationSelector.svelte"
   import CronBuilder from "./CronBuilder.svelte"
-  import Editor from "components/integration/QueryEditor.svelte"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { BindingHelpers, BindingType } from "components/common/bindings/utils"
+  import Editor from "@/components/integration/QueryEditor.svelte"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import {
+    BindingHelpers,
+    BindingType,
+  } from "@/components/common/bindings/utils"
   import {
     bindingsToCompletions,
     hbAutocomplete,
     EditorModes,
-  } from "components/common/CodeEditor"
-  import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
+  } from "@/components/common/CodeEditor"
+  import FilterBuilder from "@/components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
   import { QueryUtils, Utils, search, memo } from "@budibase/frontend-core"
-  import { getSchemaForDatasourcePlus } from "dataBinding"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { getSchemaForDatasourcePlus } from "@/dataBinding"
+  import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
   import { onMount, createEventDispatcher } from "svelte"
   import { writable } from "svelte/store"
   import { cloneDeep } from "lodash/fp"
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
index cda8f76de3..a9cb3cc64f 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { automationStore, selectedAutomation } from "stores/builder"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
+  import { TriggerStepID } from "@/constants/backend/automations"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
 
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index 133d5c9eb1..f04c5454ea 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -8,9 +8,9 @@
     notifications,
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { flags } from "stores/builder"
-  import { featureFlags, licensing } from "stores/portal"
-  import { API } from "api"
+  import { flags } from "@/stores/builder"
+  import { featureFlags, licensing } from "@/stores/portal"
+  import { API } from "@/api"
   import MagicWand from "../../../../assets/MagicWand.svelte"
 
   import { helpers, REBOOT_CRON } from "@budibase/shared-core"
diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index f46bca3090..eb97f9b02f 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/builder"
+  import { queries } from "@/stores/builder"
   import { Select, Label } 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 384067e3f2..cf5cd645e4 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/builder"
+  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 88e2f06be9..cc3315a4ab 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/builder"
+  import { tables } from "@/stores/builder"
   import {
     ActionButton,
     Popover,
@@ -13,8 +13,8 @@
   import RowSelectorTypes from "./RowSelectorTypes.svelte"
   import DrawerBindableSlot from "../../common/bindings/DrawerBindableSlot.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
-  import { FIELDS } from "constants/backend"
-  import { capitalise } from "helpers"
+  import { FIELDS } from "@/constants/backend"
+  import { capitalise } from "@/helpers"
   import { memo } from "@budibase/frontend-core"
   import PropField from "./PropField.svelte"
   import { cloneDeep, isPlainObject, mergeWith } from "lodash"
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 5bdc20ab37..86666660af 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -7,16 +7,16 @@
     Toggle,
   } from "@budibase/bbui"
   import { FieldType } from "@budibase/types"
-  import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
+  import LinkedRowSelector from "@/components/common/LinkedRowSelector.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import ModalBindableInput from "../../common/bindings/ModalBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let onChange
   export let field
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index 74bfe27b29..5488e9651c 100644
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { TableNames } from "constants"
+  import { TableNames } from "@/constants"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 56cc58e0c5..dfe2b0bc7d 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, ModalContent } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { onMount, onDestroy } from "svelte"
 
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 745f29d56a..ffab667142 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { API } from "api"
+  import { API } from "@/api"
   import {
     Input,
     Select,
@@ -13,12 +13,12 @@
     ActionButton,
     notifications,
   } from "@budibase/bbui"
-  import Dropzone from "components/common/Dropzone.svelte"
-  import { capitalise } from "helpers"
-  import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
+  import Dropzone from "@/components/common/Dropzone.svelte"
+  import { capitalise } from "@/helpers"
+  import LinkedRowSelector from "@/components/common/LinkedRowSelector.svelte"
   import Editor from "../../integration/QueryEditor.svelte"
   import { SignatureModal } from "@budibase/frontend-core/src/components"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
 
   export let meta
   export let value
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index e09dd4bd39..a32d67c881 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -2,8 +2,8 @@
   import { fade } from "svelte/transition"
   import { goto, params } from "@roxi/routify"
   import { Table, Heading, Layout } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
+  import Spinner from "@/components/common/Spinner.svelte"
+  import { TableNames, UNEDITABLE_USER_FIELDS } from "@/constants"
   import RoleCell from "./cells/RoleCell.svelte"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/frontend-core"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
index 6c718d79ae..d8d1f4d24c 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { Button } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let selectedRows
   export let deleteRows
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
index e2d611a523..21173965d9 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
@@ -2,7 +2,7 @@
   import { ActionButton, notifications } from "@budibase/bbui"
   import CreateEditRelationshipModal from "../../Datasources/CreateEditRelationshipModal.svelte"
 
-  import { datasources, tables as tablesStore } from "stores/builder"
+  import { datasources, tables as tablesStore } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let table
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte
index fadf6d83da..ee53faf9bc 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte
@@ -7,9 +7,9 @@
     Button,
   } from "@budibase/bbui"
   import download from "downloadjs"
-  import { API } from "api"
-  import { ROW_EXPORT_FORMATS } from "constants/backend"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import { API } from "@/api"
+  import { ROW_EXPORT_FORMATS } from "@/constants/backend"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   export let view
   export let sorting
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
index f96492a570..ddbf4a53e9 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
@@ -1,9 +1,9 @@
 <script>
   import { ActionButton, Button, Body, notifications } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
-  import ExistingTableDataImport from "components/backend/TableNavigator/ExistingTableDataImport.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
+  import ExistingTableDataImport from "@/components/backend/TableNavigator/ExistingTableDataImport.svelte"
   import { createEventDispatcher } from "svelte"
-  import { API } from "api"
+  import { API } from "@/api"
 
   export let tableId
   export let tableType
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index 85227b9140..092c09e735 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
@@ -8,12 +8,12 @@
     ListItem,
     notifications,
   } from "@budibase/bbui"
-  import { permissions as permissionsStore, roles } from "stores/builder"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import { permissions as permissionsStore, roles } from "@/stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import { PermissionSource } from "@budibase/types"
-  import { capitalise } from "helpers"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
-  import { Roles } from "constants/backend"
+  import { capitalise } from "@/helpers"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import { Roles } from "@/constants/backend"
 
   export let resourceId
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index d4a71c9ef8..ff687e69f2 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -1,12 +1,12 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { ActionButton, Button } from "@budibase/bbui"
-  import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
-  import { getUserBindings } from "dataBinding"
+  import FilterBuilder from "@/components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
+  import { getUserBindings } from "@/dataBinding"
   import { makePropSafe } from "@budibase/string-templates"
   import { search, Utils } from "@budibase/frontend-core"
-  import { tables } from "stores/builder"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import { tables } from "@/stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   export let schema
   export let filters
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte
index 2cda43dda0..1b9ed5b001 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext } from "svelte"
-  import ToggleActionButtonGroup from "components/common/ToggleActionButtonGroup.svelte"
+  import ToggleActionButtonGroup from "@/components/common/ToggleActionButtonGroup.svelte"
   import { helpers } from "@budibase/shared-core"
   import { SchemaUtils } from "@budibase/frontend-core"
   import { Icon, notifications, ActionButton, Popover } from "@budibase/bbui"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte
index b2448eeaf3..7016fcf0b0 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ActionButton, List, ListItem, Button } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
-  import { automationStore, appStore } from "stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
+  import { TriggerStepID } from "@/constants/backend/automations"
+  import { automationStore, appStore } from "@/stores/builder"
   import { createEventDispatcher, getContext } from "svelte"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
index 801abeaf9f..349e242422 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
@@ -10,7 +10,7 @@
   import { getContext } from "svelte"
   import { ActionButton } from "@budibase/bbui"
   import ColumnsSettingContent from "./ColumnsSettingContent.svelte"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const { tableColumns, datasource } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
index 5d1ec835d5..40edfa326a 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
@@ -6,14 +6,14 @@
     tables,
     builderStore,
     viewsV2,
-  } from "stores/builder"
-  import { TriggerStepID } from "constants/backend/automations"
+  } from "@/stores/builder"
+  import { TriggerStepID } from "@/constants/backend/automations"
   import { goto } from "@roxi/routify"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import MagicWand from "./magic-wand.svg"
-  import { AutoScreenTypes } from "constants"
-  import CreateScreenModal from "pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte"
-  import { getSequentialName } from "helpers/duplicate"
+  import { AutoScreenTypes } from "@/constants"
+  import CreateScreenModal from "@/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte"
+  import { getSequentialName } from "@/helpers/duplicate"
 
   const { datasource } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
index 496f367c01..1f02162cf0 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
@@ -10,9 +10,9 @@
     ModalContent,
     Input,
   } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import { getContext } from "svelte"
-  import { appStore, rowActions } from "stores/builder"
+  import { appStore, rowActions } from "@/stores/builder"
   import { goto, url } from "@roxi/routify"
   import { derived } from "svelte/store"
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte
index db446b3c9e..b2edb52725 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, List, ListItem, Button } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
-  import { screenStore, appStore } from "stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
+  import { screenStore, appStore } from "@/stores/builder"
   import { getContext, createEventDispatcher } from "svelte"
 
   const { datasource } = getContext("grid")
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
index 148d8b1d5f..7ee47a5cfc 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Label } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const {
     Constants,
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
index 244a1b1560..aab29286c0 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { ActionButton, Select } from "@budibase/bbui"
   import { canBeSortColumn } from "@budibase/frontend-core"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const { sort, columns } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte
index 55eb2475cf..34b388c9ac 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, Popover, Heading, Body, Button } from "@budibase/bbui"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   let anchor
   let open = false
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
index 7b279d3948..7733a90bad 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
@@ -7,9 +7,9 @@
     Button,
   } from "@budibase/bbui"
   import { CalculationType, canGroupBy, isNumeric } from "@budibase/types"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
   import { getContext } from "svelte"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const { definition, datasource, rows } = getContext("grid")
   const calculationTypeOptions = [
diff --git a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
index 8c9b4e306b..a39badb81b 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/builder"
+  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 a9491abfef..9ec75b52c0 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -1,6 +1,6 @@
 import { FieldType } from "@budibase/types"
-import { FIELDS } from "constants/backend"
-import { tables } from "stores/builder"
+import { FIELDS } from "@/constants/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 1acf5e3efd..45711bc733 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
-  import { tables, views } from "stores/builder"
-  import { FIELDS } from "constants/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 17069aa8c6..db5b8a7d49 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -25,32 +25,32 @@
   import { makePropSafe } from "@budibase/string-templates"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/builder"
-  import { featureFlags } from "stores/portal"
-  import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
+  import { tables, datasources } from "@/stores/builder"
+  import { featureFlags } from "@/stores/portal"
+  import { TableNames, UNEDITABLE_USER_FIELDS } from "@/constants"
   import {
     FIELDS,
     RelationshipType,
     PrettyRelationshipDefinitions,
     DB_TYPE_EXTERNAL,
-  } from "constants/backend"
-  import { getAutoColumnInformation, buildAutoColumn } from "helpers/utils"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import AIFieldConfiguration from "components/common/AIFieldConfiguration.svelte"
-  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
-  import { getBindings } from "components/backend/DataTable/formula"
+  } from "@/constants/backend"
+  import { getAutoColumnInformation, buildAutoColumn } from "@/helpers/utils"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import AIFieldConfiguration from "@/components/common/AIFieldConfiguration.svelte"
+  import ModalBindableInput from "@/components/common/bindings/ModalBindableInput.svelte"
+  import { getBindings } from "@/components/backend/DataTable/formula"
   import JSONSchemaModal from "./JSONSchemaModal.svelte"
   import {
     BBReferenceFieldSubType,
     FieldType,
     SourceName,
   } from "@budibase/types"
-  import RelationshipSelector from "components/common/RelationshipSelector.svelte"
+  import RelationshipSelector from "@/components/common/RelationshipSelector.svelte"
   import { RowUtils, canBeDisplayColumn } from "@budibase/frontend-core"
-  import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
+  import ServerBindingPanel from "@/components/common/bindings/ServerBindingPanel.svelte"
   import OptionsEditor from "./OptionsEditor.svelte"
-  import { isEnabled } from "helpers/featureFlags"
-  import { getUserBindings } from "dataBinding"
+  import { isEnabled } from "@/helpers/featureFlags"
+  import { getUserBindings } from "@/dataBinding"
 
   export let field
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index eb99e994d1..beaf51cf70 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,10 +1,10 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import { ModalContent, keepOpen, notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
-  import { API } from "api"
-  import { FIELDS } from "constants/backend"
+  import { API } from "@/api"
+  import { FIELDS } from "@/constants/backend"
 
   const FORMULA_TYPE = FIELDS.FORMULA.type
   const AI_TYPE = FIELDS.AI.type
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 5ac2beab65..a3fe16733b 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables, roles } from "stores/builder"
+  import { tables, roles } from "@/stores/builder"
   import {
     notifications,
     keepOpen,
@@ -9,8 +9,8 @@
     Link,
   } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
-  import { API } from "api"
-  import ErrorsBox from "components/common/ErrorsBox.svelte"
+  import { API } from "@/api"
+  import ErrorsBox from "@/components/common/ErrorsBox.svelte"
   import { goto } from "@roxi/routify"
 
   export let row = {}
diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
index 1c67da1ab8..025015a6c3 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/builder"
+  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 d122013428..acd6040973 100644
--- a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, ModalContent, notifications } from "@budibase/bbui"
-  import { tables, views } from "stores/builder"
-  import { FIELDS } from "constants/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/JSONSchemaModal.svelte b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
index 0b2eb58748..908a7b1aea 100644
--- a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Editor from "components/integration/QueryEditor.svelte"
+  import Editor from "@/components/integration/QueryEditor.svelte"
   import {
     ModalContent,
     Tabs,
@@ -12,8 +12,8 @@
     ActionButton,
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { FIELDS } from "constants/backend"
-  import { generate } from "helpers/schemaGenerator"
+  import { FIELDS } from "@/constants/backend"
+  import { generate } from "@/helpers/schemaGenerator"
 
   export let schema = {}
   export let json
diff --git a/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte b/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte
index 8e35e38ae9..8546b34cd8 100644
--- a/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte
@@ -4,7 +4,7 @@
   import { Icon, Popover } from "@budibase/bbui"
   import { tick } from "svelte"
   import { Constants } from "@budibase/frontend-core"
-  import { getSequentialName } from "helpers/duplicate"
+  import { getSequentialName } from "@/helpers/duplicate"
   import { derived, writable } from "svelte/store"
 
   export let constraints
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte
index d031e752cd..58507373ac 100644
--- a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext } from "svelte"
-  import CreateEditColumn from "components/backend/DataTable/modals/CreateEditColumn.svelte"
+  import CreateEditColumn from "@/components/backend/DataTable/modals/CreateEditColumn.svelte"
 
   const { datasource, rows } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte
index 1ba32838ab..d538a9b1b7 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte
@@ -1,12 +1,12 @@
 <script>
   import { isActive } from "@roxi/routify"
-  import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
-  import { contextMenuStore, userSelectedResourceMap } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
+  import { BUDIBASE_INTERNAL_DB_ID } from "@/constants/backend"
+  import { contextMenuStore, userSelectedResourceMap } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
 
-  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+  import IntegrationIcon from "@/components/backend/DatasourceNavigator/IntegrationIcon.svelte"
   import { Icon } from "@budibase/bbui"
-  import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
+  import UpdateDatasourceModal from "@/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
   import DeleteConfirmationModal from "./DeleteConfirmationModal.svelte"
 
   export let datasource
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
index 3d36d1e00e..6982f87dc7 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources } from "stores/builder"
+  import { datasources } from "@/stores/builder"
   import { notifications } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let datasource
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index d7a98c564a..8d85bee556 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -8,12 +8,12 @@
     views,
     viewsV2,
     userSelectedResourceMap,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import QueryNavItem from "./QueryNavItem.svelte"
-  import NavItem from "components/common/NavItem.svelte"
-  import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import TableNavigator from "@/components/backend/TableNavigator/TableNavigator.svelte"
   import DatasourceNavItem from "./DatasourceNavItem/DatasourceNavItem.svelte"
-  import { TableNames } from "constants"
+  import { TableNames } from "@/constants"
   import { enrichDatasources } from "./datasourceUtils"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte b/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte
index a0cdabc63c..1f6b0060d2 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getIcon } from "./icons"
-  import CustomSVG from "components/common/CustomSVG.svelte"
+  import CustomSVG from "@/components/common/CustomSVG.svelte"
 
   export let integrationType
   export let schema
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte b/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte
index 8d7d6dc5d3..5b611cc4df 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte
@@ -3,16 +3,16 @@
     customQueryIconText,
     customQueryIconColor,
     customQueryText,
-  } from "helpers/data/utils"
+  } from "@/helpers/data/utils"
   import { goto as gotoStore, isActive } from "@roxi/routify"
   import {
     datasources,
     queries,
     userSelectedResourceMap,
     contextMenuStore,
-  } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { notifications, Icon } from "@budibase/bbui"
 
   export let datasource
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
index bc7fa53b49..5e38cc9bfe 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
@@ -1,4 +1,4 @@
-import { TableNames } from "constants"
+import { TableNames } from "@/constants"
 
 const showDatasourceOpen = ({
   selected,
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
index 88359c2782..5b48834b5b 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/builder"
+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 1de322c203..37610061ac 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/builder"
+  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 845a1b8549..df1cf5f589 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { get } from "svelte/store"
-  import { datasources, integrations } from "stores/builder"
+  import { datasources, integrations } from "@/stores/builder"
   import { notifications, Input, ModalContent, Modal } from "@budibase/bbui"
-  import { integrationForDatasource } from "stores/selectors"
+  import { integrationForDatasource } from "@/stores/selectors"
 
   let error = ""
   let modal
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte
index e92655cc59..6dbfc7f6d9 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, Button } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
 
   export let name
   export let value
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte
index 556c5eb6c1..4e42a3f1fc 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, EnvDropdown } from "@budibase/bbui"
-  import { environment, licensing } from "stores/portal"
+  import { environment, licensing } from "@/stores/portal"
 
   export let type
   export let name
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
index 5e825d9704..058b4348cc 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
@@ -8,12 +8,12 @@
     ModalContent,
   } from "@budibase/bbui"
   import { processStringSync } from "@budibase/string-templates"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
   import ConfigInput from "./ConfigInput.svelte"
   import { createValidatedConfigStore } from "./stores/validatedConfig"
   import { createValidatedNameStore } from "./stores/validatedName"
   import { get } from "svelte/store"
-  import { environment } from "stores/portal"
+  import { environment } from "@/stores/portal"
 
   export let integration
   export let config
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
index 47479be69f..df2bab1dd9 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
@@ -1,6 +1,6 @@
 import { derived, writable, get } from "svelte/store"
 import { getValidatorFields } from "./validation"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { notifications } from "@budibase/bbui"
 import { object } from "yup"
 
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js
index d4179a8c45..0e7a9c81bc 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js
@@ -1,5 +1,5 @@
 import { derived, get, writable } from "svelte/store"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { string } from "yup"
 
 export const createValidatedNameStore = (name, isVisible) => {
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index 7e11c98768..97d3de6874 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -2,7 +2,7 @@
   import {
     RelationshipType,
     PrettyRelationshipDefinitions,
-  } from "constants/backend"
+  } from "@/constants/backend"
   import {
     keepOpen,
     Button,
@@ -13,10 +13,10 @@
     Body,
     Helpers,
   } from "@budibase/bbui"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"
-  import RelationshipSelector from "components/common/RelationshipSelector.svelte"
+  import RelationshipSelector from "@/components/common/RelationshipSelector.svelte"
 
   export let save
   export let datasource
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
index 247c1b8041..1bfe87617d 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
@@ -2,8 +2,8 @@
   import { Modal } from "@budibase/bbui"
   import { get } from "svelte/store"
   import CreateEditRelationship from "./CreateEditRelationship.svelte"
-  import { integrations, datasources } from "stores/builder"
-  import { integrationForDatasource } from "stores/selectors"
+  import { integrations, datasources } from "@/stores/builder"
+  import { integrationForDatasource } from "@/stores/selectors"
 
   export let datasource
   export let tables
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte b/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte
index 3bc2457c99..66968a7ea2 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte
@@ -6,8 +6,8 @@
     Layout,
     ModalContent,
   } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import { IntegrationTypes } from "constants/backend"
+  import Spinner from "@/components/common/Spinner.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
   import { createTableSelectionStore } from "./tableSelectionStore"
 
   export let integration
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index e9bd06d69b..31a94f0a96 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/builder"
+import { datasources, tables } from "@/stores/builder"
 
 export const createTableSelectionStore = (integration, datasource) => {
   const tableNamesStore = writable([])
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte b/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte
index 84badeb6b2..60afefd8c6 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte
@@ -2,7 +2,7 @@
   import { getBezierPath, BaseEdge, EdgeLabelRenderer } from "@xyflow/svelte"
   import { Icon, TooltipPosition } from "@budibase/bbui"
   import { getContext, onMount } from "svelte"
-  import { roles } from "stores/builder"
+  import { roles } from "@/stores/builder"
 
   export let sourceX
   export let sourceY
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte b/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
index 90c0a9fca8..a9d1aed1e4 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
@@ -23,9 +23,9 @@
   import { setContext, tick } from "svelte"
   import Controls from "./Controls.svelte"
   import { GridResolution, MaxAutoZoom, ZoomDuration } from "./constants"
-  import { roles } from "stores/builder"
-  import { Roles } from "constants/backend"
-  import { getSequentialName } from "helpers/duplicate"
+  import { roles } from "@/stores/builder"
+  import { Roles } from "@/constants/backend"
+  import { getSequentialName } from "@/helpers/duplicate"
   import { derivedMemo } from "@budibase/frontend-core"
 
   const flow = useSvelteFlow()
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte b/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
index 32a95f4278..c01ae43362 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
@@ -10,8 +10,8 @@
   } from "@budibase/bbui"
   import { NodeWidth, NodeHeight } from "./constants"
   import { getContext } from "svelte"
-  import { roles } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { roles } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let data
   export let id
diff --git a/packages/builder/src/components/backend/RoleEditor/utils.js b/packages/builder/src/components/backend/RoleEditor/utils.js
index a958fc6401..4a7f40ce31 100644
--- a/packages/builder/src/components/backend/RoleEditor/utils.js
+++ b/packages/builder/src/components/backend/RoleEditor/utils.js
@@ -9,8 +9,8 @@ import {
   EmptyStateID,
 } from "./constants"
 import { getNodesBounds, Position } from "@xyflow/svelte"
-import { Roles } from "constants/backend"
-import { roles } from "stores/builder"
+import { Roles } from "@/constants/backend"
+import { roles } from "@/stores/builder"
 import { get } from "svelte/store"
 
 // Calculates the bounds of all custom nodes
diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
index e4601b5372..beddf447df 100644
--- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
@@ -5,10 +5,10 @@
     SourceName,
   } from "@budibase/types"
   import { Select, Toggle, Multiselect, Label, Layout } from "@budibase/bbui"
-  import { DB_TYPE_INTERNAL } from "constants/backend"
-  import { API } from "api"
+  import { DB_TYPE_INTERNAL } from "@/constants/backend"
+  import { API } from "@/api"
   import { parseFile } from "./utils"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
 
   let error = null
   let fileName = null
diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 80957a90b3..a7d2b2e6d7 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Select, Icon, Layout, Label } from "@budibase/bbui"
-  import { FIELDS } from "constants/backend"
+  import { FIELDS } from "@/constants/backend"
   import { utils } from "@budibase/shared-core"
   import { canBeDisplayColumn } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import { parseFile } from "./utils"
 
   export let rows = []
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
index c0e030845f..183a803902 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
@@ -1,9 +1,9 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { appStore, tables, datasources, screenStore } from "stores/builder"
+  import { appStore, tables, datasources, screenStore } from "@/stores/builder"
   import { InlineAlert, Link, Input, notifications } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   export let table
 
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte
index f0b49ca8cd..e3bb83f621 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
   import { Input, Modal, ModalContent, notifications } from "@budibase/bbui"
 
   export let table
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte
index 6b64096e2e..f3deccb3c9 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte
@@ -3,14 +3,14 @@
     tables as tablesStore,
     userSelectedResourceMap,
     contextMenuStore,
-  } from "stores/builder"
-  import { TableNames } from "constants"
-  import NavItem from "components/common/NavItem.svelte"
+  } from "@/stores/builder"
+  import { TableNames } from "@/constants"
+  import NavItem from "@/components/common/NavItem.svelte"
   import { isActive } from "@roxi/routify"
   import EditModal from "./EditModal.svelte"
   import DeleteConfirmationModal from "./DeleteConfirmationModal.svelte"
   import { Icon } from "@budibase/bbui"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   export let table
   export let idx
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 5596ade573..cc3876208b 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,13 +1,13 @@
 <script>
   import { goto, url } from "@roxi/routify"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
   import { notifications, Input, ModalContent } from "@budibase/bbui"
   import TableDataImport from "../TableDataImport.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,
     BUDIBASE_DATASOURCE_TYPE,
     DB_TYPE_INTERNAL,
-  } from "constants/backend"
+  } from "@/constants/backend"
 
   $: tableNames = $tables.list.map(table => table.name)
   $: selectedSource = $datasources.list.find(
diff --git a/packages/builder/src/components/backend/TableNavigator/utils.js b/packages/builder/src/components/backend/TableNavigator/utils.js
index a76a14c1a4..2889d90cc0 100644
--- a/packages/builder/src/components/backend/TableNavigator/utils.js
+++ b/packages/builder/src/components/backend/TableNavigator/utils.js
@@ -1,5 +1,5 @@
-import { API } from "api"
-import { FIELDS } from "constants/backend"
+import { API } from "@/api"
+import { FIELDS } from "@/constants/backend"
 
 const BYTES_IN_MB = 1000000
 const FILE_SIZE_LIMIT = BYTES_IN_MB * 5
diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte
index 51a688fc72..4598b44873 100644
--- a/packages/builder/src/components/commandPalette/CommandPalette.svelte
+++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte
@@ -7,7 +7,7 @@
     Detail,
     notifications,
   } from "@budibase/bbui"
-  import { API } from "api"
+  import { API } from "@/api"
   import { goto } from "@roxi/routify"
   import {
     automationStore,
@@ -19,8 +19,8 @@
     queries,
     tables,
     views,
-  } from "stores/builder"
-  import { themeStore } from "stores/portal"
+  } from "@/stores/builder"
+  import { themeStore } from "@/stores/portal"
   import { getContext } from "svelte"
   import { ThemeOptions } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/components/common/AIFieldConfiguration.svelte b/packages/builder/src/components/common/AIFieldConfiguration.svelte
index cb7ac77b75..24908e0fe2 100644
--- a/packages/builder/src/components/common/AIFieldConfiguration.svelte
+++ b/packages/builder/src/components/common/AIFieldConfiguration.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Helpers, Multiselect, Select } from "@budibase/bbui"
-  import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
-  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
+  import ServerBindingPanel from "@/components/common/bindings/ServerBindingPanel.svelte"
+  import ModalBindableInput from "@/components/common/bindings/ModalBindableInput.svelte"
   import {
     AIOperations,
     OperationFields,
diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index c3e4835f96..f94d26603d 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -43,7 +43,7 @@
   import { Compartment, EditorState } from "@codemirror/state"
   import { javascript } from "@codemirror/lang-javascript"
   import { EditorModes } from "./"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
 
   export let label
   export let completions = []
diff --git a/packages/builder/src/components/common/CodeMirrorEditor.svelte b/packages/builder/src/components/common/CodeMirrorEditor.svelte
index 48177ff870..94cc9ccd0d 100644
--- a/packages/builder/src/components/common/CodeMirrorEditor.svelte
+++ b/packages/builder/src/components/common/CodeMirrorEditor.svelte
@@ -26,8 +26,8 @@
 
 <script>
   import { Label } from "@budibase/bbui"
-  import CodeMirror from "components/integration/codemirror"
-  import { themeStore } from "stores/portal"
+  import CodeMirror from "@/components/integration/codemirror"
+  import { themeStore } from "@/stores/portal"
   import { createEventDispatcher, onMount } from "svelte"
 
   export let mode = EditorModes.JS
diff --git a/packages/builder/src/components/common/Dropzone.spec.js b/packages/builder/src/components/common/Dropzone.spec.js
index 8bf202223b..0ffa7e51a1 100644
--- a/packages/builder/src/components/common/Dropzone.spec.js
+++ b/packages/builder/src/components/common/Dropzone.spec.js
@@ -2,7 +2,7 @@ import { it, expect, describe, vi } from "vitest"
 import Dropzone from "./Dropzone.svelte"
 import { render, fireEvent } from "@testing-library/svelte"
 import { notifications } from "@budibase/bbui"
-import { admin } from "stores/portal"
+import { admin } from "@/stores/portal"
 
 vi.spyOn(notifications, "error").mockImplementation(() => {})
 
diff --git a/packages/builder/src/components/common/Dropzone.svelte b/packages/builder/src/components/common/Dropzone.svelte
index 8cd85e2530..149462a97a 100644
--- a/packages/builder/src/components/common/Dropzone.svelte
+++ b/packages/builder/src/components/common/Dropzone.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Dropzone, notifications } from "@budibase/bbui"
-  import { admin } from "stores/portal"
-  import { API } from "api"
+  import { admin } from "@/stores/portal"
+  import { API } from "@/api"
 
   export let value = []
   export let label
diff --git a/packages/builder/src/components/common/EditableIcon.svelte b/packages/builder/src/components/common/EditableIcon.svelte
index 6c0986e601..150a23ecb7 100644
--- a/packages/builder/src/components/common/EditableIcon.svelte
+++ b/packages/builder/src/components/common/EditableIcon.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, Modal } from "@budibase/bbui"
-  import ChooseIconModal from "components/start/ChooseIconModal.svelte"
+  import ChooseIconModal from "@/components/start/ChooseIconModal.svelte"
 
   export let name
   export let size = "M"
diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte
index bba55e88dc..db2b496c12 100644
--- a/packages/builder/src/components/common/HelpMenu.svelte
+++ b/packages/builder/src/components/common/HelpMenu.svelte
@@ -1,9 +1,9 @@
 <script>
   import FontAwesomeIcon from "./FontAwesomeIcon.svelte"
   import { Popover, Heading, Body } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
-  import { isPremiumOrAbove } from "helpers/planTitle"
-  import { ChangelogURL } from "constants"
+  import { licensing } from "@/stores/portal"
+  import { isPremiumOrAbove } from "@/helpers/planTitle"
+  import { ChangelogURL } from "@/constants"
 
   $: premiumOrAboveLicense = isPremiumOrAbove($licensing?.license?.plan?.type)
 
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 009d943456..8875b8896b 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { tables } from "stores/builder"
-  import { API } from "api"
+  import { tables } from "@/stores/builder"
+  import { API } from "@/api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { createEventDispatcher } from "svelte"
 
   export let schema
diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte
index 2c67a3f9b3..d83d7f578b 100644
--- a/packages/builder/src/components/common/NavHeader.svelte
+++ b/packages/builder/src/components/common/NavHeader.svelte
@@ -1,7 +1,7 @@
 <script>
   import { tick } from "svelte"
   import { Icon, Body } from "@budibase/bbui"
-  import { keyUtils } from "helpers/keyUtils"
+  import { keyUtils } from "@/helpers/keyUtils"
 
   export let title
   export let placeholder
diff --git a/packages/builder/src/components/common/RoleIcon.svelte b/packages/builder/src/components/common/RoleIcon.svelte
index 3b48935e0c..e6c5af6ee0 100644
--- a/packages/builder/src/components/common/RoleIcon.svelte
+++ b/packages/builder/src/components/common/RoleIcon.svelte
@@ -1,6 +1,6 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
-  import { roles } from "stores/builder"
+  import { roles } from "@/stores/builder"
 
   export let id
   export let size = "M"
diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index 38b84e964d..62c33458bf 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -1,11 +1,11 @@
 <script>
   import { Select, FancySelect } from "@budibase/bbui"
-  import { roles } from "stores/builder"
-  import { licensing } from "stores/portal"
+  import { roles } from "@/stores/builder"
+  import { licensing } from "@/stores/portal"
 
   import { Constants } from "@budibase/frontend-core"
   import { createEventDispatcher } from "svelte"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   export let value
   export let error
diff --git a/packages/builder/src/components/common/TemplateDisplay.svelte b/packages/builder/src/components/common/TemplateDisplay.svelte
index 4fbd8b1fb8..a72e846011 100644
--- a/packages/builder/src/components/common/TemplateDisplay.svelte
+++ b/packages/builder/src/components/common/TemplateDisplay.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Layout, Detail, Button, Modal } from "@budibase/bbui"
-  import TemplateCard from "components/common/TemplateCard.svelte"
-  import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import { licensing } from "stores/portal"
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
+  import TemplateCard from "@/components/common/TemplateCard.svelte"
+  import CreateAppModal from "@/components/start/CreateAppModal.svelte"
+  import { licensing } from "@/stores/portal"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
 
   export let templates
 
diff --git a/packages/builder/src/components/common/UndoRedoControl.svelte b/packages/builder/src/components/common/UndoRedoControl.svelte
index bd197f3d38..b6407b7aa1 100644
--- a/packages/builder/src/components/common/UndoRedoControl.svelte
+++ b/packages/builder/src/components/common/UndoRedoControl.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Icon, ActionButton } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { isBuilderInputFocused } from "helpers"
+  import { isBuilderInputFocused } from "@/helpers"
 
   export let store
   export let showButtonGroup = false
diff --git a/packages/builder/src/components/common/UpdateAppForm.svelte b/packages/builder/src/components/common/UpdateAppForm.svelte
index 0e07c5c918..b399d3f063 100644
--- a/packages/builder/src/components/common/UpdateAppForm.svelte
+++ b/packages/builder/src/components/common/UpdateAppForm.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Button, Label, Icon, Input, notifications } from "@budibase/bbui"
-  import { AppStatus } from "constants"
-  import { appStore, initialise } from "stores/builder"
-  import { appsStore } from "stores/portal"
-  import { API } from "api"
+  import { AppStatus } from "@/constants"
+  import { appStore, initialise } from "@/stores/builder"
+  import { appsStore } from "@/stores/portal"
+  import { API } from "@/api"
   import { writable } from "svelte/store"
-  import { createValidationStore } from "helpers/validation/yup"
-  import * as appValidation from "helpers/validation/yup/app"
-  import EditableIcon from "components/common/EditableIcon.svelte"
+  import { createValidationStore } from "@/helpers/validation/yup"
+  import * as appValidation from "@/helpers/validation/yup/app"
+  import EditableIcon from "@/components/common/EditableIcon.svelte"
   import { isEqual } from "lodash"
   import { createEventDispatcher } from "svelte"
 
diff --git a/packages/builder/src/components/common/VerificationPromptBanner.svelte b/packages/builder/src/components/common/VerificationPromptBanner.svelte
index e9109ae0b1..d707eb640d 100644
--- a/packages/builder/src/components/common/VerificationPromptBanner.svelte
+++ b/packages/builder/src/components/common/VerificationPromptBanner.svelte
@@ -1,6 +1,6 @@
 <script>
   import { notifications, Button, Icon, Body } from "@budibase/bbui"
-  import { admin, auth } from "stores/portal"
+  import { admin, auth } from "@/stores/portal"
 
   $: user = $auth.user
   let loading = false
diff --git a/packages/builder/src/components/common/bindings/BindableCombobox.svelte b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
index 3754abd341..b3b7511ccd 100644
--- a/packages/builder/src/components/common/bindings/BindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 4186cb54cc..4d1de22a57 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -14,7 +14,7 @@
     processObjectSync,
     processStringSync,
   } from "@budibase/string-templates"
-  import { readableToRuntimeBinding } from "dataBinding"
+  import { readableToRuntimeBinding } from "@/dataBinding"
   import CodeEditor from "../CodeEditor/CodeEditor.svelte"
   import {
     getHelperCompletions,
@@ -29,9 +29,9 @@
   import SnippetSidePanel from "./SnippetSidePanel.svelte"
   import { BindingHelpers } from "./utils"
   import formatHighlight from "json-format-highlight"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { Utils } from "@budibase/frontend-core"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/common/bindings/BindingSidePanel.svelte b/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
index f364b39ba9..c45d7999e5 100644
--- a/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
@@ -2,7 +2,7 @@
   import groupBy from "lodash/fp/groupBy"
   import { convertToJS } from "@budibase/string-templates"
   import { Input, Layout, Icon, Popover } from "@budibase/bbui"
-  import { handlebarsCompletions } from "constants/completions"
+  import { handlebarsCompletions } from "@/constants/completions"
 
   export let addHelper
   export let addBinding
diff --git a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
index 4aa7ced9dc..6d329a8321 100644
--- a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import BindingPanel from "./BindingPanel.svelte"
-  import { previewStore, snippets } from "stores/builder"
+  import { previewStore, snippets } from "@/stores/builder"
   import { onMount } from "svelte"
 
   export let bindings = []
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
index a4a1a2b356..77eb280bb7 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  } from "@/dataBinding"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index 65831b652a..aec23f6ccc 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -3,11 +3,11 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  } from "@/dataBinding"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   export let panel = ClientBindingPanel
   export let value = ""
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
index e41a740229..6fda04480c 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
@@ -3,10 +3,10 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { FieldType } from "@budibase/types"
 
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding, findHBSBlocks } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
index 3261dc6b74..dcd62f4eed 100644
--- a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
@@ -1,5 +1,5 @@
 <script>
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 </script>
 
 <DrawerBindableInput
diff --git a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
index df0da768e0..19a466db6b 100644
--- a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import BindingPanel from "./BindingPanel.svelte"
-  import { snippets } from "stores/builder"
+  import { snippets } from "@/stores/builder"
 
   export let bindings = []
   export let value = ""
diff --git a/packages/builder/src/components/common/bindings/SnippetDrawer.svelte b/packages/builder/src/components/common/bindings/SnippetDrawer.svelte
index d8e56b059a..90ca6ffd9f 100644
--- a/packages/builder/src/components/common/bindings/SnippetDrawer.svelte
+++ b/packages/builder/src/components/common/bindings/SnippetDrawer.svelte
@@ -8,11 +8,11 @@
     TooltipType,
     notifications,
   } from "@budibase/bbui"
-  import BindingPanel from "components/common/bindings/BindingPanel.svelte"
+  import BindingPanel from "@/components/common/bindings/BindingPanel.svelte"
   import { decodeJSBinding, encodeJSBinding } from "@budibase/string-templates"
-  import { snippets } from "stores/builder"
-  import { getSequentialName } from "helpers/duplicate"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { snippets } from "@/stores/builder"
+  import { getSequentialName } from "@/helpers/duplicate"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { ValidSnippetNameRegex } from "@budibase/shared-core"
 
   export let snippet
diff --git a/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte b/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte
index 2cc27b91cd..95f40005c0 100644
--- a/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte
+++ b/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte
@@ -9,11 +9,11 @@
     Body,
     Button,
   } from "@budibase/bbui"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import { EditorModes } from "components/common/CodeEditor"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import { EditorModes } from "@/components/common/CodeEditor"
   import SnippetDrawer from "./SnippetDrawer.svelte"
-  import { licensing } from "stores/portal"
-  import UpgradeButton from "pages/builder/portal/_components/UpgradeButton.svelte"
+  import { licensing } from "@/stores/portal"
+  import UpgradeButton from "@/pages/builder/portal/_components/UpgradeButton.svelte"
 
   export let addSnippet
   export let snippets
diff --git a/packages/builder/src/components/common/bindings/utils.js b/packages/builder/src/components/common/bindings/utils.js
index 77e4a1dfb1..9fc147a420 100644
--- a/packages/builder/src/components/common/bindings/utils.js
+++ b/packages/builder/src/components/common/bindings/utils.js
@@ -1,5 +1,5 @@
 import { decodeJSBinding } from "@budibase/string-templates"
-import { hbInsert, jsInsert } from "components/common/CodeEditor"
+import { hbInsert, jsInsert } from "@/components/common/CodeEditor"
 
 export const BindingType = {
   READABLE: "readableBinding",
diff --git a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
index b5155fc044..bc019a3c71 100644
--- a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   export let value
 </script>
diff --git a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
index bd7f5b50c7..46597a57c8 100644
--- a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
+++ b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
@@ -1,7 +1,10 @@
 <script>
   import { FancyForm, FancyInput } from "@budibase/bbui"
-  import { createValidationStore, requiredValidator } from "helpers/validation"
-  import { admin } from "stores/portal"
+  import {
+    createValidationStore,
+    requiredValidator,
+  } from "@/helpers/validation"
+  import { admin } from "@/stores/portal"
 
   export let password
   export let passwordForm
diff --git a/packages/builder/src/components/common/users/UpgradeModal.svelte b/packages/builder/src/components/common/users/UpgradeModal.svelte
index 52d5e1f9e9..fd2cc4f680 100644
--- a/packages/builder/src/components/common/users/UpgradeModal.svelte
+++ b/packages/builder/src/components/common/users/UpgradeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   export let isOwner
 </script>
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 9ba46832f4..f57563b2ab 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -11,13 +11,13 @@
     StatusLight,
     AbsTooltip,
   } from "@budibase/bbui"
-  import RevertModal from "components/deploy/RevertModal.svelte"
-  import VersionModal from "components/deploy/VersionModal.svelte"
+  import RevertModal from "@/components/deploy/RevertModal.svelte"
+  import VersionModal from "@/components/deploy/VersionModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import analytics, { Events, EventSource } from "analytics"
-  import { API } from "api"
-  import { appsStore } from "stores/portal"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import analytics, { Events, EventSource } from "@/analytics"
+  import { API } from "@/api"
+  import { appsStore } from "@/stores/portal"
   import {
     previewStore,
     builderStore,
@@ -26,9 +26,9 @@
     deploymentStore,
     sortedScreens,
     appPublished,
-  } from "stores/builder"
-  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
-  import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
+  } 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"
 
   export let application
diff --git a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
index 899d1659e8..927d69f43c 100644
--- a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
+++ b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import { ModalContent } from "@budibase/bbui"
   import { onMount } from "svelte"
   import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "@/constants/backend/automations"
 
   let webhookUrls = []
 
diff --git a/packages/builder/src/components/deploy/DeleteModal.svelte b/packages/builder/src/components/deploy/DeleteModal.svelte
index 02ac583839..ebdcb6e5e8 100644
--- a/packages/builder/src/components/deploy/DeleteModal.svelte
+++ b/packages/builder/src/components/deploy/DeleteModal.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Input, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { appsStore } from "stores/portal"
-  import { API } from "api"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { appsStore } from "@/stores/portal"
+  import { API } from "@/api"
 
   export let appId
   export let appName
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index dc97c81c22..a8c7b04d9f 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Input, Modal, notifications, ModalContent } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/builder"
-  import { API } from "api"
+  import { appStore, initialise } from "@/stores/builder"
+  import { API } from "@/api"
 
   export let onComplete = () => {}
 
diff --git a/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte b/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte
index ed40a101d0..b9092e8baa 100644
--- a/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte
+++ b/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte
@@ -1,7 +1,7 @@
 <script>
-  import { API } from "api"
+  import { API } from "@/api"
   import clientVersions from "./clientVersions.json"
-  import { appStore } from "stores/builder"
+  import { appStore } from "@/stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let revertableVersion
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index 653aa09fa6..f8fe2fff5d 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { admin } from "stores/portal"
+  import { admin } from "@/stores/portal"
   import {
     Modal,
     notifications,
@@ -9,10 +9,10 @@
     StatusLight,
     Link,
   } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/builder"
-  import { API } from "api"
+  import { appStore, initialise } from "@/stores/builder"
+  import { API } from "@/api"
   import RevertModalVersionSelect from "./RevertModalVersionSelect.svelte"
-  import { ChangelogURL } from "constants"
+  import { ChangelogURL } from "@/constants"
 
   export function show() {
     updateModal.show()
diff --git a/packages/builder/src/components/design/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
index 34872daf8c..3f8e08d031 100644
--- a/packages/builder/src/components/design/ScreenDetailsModal.svelte
+++ b/packages/builder/src/components/design/ScreenDetailsModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ModalContent, Input } from "@budibase/bbui"
-  import sanitizeUrl from "helpers/sanitizeUrl"
+  import sanitizeUrl from "@/helpers/sanitizeUrl"
   import { get } from "svelte/store"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   export let onConfirm
   export let onCancel
diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index ede48b84ba..724a544823 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -1,5 +1,5 @@
 import { Checkbox, Select, RadioGroup, Stepper, Input } from "@budibase/bbui"
-import { licensing } from "stores/portal"
+import { licensing } from "@/stores/portal"
 import { get } from "svelte/store"
 import DataSourceSelect from "./controls/DataSourceSelect/DataSourceSelect.svelte"
 import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte"
@@ -19,7 +19,7 @@ import URLSelect from "./controls/URLSelect.svelte"
 import OptionsEditor from "./controls/OptionsEditor/OptionsEditor.svelte"
 import FormFieldSelect from "./controls/FormFieldSelect.svelte"
 import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelte"
-import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte"
 import BasicColumnEditor from "./controls/ColumnEditor/BasicColumnEditor.svelte"
 import GridColumnEditor from "./controls/GridColumnConfiguration/GridColumnConfiguration.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
index 471207dcff..5266c9ce07 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -16,7 +16,7 @@
     getActionBindings,
     makeStateBinding,
     updateReferencesInObject,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { cloneDeep } from "lodash/fp"
 
   const flipDurationMs = 150
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 6e7c5874fc..19ec3df010 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,9 +1,9 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
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 0b0fe0cfb7..af31519081 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,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
index ad44ae0f2a..cd289e3f61 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Label, Select, Body } from "@budibase/bbui"
-  import { findAllMatchingComponents } from "helpers/components"
-  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
+  import { selectedScreen } from "@/stores/builder"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
index 12d4bad05a..c72fbf3c0f 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
index 91b70e0c45..2bd9d1ea7d 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings
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 410e4bb56e..da5a1168d5 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,7 +1,7 @@
 <script>
   import { Select, Label, Checkbox, Body } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { tables, viewsV2 } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte
index babaf2815b..7487bff37c 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { FieldType } from "@budibase/types"
-  import { tables, viewsV2 } from "stores/builder"
+  import { tables, viewsV2 } from "@/stores/builder"
 
   export let parameters
   export let bindings = []
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 e92991ad70..cc3ad058b6 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
@@ -5,11 +5,11 @@
     componentStore,
     tables,
     viewsV2,
-  } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getSchemaForDatasourcePlus } from "dataBinding"
+  } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { getSchemaForDatasourcePlus } from "@/dataBinding"
   import SaveFields from "./SaveFields.svelte"
-  import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
+  import { getDatasourceLikeProviders } from "@/components/design/settings/controls/ButtonActionEditor/actions/utils"
 
   export let parameters
   export let bindings = []
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 498d9b4a66..a92ef11639 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,13 +1,13 @@
 <script>
   import { Select, Layout, Checkbox } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { datasources, integrations, queries } from "stores/builder"
-  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
-  import IntegrationQueryEditor from "components/integration/index.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { datasources, integrations, queries } from "@/stores/builder"
+  import BindingBuilder from "@/components/integration/QueryBindingBuilder.svelte"
+  import IntegrationQueryEditor from "@/components/integration/index.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,
     BUDIBASE_DATASOURCE_TYPE,
-  } from "constants/backend"
+  } from "@/constants/backend"
 
   export let parameters
   export let bindings = []
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 a857bc7ede..a2de49935b 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
@@ -2,8 +2,8 @@
   import { Label, Select, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import ColumnEditor from "../../ColumnEditor/ColumnEditor.svelte"
-  import { findAllMatchingComponents } from "helpers/components"
-  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
+  import { selectedScreen } from "@/stores/builder"
 
   export let parameters
 
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 61b7494ab2..db86cee171 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,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { tables, viewsV2 } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
index f0606d86b3..7a1019fb5e 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, Body, Layout } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
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 86f454d6bc..54943c19c4 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,9 +1,9 @@
 <script>
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
   import { onMount } from "svelte"
   import { Label, Checkbox, Select } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte
index 8e61b8763f..4bc2f2017a 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let parameters
 
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 1eb1c1116b..50a4ef9453 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/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte
index 77fb579aa4..e883a92ec2 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body, Label } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings
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 3a56689f82..9cbe4baf7f 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,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte
index 8158d2dea5..2b45bdbdc4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Checkbox } from "@budibase/bbui"
-  import { tables, viewsV2, rowActions } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { tables, viewsV2, rowActions } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
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 11bd58a860..e3390b9b1a 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 { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
index e03af75207..c6c912b1a7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Label, ActionButton, Button, Select, Input } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   const dispatch = createEventDispatcher()
 
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 819ed10880..a3d09693d2 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
@@ -5,11 +5,11 @@
     componentStore,
     tables,
     viewsV2,
-  } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getSchemaForDatasourcePlus } from "dataBinding"
+  } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { getSchemaForDatasourcePlus } from "@/dataBinding"
   import SaveFields from "./SaveFields.svelte"
-  import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
+  import { getDatasourceLikeProviders } from "@/components/design/settings/controls/ButtonActionEditor/actions/utils"
 
   export let parameters
   export let bindings = []
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 af16c4d197..074189627a 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,8 +1,8 @@
 <script>
-  import { selectedScreen, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "@/stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
-  import { getActionProviders, buildFormSchema } from "dataBinding"
-  import { findComponent } from "helpers/components"
+  import { getActionProviders, buildFormSchema } from "@/dataBinding"
+  import { findComponent } from "@/helpers/components"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
index ef6232b382..e515590297 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Checkbox } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
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 5cd5658063..e6e89d13aa 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,8 +1,8 @@
 <script>
   import { Select, Label, Input, Checkbox, Icon, Body } from "@budibase/bbui"
-  import { automationStore } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { automationStore } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
 
   export let parameters = {}
   export let bindings = []
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 9c843e35d6..a8e3eceeba 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
@@ -1,10 +1,10 @@
 <script>
   import { Select, Label, Combobox } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders, buildFormSchema } from "dataBinding"
-  import { findComponent } from "helpers/components"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders, buildFormSchema } from "@/dataBinding"
+  import { findComponent } from "@/helpers/components"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
index fda05ef45a..025170e780 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select, Label, Combobox, Checkbox, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getAllStateVariables } from "dataBinding"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { getAllStateVariables } from "@/dataBinding"
 
   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 f44b68d4c6..8eec588794 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,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
index ba7955f1a5..30ec0039d9 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@@ -1,5 +1,5 @@
-import { getAllComponentContexts } from "dataBinding"
-import { capitalise } from "helpers"
+import { getAllComponentContexts } from "@/dataBinding"
+import { capitalise } from "@/helpers"
 
 // Generates bindings for all components that provider "datasource like"
 // contexts. This includes "form" contexts and "schema" contexts. This is used
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 e8da0f74df..8602cbf064 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/builder"
+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 6f3a13a745..6bb9c54e18 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -3,10 +3,10 @@
   import ButtonSetting from "./ButtonSetting.svelte"
   import { createEventDispatcher } from "svelte"
   import { Helpers, Menu, MenuItem, Popover } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
-  import { getEventContextBindings } from "dataBinding"
+  import { componentStore } from "@/stores/builder"
+  import { getEventContextBindings } from "@/dataBinding"
   import { cloneDeep, isEqual } from "lodash/fp"
-  import { getRowActionButtonTemplates } from "templates/rowActions"
+  import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
   export let componentInstance
   export let componentBindings
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
index 2387fda683..726f3cdbea 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
@@ -1,7 +1,7 @@
 <script>
   import EditComponentPopover from "../EditComponentPopover.svelte"
   import { Icon } from "@budibase/bbui"
-  import { runtimeToReadableBinding } from "dataBinding"
+  import { runtimeToReadableBinding } from "@/dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
 
   export let item
diff --git a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
index e4e27a2fe5..7f013e3717 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/builder"
+  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 d2e0ddc1b0..13db369893 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
@@ -7,8 +7,8 @@
     Layout,
     Label,
   } from "@budibase/bbui"
-  import { themeStore, previewStore } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { themeStore, previewStore } 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 4a11211662..5e27b591f8 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -4,8 +4,11 @@
   import { createEventDispatcher } from "svelte"
   import ColumnDrawer from "./ColumnDrawer.svelte"
   import { cloneDeep } from "lodash/fp"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen, tables } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen, tables } from "@/stores/builder"
 
   export let componentInstance
   export let value = []
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index 2e74cac0f4..310a22e73e 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 { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   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 e79ed75d76..e7a30e68dd 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -2,7 +2,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import {
     Button,
     Popover,
@@ -26,15 +26,15 @@
     componentStore,
     datasources,
     integrations,
-  } from "stores/builder"
-  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
-  import IntegrationQueryEditor from "components/integration/index.svelte"
+  } 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"
-  import { findAllComponents } from "helpers/components"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
-  import DataSourceCategory from "components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
-  import { API } from "api"
-  import { datasourceSelect as format } from "helpers/data/format"
+  import { findAllComponents } from "@/helpers/components"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
+  import DataSourceCategory from "@/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
+  import { API } from "@/api"
+  import { datasourceSelect as format } from "@/helpers/data/format"
 
   export let value = {}
   export let otherSources
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index a491561f93..211f73cb3f 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Icon, Popover, Layout } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher, getContext } from "svelte"
-  import ComponentSettingsSection from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import ComponentSettingsSection from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
 
   export let anchor
   export let componentInstance
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte
index 7fbac09827..085ac5702c 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import {
     BindingValue,
     Block,
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte
index 811283ba51..f01b176704 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte
@@ -1,13 +1,13 @@
 <script>
   import { decodeJSBinding } from "@budibase/string-templates"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import { EditorModes } from "components/common/CodeEditor"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import { EditorModes } from "@/components/common/CodeEditor"
   import {
     runtimeToReadableBinding,
     getDatasourceForProvider,
-  } from "dataBinding"
-  import { tables, selectedScreen, selectedComponent } from "stores/builder"
-  import { getBindings } from "components/backend/DataTable/formula"
+  } from "@/dataBinding"
+  import { tables, selectedScreen, selectedComponent } from "@/stores/builder"
+  import { getBindings } from "@/components/backend/DataTable/formula"
 
   export let value
   $: datasource = getDatasourceForProvider($selectedScreen, $selectedComponent)
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte b/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte
index 42ae9ed783..177f2edcd3 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte
@@ -16,7 +16,7 @@
     DateAsNumber,
   } from "./lines"
   import subjects from "./subjects"
-  import { appStore } from "stores/builder"
+  import { appStore } from "@/stores/builder"
 
   export let tableHref = () => {}
   export let schema
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte b/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte
index ef2616f562..b7e0693d76 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Line, InfoWord, DocumentationLink, Text } from "../typography"
   import { FieldType } from "@budibase/types"
-  import { FIELDS } from "constants/backend"
+  import { FIELDS } from "@/constants/backend"
   import subjects from "../subjects"
 
   export let schema
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte b/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte
index ccb33798d7..0541856737 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte
@@ -2,7 +2,7 @@
   import { Line, InfoWord, DocumentationLink, Text } from "../typography"
   import subjects from "../subjects"
   import * as explanation from "../explanation"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
 
   export let setExplanationSubject
   export let support
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 4d1a4a2f69..e1a718c210 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -6,8 +6,8 @@
     getSchemaForDatasource,
     getBindableProperties,
     getComponentBindableProperties,
-  } from "dataBinding"
-  import { selectedScreen, componentStore } from "stores/builder"
+  } from "@/dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
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 27590a9858..d39af94ce1 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
@@ -3,9 +3,9 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { runtimeToReadableBinding } from "dataBinding"
+  import { runtimeToReadableBinding } from "@/dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
-  import { componentStore } from "stores/builder"
+  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 aab7eb60a5..f6d0190562 100644
--- a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
@@ -1,7 +1,10 @@
 <script>
   import { Select, ContextTooltip } from "@budibase/bbui"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
   import { Explanation } from "./Explanation"
   import { debounce } from "lodash"
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte
index 7e3cf5d3ec..010216cb4d 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte
@@ -1,11 +1,11 @@
 <script>
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { CoreFilterBuilder } from "@budibase/frontend-core"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import {
     runtimeToReadableBinding,
     readableToRuntimeBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let schemaFields
   export let filters
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 b8a6b86b4d..2776411050 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -7,9 +7,12 @@
     DrawerContent,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
   import FilterBuilder from "./FilterBuilder.svelte"
-  import { tables, selectedScreen } from "stores/builder"
+  import { tables, selectedScreen } from "@/stores/builder"
   import { search, Utils } from "@budibase/frontend-core"
   import { utils } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index b418cb3111..0ddca2b0e9 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import { selectedScreen } from "stores/builder"
-  import { getComponentFieldOptions } from "helpers/formFields"
+  import { selectedScreen } from "@/stores/builder"
+  import { getComponentFieldOptions } from "@/helpers/formFields"
 
   export let componentInstance
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 6e7297a245..380ff73848 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -1,8 +1,12 @@
 <script>
   import { createEventDispatcher, setContext } from "svelte"
-  import ComponentSettingsSection from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getDatasourceForProvider } from "dataBinding"
-  import { selectedScreen, componentStore, previewStore } from "stores/builder"
+  import ComponentSettingsSection from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import { getDatasourceForProvider } from "@/dataBinding"
+  import {
+    selectedScreen,
+    componentStore,
+    previewStore,
+  } from "@/stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"
   import { Utils } from "@budibase/frontend-core"
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
index 149ec7265a..fef6a99a4d 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
@@ -3,7 +3,7 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { FIELDS } from "constants/backend"
+  import { FIELDS } from "@/constants/backend"
   import { Constants } from "@budibase/frontend-core"
   import { FieldType } from "@budibase/types"
 
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
index 39f9e37658..46aea2a6c4 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
@@ -1,13 +1,16 @@
 <script>
   import { enrichSchemaWithRelColumns } from "@budibase/frontend-core"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen, componentStore } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
   import PrimaryColumnFieldSetting from "./PrimaryColumnFieldSetting.svelte"
   import getColumns from "./getColumns.js"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
 
   export let value
   export let componentInstance
@@ -23,12 +26,14 @@
   const getSchema = (asset, datasource) => {
     const schema = getSchemaForDatasource(asset, datasource).schema
 
-    // Don't show ID and rev in tables
-    if (schema) {
-      delete schema._id
-      delete schema._rev
+    if (!schema) {
+      return
     }
 
+    // Don't show ID and rev in tables
+    delete schema._id
+    delete schema._rev
+
     const result = enrichSchemaWithRelColumns(schema)
     return result
   }
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
index 57423e8667..c4c2b3eafb 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
@@ -4,7 +4,7 @@
   import { setContext } from "svelte"
   import { writable } from "svelte/store"
   import { FieldTypeToComponentMap } from "../FieldConfiguration/utils"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
 
   export let item
   export let anchor
diff --git a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
index a7966eb671..3065a90406 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/builder"
+  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 7fa784ed77..2a936dd3a3 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -1,7 +1,10 @@
 <script>
   import { Multiselect, ContextTooltip } from "@budibase/bbui"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
   import { Explanation } from "./Explanation"
   import { params } from "@roxi/routify"
diff --git a/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte b/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte
index c28bc49e3d..e41c533adc 100644
--- a/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Tag, Tags } from "@budibase/bbui"
-  import { getFormattedPlanName } from "helpers/planTitle"
+  import { getFormattedPlanName } from "@/helpers/planTitle"
 
   export let license
 
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 4db9a03d80..65b3ed9395 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import { builderStore } from "stores/builder"
+  } from "@/dataBinding"
+  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 43f158bef3..da27512942 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -2,9 +2,12 @@
   import {
     findClosestMatchingComponent,
     findComponent,
-  } from "helpers/components"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { tables, selectedScreen, componentStore } from "stores/builder"
+  } from "@/helpers/components"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { tables, selectedScreen, componentStore } 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 b716c04619..ae88b78ec5 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -1,9 +1,9 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { findClosestMatchingComponent } from "helpers/components"
-  import { makeDatasourceFormComponents } from "templates/commonComponents"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { findClosestMatchingComponent } from "@/helpers/components"
+  import { makeDatasourceFormComponents } from "@/templates/commonComponents"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let componentInstance
 
diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
index b99e58f205..b0b968c403 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/builder"
+  import { roles } from "@/stores/builder"
 
   export let value
   export let error
diff --git a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
index c52532508c..0c0045fe74 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/builder"
+  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 064e53cf0d..919d58fb70 100644
--- a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
@@ -1,8 +1,11 @@
 <script>
   import { Multiselect } from "@budibase/bbui"
   import { search } from "@budibase/frontend-core"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen, tables } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen, tables } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index 0f9290ec8d..3d984de0f8 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -1,7 +1,10 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/frontend-core"
 
diff --git a/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte b/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte
index 05770a3c5c..0575ba8dbf 100644
--- a/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte
@@ -14,7 +14,7 @@
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash"
   import ColorPicker from "./ColorPicker.svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { QueryUtils, Constants, FilterUsers } from "@budibase/frontend-core"
   import { generate } from "shortid"
   import { FieldType, FormulaType } from "@budibase/types"
diff --git a/packages/builder/src/components/design/settings/controls/TableSelect.svelte b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
index 545110a8cc..706c4ca74e 100644
--- a/packages/builder/src/components/design/settings/controls/TableSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher, onMount } from "svelte"
-  import { tables as tablesStore, viewsV2 } from "stores/builder"
-  import { tableSelect as format } from "helpers/data/format"
+  import { tables as tablesStore, viewsV2 } from "@/stores/builder"
+  import { tableSelect as format } from "@/helpers/data/format"
 
   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 d087af95b0..3166b17e5a 100644
--- a/packages/builder/src/components/design/settings/controls/URLSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { screenStore } from "stores/builder"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
+  import { screenStore } from "@/stores/builder"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let value
   export let bindings
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 f70c0910e0..c49822504d 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -10,10 +10,13 @@
     Input,
     DatePicker,
   } from "@budibase/bbui"
-  import { selectedScreen, selectedComponent } from "stores/builder"
-  import { findClosestMatchingComponent } from "helpers/components"
-  import { getSchemaForDatasource, getDatasourceForProvider } from "dataBinding"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { selectedScreen, selectedComponent } from "@/stores/builder"
+  import { findClosestMatchingComponent } from "@/helpers/components"
+  import {
+    getSchemaForDatasource,
+    getDatasourceForProvider,
+  } from "@/dataBinding"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
 
   export let fieldName = null
diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index 02ea50e780..fc84369c11 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Label, notifications } from "@budibase/bbui"
-  import { permissions } from "stores/builder"
+  import { permissions } from "@/stores/builder"
   import { Constants } from "@budibase/frontend-core"
-  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
+  import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
 
   export let query
   export let label
diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 6f69e71ccb..e42703f9c6 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -10,8 +10,8 @@
     MenuItem,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { lowercase } from "helpers"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { lowercase } from "@/helpers"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   let dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index 88d46de0a0..f79c967cda 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  } from "@/dataBinding"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { createEventDispatcher } from "svelte"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index 995451b7e3..b518bab2d6 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -2,7 +2,7 @@
   import CodeMirror from "./codemirror"
   import { Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
   import { Theme } from "@budibase/types"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
index 340dc7839c..898a834651 100644
--- a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
@@ -2,7 +2,7 @@
   import { Label, Layout, Input } from "@budibase/bbui"
   import Editor from "./QueryEditor.svelte"
   import KeyValueBuilder from "./KeyValueBuilder.svelte"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   export let fields = {}
   export let schema
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 99635323ca..0f2ed24177 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/builder"
+  import { datasources, integrations, queries } from "@/stores/builder"
   import {
     Icon,
     Select,
@@ -12,13 +12,13 @@
     Divider,
     Button,
   } from "@budibase/bbui"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import AccessLevelSelect from "./AccessLevelSelect.svelte"
-  import IntegrationQueryEditor from "components/integration/index.svelte"
+  import IntegrationQueryEditor from "@/components/integration/index.svelte"
   import QueryViewerSidePanel from "./QueryViewerSidePanel/index.svelte"
   import { cloneDeep } from "lodash/fp"
-  import BindingBuilder from "components/integration/QueryViewerBindingBuilder.svelte"
-  import CodeMirrorEditor from "components/common/CodeMirrorEditor.svelte"
+  import BindingBuilder from "@/components/integration/QueryViewerBindingBuilder.svelte"
+  import CodeMirrorEditor from "@/components/common/CodeMirrorEditor.svelte"
   import { ValidQueryNameRegex } from "@budibase/shared-core"
   import ExtraQueryConfig from "./ExtraQueryConfig.svelte"
   import QueryViewerSavePromptModal from "./QueryViewerSavePromptModal.svelte"
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
index 7e79209d8b..8e8977b2c4 100644
--- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@@ -1,6 +1,6 @@
 <script>
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { getUserBindings } from "dataBinding"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import { getUserBindings } from "@/dataBinding"
 
   export let queryBindings = []
 
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
index 29f15bca40..2009f49f1c 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Table from "components/backend/DataTable/Table.svelte"
+  import Table from "@/components/backend/DataTable/Table.svelte"
   import { cloneDeep } from "lodash/fp"
 
   export let schema = {}
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
index 05579275ef..eea724a3f7 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import KeyValueBuilder from "../KeyValueBuilder.svelte"
-  import { SchemaTypeOptionsExpanded } from "constants/backend"
+  import { SchemaTypeOptionsExpanded } from "@/constants/backend"
 
   export let schema
   export let onSchemaChange = () => {}
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
index c08dc5801c..6191503c31 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import { ActionButton } from "@budibase/bbui"
   import JSONPanel from "./JSONPanel.svelte"
   import SchemaPanel from "./SchemaPanel.svelte"
diff --git a/packages/builder/src/components/integration/RestBodyInput.svelte b/packages/builder/src/components/integration/RestBodyInput.svelte
index 4e3b645373..3bea4ffa0c 100644
--- a/packages/builder/src/components/integration/RestBodyInput.svelte
+++ b/packages/builder/src/components/integration/RestBodyInput.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Body } from "@budibase/bbui"
-  import { RawRestBodyTypes } from "constants/backend"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import { RawRestBodyTypes } from "@/constants/backend"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import CodeMirrorEditor, {
     EditorModes,
-  } from "components/common/CodeMirrorEditor.svelte"
+  } from "@/components/common/CodeMirrorEditor.svelte"
 
   const objectTypes = [RawRestBodyTypes.FORM, RawRestBodyTypes.ENCODED]
   const textTypes = [
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 16d73e8863..8468bf7017 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { datasources, flags, integrations, queries } from "stores/builder"
-  import { environment } from "stores/portal"
+  import { datasources, flags, integrations, queries } from "@/stores/builder"
+  import { environment } from "@/stores/portal"
   import {
     Banner,
     Body,
@@ -19,24 +19,24 @@
     Tabs,
     TextArea,
   } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import EditableLabel from "components/common/inputs/EditableLabel.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import EditableLabel from "@/components/common/inputs/EditableLabel.svelte"
   import CodeMirrorEditor, {
     EditorModes,
-  } from "components/common/CodeMirrorEditor.svelte"
+  } from "@/components/common/CodeMirrorEditor.svelte"
   import RestBodyInput from "./RestBodyInput.svelte"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { onMount } from "svelte"
-  import restUtils from "helpers/data/utils"
+  import restUtils from "@/helpers/data/utils"
   import {
     PaginationLocations,
     PaginationTypes,
     RawRestBodyTypes,
     RestBodyTypes as bodyTypes,
     SchemaTypeOptionsExpanded,
-  } from "constants/backend"
-  import JSONPreview from "components/integration/JSONPreview.svelte"
-  import AccessLevelSelect from "components/integration/AccessLevelSelect.svelte"
+  } from "@/constants/backend"
+  import JSONPreview from "@/components/integration/JSONPreview.svelte"
+  import AccessLevelSelect from "@/components/integration/AccessLevelSelect.svelte"
   import DynamicVariableModal from "./DynamicVariableModal.svelte"
   import Placeholder from "assets/bb-spaceship.svg"
   import { cloneDeep } from "lodash/fp"
@@ -48,7 +48,7 @@
     runtimeToReadableBinding,
     runtimeToReadableMap,
     toBindingsArray,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let queryId
 
diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
index 5c69b151a6..dc5bb6c8f8 100644
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@@ -8,8 +8,8 @@
     notifications,
     Context,
   } from "@budibase/bbui"
-  import { environment } from "stores/portal"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { environment } from "@/stores/portal"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { getContext } from "svelte"
 
   const modalContext = getContext(Context.Modal)
diff --git a/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte b/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte
index 2278b4f6df..51b5c4c427 100644
--- a/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte
+++ b/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Modal, ModalContent, Body } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
 
   export let onDismiss = () => {}
   export let onShow = () => {}
diff --git a/packages/builder/src/components/portal/licensing/AppLimitModal.svelte b/packages/builder/src/components/portal/licensing/AppLimitModal.svelte
index bdecbcab3d..64529f8d69 100644
--- a/packages/builder/src/components/portal/licensing/AppLimitModal.svelte
+++ b/packages/builder/src/components/portal/licensing/AppLimitModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Modal, ModalContent, Body } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
 
   export let onDismiss = () => {}
 
diff --git a/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte b/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte
index 350ebb0f11..ad218b1126 100644
--- a/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte
+++ b/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte
@@ -3,7 +3,7 @@
   import Portal from "svelte-portal"
   import { fly } from "svelte/transition"
   import { Banner, BANNER_TYPES } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   export let show = true
 
diff --git a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
index e2c52e3448..3de2b464e0 100644
--- a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
+++ b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { licensing, auth, temporalStore } from "stores/portal"
+  import { licensing, auth, temporalStore } from "@/stores/portal"
   import { onMount } from "svelte"
   import PaymentFailedModal from "./PaymentFailedModal.svelte"
   import AccountDowngradedModal from "./AccountDowngradedModal.svelte"
diff --git a/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte b/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte
index 502d43d644..239c611ccb 100644
--- a/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte
+++ b/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Modal, ModalContent, Body, TooltipWrapper } from "@budibase/bbui"
-  import { auth, admin, licensing } from "stores/portal"
+  import { auth, admin, licensing } from "@/stores/portal"
   import { onMount } from "svelte"
 
   export let onDismiss = () => {}
diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js
index a9f3d21ffc..230b9fe6f6 100644
--- a/packages/builder/src/components/portal/licensing/licensingBanners.js
+++ b/packages/builder/src/components/portal/licensing/licensingBanners.js
@@ -1,5 +1,5 @@
 import { ExpiringKeys } from "./constants"
-import { admin, auth, licensing, temporalStore } from "stores/portal"
+import { admin, auth, licensing, temporalStore } from "@/stores/portal"
 import { get } from "svelte/store"
 import { BANNER_TYPES } from "@budibase/bbui"
 
diff --git a/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte b/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
index e195b52106..f9dab7c06b 100644
--- a/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
+++ b/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
@@ -2,8 +2,8 @@
   import { Modal, ModalContent } from "@budibase/bbui"
   import FreeTrial from "../../../../assets/FreeTrial.svelte"
   import { get } from "svelte/store"
-  import { auth, licensing, admin } from "stores/portal"
-  import { API } from "api"
+  import { auth, licensing, admin } from "@/stores/portal"
+  import { API } from "@/api"
   import { PlanType } from "@budibase/types"
 
   let freeTrialModal
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index 732ee40e11..dabbde098b 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, getCurrentStepIdx } from "./tours.js"
   import { goto, layout, isActive } from "@roxi/routify"
-  import { builderStore } from "stores/builder"
+  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 05b3935f23..db0841a05b 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 { TOURSBYSTEP, TOURS, getCurrentStepIdx } from "./tours"
   import { onMount, onDestroy } from "svelte"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   export let stepKeys = []
 
diff --git a/packages/builder/src/components/portal/onboarding/tourHandler.js b/packages/builder/src/components/portal/onboarding/tourHandler.js
index 6268e980db..c89475438d 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/builder"
+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 6a3fe1daf0..ad62bdde4d 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
-import { builderStore } from "stores/builder"
-import { auth } from "stores/portal"
-import analytics from "analytics"
+import { builderStore } from "@/stores/builder"
+import { auth } from "@/stores/portal"
+import analytics from "@/analytics"
 import {
   OnboardingData,
   OnboardingDesign,
@@ -9,7 +9,7 @@ import {
   NewViewUpdateFormRowId,
   NewFormSteps,
 } from "./steps"
-import { API } from "api"
+import { API } from "@/api"
 
 const ONBOARDING_EVENT_PREFIX = "onboarding"
 
diff --git a/packages/builder/src/components/settings/APIKeyModal.svelte b/packages/builder/src/components/settings/APIKeyModal.svelte
index 06b1d095fc..f5bff9281d 100644
--- a/packages/builder/src/components/settings/APIKeyModal.svelte
+++ b/packages/builder/src/components/settings/APIKeyModal.svelte
@@ -6,7 +6,7 @@
     notifications,
     CopyInput,
   } from "@budibase/bbui"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   let apiKey = null
diff --git a/packages/builder/src/components/settings/ChangePasswordModal.svelte b/packages/builder/src/components/settings/ChangePasswordModal.svelte
index 32b8b53fa9..353e260d57 100644
--- a/packages/builder/src/components/settings/ChangePasswordModal.svelte
+++ b/packages/builder/src/components/settings/ChangePasswordModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ModalContent, Body, notifications } from "@budibase/bbui"
-  import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
-  import { auth } from "stores/portal"
+  import PasswordRepeatInput from "@/components/common/users/PasswordRepeatInput.svelte"
+  import { auth } from "@/stores/portal"
 
   let password
   let error
diff --git a/packages/builder/src/components/settings/ProfileModal.svelte b/packages/builder/src/components/settings/ProfileModal.svelte
index caaf5154b3..55deb6387a 100644
--- a/packages/builder/src/components/settings/ProfileModal.svelte
+++ b/packages/builder/src/components/settings/ProfileModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
   import { writable } from "svelte/store"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 
   const values = writable({
     firstName: $auth.user.firstName,
diff --git a/packages/builder/src/components/settings/ThemeModal.svelte b/packages/builder/src/components/settings/ThemeModal.svelte
index 7bc3c1efa3..d8f5446e49 100644
--- a/packages/builder/src/components/settings/ThemeModal.svelte
+++ b/packages/builder/src/components/settings/ThemeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Select } from "@budibase/bbui"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
   import { ThemeOptions } from "@budibase/shared-core"
 </script>
 
diff --git a/packages/builder/src/components/start/AppContextMenuModals.svelte b/packages/builder/src/components/start/AppContextMenuModals.svelte
index f4921c4312..186e0d8601 100644
--- a/packages/builder/src/components/start/AppContextMenuModals.svelte
+++ b/packages/builder/src/components/start/AppContextMenuModals.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Modal } from "@budibase/bbui"
-  import DeleteModal from "components/deploy/DeleteModal.svelte"
+  import DeleteModal from "@/components/deploy/DeleteModal.svelte"
   import ExportAppModal from "./ExportAppModal.svelte"
   import DuplicateAppModal from "./DuplicateAppModal.svelte"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   export let app
 
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 2f0b30ded9..bf1e899a84 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Heading, Body, Button, Icon } from "@budibase/bbui"
   import { processStringSync } from "@budibase/string-templates"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { goto } from "@roxi/routify"
   import { UserAvatars } from "@budibase/frontend-core"
   import { sdk } from "@budibase/shared-core"
   import AppContextMenuModals from "./AppContextMenuModals.svelte"
   import getAppContextMenuItems from "./getAppContextMenuItems.js"
-  import FavouriteAppButton from "pages/builder/portal/apps/FavouriteAppButton.svelte"
-  import { contextMenuStore } from "stores/builder"
+  import FavouriteAppButton from "@/pages/builder/portal/apps/FavouriteAppButton.svelte"
+  import { contextMenuStore } from "@/stores/builder"
 
   export let app
   export let lockedAction
diff --git a/packages/builder/src/components/start/ChooseIconModal.svelte b/packages/builder/src/components/start/ChooseIconModal.svelte
index 463567b12a..3128b70807 100644
--- a/packages/builder/src/components/start/ChooseIconModal.svelte
+++ b/packages/builder/src/components/start/ChooseIconModal.svelte
@@ -6,7 +6,7 @@
     Label,
     notifications,
   } from "@budibase/bbui"
-  import { appsStore } from "stores/portal"
+  import { appsStore } from "@/stores/portal"
   import { createEventDispatcher } from "svelte"
 
   export let app
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index a93f31e2e5..af122ee02e 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -7,15 +7,15 @@
     ModalContent,
     Dropzone,
   } from "@budibase/bbui"
-  import { initialise } from "stores/builder"
-  import { API } from "api"
-  import { appsStore, admin, auth } from "stores/portal"
+  import { initialise } from "@/stores/builder"
+  import { API } from "@/api"
+  import { appsStore, admin, auth } from "@/stores/portal"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
-  import { createValidationStore } from "helpers/validation/yup"
-  import * as appValidation from "helpers/validation/yup/app"
-  import TemplateCard from "components/common/TemplateCard.svelte"
-  import { lowercase } from "helpers"
+  import { createValidationStore } from "@/helpers/validation/yup"
+  import * as appValidation from "@/helpers/validation/yup/app"
+  import TemplateCard from "@/components/common/TemplateCard.svelte"
+  import { lowercase } from "@/helpers"
   import { sdk } from "@budibase/shared-core"
 
   export let template
diff --git a/packages/builder/src/components/start/DuplicateAppModal.svelte b/packages/builder/src/components/start/DuplicateAppModal.svelte
index 79d91e35bb..2db6a99762 100644
--- a/packages/builder/src/components/start/DuplicateAppModal.svelte
+++ b/packages/builder/src/components/start/DuplicateAppModal.svelte
@@ -6,12 +6,12 @@
     Layout,
     keepOpen,
   } from "@budibase/bbui"
-  import { createValidationStore } from "helpers/validation/yup"
+  import { createValidationStore } from "@/helpers/validation/yup"
   import { writable, get } from "svelte/store"
-  import * as appValidation from "helpers/validation/yup/app"
-  import { appsStore, auth } from "stores/portal"
+  import * as appValidation from "@/helpers/validation/yup/app"
+  import { appsStore, auth } from "@/stores/portal"
   import { onMount } from "svelte"
-  import { API } from "api"
+  import { API } from "@/api"
   import { sdk } from "@budibase/shared-core"
 
   export let appId
diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte
index 3fba522b09..88615af44d 100644
--- a/packages/builder/src/components/start/ExportAppModal.svelte
+++ b/packages/builder/src/components/start/ExportAppModal.svelte
@@ -9,7 +9,7 @@
     notifications,
   } from "@budibase/bbui"
   import { downloadFile } from "@budibase/frontend-core"
-  import { createValidationStore } from "helpers/validation/yup"
+  import { createValidationStore } from "@/helpers/validation/yup"
 
   export let app
   export let published
diff --git a/packages/builder/src/components/start/ImportAppModal.svelte b/packages/builder/src/components/start/ImportAppModal.svelte
index 4c88593514..209e8bedc7 100644
--- a/packages/builder/src/components/start/ImportAppModal.svelte
+++ b/packages/builder/src/components/start/ImportAppModal.svelte
@@ -8,8 +8,8 @@
     notifications,
     Body,
   } from "@budibase/bbui"
-  import { API } from "api"
-  import { initialise } from "stores/builder"
+  import { API } from "@/api"
+  import { initialise } from "@/stores/builder"
 
   export let app
 
diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte
index da1bb4489a..ee2f5ddb4b 100644
--- a/packages/builder/src/components/usage/Usage.svelte
+++ b/packages/builder/src/components/usage/Usage.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, ProgressBar, Heading, Icon, Link } from "@budibase/bbui"
-  import { admin, auth } from "stores/portal"
+  import { admin, auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   export let usage
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 796a271aff..1272c9eb6d 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -7,7 +7,7 @@ import {
   findComponent,
   findComponentPath,
   getComponentContexts,
-} from "helpers/components"
+} from "@/helpers/components"
 import {
   componentStore,
   screenStore,
@@ -17,7 +17,7 @@ import {
   tables as tablesStore,
   roles as rolesStore,
   selectedScreen,
-} from "stores/builder"
+} from "@/stores/builder"
 import {
   makePropSafe,
   isJSBinding,
@@ -27,10 +27,10 @@ import {
 } from "@budibase/string-templates"
 import { TableNames } from "./constants"
 import { JSONUtils, Constants } from "@budibase/frontend-core"
-import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
-import { environment, licensing } from "stores/portal"
-import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils"
-import { FIELDS, DB_TYPE_INTERNAL } from "constants/backend"
+import ActionDefinitions from "@/components/design/settings/controls/ButtonActionEditor/manifest.json"
+import { environment, licensing } from "@/stores/portal"
+import { convertOldFieldFormat } from "@/components/design/settings/controls/FieldConfiguration/utils"
+import { FIELDS, DB_TYPE_INTERNAL } from "@/constants/backend"
 import { FieldType } from "@budibase/types"
 
 const { ContextScopes } = Constants
diff --git a/packages/builder/src/dataBinding.test.js b/packages/builder/src/dataBinding.test.js
index 6cea9b166b..5e3b484e22 100644
--- a/packages/builder/src/dataBinding.test.js
+++ b/packages/builder/src/dataBinding.test.js
@@ -3,7 +3,7 @@ import {
   runtimeToReadableBinding,
   readableToRuntimeBinding,
   updateReferencesInObject,
-} from "dataBinding"
+} from "@/dataBinding"
 
 describe("Builder dataBinding", () => {
   beforeEach(() => {
diff --git a/packages/builder/src/helpers/components.js b/packages/builder/src/helpers/components.js
index ca1be3c736..b1116d7750 100644
--- a/packages/builder/src/helpers/components.js
+++ b/packages/builder/src/helpers/components.js
@@ -1,4 +1,4 @@
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 import { get } from "svelte/store"
 import { Helpers } from "@budibase/bbui"
 import {
@@ -6,7 +6,7 @@ import {
   encodeJSBinding,
   findHBSBlocks,
 } from "@budibase/string-templates"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { Constants } from "@budibase/frontend-core"
 
 const { ContextScopes } = Constants
diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index a592b57a26..7194dc13ee 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -1,4 +1,4 @@
-import { IntegrationTypes } from "constants/backend"
+import { IntegrationTypes } from "@/constants/backend"
 import { findHBSBlocks } from "@budibase/string-templates"
 
 export function breakQueryString(qs) {
diff --git a/packages/builder/src/helpers/fetchData.js b/packages/builder/src/helpers/fetchData.js
index 9208419c4e..085d0ae5b4 100644
--- a/packages/builder/src/helpers/fetchData.js
+++ b/packages/builder/src/helpers/fetchData.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 export default function (url) {
   const store = writable({ status: "LOADING", data: {}, error: {} })
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
index 693fd35d4d..ec5d625917 100644
--- a/packages/builder/src/helpers/formFields.js
+++ b/packages/builder/src/helpers/formFields.js
@@ -1,5 +1,5 @@
-import { findClosestMatchingComponent } from "helpers/components"
-import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+import { findClosestMatchingComponent } from "@/helpers/components"
+import { getDatasourceForProvider, getSchemaForDatasource } from "@/dataBinding"
 
 export const getComponentFieldOptions = (asset, id, type, loose = true) => {
   const form = findClosestMatchingComponent(
diff --git a/packages/builder/src/helpers/utils.js b/packages/builder/src/helpers/utils.js
index f3d48331e7..27f459d6f2 100644
--- a/packages/builder/src/helpers/utils.js
+++ b/packages/builder/src/helpers/utils.js
@@ -1,13 +1,13 @@
 import { FieldType } from "@budibase/types"
-import { ActionStepID } from "constants/backend/automations"
-import { TableNames } from "constants"
+import { ActionStepID } from "@/constants/backend/automations"
+import { TableNames } from "@/constants"
 import {
   AUTO_COLUMN_DISPLAY_NAMES,
   AUTO_COLUMN_SUB_TYPES,
   FIELDS,
   isAutoColumnUserRelationship,
-} from "constants/backend"
-import { isEnabled } from "helpers/featureFlags"
+} from "@/constants/backend"
+import { isEnabled } from "@/helpers/featureFlags"
 
 export function getAutoColumnInformation(enabled = true) {
   let info = {}
diff --git a/packages/builder/src/helpers/validation/yup/app.js b/packages/builder/src/helpers/validation/yup/app.js
index 3a00b7a49f..ff2be34d09 100644
--- a/packages/builder/src/helpers/validation/yup/app.js
+++ b/packages/builder/src/helpers/validation/yup/app.js
@@ -1,5 +1,5 @@
 import { string, mixed } from "yup"
-import { APP_NAME_REGEX, APP_URL_REGEX } from "constants"
+import { APP_NAME_REGEX, APP_URL_REGEX } from "@/constants"
 
 export const name = (validation, { apps, currentApp } = { apps: [] }) => {
   validation.addValidator(
diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js
index b10ed2369e..7323f5b723 100644
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@@ -1,4 +1,4 @@
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { object, string, number } from "yup"
 import { writable, get } from "svelte/store"
 import { notifications } from "@budibase/bbui"
diff --git a/packages/builder/src/pages/builder/Branding.svelte b/packages/builder/src/pages/builder/Branding.svelte
index e51ca1c70d..8e47879950 100644
--- a/packages/builder/src/pages/builder/Branding.svelte
+++ b/packages/builder/src/pages/builder/Branding.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { organisation, auth } from "stores/portal"
+  import { organisation, auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   let loaded = false
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 13067c5836..209cf2746d 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,11 +1,11 @@
 <script>
   import { isActive, redirect, params } from "@roxi/routify"
-  import { admin, auth, licensing, navigation } from "stores/portal"
+  import { admin, auth, licensing, navigation } from "@/stores/portal"
   import { onMount } from "svelte"
   import { CookieUtils, Constants } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import Branding from "./Branding.svelte"
-  import ContextMenu from "components/ContextMenu.svelte"
+  import ContextMenu from "@/components/ContextMenu.svelte"
 
   let loaded = false
 
diff --git a/packages/builder/src/pages/builder/admin/_layout.svelte b/packages/builder/src/pages/builder/admin/_layout.svelte
index b304d91710..afc065b4bb 100644
--- a/packages/builder/src/pages/builder/admin/_layout.svelte
+++ b/packages/builder/src/pages/builder/admin/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { admin } from "stores/portal"
+  import { admin } from "@/stores/portal"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
 
diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index a84858c8d6..8a9aaf273b 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -9,8 +9,8 @@
     FancyInput,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { API } from "api"
-  import { admin, auth } from "stores/portal"
+  import { API } from "@/api"
+  import { admin, auth } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { passwordsMatch, handleError } from "../auth/_components/utils"
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 b80d3137f0..88e034a96b 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, roles, appPublished } from "stores/builder"
+  import { builderStore, appStore, roles, appPublished } from "@/stores/builder"
   import {
     groups,
     licensing,
@@ -22,7 +22,7 @@
     users,
     auth,
     admin,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import {
     fetchData,
     Constants,
@@ -30,11 +30,11 @@
     RoleUtils,
   } from "@budibase/frontend-core"
   import { sdk } from "@budibase/shared-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import GroupIcon from "../../../portal/users/groups/_components/GroupIcon.svelte"
-  import RoleSelect from "components/common/RoleSelect.svelte"
-  import UpgradeModal from "components/common/users/UpgradeModal.svelte"
-  import { emailValidator } from "helpers/validation"
+  import RoleSelect from "@/components/common/RoleSelect.svelte"
+  import UpgradeModal from "@/components/common/users/UpgradeModal.svelte"
+  import { emailValidator } from "@/helpers/validation"
   import { fly } from "svelte/transition"
   import InfoDisplay from "../design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
 
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 d77744a809..e57ede854b 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/builder"
+  } 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 bad28f89f7..27b27e7685 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -7,8 +7,8 @@
     previewStore,
     userStore,
     deploymentStore,
-  } from "stores/builder"
-  import { auth, appsStore } from "stores/portal"
+  } from "@/stores/builder"
+  import { auth, appsStore } from "@/stores/portal"
   import {
     Icon,
     Tabs,
@@ -18,21 +18,21 @@
     notifications,
     TooltipPosition,
   } from "@budibase/bbui"
-  import AppActions from "components/deploy/AppActions.svelte"
-  import { API } from "api"
+  import AppActions from "@/components/deploy/AppActions.svelte"
+  import { API } from "@/api"
   import { isActive, url, goto, layout, redirect } from "@roxi/routify"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { onMount, onDestroy } from "svelte"
-  import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte"
-  import CommandPalette from "components/commandPalette/CommandPalette.svelte"
-  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
-  import TourPopover from "components/portal/onboarding/TourPopover.svelte"
+  import VerificationPromptBanner from "@/components/common/VerificationPromptBanner.svelte"
+  import CommandPalette from "@/components/commandPalette/CommandPalette.svelte"
+  import TourWrap from "@/components/portal/onboarding/TourWrap.svelte"
+  import TourPopover from "@/components/portal/onboarding/TourPopover.svelte"
   import BuilderSidePanel from "./_components/BuilderSidePanel.svelte"
   import { UserAvatars } from "@budibase/frontend-core"
-  import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
+  import { TOUR_KEYS } from "@/components/portal/onboarding/tours.js"
   import PreviewOverlay from "./_components/PreviewOverlay.svelte"
-  import EnterpriseBasicTrialModal from "components/portal/onboarding/EnterpriseBasicTrialModal.svelte"
-  import UpdateAppTopNav from "components/common/UpdateAppTopNav.svelte"
+  import EnterpriseBasicTrialModal from "@/components/portal/onboarding/EnterpriseBasicTrialModal.svelte"
+  import UpdateAppTopNav from "@/components/common/UpdateAppTopNav.svelte"
 
   export let application
 
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 9d5f716e0e..f6899c0fa4 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/builder"
+  import { automationStore } from "@/stores/builder"
   import { params } from "@roxi/routify"
 
   if ($params.automation) {
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte
index 1a15ed48c6..d2c2cbc94c 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import AutomationBuilder from "components/automation/AutomationBuilder/AutomationBuilder.svelte"
+  import AutomationBuilder from "@/components/automation/AutomationBuilder/AutomationBuilder.svelte"
 </script>
 
 <AutomationBuilder />
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 a3887d951f..f0f7f9be20 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
@@ -1,17 +1,17 @@
 <script>
   import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
-  import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
-  import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
-  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import TestPanel from "components/automation/AutomationBuilder/TestPanel.svelte"
+  import AutomationPanel from "@/components/automation/AutomationPanel/AutomationPanel.svelte"
+  import CreateAutomationModal from "@/components/automation/AutomationPanel/CreateAutomationModal.svelte"
+  import CreateWebhookModal from "@/components/automation/Shared/CreateWebhookModal.svelte"
+  import TestPanel from "@/components/automation/AutomationBuilder/TestPanel.svelte"
   import { onDestroy, onMount } from "svelte"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import {
     builderStore,
     automationStore,
     selectedAutomation,
-  } from "stores/builder"
+  } from "@/stores/builder"
 
   $: automationId = $selectedAutomation?.data?._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 ffd9b5d34c..3899947631 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/builder"
+  import { automationStore } from "@/stores/builder"
 
   $: {
     if ($automationStore.automations?.length) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte
index 3d36b018c7..a5f484caff 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Layout, Link } from "@budibase/bbui"
-  import { organisation } from "stores/portal"
+  import { organisation } from "@/stores/portal"
   import GoogleButton from "./GoogleButton.svelte"
 
   $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured
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 3024fe1395..924d1ee060 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/builder"
+  import { auth } from "@/stores/portal"
+  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 e24b95a0fe..ecefe5356b 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
@@ -1,16 +1,16 @@
 <script>
   import { Modal, keepOpen, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { IntegrationTypes } from "constants/backend"
+  import { IntegrationTypes } from "@/constants/backend"
   import GoogleAuthPrompt from "./GoogleAuthPrompt.svelte"
 
   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/builder"
+  import TableImportSelection from "@/components/backend/Datasources/TableImportSelection/index.svelte"
+  import DatasourceConfigEditor from "@/components/backend/Datasources/ConfigEditor/index.svelte"
+  import { datasources } from "@/stores/builder"
   import { createOnGoogleAuthStore } from "./stores/onGoogleAuth.js"
   import { createDatasourceCreationStore } from "./stores/datasourceCreation.js"
-  import { configFromIntegration } from "stores/selectors"
+  import { configFromIntegration } from "@/stores/selectors"
 
   export let loading = false
   const store = createDatasourceCreationStore()
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js
index 9b39f1f658..01c89cfabb 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js
@@ -1,5 +1,5 @@
 import { get, writable } from "svelte/store"
-import { shouldIntegrationFetchTableNames } from "stores/selectors"
+import { shouldIntegrationFetchTableNames } from "@/stores/selectors"
 
 export const defaultStore = {
   finished: false,
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js
index 1cb3842c89..9552dcbf20 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js
@@ -5,7 +5,7 @@ import {
 } from "./datasourceCreation"
 import { get } from "svelte/store"
 
-vi.mock("stores/selectors", () => ({
+vi.mock("@/stores/selectors", () => ({
   shouldIntegrationFetchTableNames: vi.fn(),
 }))
 
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 57dd5ee419..c93425b987 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,7 +1,7 @@
 import { derived } from "svelte/store"
 import { params } from "@roxi/routify"
-import { integrations } from "stores/builder"
-import { IntegrationTypes } from "constants/backend"
+import { integrations } from "@/stores/builder"
+import { IntegrationTypes } from "@/constants/backend"
 
 export const createOnGoogleAuthStore = () => {
   return derived([params, integrations], ([$params, $integrations]) => {
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 edf133ea0d..3bd0f47bb1 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
 import { params } from "@roxi/routify"
 // eslint-disable-next-line
-import { integrations } from "stores/builder"
-import { IntegrationTypes } from "constants/backend"
+import { integrations } from "@/stores/builder"
+import { IntegrationTypes } from "@/constants/backend"
 
 vi.mock("@roxi/routify", () => ({
   params: vi.fn(),
 }))
 
-vi.mock("stores/builder", () => ({
+vi.mock("@/stores/builder", () => ({
   integrations: vi.fn(),
 }))
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte
index a23b960f21..6fee783363 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Modal, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
+  import CreateTableModal from "@/components/backend/TableNavigator/modals/CreateTableModal.svelte"
 
   let modal
   let promptUpload = false
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 869110c2f4..0dc60505c7 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
-  import Panel from "components/design/Panel.svelte"
+  import DatasourceNavigator from "@/components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import { isActive, redirect, goto, params } from "@roxi/routify"
-  import { datasources } from "stores/builder"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import { datasources } from "@/stores/builder"
+  import NavHeader from "@/components/common/NavHeader.svelte"
 
   let searchValue
 
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 b472a18514..2bc8a1ba18 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,8 +1,8 @@
 <script>
   import { keepOpen, Modal, notifications } from "@budibase/bbui"
-  import { integrationForDatasource } from "stores/selectors"
-  import { datasources, integrations } from "stores/builder"
-  import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
+  import { integrationForDatasource } from "@/stores/selectors"
+  import { datasources, integrations } from "@/stores/builder"
+  import DatasourceConfigEditor from "@/components/backend/Datasources/ConfigEditor/index.svelte"
   import EditDatasourceConfigButton from "./EditDatasourceConfigButton.svelte"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
index 298677ef52..5048cbef6a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body } from "@budibase/bbui"
-  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
-  import { IntegrationTypes } from "constants/backend"
+  import FontAwesomeIcon from "@/components/common/FontAwesomeIcon.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
 
   export let datasource
   const getSubtitle = datasource => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte
index 9e7f04fd78..165f732b55 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto as gotoStore, params as paramsStore } from "@roxi/routify"
   import { Modal, ModalContent, Body, Heading } from "@budibase/bbui"
-  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
+  import FontAwesomeIcon from "@/components/common/FontAwesomeIcon.svelte"
 
   const handleOpen = (modal, params) => {
     if (params["?promptQuery"] && modal?.show) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
index a4ba056cc5..9b562182b7 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
@@ -11,10 +11,10 @@
     notifications,
   } from "@budibase/bbui"
   import { AUTH_TYPE_LABELS, AUTH_TYPES } from "./authTypes"
-  import { BindableCombobox } from "components/common/bindings"
-  import { getAuthBindings, getEnvironmentBindings } from "dataBinding"
-  import { environment, licensing, auth } from "stores/portal"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import { BindableCombobox } from "@/components/common/bindings"
+  import { getAuthBindings, getEnvironmentBindings } from "@/dataBinding"
+  import { environment, licensing, auth } from "@/stores/portal"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
 
   export let configs
   export let currentConfig
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
index 6e7ed89d84..4dd6a90a44 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
@@ -1,11 +1,11 @@
 <script>
   import { ActionButton } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import {
     getRestBindings,
     readableToRuntimeBinding,
     runtimeToReadableMap,
-  } from "dataBinding"
+  } from "@/dataBinding"
   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]/_components/panels/Queries/RestImportQueriesModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
index 87f90551a4..dd90acf367 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/builder"
+  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 93f1e87672..b70b55e8d4 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,8 +1,8 @@
 <script>
   import { goto } from "@roxi/routify"
   import { Button, Table } from "@budibase/bbui"
-  import { queries } from "stores/builder"
-  import CapitaliseRenderer from "components/common/renderers/CapitaliseRenderer.svelte"
+  import { queries } from "@/stores/builder"
+  import CapitaliseRenderer from "@/components/common/renderers/CapitaliseRenderer.svelte"
   import RestImportButton from "./RestImportButton.svelte"
   import Panel from "../Panel.svelte"
   import Tooltip from "../Tooltip.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 dd35abf001..4ccb353847 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
@@ -1,13 +1,13 @@
 <script>
   import { Button, Table, notifications } from "@budibase/bbui"
-  import CreateEditRelationshipModal from "components/backend/Datasources/CreateEditRelationshipModal.svelte"
+  import CreateEditRelationshipModal from "@/components/backend/Datasources/CreateEditRelationshipModal.svelte"
   import {
     tables as tablesStore,
     integrations as integrationsStore,
     datasources as datasourcesStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { DatasourceFeature } from "@budibase/types"
-  import { API } from "api"
+  import { API } from "@/api"
   import Panel from "./Panel.svelte"
   import Tooltip from "./Tooltip.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 b0f8b86a89..4bbeba728a 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
@@ -1,8 +1,8 @@
 <script>
   import { get } from "svelte/store"
   import { isEqual } from "lodash"
-  import { integrationForDatasource } from "stores/selectors"
-  import { integrations, datasources } from "stores/builder"
+  import { integrationForDatasource } from "@/stores/selectors"
+  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/Settings.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
index 894b705a30..1cc25f3799 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body, Button, Layout, notifications } from "@budibase/bbui"
   import Panel from "./Panel.svelte"
-  import { API } from "api"
+  import { API } from "@/api"
   import { downloadText } from "@budibase/frontend-core"
 
   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 612ea5fc35..eaf517a30a 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,9 +1,9 @@
 <script>
   import { Button, Modal } from "@budibase/bbui"
-  import { integrations, tables } from "stores/builder"
+  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"
+  import TableImportSelection from "@/components/backend/Datasources/TableImportSelection/index.svelte"
+  import { integrationForDatasource } from "@/stores/selectors"
 
   export let datasource
 
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 b5a8dfc8ac..74295e1d42 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,8 +1,8 @@
 <script>
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
   import { goto } from "@roxi/routify"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   export let datasource
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte
index 831936fb28..6346c3cba1 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "@roxi/routify"
   import { Table } from "@budibase/bbui"
-  import ArrayRenderer from "components/common/renderers/ArrayRenderer.svelte"
+  import ArrayRenderer from "@/components/common/renderers/ArrayRenderer.svelte"
   import Controls from "./Controls.svelte"
   import Panel from "../Panel.svelte"
   import Tooltip from "../Tooltip.svelte"
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 2d37c71999..a19beb9083 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/builder"
+  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 b50d5e7611..0e0dba066a 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
@@ -1,10 +1,10 @@
 <script>
   import { Heading, Layout } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import ViewDynamicVariables from "./ViewDynamicVariables.svelte"
-  import { getEnvironmentBindings } from "dataBinding"
-  import { licensing } from "stores/portal"
-  import { queries } from "stores/builder"
+  import { getEnvironmentBindings } from "@/dataBinding"
+  import { licensing } from "@/stores/portal"
+  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 417f750ab5..7f66c7ce53 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,7 +1,7 @@
 <script>
   import { params } from "@roxi/routify"
-  import { datasources, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { datasources, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
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 3757ed7dee..9aa0c5b7e8 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,7 +1,7 @@
 <script>
   import { Tabs, Tab, Heading, Body, Layout } from "@budibase/bbui"
-  import { datasources, integrations } from "stores/builder"
-  import ICONS from "components/backend/DatasourceNavigator/icons"
+  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"
   import RelationshipsPanel from "./_components/panels/Relationships.svelte"
@@ -12,8 +12,8 @@
   import PromptQueryModal from "./_components/PromptQueryModal.svelte"
   import SettingsPanel from "./_components/panels/Settings.svelte"
   import { helpers } from "@budibase/shared-core"
-  import { admin } from "stores/portal"
-  import { IntegrationTypes } from "constants/backend"
+  import { admin } from "@/stores/portal"
+  import { IntegrationTypes } from "@/constants/backend"
 
   let selectedPanel = null
   let panelOptions = []
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 57b851bb25..c37ca6d606 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
@@ -1,12 +1,15 @@
 <script>
   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, builderStore } from "stores/builder"
+  import CreateTableModal from "@/components/backend/TableNavigator/modals/CreateTableModal.svelte"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
+  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 {
+    BUDIBASE_INTERNAL_DB_ID,
+    DB_TYPE_EXTERNAL,
+  } from "@/constants/backend"
+  import { TableNames } from "@/constants"
 
   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 789d6c5443..96a0201238 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
@@ -1,10 +1,13 @@
 <script>
   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, builderStore } from "stores/builder"
+  import CreateTableModal from "@/components/backend/TableNavigator/modals/CreateTableModal.svelte"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
+  import { tables, datasources, builderStore } from "@/stores/builder"
   import { goto } from "@roxi/routify"
-  import { DEFAULT_BB_DATASOURCE_ID, DB_TYPE_EXTERNAL } from "constants/backend"
+  import {
+    DEFAULT_BB_DATASOURCE_ID,
+    DB_TYPE_EXTERNAL,
+  } from "@/constants/backend"
   import { onMount } from "svelte"
 
   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 c77ff0dce9..5daf3c3e6e 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/builder"
+  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 ff9a27a14b..2f40adc162 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/builder"
+  import { TableNames } from "@/constants"
+  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 20efd3667b..2ba23686ab 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
@@ -1,20 +1,20 @@
 <script>
-  import { API } from "api"
+  import { API } from "@/api"
   import {
     tables,
     datasources,
     sortedIntegrations as integrations,
-  } from "stores/builder"
+  } from "@/stores/builder"
 
-  import { hasData } from "stores/selectors"
+  import { hasData } from "@/stores/selectors"
   import { notifications, Body, Icon, AbsTooltip } from "@budibase/bbui"
   import { params, goto } from "@roxi/routify"
   import CreateExternalDatasourceModal from "./_components/CreateExternalDatasourceModal/index.svelte"
   import CreateInternalTableModal from "./_components/CreateInternalTableModal.svelte"
   import DatasourceOption from "./_components/DatasourceOption.svelte"
-  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
-  import CreationPage from "components/common/CreationPage.svelte"
-  import ICONS from "components/backend/DatasourceNavigator/icons/index.js"
+  import IntegrationIcon from "@/components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+  import CreationPage from "@/components/common/CreationPage.svelte"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons/index.js"
 
   let internalTableModal
   let externalDatasourceModal
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 580c0d557a..8f7218dfe9 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,6 +1,6 @@
 <script>
-  import { queries, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { queries, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
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 754bf9c83d..7d67c8cb73 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,8 +1,8 @@
 <script>
-  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 { 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"
 
   $: query = $queries.selected
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 277970defa..cd961e15e5 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/builder"
+  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 7d27b05d67..e3690f21ae 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,9 +1,9 @@
 <script>
   import { params, redirect } from "@roxi/routify"
-  import QueryViewer from "components/integration/QueryViewer.svelte"
-  import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
-  import { IntegrationTypes } from "constants/backend"
-  import { datasources } from "stores/builder"
+  import QueryViewer from "@/components/integration/QueryViewer.svelte"
+  import RestQueryViewer from "@/components/integration/RestQueryViewer.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
+  import { datasources } from "@/stores/builder"
 
   $: datasource = $datasources.list.find(ds => ds._id === $params.datasourceId)
   $: {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/roles.svelte b/packages/builder/src/pages/builder/app/[application]/data/roles.svelte
index 0177577730..1edbdfb75c 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/roles.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/roles.svelte
@@ -1,6 +1,6 @@
 <script>
-  import RoleEditor from "components/backend/RoleEditor/RoleEditor.svelte"
-  import { builderStore } from "stores/builder"
+  import RoleEditor from "@/components/backend/RoleEditor/RoleEditor.svelte"
+  import { builderStore } from "@/stores/builder"
 
   builderStore.selectResource("roles")
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte
index 9c1baa723e..4a12047c37 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { viewsV2, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { viewsV2, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
index 39b1dc4768..9ac7ccd715 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
@@ -1,19 +1,19 @@
 <script>
-  import { viewsV2, rowActions } from "stores/builder"
-  import { admin, themeStore, featureFlags } from "stores/portal"
+  import { viewsV2, rowActions } from "@/stores/builder"
+  import { admin, themeStore, featureFlags } from "@/stores/portal"
   import { Grid } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import { notifications } from "@budibase/bbui"
-  import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
-  import GridFilterButton from "components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
-  import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
-  import GridSortButton from "components/backend/DataTable/buttons/grid/GridSortButton.svelte"
-  import GridColumnsSettingButton from "components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte"
-  import GridSizeButton from "components/backend/DataTable/buttons/grid/GridSizeButton.svelte"
-  import GridGenerateButton from "components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
-  import GridScreensButton from "components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
-  import GridRowActionsButton from "components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
-  import GridViewCalculationButton from "components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte"
+  import GridCreateEditRowModal from "@/components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
+  import GridFilterButton from "@/components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
+  import GridManageAccessButton from "@/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
+  import GridSortButton from "@/components/backend/DataTable/buttons/grid/GridSortButton.svelte"
+  import GridColumnsSettingButton from "@/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte"
+  import GridSizeButton from "@/components/backend/DataTable/buttons/grid/GridSizeButton.svelte"
+  import GridGenerateButton from "@/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
+  import GridScreensButton from "@/components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
+  import GridRowActionsButton from "@/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
+  import GridViewCalculationButton from "@/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte"
   import { ViewV2Type } from "@budibase/types"
 
   let generateButton
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte
index ecc85e7622..06d6359f11 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte
@@ -1,8 +1,8 @@
 <script>
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import { Input, notifications, Button, Icon, ListItem } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { viewsV2 } from "stores/builder"
+  import { viewsV2 } from "@/stores/builder"
   import { ViewV2Type } from "@budibase/types"
 
   export let table
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte
index 0b5f18b70b..5a23c976f8 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { views, viewsV2 } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { views, viewsV2 } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { notifications } from "@budibase/bbui"
 
   export let view
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte
index 0f39fa063d..165dd2fdca 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { views, viewsV2 } from "stores/builder"
+  import { views, viewsV2 } from "@/stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { notifications, Input, Modal, ModalContent } from "@budibase/bbui"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
index bf3d073f60..e9c5745cc6 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
@@ -5,18 +5,18 @@
     userSelectedResourceMap,
     contextMenuStore,
     appStore,
-  } from "stores/builder"
-  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+  } from "@/stores/builder"
+  import IntegrationIcon from "@/components/backend/DatasourceNavigator/IntegrationIcon.svelte"
   import { Icon, ActionButton, ActionMenu, MenuItem } from "@budibase/bbui"
   import { params, url } from "@roxi/routify"
   import EditViewModal from "./EditViewModal.svelte"
   import DeleteViewModal from "./DeleteViewModal.svelte"
-  import EditTableModal from "components/backend/TableNavigator/TableNavItem/EditModal.svelte"
-  import DeleteTableModal from "components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte"
+  import EditTableModal from "@/components/backend/TableNavigator/TableNavItem/EditModal.svelte"
+  import DeleteTableModal from "@/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte"
   import { UserAvatars } from "@budibase/frontend-core"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
-  import { TableNames } from "constants"
-  import { alphabetical } from "components/backend/TableNavigator/utils"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
+  import { TableNames } from "@/constants"
+  import { alphabetical } from "@/components/backend/TableNavigator/utils"
   import { tick, onDestroy } from "svelte"
   import { derived } from "svelte/store"
   import CreateViewButton from "./CreateViewButton.svelte"
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 da05196c04..58fcf7c9c3 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,6 +1,6 @@
 <script>
-  import { syncURLToState } from "helpers/urlStateSync"
-  import { tables, builderStore } from "stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
+  import { tables, builderStore } from "@/stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
   import ViewNavBar from "./_components/ViewNavBar.svelte"
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 5684e77e31..1100b7cf1e 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
@@ -7,25 +7,25 @@
     appStore,
     rowActions,
     roles,
-  } from "stores/builder"
-  import { themeStore, admin, featureFlags } from "stores/portal"
-  import { TableNames } from "constants"
+  } from "@/stores/builder"
+  import { themeStore, admin, featureFlags } from "@/stores/portal"
+  import { TableNames } from "@/constants"
   import { Grid } from "@budibase/frontend-core"
-  import { API } from "api"
-  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"
-  import GridImportButton from "components/backend/DataTable/buttons/grid/GridImportButton.svelte"
-  import GridExportButton from "components/backend/DataTable/buttons/grid/GridExportButton.svelte"
-  import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
-  import GridRelationshipButton from "components/backend/DataTable/buttons/grid/GridRelationshipButton.svelte"
-  import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte"
-  import GridUsersTableButton from "components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte"
-  import GridGenerateButton from "components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
-  import GridScreensButton from "components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
-  import GridAutomationsButton from "components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte"
-  import GridRowActionsButton from "components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { API } from "@/api"
+  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"
+  import GridImportButton from "@/components/backend/DataTable/buttons/grid/GridImportButton.svelte"
+  import GridExportButton from "@/components/backend/DataTable/buttons/grid/GridExportButton.svelte"
+  import GridManageAccessButton from "@/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
+  import GridRelationshipButton from "@/components/backend/DataTable/buttons/grid/GridRelationshipButton.svelte"
+  import GridEditColumnModal from "@/components/backend/DataTable/modals/grid/GridEditColumnModal.svelte"
+  import GridUsersTableButton from "@/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte"
+  import GridGenerateButton from "@/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
+  import GridScreensButton from "@/components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
+  import GridAutomationsButton from "@/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte"
+  import GridRowActionsButton from "@/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   let generateButton
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
index df3a18c2bb..001b2b1736 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { views, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { views, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
index 093999559b..f56b48af17 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
@@ -1,15 +1,15 @@
 <script>
-  import { views, tables } from "stores/builder"
-  import { API } from "api"
-  import Table from "components/backend/DataTable/Table.svelte"
-  import CalculateButton from "components/backend/DataTable/buttons/CalculateButton.svelte"
-  import GroupByButton from "components/backend/DataTable/buttons/GroupByButton.svelte"
-  import ViewFilterButton from "components/backend/DataTable/buttons/ViewFilterButton.svelte"
-  import ExportButton from "components/backend/DataTable/buttons/ExportButton.svelte"
-  import ManageAccessButton from "components/backend/DataTable/buttons/ManageAccessButton.svelte"
-  import HideAutocolumnButton from "components/backend/DataTable/buttons/HideAutocolumnButton.svelte"
+  import { views, tables } from "@/stores/builder"
+  import { API } from "@/api"
+  import Table from "@/components/backend/DataTable/Table.svelte"
+  import CalculateButton from "@/components/backend/DataTable/buttons/CalculateButton.svelte"
+  import GroupByButton from "@/components/backend/DataTable/buttons/GroupByButton.svelte"
+  import ViewFilterButton from "@/components/backend/DataTable/buttons/ViewFilterButton.svelte"
+  import ExportButton from "@/components/backend/DataTable/buttons/ExportButton.svelte"
+  import ManageAccessButton from "@/components/backend/DataTable/buttons/ManageAccessButton.svelte"
+  import HideAutocolumnButton from "@/components/backend/DataTable/buttons/HideAutocolumnButton.svelte"
   import { notifications } from "@budibase/bbui"
-  import { ROW_EXPORT_FORMATS } from "constants/backend"
+  import { ROW_EXPORT_FORMATS } from "@/constants/backend"
 
   let hideAutocolumns = true
   let data = []
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 3f21e48672..22b786bd00 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,8 +1,8 @@
 <script>
   import { onMount } from "svelte"
-  import { datasources, tables } from "stores/builder"
+  import { datasources, tables } from "@/stores/builder"
   import { redirect } from "@roxi/routify"
-  import { TableNames } from "constants"
+  import { TableNames } from "@/constants"
 
   onMount(() => {
     if ($tables.selected) {
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 ee72c0fbf5..30f11e6cab 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
@@ -1,23 +1,23 @@
 <script>
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import {
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
   import ConditionalUISection from "./ConditionalUISection.svelte"
-  import { getComponentName } from "helpers/components"
+  import { getComponentName } from "@/helpers/components"
   import {
     getBindableProperties,
     getComponentBindableProperties,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { capitalise } from "helpers"
-  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
-  import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
+  import { capitalise } from "@/helpers"
+  import TourWrap from "@/components/portal/onboarding/TourWrap.svelte"
+  import { TOUR_STEP_KEYS } from "@/components/portal/onboarding/tours.js"
 
   const {
     BUILDER_FORM_CREATE_STEPS,
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 d40f28e65a..0b147e867c 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,12 +1,12 @@
 <script>
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { componentStore, builderStore } 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"
-  import { getComponentForSetting } from "components/design/settings/componentSettings"
+  import { componentStore, builderStore } 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"
+  import { getComponentForSetting } from "@/components/design/settings/componentSettings"
   import InfoDisplay from "./InfoDisplay.svelte"
-  import analytics, { Events } from "analytics"
+  import analytics, { Events } from "@/analytics"
   import { shouldDisplaySetting } from "@budibase/frontend-core"
   import { getContext, setContext } from "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 c7139a81e2..2309737cb8 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
@@ -11,11 +11,11 @@
   import { flip } from "svelte/animate"
   import { dndzone } from "svelte-dnd-action"
   import { generate } from "shortid"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { QueryUtils, Constants } from "@budibase/frontend-core"
-  import { selectedComponent, componentStore } from "stores/builder"
-  import { getComponentForSetting } from "components/design/settings/componentSettings"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import { selectedComponent, componentStore } from "@/stores/builder"
+  import { getComponentForSetting } from "@/components/design/settings/componentSettings"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
 
   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 fc862a19c8..b40a6af3c6 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/builder"
+  import { componentStore } from "@/stores/builder"
   import ConditionalUIDrawer from "./ConditionalUIDrawer.svelte"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
 
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 fea5da244f..30e448774b 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
@@ -9,13 +9,13 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import {
     getBindableProperties,
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let componentInstance
   export let componentDefinition
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 a0a0686412..54940ce29c 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 PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
+  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/Component/componentStyles.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js
index 7c65b6e6ec..7f0d4caaa9 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js
@@ -1,5 +1,5 @@
 import { Input, Select } from "@budibase/bbui"
-import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
+import ColorPicker from "@/components/design/settings/controls/ColorPicker.svelte"
 
 export const margin = {
   label: "Margin",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte
index 1355561076..2437645c40 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte
@@ -1,12 +1,12 @@
 <script>
   import { Icon, Popover, RadioGroup } from "@budibase/bbui"
   import { createEventDispatcher, getContext } from "svelte"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
-  import RoleSelect from "components/common/RoleSelect.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
+  import RoleSelect from "@/components/common/RoleSelect.svelte"
   import SubLinksDrawer from "./SubLinksDrawer.svelte"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   export let anchor
   export let navItem
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte
index 3cea3f7367..e14b1e7d12 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { runtimeToReadableBinding } from "dataBinding"
+  import { runtimeToReadableBinding } from "@/dataBinding"
   import EditNavItemPopover from "./EditNavItemPopover.svelte"
   import { Icon } from "@budibase/bbui"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte
index db55f501f0..95881b1bed 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { navigationStore } from "stores/builder"
-  import DraggableList from "components/design/settings/controls/DraggableList/DraggableList.svelte"
+  import { navigationStore } from "@/stores/builder"
+  import DraggableList from "@/components/design/settings/controls/DraggableList/DraggableList.svelte"
   import NavItem from "./NavItem.svelte"
   import { generate } from "shortid"
-  import { getSequentialName } from "helpers/duplicate"
+  import { getSequentialName } from "@/helpers/duplicate"
   import { Constants } from "@budibase/frontend-core"
 
   export let bindings
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte
index b1958e4d3d..56bbbd1dab 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte
@@ -11,8 +11,8 @@
   import { flip } from "svelte/animate"
   import { dndzone } from "svelte-dnd-action"
   import { generate } from "shortid"
-  import { screenStore } from "stores/builder"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
+  import { screenStore } from "@/stores/builder"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let value = []
   export let onChange
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 7c8b03caca..cdc0c4056d 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
@@ -1,7 +1,7 @@
 <script>
   import NavItemConfiguration from "./NavItemConfiguration.svelte"
   import { get } from "svelte/store"
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import {
     Toggle,
     DetailSummary,
@@ -15,14 +15,14 @@
     screenStore,
     componentStore,
     navigationStore as nav,
-  } from "stores/builder"
-  import { DefaultAppTheme } from "constants"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import BarButtonList from "components/design/settings/controls/BarButtonList.svelte"
-  import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
-  import { getBindableProperties } from "dataBinding"
+  } from "@/stores/builder"
+  import { DefaultAppTheme } from "@/constants"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import BarButtonList from "@/components/design/settings/controls/BarButtonList.svelte"
+  import ColorPicker from "@/components/design/settings/controls/ColorPicker.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
+  import { getBindableProperties } from "@/dataBinding"
 
   const positionOptions = [
     { value: "Top", barIcon: "PaddingTop" },
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 eb7a839b22..3bd683bec4 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/builder"
+  import { themeStore, appStore } from "@/stores/builder"
   import { ThemeOptions, getThemeClassNames } from "@budibase/shared-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 62fe593602..3a6e7a702c 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
@@ -8,13 +8,13 @@
     Select,
     notifications,
   } 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/builder"
-  import sanitizeUrl from "helpers/sanitizeUrl"
-  import ButtonActionEditor from "components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
-  import { getBindableProperties } from "dataBinding"
-  import BarButtonList from "components/design/settings/controls/BarButtonList.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
+  import { selectedScreen, screenStore } from "@/stores/builder"
+  import sanitizeUrl from "@/helpers/sanitizeUrl"
+  import ButtonActionEditor from "@/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
+  import { getBindableProperties } from "@/dataBinding"
+  import BarButtonList from "@/components/design/settings/controls/BarButtonList.svelte"
 
   $: bindings = getBindableProperties($selectedScreen, null)
   $: screenSettings = getScreenSettings($selectedScreen)
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 8b3128f852..af693a872f 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,11 +7,11 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { themeStore, appStore } from "stores/builder"
-  import { DefaultAppTheme } from "constants"
+  import { themeStore, appStore } from "@/stores/builder"
+  import { DefaultAppTheme } from "@/constants"
   import AppThemeSelect from "./AppThemeSelect.svelte"
   import ButtonRoundnessSelect from "./ButtonRoundnessSelect.svelte"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
 
   $: customTheme = $themeStore.customTheme || {}
 
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 405b8b0c21..d2fed41655 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,9 +1,9 @@
 <script>
   import GeneralPanel from "./GeneralPanel.svelte"
   import ThemePanel from "./ThemePanel.svelte"
-  import { selectedScreen } from "stores/builder"
-  import Panel from "components/design/Panel.svelte"
-  import { capitalise } from "helpers"
+  import { selectedScreen } from "@/stores/builder"
+  import Panel from "@/components/design/Panel.svelte"
+  import { capitalise } from "@/helpers"
   import { ActionButton, Layout } from "@budibase/bbui"
 
   let activeTab = "general"
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 15a9c773ef..16fe7d9c2f 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,14 +1,14 @@
 <script>
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import {
     builderStore,
     screenStore,
     selectedScreen,
     componentStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { findComponent } from "helpers/components"
+  import { findComponent } from "@/helpers/components"
   import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
   import NavigationPanel from "./_components/Navigation/index.svelte"
   import ScreenSettingsPanel from "./_components/Screen/index.svelte"
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 361e07a026..aa0b26f6b7 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
@@ -1,5 +1,5 @@
 <script>
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import { goto } from "@roxi/routify"
   import { Layout, Search, Icon, Body, notifications } from "@budibase/bbui"
   import structure from "./componentStructure.json"
@@ -8,10 +8,10 @@
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
-  import { findComponentPath } from "helpers/components"
+  import { findComponentPath } from "@/helpers/components"
 
   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 4617814485..29e2ce03ff 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,8 +1,8 @@
 <script>
   import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
   import AppPreview from "./AppPreview.svelte"
-  import { screenStore, appStore } from "stores/builder"
-  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
+  import { screenStore, appStore } from "@/stores/builder"
+  import UndoRedoControl from "@/components/common/UndoRedoControl.svelte"
 </script>
 
 <div class="app-panel">
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 1e8868f03c..55a4dc4de4 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
@@ -12,11 +12,11 @@
     hoverStore,
     componentTreeNodesStore,
     snippets,
-  } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { Layout, Heading, Body, Icon, notifications } from "@budibase/bbui"
   import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw"
-  import { findComponent, findComponentPath } from "helpers/components"
+  import { findComponent, findComponentPath } from "@/helpers/components"
   import { isActive, goto } from "@roxi/routify"
   import { ClientAppSkeleton } from "@budibase/frontend-core"
   import { getThemeClassNames, ThemeClassPrefix } from "@budibase/shared-core"
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 6b27d79c15..ca8a08368a 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
@@ -5,11 +5,11 @@
     componentStore,
     selectedComponent,
     componentTreeNodesStore,
-  } from "stores/builder"
-  import { findComponent, getChildIdsForComponent } from "helpers/components"
+  } from "@/stores/builder"
+  import { findComponent, getChildIdsForComponent } from "@/helpers/components"
   import { goto, isActive } from "@roxi/routify"
   import { notifications } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   let confirmDeleteDialog
   let confirmEjectDialog
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 997fac6f10..a6f404d61b 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
@@ -1,5 +1,5 @@
 <script>
-  import NavItem from "components/common/NavItem.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
   import { Icon, notifications } from "@budibase/bbui"
   import {
     selectedScreen,
@@ -9,12 +9,12 @@
     hoverStore,
     componentTreeNodesStore,
     contextMenuStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import {
     findComponentPath,
     getComponentText,
     getComponentName,
-  } from "helpers/components"
+  } from "@/helpers/components"
   import { get } from "svelte/store"
   import { dndStore } from "./dndStore"
   import getComponentContextMenuItems from "./getComponentContextMenuItems"
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 0ab78b387f..2361abce89 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
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
-import { findComponentParent, findComponentPath } from "helpers/components"
-import { selectedScreen, componentStore } from "stores/builder"
+import { findComponentParent, findComponentPath } from "@/helpers/components"
+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/getComponentContextMenuItems.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js
index f2dfb73a68..76f42b518e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 
 const getContextMenuItems = (component, componentCollapsed) => {
   const definition = componentStore.getDefinition(component?._component)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js
index 25f2e908e6..3a514db260 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 import { notifications } from "@budibase/bbui"
 
 const getContextMenuItems = (component, showCopy) => {
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 fce8c12800..eb5a57ec9c 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
@@ -8,8 +8,8 @@
     userSelectedResourceMap,
     hoverStore,
     contextMenuStore,
-  } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
+  } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
   import ComponentTree from "./ComponentTree.svelte"
   import { dndStore, DropPosition } from "./dndStore.js"
   import DNDPositionIndicator from "./DNDPositionIndicator.svelte"
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 9c0df03f12..436571dd2e 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/builder"
+  import { previewStore } from "@/stores/builder"
 </script>
 
 <ActionGroup compact quiet>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte
index ab078a3a5b..fa3ad5f6be 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import ScreenList from "./ScreenList/index.svelte"
   import ComponentList from "./ComponentList/index.svelte"
-  import { getHorizontalResizeActions } from "components/common/resizable"
+  import { getHorizontalResizeActions } from "@/components/common/resizable"
 
   const [resizable, resizableHandle] = getHorizontalResizeActions()
 </script>
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 09e29d806a..807c0208a2 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 { Tooltip, StatusLight } from "@budibase/bbui"
-  import { roles } from "stores/builder"
-  import { Roles } from "constants/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/ScreenNavItem.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
index e533145fa1..6377e1ca33 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
@@ -6,14 +6,14 @@
     userSelectedResourceMap,
     contextMenuStore,
     componentStore,
-  } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
+  } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
   import RoleIndicator from "./RoleIndicator.svelte"
-  import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
-  import sanitizeUrl from "helpers/sanitizeUrl"
-  import { makeComponentUnique } from "helpers/components"
-  import { capitalise } from "helpers"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ScreenDetailsModal from "@/components/design/ScreenDetailsModal.svelte"
+  import sanitizeUrl from "@/helpers/sanitizeUrl"
+  import { makeComponentUnique } from "@/helpers/components"
+  import { capitalise } from "@/helpers"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let screen
 
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 5c9da100e4..a5f00f2c7a 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
@@ -1,10 +1,10 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import { sortedScreens } from "stores/builder"
+  import { sortedScreens } from "@/stores/builder"
   import ScreenNavItem from "./ScreenNavItem.svelte"
   import { goto } from "@roxi/routify"
-  import { getVerticalResizeActions } from "components/common/resizable"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import { getVerticalResizeActions } from "@/components/common/resizable"
+  import NavHeader from "@/components/common/NavHeader.svelte"
 
   const [resizable, resizableHandle] = getVerticalResizeActions()
 
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 ac87b53db2..c990971c3d 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
@@ -1,8 +1,8 @@
 <script>
   import AppPanel from "./_components/AppPanel.svelte"
   import * as routify from "@roxi/routify"
-  import { syncURLToState } from "helpers/urlStateSync"
-  import { screenStore, selectedScreen } from "stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
+  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 e71dba1280..ed553bd452 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/builder"
+  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 47d7c765d6..edc502bbb4 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
@@ -1,5 +1,5 @@
 <script>
-  import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
+  import ScreenDetailsModal from "@/components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
   import TypeModal from "./TypeModal.svelte"
   import tableTypes from "./tableTypes"
@@ -12,13 +12,13 @@
     builderStore,
     datasources,
     appStore,
-  } from "stores/builder"
-  import { auth } from "stores/portal"
+  } from "@/stores/builder"
+  import { auth } from "@/stores/portal"
   import { goto } from "@roxi/routify"
-  import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
-  import * as screenTemplating from "templates/screenTemplating"
-  import { Roles } from "constants/backend"
-  import { AutoScreenTypes } from "constants"
+  import { TOUR_KEYS } from "@/components/portal/onboarding/tours.js"
+  import * as screenTemplating from "@/templates/screenTemplating"
+  import { Roles } from "@/constants/backend"
+  import { AutoScreenTypes } from "@/constants"
   import { makeTableOption, makeViewOption } from "./utils"
 
   let mode
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 d32e8e3fc7..4c37d626bd 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,8 +1,8 @@
 <script>
   import { Body, ModalContent, Layout } from "@budibase/bbui"
-  import { datasources as datasourcesStore } from "stores/builder"
-  import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { IntegrationNames } from "constants"
+  import { datasources as datasourcesStore } from "@/stores/builder"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
+  import { IntegrationNames } from "@/constants"
   import { createEventDispatcher } from "svelte"
   import TableOrViewOption from "./TableOrViewOption.svelte"
   import { makeTableOption, makeViewOption } from "./utils"
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 3101ce41ea..bbd6fda256 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
@@ -1,11 +1,11 @@
 <script>
   import { Body } from "@budibase/bbui"
-  import CreationPage from "components/common/CreationPage.svelte"
+  import CreationPage from "@/components/common/CreationPage.svelte"
   import blank from "./images/blank.svg"
   import table from "./images/tableInline.svg"
   import form from "./images/formUpdate.svg"
   import CreateScreenModal from "./CreateScreenModal.svelte"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   export let onClose = null
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js
index 1f2461d2cb..212a475462 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js
@@ -1,4 +1,4 @@
-import * as format from "helpers/data/format"
+import * as format from "@/helpers/data/format"
 
 export const makeViewOption = view => ({
   icon: "Remove",
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 b9fca41695..93761fe596 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/builder"
+  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 a9af09a3a1..5b1772c5bf 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/builder"
+  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 67befddcb9..5691c2556b 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
   import { Page, Layout, AbsTooltip, TooltipPosition } from "@budibase/bbui"
   import { url, isActive } from "@roxi/routify"
-  import DeleteModal from "components/deploy/DeleteModal.svelte"
-  import { isOnlyUser, appStore } from "stores/builder"
+  import DeleteModal from "@/components/deploy/DeleteModal.svelte"
+  import { isOnlyUser, appStore } from "@/stores/builder"
 
   let deleteModal
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
index 6dc95b0a13..cfe912699f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
@@ -8,10 +8,10 @@
     Icon,
   } from "@budibase/bbui"
   import StatusRenderer from "./StatusRenderer.svelte"
-  import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
-  import TestDisplay from "components/automation/AutomationBuilder/TestDisplay.svelte"
+  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/builder"
+  import { automationStore } from "@/stores/builder"
 
   export let history
   export let appId
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index dd332c92a9..71faa5762f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -11,14 +11,14 @@
     Toggle,
     notifications,
   } from "@budibase/bbui"
-  import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
+  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/builder"
-  import { createPaginationStore } from "helpers/pagination"
+  import { automationStore, appStore } from "@/stores/builder"
+  import { createPaginationStore } from "@/helpers/pagination"
   import { getContext, onDestroy, onMount } from "svelte"
   import dayjs from "dayjs"
-  import { auth, licensing, admin, appsStore } from "stores/portal"
+  import { auth, licensing, admin, appsStore } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
   import Portal from "svelte-portal"
 
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 3e88fb5541..93d6f0ae81 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
@@ -9,11 +9,11 @@
     AbsTooltip,
     TooltipPosition,
   } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import CreateRestoreModal from "./CreateRestoreModal.svelte"
   import { createEventDispatcher } from "svelte"
-  import { isOnlyUser } from "stores/builder"
-  import { BackupType } from "constants/backend/backups"
+  import { isOnlyUser } from "@/stores/builder"
+  import { BackupType } from "@/constants/backend/backups"
 
   export let row
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte
index 62ef3e239d..09528be113 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Input, Body } from "@budibase/bbui"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 
   export let confirm
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
index 9fd15c22df..23a1f6411e 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { BackupTrigger } from "constants/backend/backups"
+  import { BackupTrigger } from "@/constants/backend/backups"
 
   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 ecdd3ee419..0e01cdcbff 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
@@ -12,9 +12,9 @@
     Tag,
     Table,
   } from "@budibase/bbui"
-  import { backups, licensing, auth, admin } from "stores/portal"
-  import { appStore } from "stores/builder"
-  import { createPaginationStore } from "helpers/pagination"
+  import { backups, licensing, auth, admin } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
+  import { createPaginationStore } from "@/helpers/pagination"
   import TimeAgoRenderer from "./_components/TimeAgoRenderer.svelte"
   import AppSizeRenderer from "./_components/AppSizeRenderer.svelte"
   import ActionsRenderer from "./_components/ActionsRenderer.svelte"
@@ -22,9 +22,9 @@
   import StatusRenderer from "./_components/StatusRenderer.svelte"
   import TypeRenderer from "./_components/TypeRenderer.svelte"
   import BackupsDefault from "assets/backups-default.png"
-  import { BackupTrigger, BackupType } from "constants/backend/backups"
+  import { BackupTrigger, BackupType } from "@/constants/backend/backups"
   import { onMount } from "svelte"
-  import DateRangePicker from "components/common/DateRangePicker.svelte"
+  import DateRangePicker from "@/components/common/DateRangePicker.svelte"
 
   let loading = true
   let backupData = null
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 5f82447e36..5b820f8ada 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
@@ -9,9 +9,9 @@
     Icon,
     notifications,
   } from "@budibase/bbui"
-  import { AppStatus } from "constants"
-  import { appsStore } from "stores/portal"
-  import { appStore } from "stores/builder"
+  import { AppStatus } from "@/constants"
+  import { appsStore } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
 
   $: filteredApps = $appsStore.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 417b5e4872..9b27a7dc03 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
@@ -7,11 +7,11 @@
     ActionButton,
     Modal,
   } from "@budibase/bbui"
-  import { AppStatus } from "constants"
-  import { appsStore } from "stores/portal"
-  import { appStore } from "stores/builder"
-  import ExportAppModal from "components/start/ExportAppModal.svelte"
-  import ImportAppModal from "components/start/ImportAppModal.svelte"
+  import { AppStatus } from "@/constants"
+  import { appsStore } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
+  import ExportAppModal from "@/components/start/ExportAppModal.svelte"
+  import ImportAppModal from "@/components/start/ImportAppModal.svelte"
 
   $: filteredApps = $appsStore.apps.filter(app => app.devId === $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
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 e91b8ac3a8..846dacc002 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
@@ -1,6 +1,6 @@
 <script>
   import { Layout, Divider, Heading, Body } from "@budibase/bbui"
-  import UpdateAppForm from "components/common/UpdateAppForm.svelte"
+  import UpdateAppForm from "@/components/common/UpdateAppForm.svelte"
 </script>
 
 <Layout noPadding>
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 bd592fa308..6a780555a9 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Layout, Heading, Body, Divider, Button } from "@budibase/bbui"
-  import { isOnlyUser, appStore } from "stores/builder"
-  import VersionModal from "components/deploy/VersionModal.svelte"
+  import { isOnlyUser, appStore } from "@/stores/builder"
+  import VersionModal from "@/components/deploy/VersionModal.svelte"
 
   let versionModal
 
diff --git a/packages/builder/src/pages/builder/app/_layout.svelte b/packages/builder/src/pages/builder/app/_layout.svelte
index 17f70bf815..0b81999dfa 100644
--- a/packages/builder/src/pages/builder/app/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 </script>
 
 {#if $auth.user}
diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index 1f92861edf..34468e3c71 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -2,7 +2,7 @@
   import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
-  import { API } from "api"
+  import { API } from "@/api"
 
   async function isMigrationDone() {
     const response = await API.getMigrationStatus()
diff --git a/packages/builder/src/pages/builder/apps/_layout.svelte b/packages/builder/src/pages/builder/apps/_layout.svelte
index 17f70bf815..0b81999dfa 100644
--- a/packages/builder/src/pages/builder/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/apps/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 </script>
 
 {#if $auth.user}
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 632478748d..8bf96d0240 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -19,12 +19,12 @@
     groups,
     licensing,
     enrichedApps,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { goto } from "@roxi/routify"
-  import { AppStatus } from "constants"
-  import { gradient } from "actions"
-  import ProfileModal from "components/settings/ProfileModal.svelte"
-  import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
+  import { AppStatus } from "@/constants"
+  import { gradient } from "@/actions"
+  import ProfileModal from "@/components/settings/ProfileModal.svelte"
+  import ChangePasswordModal from "@/components/settings/ChangePasswordModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
   import Spaceman from "assets/bb-space-man.svg"
   import Logo from "assets/bb-emblem.svg"
diff --git a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
index 812f744087..c27f08a8c3 100644
--- a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { FancyButton } from "@budibase/bbui"
   import GoogleLogo from "assets/google-logo.png"
-  import { auth, organisation } from "stores/portal"
+  import { auth, organisation } from "@/stores/portal"
 
   export let samePage
   let show
diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
index f5dcbe7466..52ab905651 100644
--- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
@@ -6,7 +6,7 @@
   import OktaLogo from "assets/okta-logo.png"
   import OneLoginLogo from "assets/onelogin-logo.png"
 
-  import { oidc, organisation, auth } from "stores/portal"
+  import { oidc, organisation, auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   export let samePage
diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index 1a40847aa0..1978d0c985 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
   import { CookieUtils } from "@budibase/frontend-core"
 
diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte
index 3ec0416c73..c775bf33fb 100644
--- a/packages/builder/src/pages/builder/auth/forgot.svelte
+++ b/packages/builder/src/pages/builder/auth/forgot.svelte
@@ -9,7 +9,7 @@
     FancyForm,
     FancyInput,
   } from "@budibase/bbui"
-  import { organisation, auth } from "stores/portal"
+  import { organisation, auth } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
diff --git a/packages/builder/src/pages/builder/auth/index.svelte b/packages/builder/src/pages/builder/auth/index.svelte
index 72b3a8c7cf..330ac7462e 100644
--- a/packages/builder/src/pages/builder/auth/index.svelte
+++ b/packages/builder/src/pages/builder/auth/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { onMount } from "svelte"
   import { notifications } from "@budibase/bbui"
 
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 650bbc4bf5..41e56fa9c2 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -12,7 +12,7 @@
     FancyInput,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth, organisation, oidc, admin } from "stores/portal"
+  import { auth, organisation, oidc, admin } from "@/stores/portal"
   import GoogleButton from "./_components/GoogleButton.svelte"
   import OIDCButton from "./_components/OIDCButton.svelte"
   import { handleError } from "./_components/utils"
diff --git a/packages/builder/src/pages/builder/auth/org.svelte b/packages/builder/src/pages/builder/auth/org.svelte
index 8fd94463d9..ee5a5e606c 100644
--- a/packages/builder/src/pages/builder/auth/org.svelte
+++ b/packages/builder/src/pages/builder/auth/org.svelte
@@ -9,7 +9,7 @@
     notifications,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { get } from "svelte/store"
   import { onMount } from "svelte"
diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte
index e1464aba77..1179618e40 100644
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@@ -8,7 +8,7 @@
     notifications,
   } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
-  import { auth, organisation } from "stores/portal"
+  import { auth, organisation } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { onMount } from "svelte"
diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte
index c6d9d3c1c3..da8e49ad9a 100644
--- a/packages/builder/src/pages/builder/index.svelte
+++ b/packages/builder/src/pages/builder/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   auth.checkQueryString()
diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte
index 60f3b18f77..cf0c293254 100644
--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@@ -9,7 +9,7 @@
     FancyInput,
   } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
-  import { users, organisation, auth, admin } from "stores/portal"
+  import { users, organisation, auth, admin } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { onMount } from "svelte"
diff --git a/packages/builder/src/pages/builder/maintenance/index.svelte b/packages/builder/src/pages/builder/maintenance/index.svelte
index f7eb16ab81..017b4356ba 100644
--- a/packages/builder/src/pages/builder/maintenance/index.svelte
+++ b/packages/builder/src/pages/builder/maintenance/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { MaintenanceType } from "@budibase/types"
   import { Heading, Body, Button, Layout } from "@budibase/bbui"
-  import { admin } from "stores/portal"
+  import { admin } from "@/stores/portal"
   import BudibaseLogo from "../portal/_components/BudibaseLogo.svelte"
 
   $: {
diff --git a/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte b/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
index 1df724099b..75c0ce7aec 100644
--- a/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
@@ -10,7 +10,7 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
 
   export let title
   export let planType
diff --git a/packages/builder/src/pages/builder/portal/_components/Logo.svelte b/packages/builder/src/pages/builder/portal/_components/Logo.svelte
index 0d928d68ca..817d93adfa 100644
--- a/packages/builder/src/pages/builder/portal/_components/Logo.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/Logo.svelte
@@ -1,7 +1,7 @@
 <script>
   import Logo from "assets/bb-emblem.svg"
   import { goto } from "@roxi/routify"
-  import { organisation } from "stores/portal"
+  import { organisation } from "@/stores/portal"
 </script>
 
 <!-- svelte-ignore a11y-no-noninteractive-element-interactions-->
diff --git a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte
index 9b4938e0d5..256199f3d7 100644
--- a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte
@@ -1,12 +1,12 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import { SideNav, SideNavItem } from "components/portal/page"
+  import { SideNav, SideNavItem } from "@/components/portal/page"
   import { createEventDispatcher } from "svelte"
   import { isActive } from "@roxi/routify"
   import UpgradeButton from "./UpgradeButton.svelte"
   import { fade } from "svelte/transition"
   import Logo from "./Logo.svelte"
-  import { menu } from "stores/portal"
+  import { menu } from "@/stores/portal"
 
   export let visible = false
 
diff --git a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
index 7131285b55..3c2e65ebf5 100644
--- a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth, admin, licensing } from "stores/portal"
+  import { auth, admin, licensing } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 </script>
 
diff --git a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
index 9faae70aa9..d2a7be8237 100644
--- a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { ActionMenu, MenuItem, Icon, Modal } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import ProfileModal from "components/settings/ProfileModal.svelte"
-  import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
-  import ThemeModal from "components/settings/ThemeModal.svelte"
-  import APIKeyModal from "components/settings/APIKeyModal.svelte"
+  import ProfileModal from "@/components/settings/ProfileModal.svelte"
+  import ChangePasswordModal from "@/components/settings/ChangePasswordModal.svelte"
+  import ThemeModal from "@/components/settings/ThemeModal.svelte"
+  import APIKeyModal from "@/components/settings/APIKeyModal.svelte"
   import { UserAvatar } from "@budibase/frontend-core"
 
   let themeModal
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 73152a1cd5..323b231037 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -8,16 +8,16 @@
     appsStore,
     licensing,
     admin,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { onMount } from "svelte"
   import UpgradeButton from "./_components/UpgradeButton.svelte"
   import MobileMenu from "./_components/MobileMenu.svelte"
   import Logo from "./_components/Logo.svelte"
   import UserDropdown from "./_components/UserDropdown.svelte"
-  import HelpMenu from "components/common/HelpMenu.svelte"
-  import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte"
+  import HelpMenu from "@/components/common/HelpMenu.svelte"
+  import VerificationPromptBanner from "@/components/common/VerificationPromptBanner.svelte"
   import { sdk } from "@budibase/shared-core"
-  import EnterpriseBasicTrialBanner from "components/portal/licensing/EnterpriseBasicTrialBanner.svelte"
+  import EnterpriseBasicTrialBanner from "@/components/portal/licensing/EnterpriseBasicTrialBanner.svelte"
   import { Constants } from "@budibase/frontend-core"
 
   let loaded = false
diff --git a/packages/builder/src/pages/builder/portal/account/_layout.svelte b/packages/builder/src/pages/builder/portal/account/_layout.svelte
index 892e853aad..27cc3cbd85 100644
--- a/packages/builder/src/pages/builder/portal/account/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/account/_layout.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto, isActive } from "@roxi/routify"
   import { Page } from "@budibase/bbui"
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
-  import { menu } from "stores/portal"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
+  import { menu } from "@/stores/portal"
 
   $: wide = $isActive("./auditLogs")
   $: pages = $menu.find(x => x.title === "Account")?.subPages || []
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index d498c557b2..bc30dab77f 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -17,16 +17,16 @@
     Divider,
     ActionButton,
   } from "@budibase/bbui"
-  import { licensing, users, appsStore, auditLogs } from "stores/portal"
+  import { licensing, users, appsStore, auditLogs } from "@/stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
-  import { createPaginationStore } from "helpers/pagination"
+  import { createPaginationStore } from "@/helpers/pagination"
   import { onMount, setContext } from "svelte"
   import ViewDetailsRenderer from "./_components/ViewDetailsRenderer.svelte"
   import UserRenderer from "./_components/UserRenderer.svelte"
   import TimeRenderer from "./_components/TimeRenderer.svelte"
   import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
   import { cloneDeep } from "lodash"
-  import DateRangePicker from "components/common/DateRangePicker.svelte"
+  import DateRangePicker from "@/components/common/DateRangePicker.svelte"
   import dayjs from "dayjs"
 
   const schema = {
diff --git a/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte
index f9634d0b9a..aaf2e783a0 100644
--- a/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Layout, Heading, Body, Button } from "@budibase/bbui"
   import { downloadStream } from "@budibase/frontend-core"
-  import Spinner from "components/common/Spinner.svelte"
+  import Spinner from "@/components/common/Spinner.svelte"
 
-  import { API } from "api"
+  import { API } from "@/api"
 
   let loading = false
 
diff --git a/packages/builder/src/pages/builder/portal/account/upgrade.svelte b/packages/builder/src/pages/builder/portal/account/upgrade.svelte
index 98af01ccf6..3440cd71ea 100644
--- a/packages/builder/src/pages/builder/portal/account/upgrade.svelte
+++ b/packages/builder/src/pages/builder/portal/account/upgrade.svelte
@@ -13,11 +13,11 @@
     CopyInput,
     File,
   } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
   import { processStringSync } from "@budibase/string-templates"
-  import DeleteLicenseKeyModal from "components/portal/licensing/DeleteLicenseKeyModal.svelte"
-  import { API } from "api"
+  import DeleteLicenseKeyModal from "@/components/portal/licensing/DeleteLicenseKeyModal.svelte"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte
index cb0f5ea512..d318f04e09 100644
--- a/packages/builder/src/pages/builder/portal/account/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/account/usage.svelte
@@ -10,12 +10,12 @@
     TooltipWrapper,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { admin, auth, licensing } from "stores/portal"
+  import { admin, auth, licensing } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
-  import { DashCard, Usage } from "components/usage"
-  import { PlanModel } from "constants"
+  import { DashCard, Usage } from "@/components/usage"
+  import { PlanModel } from "@/constants"
   import { sdk } from "@budibase/shared-core"
-  import { getFormattedPlanName } from "helpers/planTitle"
+  import { getFormattedPlanName } from "@/helpers/planTitle"
 
   let staticUsage = []
   let monthlyUsage = []
diff --git a/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte b/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte
index 7d6b4d81a9..04cad5d763 100644
--- a/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, TooltipPosition, TooltipType } from "@budibase/bbui"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 
   export let app
   export let size = "S"
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
index 871326eb91..fd8964d5df 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params, redirect } from "@roxi/routify"
-  import { appsStore } from "stores/portal"
+  import { appsStore } from "@/stores/portal"
 
   $: app = $appsStore.apps.find(app => app.appId === $params.appId)
   $: {
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
index cc03ec01dc..feba4dceaf 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
@@ -6,9 +6,9 @@
     auth,
     sideBarCollapsed,
     enrichedApps,
-  } from "stores/portal"
-  import AppContextMenuModals from "components/start/AppContextMenuModals.svelte"
-  import getAppContextMenuItems from "components/start/getAppContextMenuItems.js"
+  } from "@/stores/portal"
+  import AppContextMenuModals from "@/components/start/AppContextMenuModals.svelte"
+  import getAppContextMenuItems from "@/components/start/getAppContextMenuItems.js"
   import FavouriteAppButton from "../FavouriteAppButton.svelte"
   import {
     Link,
@@ -19,10 +19,10 @@
     TooltipType,
   } from "@budibase/bbui"
   import { sdk, getThemeClassNames } from "@budibase/shared-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import ErrorSVG from "./ErrorSVG.svelte"
   import { ClientAppSkeleton } from "@budibase/frontend-core"
-  import { contextMenuStore } from "stores/builder"
+  import { contextMenuStore } from "@/stores/builder"
 
   $: app = $enrichedApps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte b/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte
index 92d04897fe..eb18a8db83 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte
@@ -1,13 +1,13 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { params, goto } from "@roxi/routify"
-  import NavItem from "components/common/NavItem.svelte"
-  import AppContextMenuModals from "components/start/AppContextMenuModals.svelte"
-  import getAppContextMenuItems from "components/start/getAppContextMenuItems.js"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import AppContextMenuModals from "@/components/start/AppContextMenuModals.svelte"
+  import getAppContextMenuItems from "@/components/start/getAppContextMenuItems.js"
   import FavouriteAppButton from "../FavouriteAppButton.svelte"
   import { sdk } from "@budibase/shared-core"
   import { Icon } from "@budibase/bbui"
-  import { contextMenuStore } from "stores/builder"
+  import { contextMenuStore } from "@/stores/builder"
 
   export let app
 
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
index 0f72accf9f..a11bb2b45a 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { sideBarCollapsed, enrichedApps } from "stores/portal"
+  import { sideBarCollapsed, enrichedApps } from "@/stores/portal"
   import { params, goto } from "@roxi/routify"
-  import NavItem from "components/common/NavItem.svelte"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import NavHeader from "@/components/common/NavHeader.svelte"
   import AppNavItem from "./AppNavItem.svelte"
 
   let searchString
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index 00719dc6d5..560c1394fb 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -7,7 +7,7 @@
     licensing,
     groups,
     auth,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte
index 1248c41cf8..1f3a0cb052 100644
--- a/packages/builder/src/pages/builder/portal/apps/create.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/create.svelte
@@ -2,11 +2,11 @@
   import { url } from "@roxi/routify"
   import FirstAppOnboarding from "./onboarding/index.svelte"
   import { Layout, Page, Button, Modal } from "@budibase/bbui"
-  import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import TemplateDisplay from "components/common/TemplateDisplay.svelte"
-  import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
-  import { appsStore, templates, licensing } from "stores/portal"
-  import { Breadcrumbs, Breadcrumb, Header } from "components/portal/page"
+  import CreateAppModal from "@/components/start/CreateAppModal.svelte"
+  import TemplateDisplay from "@/components/common/TemplateDisplay.svelte"
+  import AppLimitModal from "@/components/portal/licensing/AppLimitModal.svelte"
+  import { appsStore, templates, licensing } from "@/stores/portal"
+  import { Breadcrumbs, Breadcrumb, Header } from "@/components/portal/page"
 
   let template
   let creationModal = false
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index e030aa1f97..f94bad2147 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -11,13 +11,13 @@
     Body,
     Search,
   } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
-  import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte"
+  import Spinner from "@/components/common/Spinner.svelte"
+  import CreateAppModal from "@/components/start/CreateAppModal.svelte"
+  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/builder"
-  import { API } from "api"
+  import { automationStore, initialise } from "@/stores/builder"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import {
     appsStore,
@@ -27,9 +27,9 @@
     environment,
     enrichedApps,
     sortBy,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { goto } from "@roxi/routify"
-  import AppRow from "components/start/AppRow.svelte"
+  import AppRow from "@/components/start/AppRow.svelte"
   import Logo from "assets/bb-space-man.svg"
 
   let template
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
index d27d75a90d..cc414b7434 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button, FancyForm, FancyInput } from "@budibase/bbui"
   import PanelHeader from "./PanelHeader.svelte"
-  import { APP_URL_REGEX } from "constants"
+  import { APP_URL_REGEX } from "@/constants"
 
   export let disabled
   export let name = ""
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte
index 49b8032726..356f6c412e 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
+  import FontAwesomeIcon from "@/components/common/FontAwesomeIcon.svelte"
   import { Heading, Body } from "@budibase/bbui"
 
   export let onBack = null
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 7426dd902e..062a37315f 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -4,8 +4,8 @@
   import ExampleApp from "./_components/ExampleApp.svelte"
   import { notifications } from "@budibase/bbui"
   import { SplitPage } from "@budibase/frontend-core"
-  import { API } from "api"
-  import { auth, admin } from "stores/portal"
+  import { API } from "@/api"
+  import { auth, admin } from "@/stores/portal"
 
   let name = "My first app"
   let url = "my-first-app"
diff --git a/packages/builder/src/pages/builder/portal/apps/templates.svelte b/packages/builder/src/pages/builder/portal/apps/templates.svelte
index f9d44a34c7..87139da9a9 100644
--- a/packages/builder/src/pages/builder/portal/apps/templates.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/templates.svelte
@@ -1,9 +1,9 @@
 <script>
   import { url } from "@roxi/routify"
   import { Layout, Page } from "@budibase/bbui"
-  import TemplateDisplay from "components/common/TemplateDisplay.svelte"
-  import { templates } from "stores/portal"
-  import { Breadcrumbs, Breadcrumb, Header } from "components/portal/page"
+  import TemplateDisplay from "@/components/common/TemplateDisplay.svelte"
+  import { templates } from "@/stores/portal"
+  import { Breadcrumbs, Breadcrumb, Header } from "@/components/portal/page"
 </script>
 
 <Page>
diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte
index fe3b9056e9..ead80f1ded 100644
--- a/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte
@@ -8,9 +8,9 @@
     Body,
     notifications,
   } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { plugins } from "stores/portal"
-  import { PluginSource } from "constants"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import { plugins } from "@/stores/portal"
+  import { PluginSource } from "@/constants"
 
   function opt(name, optional) {
     if (optional) {
diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte
index 1782b44f2b..b41776dcfe 100644
--- a/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, ModalContent, notifications } from "@budibase/bbui"
-  import { plugins } from "stores/portal"
+  import { plugins } from "@/stores/portal"
   import { createEventDispatcher } from "svelte"
 
   export let plugin
diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte
index e16da42e10..9da048030f 100644
--- a/packages/builder/src/pages/builder/portal/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte
@@ -12,7 +12,7 @@
     Table,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { plugins, admin } from "stores/portal"
+  import { plugins, admin } from "@/stores/portal"
   import AddPluginModal from "./_components/AddPluginModal.svelte"
   import PluginNameRenderer from "./_components/PluginNameRenderer.svelte"
   import EditPluginRenderer from "./_components/EditPluginRenderer.svelte"
diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte
index ac22eda5f4..81a0047153 100644
--- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto, isActive } from "@roxi/routify"
   import { Page } from "@budibase/bbui"
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
-  import { menu } from "stores/portal"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
+  import { menu } from "@/stores/portal"
 
   $: wide = $isActive("./email/:template")
   $: pages = $menu.find(x => x.title === "Settings")?.subPages || []
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
index e797a1c5bd..bfd4311aa0 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
+++ b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
@@ -1,7 +1,7 @@
 import { it, expect, describe, vi } from "vitest"
 import AISettings from "./index.svelte"
 import { render, fireEvent } from "@testing-library/svelte"
-import { admin, licensing, featureFlags } from "stores/portal"
+import { admin, licensing, featureFlags } from "@/stores/portal"
 import { notifications } from "@budibase/bbui"
 
 vi.spyOn(notifications, "error").mockImplementation(vi.fn)
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
index ec0ff31e58..7ff3969115 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
@@ -12,8 +12,8 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { admin, licensing, featureFlags } from "stores/portal"
-  import { API } from "api"
+  import { admin, licensing, featureFlags } from "@/stores/portal"
+  import { API } from "@/api"
   import AIConfigModal from "./ConfigModal.svelte"
   import AIConfigTile from "./AIConfigTile.svelte"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
index 795f384fde..7693b56f29 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
@@ -16,8 +16,8 @@
     Link,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { API } from "api"
-  import { organisation, admin } from "stores/portal"
+  import { API } from "@/api"
+  import { organisation, admin } from "@/stores/portal"
 
   const ConfigTypes = {
     Google: "google",
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index e90cd5440e..a1151ad991 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -24,8 +24,8 @@
     Link,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { API } from "api"
-  import { organisation, admin, licensing } from "stores/portal"
+  import { API } from "@/api"
+  import { organisation, admin, licensing } from "@/stores/portal"
   import Scim from "./scim.svelte"
   import Google from "./google.svelte"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte b/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte
index 11c5929efb..68a6ff02ae 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte
@@ -12,8 +12,8 @@
     Helpers,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { API } from "api"
-  import { organisation, auth } from "stores/portal"
+  import { API } from "@/api"
+  import { organisation, auth } from "@/stores/portal"
 
   const configType = "scim"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/branding.svelte b/packages/builder/src/pages/builder/portal/settings/branding.svelte
index 17da5b87d7..51b6307a04 100644
--- a/packages/builder/src/pages/builder/portal/settings/branding.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte
@@ -14,8 +14,8 @@
     Label,
     TextArea,
   } from "@budibase/bbui"
-  import { auth, organisation, licensing, admin } from "stores/portal"
-  import { API } from "api"
+  import { auth, organisation, licensing, admin } from "@/stores/portal"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte b/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
index 98cee021ef..08bc7a844e 100644
--- a/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
@@ -9,9 +9,9 @@
     Icon,
     TextArea,
   } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
-  import { API } from "api"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/email/[template].svelte b/packages/builder/src/pages/builder/portal/settings/email/[template].svelte
index b31800adf0..a9c0275367 100644
--- a/packages/builder/src/pages/builder/portal/settings/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/settings/email/[template].svelte
@@ -10,10 +10,10 @@
     Tab,
   } from "@budibase/bbui"
   import { url } from "@roxi/routify"
-  import { email } from "stores/portal"
-  import Editor from "components/integration/QueryEditor.svelte"
+  import { email } from "@/stores/portal"
+  import Editor from "@/components/integration/QueryEditor.svelte"
   import TemplateBindings from "./_components/TemplateBindings.svelte"
-  import { Breadcrumbs, Breadcrumb } from "components/portal/page"
+  import { Breadcrumbs, Breadcrumb } from "@/components/portal/page"
 
   // this is the email purpose
   export let template
diff --git a/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte
index e371c2daae..c0d4d4463e 100644
--- a/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { email } from "stores/portal"
+  import { email } from "@/stores/portal"
   import { notifications } from "@budibase/bbui"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/portal/settings/email/index.svelte b/packages/builder/src/pages/builder/portal/settings/email/index.svelte
index 4d76c4f49c..3b055cc7d8 100644
--- a/packages/builder/src/pages/builder/portal/settings/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/email/index.svelte
@@ -13,8 +13,8 @@
     Table,
     Checkbox,
   } from "@budibase/bbui"
-  import { email, admin } from "stores/portal"
-  import { API } from "api"
+  import { email, admin } from "@/stores/portal"
+  import { API } from "@/api"
   import { cloneDeep } from "lodash/fp"
 
   const ConfigTypes = {
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte b/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte
index fd754fa006..8f60b3f3ca 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ActionButton, Modal } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { environment } from "stores/portal"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { environment } from "@/stores/portal"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
 
   export let row
 
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
index 0d4c7e1479..13892c61d3 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
@@ -7,9 +7,9 @@
     InlineAlert,
     notifications,
   } from "@budibase/bbui"
-  import { environment, licensing } from "stores/portal"
+  import { environment, licensing } from "@/stores/portal"
   import { onMount } from "svelte"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
   import EditVariableColumn from "./_components/EditVariableColumn.svelte"
   import LockedFeature from "../../_components/LockedFeature.svelte"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte
index 26688e3861..016b28aebc 100644
--- a/packages/builder/src/pages/builder/portal/settings/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { featureFlags } from "stores/portal"
+  import { featureFlags } from "@/stores/portal"
 
   if ($featureFlags.AI_CUSTOM_CONFIGS) {
     $redirect("./ai")
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index c107a7339e..7e473bf8f2 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -10,7 +10,7 @@
     notifications,
     Toggle,
   } from "@budibase/bbui"
-  import { auth, organisation, admin } from "stores/portal"
+  import { auth, organisation, admin } from "@/stores/portal"
   import { writable } from "svelte/store"
   import { redirect } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/pages/builder/portal/settings/version.svelte b/packages/builder/src/pages/builder/portal/settings/version.svelte
index 032c077557..62e405d0d3 100644
--- a/packages/builder/src/pages/builder/portal/settings/version.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/version.svelte
@@ -9,8 +9,8 @@
     Label,
     Link,
   } from "@budibase/bbui"
-  import { API } from "api"
-  import { auth, admin } from "stores/portal"
+  import { API } from "@/api"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte
index d53da89613..c13fa2a8b5 100644
--- a/packages/builder/src/pages/builder/portal/users/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Page, notifications } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { SideNav, SideNavItem, Content } from "components/portal/page"
+  import { SideNav, SideNavItem, Content } from "@/components/portal/page"
   import { isActive, goto } from "@roxi/routify"
-  import { menu, features } from "stores/portal"
+  import { menu, features } from "@/stores/portal"
 
   $: wide = $isActive("./users/index") || $isActive("./groups/index")
   $: pages = $menu.find(x => x.title === "Users")?.subPages || []
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 36ec43b6b3..312d87f873 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -10,10 +10,10 @@
     notifications,
   } from "@budibase/bbui"
   import { goto, url } from "@roxi/routify"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { Breadcrumb, Breadcrumbs } from "components/portal/page"
-  import { roles } from "stores/builder"
-  import { appsStore, auth, groups } from "stores/portal"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { Breadcrumb, Breadcrumbs } from "@/components/portal/page"
+  import { roles } from "@/stores/builder"
+  import { appsStore, auth, groups } from "@/stores/portal"
   import { onMount, setContext } from "svelte"
   import AppNameTableRenderer from "../users/_components/AppNameTableRenderer.svelte"
   import AppRoleTableRenderer from "../users/_components/AppRoleTableRenderer.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 5071d40add..75600c6fc0 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,8 +1,8 @@
 <script>
   import { keepOpen, Body, ModalContent, Select } from "@budibase/bbui"
-  import { appsStore, groups } from "stores/portal"
-  import { roles } from "stores/builder"
-  import RoleSelect from "components/common/RoleSelect.svelte"
+  import { appsStore, groups } from "@/stores/portal"
+  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/groups/_components/EditUserPicker.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte
index 8cec28a0ef..1e7e15d1b4 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Button, Popover, notifications } from "@budibase/bbui"
-  import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
-  import { createPaginationStore } from "helpers/pagination"
-  import { groups, users } from "stores/portal"
+  import UserGroupPicker from "@/components/settings/UserGroupPicker.svelte"
+  import { createPaginationStore } from "@/helpers/pagination"
+  import { groups, users } from "@/stores/portal"
 
   export let groupId
   export let onUsersUpdated
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 9f6703964a..8d99d406fd 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -4,8 +4,8 @@
   import { Heading, Pagination, Table, Search } from "@budibase/bbui"
   import { fetchData } from "@budibase/frontend-core"
   import { goto } from "@roxi/routify"
-  import { API } from "api"
-  import { groups } from "stores/portal"
+  import { API } from "@/api"
+  import { groups } from "@/stores/portal"
   import { setContext } from "svelte"
 
   import RemoveUserTableRenderer from "../_components/RemoveUserTableRenderer.svelte"
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte
index 4d71c71ae6..406a499f51 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton } from "@budibase/bbui"
   import { getContext } from "svelte"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
index 5636d555ae..77b0dc5734 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
@@ -13,7 +13,7 @@
     Search,
     notifications,
   } from "@budibase/bbui"
-  import { groups, auth, licensing, admin } from "stores/portal"
+  import { groups, auth, licensing, admin } from "@/stores/portal"
   import { onMount } from "svelte"
   import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
   import { cloneDeep } from "lodash/fp"
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 3547a4876e..94fe3081c3 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -18,14 +18,14 @@
     Table,
   } from "@budibase/bbui"
   import { onMount, setContext } from "svelte"
-  import { users, auth, groups, appsStore, licensing } from "stores/portal"
-  import { roles } from "stores/builder"
+  import { users, auth, groups, appsStore, licensing } from "@/stores/portal"
+  import { roles } from "@/stores/builder"
   import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"
-  import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
+  import UserGroupPicker from "@/components/settings/UserGroupPicker.svelte"
   import DeleteUserModal from "./_components/DeleteUserModal.svelte"
   import GroupIcon from "../groups/_components/GroupIcon.svelte"
   import { Constants, UserAvatar } from "@budibase/frontend-core"
-  import { Breadcrumbs, Breadcrumb } from "components/portal/page"
+  import { Breadcrumbs, Breadcrumb } from "@/components/portal/page"
   import RemoveGroupTableRenderer from "./_components/RemoveGroupTableRenderer.svelte"
   import GroupNameTableRenderer from "../groups/_components/GroupNameTableRenderer.svelte"
   import AppNameTableRenderer from "./_components/AppNameTableRenderer.svelte"
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
index 36709ae9c0..9122ff09ab 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
@@ -9,10 +9,10 @@
     Layout,
     Icon,
   } from "@budibase/bbui"
-  import { groups, licensing } from "stores/portal"
+  import { groups, licensing } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
-  import { emailValidator } from "helpers/validation"
-  import { capitalise } from "helpers"
+  import { emailValidator } from "@/helpers/validation"
+  import { capitalise } from "@/helpers"
 
   export let showOnboardingTypeModal
 
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 03a3e626a4..9429cfbc23 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,8 +1,8 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
   import { Constants } from "@budibase/frontend-core"
-  import { roles } from "stores/builder"
-  import { capitalise } from "helpers"
+  import { roles } from "@/stores/builder"
+  import { capitalise } from "@/helpers"
 
   export let value
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte
index 28057f609c..54d220b67a 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
-  import { appsStore } from "stores/portal"
+  import { appsStore } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte
index 946fa430d2..ea1070090f 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte
@@ -2,7 +2,7 @@
   import { goto } from "@roxi/routify"
   import { Body, ModalContent, notifications } from "@budibase/bbui"
 
-  import { users } from "stores/portal"
+  import { users } from "@/stores/portal"
 
   export let user
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte
index 36fdcccbce..7f8ad3d492 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
-  import { users } from "stores/portal"
+  import { users } from "@/stores/portal"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
index 432fb7abb7..b8aca87459 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
@@ -7,10 +7,10 @@
     notifications,
     Icon,
   } from "@budibase/bbui"
-  import { groups, licensing, admin } from "stores/portal"
-  import { emailValidator } from "helpers/validation"
+  import { groups, licensing, admin } from "@/stores/portal"
+  import { emailValidator } from "@/helpers/validation"
   import { Constants } from "@budibase/frontend-core"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   const BYTES_IN_MB = 1000000
   const FILE_SIZE_LIMIT = BYTES_IN_MB * 5
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
index afac8ae74b..19ff7e6f46 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Layout, Icon } from "@budibase/bbui"
-  import { OnboardingType } from "constants"
+  import { OnboardingType } from "@/constants"
 
   export let chooseCreationType
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte
index ce9c41d4ac..e5d7b32b94 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body, ModalContent, Table, Icon } from "@budibase/bbui"
   import PasswordCopyTableRenderer from "./PasswordCopyTableRenderer.svelte"
-  import { parseToCsv } from "helpers/data/utils"
+  import { parseToCsv } from "@/helpers/data/utils"
   import { onMount } from "svelte"
   import InviteResponseRenderer from "./InviteResponseRenderer.svelte"
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte
index 5eacdec944..96c13acc8c 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton } from "@budibase/bbui"
   import { getContext } from "svelte"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte
index 0006cc4be0..eae8e5e910 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { users } from "stores/portal"
+  import { users } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
 
   export let row
diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index 9c4e8f70c7..80772ccbee 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -20,10 +20,10 @@
     licensing,
     organisation,
     admin,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { onMount } from "svelte"
-  import DeleteRowsButton from "components/backend/DataTable/buttons/DeleteRowsButton.svelte"
-  import UpgradeModal from "components/common/users/UpgradeModal.svelte"
+  import DeleteRowsButton from "@/components/backend/DataTable/buttons/DeleteRowsButton.svelte"
+  import UpgradeModal from "@/components/common/users/UpgradeModal.svelte"
   import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte"
   import AppsTableRenderer from "./_components/AppsTableRenderer.svelte"
   import RoleTableRenderer from "./_components/RoleTableRenderer.svelte"
@@ -35,8 +35,8 @@
   import ImportUsersModal from "./_components/ImportUsersModal.svelte"
   import { get } from "svelte/store"
   import { Constants, Utils, fetchData } from "@budibase/frontend-core"
-  import { API } from "api"
-  import { OnboardingType } from "constants"
+  import { API } from "@/api"
+  import { OnboardingType } from "@/constants"
   import { sdk } from "@budibase/shared-core"
 
   const fetch = fetchData({
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 5bd8d4c3f4..2f13074c9f 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { onMount } from "svelte"
   import { notifications } from "@budibase/bbui"
 
diff --git a/packages/builder/src/stores/builder/app.ts b/packages/builder/src/stores/builder/app.ts
index e3226c1e13..3c8ed4afc1 100644
--- a/packages/builder/src/stores/builder/app.ts
+++ b/packages/builder/src/stores/builder/app.ts
@@ -1,4 +1,4 @@
-import { API } from "api"
+import { API } from "@/api"
 import { BudiStore } from "../BudiStore"
 import {
   App,
diff --git a/packages/builder/src/stores/builder/automations.ts b/packages/builder/src/stores/builder/automations.ts
index a70ef76821..c43a856cc4 100644
--- a/packages/builder/src/stores/builder/automations.ts
+++ b/packages/builder/src/stores/builder/automations.ts
@@ -1,17 +1,17 @@
 import { derived, get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { cloneDeep } from "lodash/fp"
 import { generate } from "shortid"
-import { createHistoryStore } from "stores/builder/history"
-import { licensing } from "stores/portal"
-import { tables } from "stores/builder"
+import { createHistoryStore } from "@/stores/builder/history"
+import { licensing } from "@/stores/portal"
+import { tables, appStore } from "@/stores/builder"
 import { notifications } from "@budibase/bbui"
 import {
   getEnvironmentBindings,
   migrateReferencesInObject,
   getUserBindings,
   getSettingBindings,
-} from "dataBinding"
+} from "@/dataBinding"
 import {
   AutomationTriggerStepId,
   AutomationEventType,
@@ -31,14 +31,13 @@ import {
   BranchPath,
   BlockDefinitions,
 } from "@budibase/types"
-import { ActionStepID } from "constants/backend/automations"
-import { FIELDS } from "constants/backend"
+import { ActionStepID } from "@/constants/backend/automations"
+import { FIELDS } from "@/constants/backend"
 import { sdk } from "@budibase/shared-core"
 import { rowActions } from "./rowActions"
-import { getNewStepName } from "helpers/automations/nameHelpers"
+import { getNewStepName } from "@/helpers/automations/nameHelpers"
 import { QueryUtils } from "@budibase/frontend-core"
-import { BudiStore, DerivedBudiStore } from "stores/BudiStore"
-import { appStore } from "stores/builder"
+import { BudiStore, DerivedBudiStore } from "@/stores/BudiStore"
 
 interface AutomationState {
   automations: Automation[]
diff --git a/packages/builder/src/stores/builder/builder.ts b/packages/builder/src/stores/builder/builder.ts
index 3822c079f3..e4cbbba7f1 100644
--- a/packages/builder/src/stores/builder/builder.ts
+++ b/packages/builder/src/stores/builder/builder.ts
@@ -3,7 +3,7 @@ import { createBuilderWebsocket } from "./websocket.js"
 import { Socket } from "socket.io-client"
 import { BuilderSocketEvent } from "@budibase/shared-core"
 import { BudiStore } from "../BudiStore.js"
-import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
+import { TOUR_KEYS } from "@/components/portal/onboarding/tours.js"
 import { App } from "@budibase/types"
 
 interface BuilderState {
diff --git a/packages/builder/src/stores/builder/componentTreeNodes.ts b/packages/builder/src/stores/builder/componentTreeNodes.ts
index 6c6f522ce1..420c540e37 100644
--- a/packages/builder/src/stores/builder/componentTreeNodes.ts
+++ b/packages/builder/src/stores/builder/componentTreeNodes.ts
@@ -1,8 +1,8 @@
 import { get } from "svelte/store"
 import { selectedScreen as selectedScreenStore } from "./screens"
-import { findComponentPath } from "helpers/components"
+import { findComponentPath } from "@/helpers/components"
 import { Screen, Component } from "@budibase/types"
-import { BudiStore, PersistenceType } from "stores/BudiStore"
+import { BudiStore, PersistenceType } from "@/stores/BudiStore"
 
 interface OpenNodesState {
   [key: string]: boolean
diff --git a/packages/builder/src/stores/builder/components.ts b/packages/builder/src/stores/builder/components.ts
index 338c4ace2f..9ad9a75f84 100644
--- a/packages/builder/src/stores/builder/components.ts
+++ b/packages/builder/src/stores/builder/components.ts
@@ -1,8 +1,8 @@
 import { get, derived } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import { API } from "api"
+import { API } from "@/api"
 import { Helpers } from "@budibase/bbui"
-import analytics, { Events } from "analytics"
+import analytics, { Events } from "@/analytics"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import {
   findComponentPath,
@@ -11,8 +11,8 @@ import {
   findComponentParent,
   findAllMatchingComponents,
   makeComponentUnique,
-} from "helpers/components"
-import { getComponentFieldOptions } from "helpers/formFields"
+} from "@/helpers/components"
+import { getComponentFieldOptions } from "@/helpers/formFields"
 import { selectedScreen } from "./screens"
 import {
   screenStore,
@@ -20,14 +20,14 @@ import {
   previewStore,
   tables,
   componentTreeNodesStore,
-} from "stores/builder"
-import { buildFormSchema, getSchemaForDatasource } from "dataBinding"
+} from "@/stores/builder"
+import { buildFormSchema, getSchemaForDatasource } from "@/dataBinding"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DEFAULT_BB_DATASOURCE_ID,
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
-} from "constants/backend"
+} from "@/constants/backend"
 import { BudiStore } from "../BudiStore"
 import { Utils } from "@budibase/frontend-core"
 import { Component, FieldType, Screen, Table } from "@budibase/types"
diff --git a/packages/builder/src/stores/builder/datasources.ts b/packages/builder/src/stores/builder/datasources.ts
index 54e9f85dbd..6b00911830 100644
--- a/packages/builder/src/stores/builder/datasources.ts
+++ b/packages/builder/src/stores/builder/datasources.ts
@@ -3,10 +3,10 @@ import {
   IntegrationTypes,
   DEFAULT_BB_DATASOURCE_ID,
   BUDIBASE_INTERNAL_DB_ID,
-} from "constants/backend"
+} from "@/constants/backend"
 import { tables } from "./tables"
 import { queries } from "./queries"
-import { API } from "api"
+import { API } from "@/api"
 import {
   DatasourceFeature,
   Datasource,
@@ -15,9 +15,13 @@ import {
   UIIntegration,
   SourceName,
 } from "@budibase/types"
-// @ts-ignore
-import { TableNames } from "constants"
-import { DerivedBudiStore } from "stores/BudiStore"
+import { TableNames } from "@/constants"
+import { DerivedBudiStore } from "@/stores/BudiStore"
+
+// when building the internal DS - seems to represent it slightly differently to the backend typing of a DS
+interface InternalDatasource extends Omit<Datasource, "entities"> {
+  entities: Table[]
+}
 
 class TableImportError extends Error {
   errors: Record<string, string>
diff --git a/packages/builder/src/stores/builder/deployments.ts b/packages/builder/src/stores/builder/deployments.ts
index 130e52bc91..122ee43c20 100644
--- a/packages/builder/src/stores/builder/deployments.ts
+++ b/packages/builder/src/stores/builder/deployments.ts
@@ -1,5 +1,5 @@
 import { writable, type Writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { notifications } from "@budibase/bbui"
 import { DeploymentProgressResponse } from "@budibase/types"
 
diff --git a/packages/builder/src/stores/builder/flags.js b/packages/builder/src/stores/builder/flags.js
index 23f41808ff..21236ffb01 100644
--- a/packages/builder/src/stores/builder/flags.js
+++ b/packages/builder/src/stores/builder/flags.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 export function createFlagsStore() {
   const { subscribe, set } = writable({})
diff --git a/packages/builder/src/stores/builder/hover.js b/packages/builder/src/stores/builder/hover.js
index 8da7191cf5..e28c74eaf2 100644
--- a/packages/builder/src/stores/builder/hover.js
+++ b/packages/builder/src/stores/builder/hover.js
@@ -1,6 +1,6 @@
 import { get } from "svelte/store"
-import { previewStore } from "stores/builder"
 import { BudiStore } from "../BudiStore"
+import { previewStore } from "@/stores/builder"
 
 export const INITIAL_HOVER_STATE = {
   componentId: null,
diff --git a/packages/builder/src/stores/builder/integrations.ts b/packages/builder/src/stores/builder/integrations.ts
index 786b74f1c9..b48f45a654 100644
--- a/packages/builder/src/stores/builder/integrations.ts
+++ b/packages/builder/src/stores/builder/integrations.ts
@@ -1,5 +1,5 @@
 import { writable, type Writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { Integration } from "@budibase/types"
 
 type IntegrationsState = Record<string, Integration>
diff --git a/packages/builder/src/stores/builder/layouts.js b/packages/builder/src/stores/builder/layouts.js
index 6b68850a93..7617e203f0 100644
--- a/packages/builder/src/stores/builder/layouts.js
+++ b/packages/builder/src/stores/builder/layouts.js
@@ -1,7 +1,7 @@
 import { derived, get } from "svelte/store"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
+import { API } from "@/api"
 import { BudiStore } from "../BudiStore"
-import { API } from "api"
 
 export const INITIAL_LAYOUT_STATE = {
   layouts: [],
diff --git a/packages/builder/src/stores/builder/navigation.js b/packages/builder/src/stores/builder/navigation.js
index abdd9638f3..e9a5e6f9dd 100644
--- a/packages/builder/src/stores/builder/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/builder"
+import { API } from "@/api"
+import { appStore } from "@/stores/builder"
 import { BudiStore } from "../BudiStore"
 
 export const INITIAL_NAVIGATION_STATE = {
diff --git a/packages/builder/src/stores/builder/permissions.js b/packages/builder/src/stores/builder/permissions.js
index 2fd94e35b0..a303cd713b 100644
--- a/packages/builder/src/stores/builder/permissions.js
+++ b/packages/builder/src/stores/builder/permissions.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 export function createPermissionStore() {
   const { subscribe } = writable([])
diff --git a/packages/builder/src/stores/builder/published.js b/packages/builder/src/stores/builder/published.js
index 6ae9392f40..a59352fb22 100644
--- a/packages/builder/src/stores/builder/published.js
+++ b/packages/builder/src/stores/builder/published.js
@@ -1,5 +1,5 @@
 import { appStore } from "./app"
-import { appsStore } from "stores/portal/apps"
+import { appsStore } from "@/stores/portal/apps"
 import { deploymentStore } from "./deployments"
 import { derived } from "svelte/store"
 
diff --git a/packages/builder/src/stores/builder/queries.js b/packages/builder/src/stores/builder/queries.js
index 27607deff5..7aeb9ff8fd 100644
--- a/packages/builder/src/stores/builder/queries.js
+++ b/packages/builder/src/stores/builder/queries.js
@@ -1,8 +1,8 @@
 import { writable, get, derived } from "svelte/store"
 import { datasources } from "./datasources"
 import { integrations } from "./integrations"
-import { API } from "api"
-import { duplicateName } from "helpers/duplicate"
+import { API } from "@/api"
+import { duplicateName } from "@/helpers/duplicate"
 
 const sortQueries = queryList => {
   queryList.sort((q1, q2) => {
diff --git a/packages/builder/src/stores/builder/roles.js b/packages/builder/src/stores/builder/roles.js
index 4d5e37434a..e718545f14 100644
--- a/packages/builder/src/stores/builder/roles.js
+++ b/packages/builder/src/stores/builder/roles.js
@@ -1,5 +1,5 @@
 import { derived, writable, get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { RoleUtils } from "@budibase/frontend-core"
 
 export function createRolesStore() {
diff --git a/packages/builder/src/stores/builder/rowActions.js b/packages/builder/src/stores/builder/rowActions.js
index 553a574d53..9cc4063b91 100644
--- a/packages/builder/src/stores/builder/rowActions.js
+++ b/packages/builder/src/stores/builder/rowActions.js
@@ -1,10 +1,10 @@
 import { get, derived } from "svelte/store"
-import { BudiStore } from "stores/BudiStore"
+import { BudiStore } from "@/stores/BudiStore"
 import { tables } from "./tables"
 import { viewsV2 } from "./viewsV2"
 import { automationStore } from "./automations"
-import { API } from "api"
-import { getSequentialName } from "helpers/duplicate"
+import { API } from "@/api"
+import { getSequentialName } from "@/helpers/duplicate"
 
 const initialState = {}
 
diff --git a/packages/builder/src/stores/builder/screens.js b/packages/builder/src/stores/builder/screens.js
index 42f61a5e0e..8298a1469d 100644
--- a/packages/builder/src/stores/builder/screens.js
+++ b/packages/builder/src/stores/builder/screens.js
@@ -2,16 +2,16 @@ 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 "helpers/components"
+import { findAllMatchingComponents } from "@/helpers/components"
 import {
   layoutStore,
   appStore,
   componentStore,
   navigationStore,
   selectedComponent,
-} from "stores/builder"
-import { createHistoryStore } from "stores/builder/history"
-import { API } from "api"
+} from "@/stores/builder"
+import { createHistoryStore } from "@/stores/builder/history"
+import { API } from "@/api"
 import { BudiStore } from "../BudiStore"
 
 export const INITIAL_SCREENS_STATE = {
diff --git a/packages/builder/src/stores/builder/snippets.js b/packages/builder/src/stores/builder/snippets.js
index d5f9a0b2a8..4e98ef1bdc 100644
--- a/packages/builder/src/stores/builder/snippets.js
+++ b/packages/builder/src/stores/builder/snippets.js
@@ -1,5 +1,5 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { appStore } from "./app"
 
 const createsnippets = () => {
diff --git a/packages/builder/src/stores/builder/sortedIntegrations.ts b/packages/builder/src/stores/builder/sortedIntegrations.ts
index 76044af331..95c52f4479 100644
--- a/packages/builder/src/stores/builder/sortedIntegrations.ts
+++ b/packages/builder/src/stores/builder/sortedIntegrations.ts
@@ -1,9 +1,8 @@
 import { integrations } from "./integrations"
 import { derived } from "svelte/store"
-
-import { DatasourceTypes } from "constants/backend"
+import { DatasourceTypes } from "@/constants/backend"
 import { UIIntegration, Integration } from "@budibase/types"
-import { BudiStore } from "stores/BudiStore"
+import { BudiStore } from "@/stores/BudiStore"
 
 const getIntegrationOrder = (type: string | undefined) => {
   // if type is not known, sort to end
diff --git a/packages/builder/src/stores/builder/tables.ts b/packages/builder/src/stores/builder/tables.ts
index d7eb7d89f2..e38731026c 100644
--- a/packages/builder/src/stores/builder/tables.ts
+++ b/packages/builder/src/stores/builder/tables.ts
@@ -7,8 +7,8 @@ import {
 import { SWITCHABLE_TYPES } from "@budibase/shared-core"
 import { get, derived, Writable } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import { API } from "api"
-import { DerivedBudiStore } from "stores/BudiStore"
+import { API } from "@/api"
+import { DerivedBudiStore } from "@/stores/BudiStore"
 
 interface BuilderTableStore {
   list: Table[]
diff --git a/packages/builder/src/stores/builder/tests/app.test.js b/packages/builder/src/stores/builder/tests/app.test.js
index 728f472317..6a7cb85bd5 100644
--- a/packages/builder/src/stores/builder/tests/app.test.js
+++ b/packages/builder/src/stores/builder/tests/app.test.js
@@ -1,6 +1,6 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get } from "svelte/store"
-import { INITIAL_APP_META_STATE, AppMetaStore } from "stores/builder/app"
+import { INITIAL_APP_META_STATE, AppMetaStore } from "@/stores/builder/app"
 import {
   clientFeaturesResp,
   generateAppPackage,
@@ -8,9 +8,9 @@ import {
   getScreenFixture,
   getScreenDocId,
 } from "./fixtures"
-import { API } from "api"
+import { API } from "@/api"
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       fetchAppRoutes: vi.fn(),
diff --git a/packages/builder/src/stores/builder/tests/builder.test.js b/packages/builder/src/stores/builder/tests/builder.test.js
index f3c42dae72..a1ff37df7d 100644
--- a/packages/builder/src/stores/builder/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/builder/builder"
+import { INITIAL_BUILDER_STATE, BuilderStore } from "@/stores/builder/builder"
 import { createBuilderWebsocket } from "../websocket.js"
 import { BuilderSocketEvent } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/stores/builder/tests/component.test.js b/packages/builder/src/stores/builder/tests/component.test.js
index 80a0c8077d..9f700cfdbf 100644
--- a/packages/builder/src/stores/builder/tests/component.test.js
+++ b/packages/builder/src/stores/builder/tests/component.test.js
@@ -3,9 +3,9 @@ import { get, writable } from "svelte/store"
 import {
   INITIAL_COMPONENTS_STATE,
   ComponentStore,
-} from "stores/builder/components"
-import { API } from "api"
-import { appStore, tables } from "stores/builder"
+} from "@/stores/builder/components"
+import { API } from "@/api"
+import { appStore, tables } from "@/stores/builder"
 import {
   componentDefinitionMap,
   getComponentFixture,
@@ -22,13 +22,13 @@ import {
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
   DEFAULT_BB_DATASOURCE_ID,
-} from "constants/backend"
+} from "@/constants/backend"
 import { makePropSafe as safe } from "@budibase/string-templates"
 
 // Could move to fixtures
 const COMP_PREFIX = "@budibase/standard-components"
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       fetchComponentLibDefinitions: vi.fn(),
@@ -36,7 +36,7 @@ vi.mock("api", () => {
   }
 })
 
-vi.mock("stores/builder", async () => {
+vi.mock("@/stores/builder", async () => {
   const mockAppStore = writable()
   const appStore = {
     subscribe: mockAppStore.subscribe,
diff --git a/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled b/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
index 772aaf36a2..fa8746306a 100644
--- a/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/fixtures/index.js b/packages/builder/src/stores/builder/tests/fixtures/index.js
index b742397f5c..03b6ceeb52 100644
--- a/packages/builder/src/stores/builder/tests/fixtures/index.js
+++ b/packages/builder/src/stores/builder/tests/fixtures/index.js
@@ -1,13 +1,13 @@
 import { v4 } from "uuid"
-import { Component } from "templates/Component"
-import { Screen } from "templates/screenTemplating/Screen"
+import { Component } from "@/templates/Component"
+import { Screen } from "@/templates/screenTemplating/Screen"
 import { get } from "svelte/store"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
   DEFAULT_BB_DATASOURCE_ID,
-} from "constants/backend"
+} from "@/constants/backend"
 import { FieldType } from "@budibase/types"
 
 const getDocId = () => {
diff --git a/packages/builder/src/stores/builder/tests/navigation.test.js b/packages/builder/src/stores/builder/tests/navigation.test.js
index f3775e1ed5..1d04496c40 100644
--- a/packages/builder/src/stores/builder/tests/navigation.test.js
+++ b/packages/builder/src/stores/builder/tests/navigation.test.js
@@ -1,13 +1,13 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get, writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import {
   INITIAL_NAVIGATION_STATE,
   NavigationStore,
-} from "stores/builder/navigation"
-import { appStore } from "stores/builder"
+} from "@/stores/builder/navigation"
+import { appStore } from "@/stores/builder"
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       saveAppMetadata: vi.fn(),
@@ -15,7 +15,7 @@ vi.mock("api", () => {
   }
 })
 
-vi.mock("stores/builder", async () => {
+vi.mock("@/stores/builder", async () => {
   const mockAppStore = writable()
   const appStore = {
     subscribe: mockAppStore.subscribe,
diff --git a/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled b/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
index d3c19964f2..83bb0d7381 100644
--- a/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
@@ -1,4 +1,4 @@
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/queries.spec.js.disabled b/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
index 20db8e4a95..ee5bc1d0b8 100644
--- a/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/roles.spec.js.disabled b/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
index b729c27ce6..1ac35af445 100644
--- a/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/screens.test.js b/packages/builder/src/stores/builder/tests/screens.test.js
index 51e3a8d830..430605b77a 100644
--- a/packages/builder/src/stores/builder/tests/screens.test.js
+++ b/packages/builder/src/stores/builder/tests/screens.test.js
@@ -1,9 +1,9 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get, writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { Constants } from "@budibase/frontend-core"
-import { componentStore, appStore } from "stores/builder"
-import { INITIAL_SCREENS_STATE, ScreenStore } from "stores/builder/screens"
+import { componentStore, appStore } from "@/stores/builder"
+import { INITIAL_SCREENS_STATE, ScreenStore } from "@/stores/builder/screens"
 import {
   getScreenFixture,
   getComponentFixture,
@@ -16,7 +16,7 @@ import {
 
 const COMP_PREFIX = "@budibase/standard-components"
 
-vi.mock("stores/builder", async () => {
+vi.mock("@/stores/builder", async () => {
   const mockAppStore = writable()
   const mockComponentStore = writable()
   const mockLayoutStore = writable()
@@ -49,7 +49,7 @@ vi.mock("stores/builder", async () => {
   }
 })
 
-vi.mock("stores/builder/components/utils", () => {
+vi.mock("@/stores/builder/components/utils", () => {
   return {
     findAllMatchingComponents: vi.fn().mockImplementation(() => {
       return []
@@ -57,7 +57,7 @@ vi.mock("stores/builder/components/utils", () => {
   }
 })
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       fetchAppPackage: vi.fn(),
diff --git a/packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts
index 6bab3ad6db..e2d777ed99 100644
--- a/packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts
+++ b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts
@@ -1,9 +1,9 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { SortedIntegrationStore } from "stores/builder/sortedIntegrations"
-import { DatasourceTypes } from "constants/backend"
+import { SortedIntegrationStore } from "@/stores/builder/sortedIntegrations"
+import { DatasourceTypes } from "@/constants/backend"
 
 import { derived } from "svelte/store"
-import { integrations } from "stores/builder/integrations"
+import { integrations } from "@/stores/builder/integrations"
 
 vi.mock("svelte/store", () => ({
   derived: vi.fn(() => ({
@@ -14,7 +14,7 @@ vi.mock("svelte/store", () => ({
   })),
 }))
 
-vi.mock("stores/builder/integrations", () => ({ integrations: vi.fn() }))
+vi.mock("@/stores/builder/integrations", () => ({ integrations: vi.fn() }))
 
 const mockedDerived = vi.mocked(derived)
 
diff --git a/packages/builder/src/stores/builder/tests/tables.spec.js.disabled b/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
index 26b4d90229..1e4d3d3cb7 100644
--- a/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/theme.js b/packages/builder/src/stores/builder/theme.js
index d6ec643e07..ed46e9095a 100644
--- a/packages/builder/src/stores/builder/theme.js
+++ b/packages/builder/src/stores/builder/theme.js
@@ -1,5 +1,5 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { ensureValidTheme, DefaultAppTheme } from "@budibase/shared-core"
 
 export const createThemeStore = () => {
diff --git a/packages/builder/src/stores/builder/views.js b/packages/builder/src/stores/builder/views.js
index 1d2463e2e2..07c356f56d 100644
--- a/packages/builder/src/stores/builder/views.js
+++ b/packages/builder/src/stores/builder/views.js
@@ -1,6 +1,6 @@
 import { writable, derived } from "svelte/store"
 import { tables } from "./tables"
-import { API } from "api"
+import { API } from "@/api"
 
 export function createViewsStore() {
   const store = writable({
diff --git a/packages/builder/src/stores/builder/viewsV2.ts b/packages/builder/src/stores/builder/viewsV2.ts
index 07cb606eaf..75a833a80b 100644
--- a/packages/builder/src/stores/builder/viewsV2.ts
+++ b/packages/builder/src/stores/builder/viewsV2.ts
@@ -1,7 +1,7 @@
 import { derived, get, Writable } from "svelte/store"
 import { tables } from "./tables"
-import { API } from "api"
-import { DerivedBudiStore } from "stores/BudiStore"
+import { API } from "@/api"
+import { DerivedBudiStore } from "@/stores/BudiStore"
 import { CreateViewRequest, UpdateViewRequest, ViewV2 } from "@budibase/types"
 import { helpers } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/stores/builder/websocket.js b/packages/builder/src/stores/builder/websocket.js
index 8a0d83abc1..3944c8cba5 100644
--- a/packages/builder/src/stores/builder/websocket.js
+++ b/packages/builder/src/stores/builder/websocket.js
@@ -10,9 +10,9 @@ import {
   datasources,
   tables,
   roles,
-} from "stores/builder"
+} from "@/stores/builder"
 import { get } from "svelte/store"
-import { auth, appsStore } from "stores/portal"
+import { auth, appsStore } from "@/stores/portal"
 import { screenStore } from "./screens"
 import { SocketEvent, BuilderSocketEvent, helpers } from "@budibase/shared-core"
 import { notifications } from "@budibase/bbui"
diff --git a/packages/builder/src/stores/portal/admin.test.js b/packages/builder/src/stores/portal/admin.test.js
index a4adb4320a..1528042630 100644
--- a/packages/builder/src/stores/portal/admin.test.js
+++ b/packages/builder/src/stores/portal/admin.test.js
@@ -1,12 +1,11 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { createAdminStore } from "./admin"
-
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
 import { banner } from "@budibase/bbui"
 
-vi.mock("stores/portal", () => {
+vi.mock("@/stores/portal", () => {
   return { auth: vi.fn() }
 })
 
@@ -21,7 +20,7 @@ vi.mock("svelte/store", () => {
   }
 })
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       getEnvironment: vi.fn(),
@@ -32,7 +31,12 @@ vi.mock("api", () => {
 })
 
 vi.mock("@budibase/bbui", () => {
-  return { banner: { showStatus: vi.fn() } }
+  return {
+    banner: { showStatus: vi.fn() },
+    Helpers: {
+      uuid: vi.fn(),
+    },
+  }
 })
 
 describe("admin store", () => {
diff --git a/packages/builder/src/stores/portal/admin.ts b/packages/builder/src/stores/portal/admin.ts
index 2141cf1b9c..f262d54bff 100644
--- a/packages/builder/src/stores/portal/admin.ts
+++ b/packages/builder/src/stores/portal/admin.ts
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
 import { banner } from "@budibase/bbui"
 import {
   ConfigChecklistResponse,
diff --git a/packages/builder/src/stores/portal/apps.ts b/packages/builder/src/stores/portal/apps.ts
index f74ae4bfe2..0c3e3b6017 100644
--- a/packages/builder/src/stores/portal/apps.ts
+++ b/packages/builder/src/stores/portal/apps.ts
@@ -1,7 +1,6 @@
 import { derived } from "svelte/store"
-// @ts-ignore
-import { AppStatus } from "constants"
-import { API } from "api"
+import { AppStatus } from "@/constants"
+import { API } from "@/api"
 import { auth } from "./auth"
 import { BudiStore } from "../BudiStore"
 import { App, UpdateAppRequest } from "@budibase/types"
diff --git a/packages/builder/src/stores/portal/auditLogs.ts b/packages/builder/src/stores/portal/auditLogs.ts
index e97b301360..ff29f0cd1b 100644
--- a/packages/builder/src/stores/portal/auditLogs.ts
+++ b/packages/builder/src/stores/portal/auditLogs.ts
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { licensing } from "./licensing"
 import { BudiStore } from "../BudiStore"
 import {
diff --git a/packages/builder/src/stores/portal/auth.ts b/packages/builder/src/stores/portal/auth.ts
index 2affea85a7..afbb75646c 100644
--- a/packages/builder/src/stores/portal/auth.ts
+++ b/packages/builder/src/stores/portal/auth.ts
@@ -1,8 +1,8 @@
 import { get } from "svelte/store"
-import { API } from "api"
-import { admin } from "stores/portal"
-import analytics from "analytics"
-import { BudiStore } from "stores/BudiStore"
+import { API } from "@/api"
+import { admin } from "@/stores/portal"
+import analytics from "@/analytics"
+import { BudiStore } from "@/stores/BudiStore"
 import {
   isSSOUser,
   SetInitInfoRequest,
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index e8378afc0f..7bd98c78ea 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 export function createBackupsStore() {
   const store = writable({})
diff --git a/packages/builder/src/stores/portal/backups.test.js b/packages/builder/src/stores/portal/backups.test.js
index 16c487e6e7..51cd13f91a 100644
--- a/packages/builder/src/stores/portal/backups.test.js
+++ b/packages/builder/src/stores/portal/backups.test.js
@@ -1,8 +1,7 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { createBackupsStore } from "./backups"
-
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 vi.mock("svelte/store", () => {
   return {
@@ -10,10 +9,13 @@ vi.mock("svelte/store", () => {
       subscribe: vi.fn(),
       update: vi.fn(),
     })),
+    derived: vi.fn(() => ({
+      subscribe: vi.fn(),
+    })),
   }
 })
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       searchBackups: vi.fn(() => "searchBackupsReturn"),
diff --git a/packages/builder/src/stores/portal/email.js b/packages/builder/src/stores/portal/email.js
index 2e222d34c4..7afd543002 100644
--- a/packages/builder/src/stores/portal/email.js
+++ b/packages/builder/src/stores/portal/email.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 export function createEmailStore() {
   const store = writable({})
diff --git a/packages/builder/src/stores/portal/environment.js b/packages/builder/src/stores/portal/environment.js
index b3e46cf7bf..232f314cad 100644
--- a/packages/builder/src/stores/portal/environment.js
+++ b/packages/builder/src/stores/portal/environment.js
@@ -1,7 +1,7 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { Constants } from "@budibase/frontend-core"
-import { licensing } from "stores/portal"
+import { licensing } from "@/stores/portal"
 
 export function createEnvironmentStore() {
   const { subscribe, update } = writable({
diff --git a/packages/builder/src/stores/portal/featureFlags.js b/packages/builder/src/stores/portal/featureFlags.js
index 902a8b488b..ef1100310a 100644
--- a/packages/builder/src/stores/portal/featureFlags.js
+++ b/packages/builder/src/stores/portal/featureFlags.js
@@ -1,5 +1,5 @@
 import { derived } from "svelte/store"
-import { auth } from "stores/portal"
+import { auth } from "@/stores/portal"
 
 export const INITIAL_FEATUREFLAG_STATE = {
   SQS: false,
diff --git a/packages/builder/src/stores/portal/features.js b/packages/builder/src/stores/portal/features.js
index e2ecb4c66a..747052aa6c 100644
--- a/packages/builder/src/stores/portal/features.js
+++ b/packages/builder/src/stores/portal/features.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { licensing } from "./licensing"
 import { ConfigType } from "@budibase/types"
 
diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js
index f81dee068b..408fb4189a 100644
--- a/packages/builder/src/stores/portal/groups.js
+++ b/packages/builder/src/stores/portal/groups.js
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { licensing } from "stores/portal"
+import { API } from "@/api"
+import { licensing } from "@/stores/portal"
 
 export function createGroupsStore() {
   const store = writable([])
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index b5dd022c5c..afc3ea1628 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -1,8 +1,8 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth, admin } from "stores/portal"
+import { API } from "@/api"
+import { auth, admin } from "@/stores/portal"
 import { Constants } from "@budibase/frontend-core"
-import { StripeStatus } from "components/portal/licensing/constants"
+import { StripeStatus } from "@/components/portal/licensing/constants"
 import { PlanModel } from "@budibase/types"
 
 const UNLIMITED = -1
diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js
index a1b5450ea4..75a9b363be 100644
--- a/packages/builder/src/stores/portal/menu.js
+++ b/packages/builder/src/stores/portal/menu.js
@@ -1,7 +1,7 @@
 import { derived } from "svelte/store"
 import { admin } from "./admin"
 import { auth } from "./auth"
-import { isEnabled } from "helpers/featureFlags"
+import { isEnabled } from "@/helpers/featureFlags"
 import { sdk } from "@budibase/shared-core"
 import { FeatureFlag } from "@budibase/types"
 
diff --git a/packages/builder/src/stores/portal/oidc.js b/packages/builder/src/stores/portal/oidc.js
index 3a4b954753..65d8eac04c 100644
--- a/packages/builder/src/stores/portal/oidc.js
+++ b/packages/builder/src/stores/portal/oidc.js
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
 
 const OIDC_CONFIG = {
   logo: undefined,
diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js
index ab33c7a5fa..6d41620c9f 100644
--- a/packages/builder/src/stores/portal/organisation.js
+++ b/packages/builder/src/stores/portal/organisation.js
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
 import _ from "lodash"
 
 const DEFAULT_CONFIG = {
diff --git a/packages/builder/src/stores/portal/plugins.ts b/packages/builder/src/stores/portal/plugins.ts
index 0794e563eb..635db4e31f 100644
--- a/packages/builder/src/stores/portal/plugins.ts
+++ b/packages/builder/src/stores/portal/plugins.ts
@@ -1,7 +1,7 @@
 import { writable } from "svelte/store"
-import { PluginSource } from "constants/index"
+import { PluginSource } from "@/constants/index"
 import { Plugin } from "@budibase/types"
-import { API } from "api"
+import { API } from "@/api"
 
 export function createPluginsStore() {
   const { subscribe, set, update } = writable<Plugin[]>([])
diff --git a/packages/builder/src/stores/portal/templates.js b/packages/builder/src/stores/portal/templates.js
index 904e9cfa8e..2ff23866ab 100644
--- a/packages/builder/src/stores/portal/templates.js
+++ b/packages/builder/src/stores/portal/templates.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 export function templatesStore() {
   const { subscribe, set } = writable([])
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
index 88467ac612..99ead22317 100644
--- a/packages/builder/src/stores/portal/users.js
+++ b/packages/builder/src/stores/portal/users.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { update } from "lodash"
 import { licensing } from "."
 import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/stores/selectors.js b/packages/builder/src/stores/selectors.js
index f592250f25..af12f7d549 100644
--- a/packages/builder/src/stores/selectors.js
+++ b/packages/builder/src/stores/selectors.js
@@ -1,4 +1,4 @@
-import { DEFAULT_BB_DATASOURCE_ID } from "constants/backend"
+import { DEFAULT_BB_DATASOURCE_ID } from "@/constants/backend"
 import { DatasourceFeature } from "@budibase/types"
 
 export const integrationForDatasource = (integrations, datasource) => ({
diff --git a/packages/builder/src/stores/selectors.test.js b/packages/builder/src/stores/selectors.test.js
index 7bc790ad75..8ea0d7ac73 100644
--- a/packages/builder/src/stores/selectors.test.js
+++ b/packages/builder/src/stores/selectors.test.js
@@ -1,5 +1,5 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { DEFAULT_BB_DATASOURCE_ID } from "constants/backend"
+import { DEFAULT_BB_DATASOURCE_ID } from "@/constants/backend"
 import { integrationForDatasource, hasData, hasDefaultData } from "./selectors"
 
 describe("selectors", () => {
diff --git a/packages/builder/src/templates/commonComponents.js b/packages/builder/src/templates/commonComponents.js
index 884419ae6c..ebc02669c8 100644
--- a/packages/builder/src/templates/commonComponents.js
+++ b/packages/builder/src/templates/commonComponents.js
@@ -1,6 +1,6 @@
-import { FieldTypeToComponentMap } from "components/design/settings/controls/FieldConfiguration/utils"
+import { FieldTypeToComponentMap } from "@/components/design/settings/controls/FieldConfiguration/utils"
 import { Component } from "./Component"
-import { getSchemaForDatasource } from "dataBinding"
+import { getSchemaForDatasource } from "@/dataBinding"
 
 export function makeDatasourceFormComponents(datasource) {
   const { schema } = getSchemaForDatasource(null, datasource, {
diff --git a/packages/builder/src/templates/rowActions.js b/packages/builder/src/templates/rowActions.js
index 639db09d00..356c20e68a 100644
--- a/packages/builder/src/templates/rowActions.js
+++ b/packages/builder/src/templates/rowActions.js
@@ -1,8 +1,8 @@
 import { get } from "svelte/store"
-import { getDatasourceForProvider } from "dataBinding"
-import { rowActions, selectedScreen, componentStore } from "stores/builder"
+import { getDatasourceForProvider } from "@/dataBinding"
+import { rowActions, selectedScreen, componentStore } from "@/stores/builder"
 import { Helpers } from "@budibase/bbui"
-import { findComponent } from "helpers/components"
+import { findComponent } from "@/helpers/components"
 
 export const getRowActionButtonTemplates = async ({
   screen,
diff --git a/packages/builder/src/templates/screenTemplating/blank.js b/packages/builder/src/templates/screenTemplating/blank.js
index 18859cc39d..81fec2030b 100644
--- a/packages/builder/src/templates/screenTemplating/blank.js
+++ b/packages/builder/src/templates/screenTemplating/blank.js
@@ -1,7 +1,7 @@
 import { Screen } from "./Screen"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "./getValidRoute"
-import { Roles } from "constants/backend"
+import { Roles } from "@/constants/backend"
 
 const blank = ({ route, screens }) => {
   const validRoute = getValidRoute(screens, route, Roles.BASIC)
diff --git a/packages/builder/src/templates/screenTemplating/form.js b/packages/builder/src/templates/screenTemplating/form.js
index e0fe815896..30070ce3cd 100644
--- a/packages/builder/src/templates/screenTemplating/form.js
+++ b/packages/builder/src/templates/screenTemplating/form.js
@@ -1,9 +1,9 @@
 import { Screen } from "./Screen"
 import { Component } from "../Component"
 import getValidRoute from "./getValidRoute"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 import { Helpers } from "@budibase/bbui"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 export const getTypeSpecificRoute = (tableOrView, type) => {
   if (type === "create") {
diff --git a/packages/builder/src/templates/screenTemplating/getValidRoute.js b/packages/builder/src/templates/screenTemplating/getValidRoute.js
index d49d6b6598..1fe2efb228 100644
--- a/packages/builder/src/templates/screenTemplating/getValidRoute.js
+++ b/packages/builder/src/templates/screenTemplating/getValidRoute.js
@@ -1,4 +1,4 @@
-import sanitizeUrl from "helpers/sanitizeUrl"
+import sanitizeUrl from "@/helpers/sanitizeUrl"
 
 const arbitraryMax = 10000
 
diff --git a/packages/builder/src/templates/screenTemplating/table/inline.js b/packages/builder/src/templates/screenTemplating/table/inline.js
index b7e0dd58b8..86f23582bb 100644
--- a/packages/builder/src/templates/screenTemplating/table/inline.js
+++ b/packages/builder/src/templates/screenTemplating/table/inline.js
@@ -1,8 +1,8 @@
 import { Screen } from "../Screen"
 import { Component } from "../../Component"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "../getValidRoute"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const inline = async ({ tableOrView, permissions, screens }) => {
   const heading = new Component("@budibase/standard-components/heading")
diff --git a/packages/builder/src/templates/screenTemplating/table/modal.js b/packages/builder/src/templates/screenTemplating/table/modal.js
index 6a97979b31..76c32ef278 100644
--- a/packages/builder/src/templates/screenTemplating/table/modal.js
+++ b/packages/builder/src/templates/screenTemplating/table/modal.js
@@ -3,9 +3,9 @@ import { Component } from "../../Component"
 import { generate } from "shortid"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import { Utils } from "@budibase/frontend-core"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "../getValidRoute"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const modal = async ({ tableOrView, permissions, screens }) => {
   /*
diff --git a/packages/builder/src/templates/screenTemplating/table/newScreen.js b/packages/builder/src/templates/screenTemplating/table/newScreen.js
index b8b06d3d44..285376a44a 100644
--- a/packages/builder/src/templates/screenTemplating/table/newScreen.js
+++ b/packages/builder/src/templates/screenTemplating/table/newScreen.js
@@ -1,10 +1,10 @@
 import { Screen } from "../Screen"
 import { Component } from "../../Component"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import getValidRoute from "../getValidRoute"
 import { Helpers } from "@budibase/bbui"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const getTableScreenTemplate = ({
   route,
diff --git a/packages/builder/src/templates/screenTemplating/table/sidePanel.js b/packages/builder/src/templates/screenTemplating/table/sidePanel.js
index 139b117d1b..966ecea2bd 100644
--- a/packages/builder/src/templates/screenTemplating/table/sidePanel.js
+++ b/packages/builder/src/templates/screenTemplating/table/sidePanel.js
@@ -3,9 +3,9 @@ import { Component } from "../../Component"
 import { generate } from "shortid"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import { Utils } from "@budibase/frontend-core"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "../getValidRoute"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const sidePanel = async ({ tableOrView, permissions, screens }) => {
   /*
diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json
index da5dcd67c6..d698e2fe1d 100644
--- a/packages/builder/tsconfig.json
+++ b/packages/builder/tsconfig.json
@@ -2,16 +2,17 @@
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
     "outDir": "./dist",
+    "lib": ["ESNext"],
     "baseUrl": ".",
     "paths": {
-      "assets/*": ["./assets/*"],
       "@budibase/*": [
         "../*/src/index.ts",
         "../*/src/index.js",
         "../*",
         "../../node_modules/@budibase/*"
       ],
-      "*": ["./src/*"]
+      "assets/*": ["assets/*"],
+      "@/*": ["src/*"]
     }
   }
 }
diff --git a/packages/builder/vite.config.mjs b/packages/builder/vite.config.mjs
index ccc5729d28..fb281f60bc 100644
--- a/packages/builder/vite.config.mjs
+++ b/packages/builder/vite.config.mjs
@@ -88,64 +88,13 @@ export default defineConfig(({ mode }) => {
     },
     resolve: {
       dedupe: ["@roxi/routify"],
-      alias: [
-        {
-          find: "assets",
-          replacement: path.resolve("./assets"),
-        },
-        {
-          find: "components",
-          replacement: path.resolve("./src/components"),
-        },
-        {
-          find: "pages",
-          replacement: path.resolve("./src/pages"),
-        },
-        {
-          find: "templates",
-          replacement: path.resolve("./src/templates"),
-        },
-        {
-          find: "stores",
-          replacement: path.resolve("./src/stores"),
-        },
-        {
-          find: "dataBinding",
-          replacement: path.resolve("./src/dataBinding.js"),
-        },
-        {
-          find: "api",
-          replacement: path.resolve("./src/api.js"),
-        },
-        {
-          find: "constants",
-          replacement: path.resolve("./src/constants"),
-        },
-        {
-          find: "analytics",
-          replacement: path.resolve("./src/analytics"),
-        },
-        {
-          find: "actions",
-          replacement: path.resolve("./src/actions"),
-        },
-        {
-          find: "helpers",
-          replacement: path.resolve("./src/helpers"),
-        },
-        {
-          find: "@budibase/types",
-          replacement: path.resolve("../types/src"),
-        },
-        {
-          find: "@budibase/shared-core",
-          replacement: path.resolve("../shared-core/src"),
-        },
-        {
-          find: "@budibase/bbui",
-          replacement: path.resolve("../bbui/src"),
-        },
-      ],
+      alias: {
+        "@budibase/types": path.resolve(__dirname, "../types/src"),
+        "@budibase/shared-core": path.resolve(__dirname, "../shared-core/src"),
+        "@budibase/bbui": path.resolve(__dirname, "../bbui/src"),
+        "@": path.resolve(__dirname, "src"),
+        assets: path.resolve(__dirname, "assets"),
+      },
     },
   }
 })
diff --git a/packages/client/svelte.config.mjs b/packages/client/svelte.config.mjs
new file mode 100644
index 0000000000..af7d74ea4b
--- /dev/null
+++ b/packages/client/svelte.config.mjs
@@ -0,0 +1,7 @@
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"
+
+const config = {
+  preprocess: vitePreprocess(),
+}
+
+export default config
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index fcaf9724c3..bd630e9908 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { setContext, onMount } from "svelte"
   import { writable, derived } from "svelte/store"
   import { fade } from "svelte/transition"
@@ -47,24 +47,22 @@
   export let buttonsCollapsedText = null
   export let darkMode = false
   export let isCloud = null
-  export let rowConditions = null
   export let aiEnabled = false
 
   // Unique identifier for DOM nodes inside this instance
   const gridID = `grid-${Math.random().toString().slice(2)}`
 
   // Store props in a store for reference in other stores
-  const props = writable($$props)
+  const props: any = writable($$props)
 
   // Build up context
-  let context = {
+  let context = attachStores({
     API: API || createAPIClient(),
     Constants,
     gridID,
     props,
-  }
-  context = { ...context, ...createEventManagers() }
-  context = attachStores(context)
+    ...createEventManagers(),
+  })
 
   // Reference some stores for local use
   const {
@@ -106,7 +104,6 @@
     darkMode,
     isCloud,
     aiEnabled,
-    rowConditions,
   })
 
   // Derive min height and make available in context
diff --git a/packages/frontend-core/src/components/grid/lib/events.js b/packages/frontend-core/src/components/grid/lib/events.ts
similarity index 78%
rename from packages/frontend-core/src/components/grid/lib/events.js
rename to packages/frontend-core/src/components/grid/lib/events.ts
index 1c486858b2..7fd826954a 100644
--- a/packages/frontend-core/src/components/grid/lib/events.js
+++ b/packages/frontend-core/src/components/grid/lib/events.ts
@@ -2,11 +2,11 @@ import { createEventDispatcher } from "svelte"
 
 export const createEventManagers = () => {
   const svelteDispatch = createEventDispatcher()
-  let subscribers = {}
+  let subscribers: Record<string, ((...params: any) => void)[]> = {}
 
   // Dispatches an event, notifying subscribers and also emitting a normal
   // svelte event
-  const dispatch = (event, payload) => {
+  const dispatch = (event: string, payload: any) => {
     svelteDispatch(event, payload)
     const subs = subscribers[event] || []
     for (let i = 0; i < subs.length; i++) {
@@ -15,7 +15,7 @@ export const createEventManagers = () => {
   }
 
   // Subscribes to events
-  const subscribe = (event, callback) => {
+  const subscribe = (event: string, callback: () => void) => {
     const subs = subscribers[event] || []
     subscribers[event] = [...subs, callback]
 
diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js
index f1f33d9950..ee74a14bf0 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.js
@@ -1,3 +1,5 @@
+// TODO: remove when all stores are typed
+
 import { GeneratedIDPrefix, CellIDSeparator } from "./constants"
 import { Helpers } from "@budibase/bbui"
 
diff --git a/packages/frontend-core/src/components/grid/lib/utils.ts b/packages/frontend-core/src/components/grid/lib/utils.ts
new file mode 100644
index 0000000000..3dd2d1ddd5
--- /dev/null
+++ b/packages/frontend-core/src/components/grid/lib/utils.ts
@@ -0,0 +1,32 @@
+import { GeneratedIDPrefix, CellIDSeparator } from "./constants"
+import { Helpers } from "@budibase/bbui"
+
+export const parseCellID = (cellId: string | null) => {
+  if (!cellId) {
+    return { rowId: undefined, field: undefined }
+  }
+  const parts = cellId.split(CellIDSeparator)
+  const field = parts.pop()
+  return { rowId: parts.join(CellIDSeparator), field }
+}
+
+export const getCellID = (rowId: string, fieldName: string) => {
+  return `${rowId}${CellIDSeparator}${fieldName}`
+}
+
+export const parseEventLocation = (event: MouseEvent | TouchEvent) => {
+  const e = event as MouseEvent & TouchEvent
+
+  return {
+    x: e.clientX ?? e.touches?.[0]?.clientX,
+    y: e.clientY ?? e.touches?.[0]?.clientY,
+  }
+}
+
+export const generateRowID = () => {
+  return `${GeneratedIDPrefix}${Helpers.uuid()}`
+}
+
+export const isGeneratedRowID = (id: string) => {
+  return id?.startsWith(GeneratedIDPrefix)
+}
diff --git a/packages/frontend-core/src/components/grid/stores/bounds.js b/packages/frontend-core/src/components/grid/stores/bounds.js
deleted file mode 100644
index c0939f7389..0000000000
--- a/packages/frontend-core/src/components/grid/stores/bounds.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { derived, writable } from "svelte/store"
-
-export const createStores = () => {
-  const bounds = writable({
-    left: 0,
-    top: 0,
-    width: 0,
-    height: 0,
-  })
-
-  // Derive height and width as primitives to avoid wasted computation
-  const width = derived(bounds, $bounds => $bounds.width, 0)
-  const height = derived(bounds, $bounds => $bounds.height, 0)
-
-  return { bounds, height, width }
-}
diff --git a/packages/frontend-core/src/components/grid/stores/bounds.ts b/packages/frontend-core/src/components/grid/stores/bounds.ts
new file mode 100644
index 0000000000..0050555f96
--- /dev/null
+++ b/packages/frontend-core/src/components/grid/stores/bounds.ts
@@ -0,0 +1,29 @@
+import { derived, Readable, Writable, writable } from "svelte/store"
+
+interface BoundsStore {
+  bounds: Writable<{
+    left: number
+    top: number
+    width: number
+    height: number
+  }>
+  height: Readable<number>
+  width: Readable<number>
+}
+
+export type Store = BoundsStore
+
+export const createStores = (): BoundsStore => {
+  const bounds = writable({
+    left: 0,
+    top: 0,
+    width: 0,
+    height: 0,
+  })
+
+  // Derive height and width as primitives to avoid wasted computation
+  const width = derived(bounds, $bounds => $bounds.width, 0)
+  const height = derived(bounds, $bounds => $bounds.height, 0)
+
+  return { bounds, height, width }
+}
diff --git a/packages/frontend-core/src/components/grid/stores/cache.js b/packages/frontend-core/src/components/grid/stores/cache.ts
similarity index 63%
rename from packages/frontend-core/src/components/grid/stores/cache.js
rename to packages/frontend-core/src/components/grid/stores/cache.ts
index cf4690f15b..999a3ea11d 100644
--- a/packages/frontend-core/src/components/grid/stores/cache.js
+++ b/packages/frontend-core/src/components/grid/stores/cache.ts
@@ -1,16 +1,31 @@
-export const createActions = context => {
+import { FindTableResponse } from "@budibase/types"
+import { Store as StoreContext } from "."
+
+interface CacheActionStore {
+  cache: {
+    actions: {
+      getPrimaryDisplayForTableId: (tableId: string) => Promise<string>
+      getTable: (tableId: string) => Promise<FindTableResponse>
+      resetCache: () => any
+    }
+  }
+}
+
+export type Store = CacheActionStore
+
+export const createActions = (context: StoreContext): CacheActionStore => {
   const { API } = context
 
   // Cache for the primary display columns of different tables.
   // If we ever need to cache table definitions for other purposes then we can
   // expand this to be a more generic cache.
-  let tableCache = {}
+  let tableCache: Record<string, Promise<FindTableResponse>> = {}
 
   const resetCache = () => {
     tableCache = {}
   }
 
-  const fetchTable = async tableId => {
+  const fetchTable = async (tableId: string) => {
     // If we've never encountered this tableId before then store a promise that
     // resolves to the primary display so that subsequent invocations before the
     // promise completes can reuse this promise
@@ -21,13 +36,13 @@ export const createActions = context => {
     return await tableCache[tableId]
   }
 
-  const getPrimaryDisplayForTableId = async tableId => {
+  const getPrimaryDisplayForTableId = async (tableId: string) => {
     const table = await fetchTable(tableId)
     const display = table?.primaryDisplay || table?.schema?.[0]?.name
     return display
   }
 
-  const getTable = async tableId => {
+  const getTable = async (tableId: string) => {
     const table = await fetchTable(tableId)
     return table
   }
@@ -43,7 +58,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { datasource, cache } = context
 
   // Wipe the caches whenever the datasource changes to ensure we aren't
diff --git a/packages/frontend-core/src/components/grid/stores/clipboard.js b/packages/frontend-core/src/components/grid/stores/clipboard.ts
similarity index 78%
rename from packages/frontend-core/src/components/grid/stores/clipboard.js
rename to packages/frontend-core/src/components/grid/stores/clipboard.ts
index 1cb75b38b1..3489e5c847 100644
--- a/packages/frontend-core/src/components/grid/stores/clipboard.js
+++ b/packages/frontend-core/src/components/grid/stores/clipboard.ts
@@ -1,10 +1,41 @@
-import { derived, writable, get } from "svelte/store"
+import { derived, writable, get, Writable, Readable } from "svelte/store"
 import { Helpers } from "@budibase/bbui"
 import { parseCellID, getCellID } from "../lib/utils"
 import { NewRowID } from "../lib/constants"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
-  const clipboard = writable({
+type ClipboardStoreData =
+  | {
+      value: any[][]
+      multiCellCopy: true
+    }
+  | {
+      value: any | null | undefined
+      multiCellCopy: false
+    }
+
+interface ClipboardStore {
+  clipboard: Writable<ClipboardStoreData>
+}
+
+interface ClipboardDerivedStore {
+  copyAllowed: Readable<boolean>
+  pasteAllowed: Readable<boolean>
+}
+
+interface ClipboardActions {
+  clipboard: ClipboardStore["clipboard"] & {
+    actions: {
+      copy: () => void
+      paste: (progressCallback: () => void) => Promise<void>
+    }
+  }
+}
+
+export type Store = ClipboardStore & ClipboardDerivedStore & ClipboardActions
+
+export const createStores = (): ClipboardStore => {
+  const clipboard = writable<ClipboardStoreData>({
     value: null,
     multiCellCopy: false,
   })
@@ -13,7 +44,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): ClipboardDerivedStore => {
   const { clipboard, focusedCellAPI, selectedCellCount, config, focusedRowId } =
     context
 
@@ -60,7 +91,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): ClipboardActions => {
   const {
     clipboard,
     focusedCellAPI,
@@ -92,11 +123,11 @@ export const createActions = context => {
       const $rowChangeCache = get(rowChangeCache)
 
       // Extract value of each selected cell, accounting for the change cache
-      let value = []
-      for (let row of $selectedCells) {
+      const value = []
+      for (const row of $selectedCells) {
         const rowValues = []
-        for (let cellId of row) {
-          const { rowId, field } = parseCellID(cellId)
+        for (const cellId of row) {
+          const { rowId = "", field = "" } = parseCellID(cellId)
           const row = {
             ...$rowLookupMap[rowId],
             ...$rowChangeCache[rowId],
@@ -113,7 +144,7 @@ export const createActions = context => {
       })
     } else {
       // Single value to copy
-      const value = $focusedCellAPI.getValue()
+      const value = $focusedCellAPI?.getValue()
       clipboard.set({
         value,
         multiCellCopy,
@@ -130,7 +161,7 @@ export const createActions = context => {
   }
 
   // Pastes the previously copied value(s) into the selected cell(s)
-  const paste = async progressCallback => {
+  const paste = async (progressCallback: () => void) => {
     if (!get(pasteAllowed)) {
       return
     }
@@ -166,8 +197,8 @@ export const createActions = context => {
         const { rowId, field } = parseCellID($focusedCellId)
         const $rowLookupMap = get(rowLookupMap)
         const $columnLookupMap = get(columnLookupMap)
-        const rowIdx = $rowLookupMap[rowId].__idx
-        const colIdx = $columnLookupMap[field].__idx
+        const rowIdx = $rowLookupMap[rowId!].__idx
+        const colIdx = $columnLookupMap[field!].__idx || 0
 
         // Get limits of how many rows and columns we're able to paste into
         const $rows = get(rows)
@@ -187,7 +218,7 @@ export const createActions = context => {
         // Paste into target cell range
         if (targetCellId === $focusedCellId) {
           // Single cell edge case
-          get(focusedCellAPI).setValue(value[0][0])
+          get(focusedCellAPI)?.setValue(value[0][0])
         } else {
           // Select the new cells to paste into, then paste
           selectedCells.actions.selectRange($focusedCellId, targetCellId)
@@ -197,17 +228,20 @@ export const createActions = context => {
     } else {
       if (multiCellPaste) {
         // Single to multi - duplicate value to all selected cells
-        const newValue = get(selectedCells).map(row => row.map(() => value))
+        const newValue = get(selectedCells).map(row => row.map(() => value!))
         await pasteIntoSelectedCells(newValue, progressCallback)
       } else {
         // Single to single - just update the cell's value
-        get(focusedCellAPI).setValue(value)
+        get(focusedCellAPI)?.setValue(value ?? null)
       }
     }
   }
 
   // Paste the specified value into the currently selected cells
-  const pasteIntoSelectedCells = async (value, progressCallback) => {
+  const pasteIntoSelectedCells = async (
+    value: string[][],
+    progressCallback: () => any
+  ) => {
     const $selectedCells = get(selectedCells)
 
     // Find the extent at which we can paste
@@ -215,11 +249,13 @@ export const createActions = context => {
     const colExtent = Math.min(value[0].length, $selectedCells[0].length)
 
     // Build change map
-    let changeMap = {}
+    let changeMap: Record<string, Record<string, string>> = {}
     for (let rowIdx = 0; rowIdx < rowExtent; rowIdx++) {
       for (let colIdx = 0; colIdx < colExtent; colIdx++) {
         const cellId = $selectedCells[rowIdx][colIdx]
-        const { rowId, field } = parseCellID(cellId)
+        let { rowId, field } = parseCellID(cellId)
+        rowId = rowId!
+        field = field!
         if (!changeMap[rowId]) {
           changeMap[rowId] = {}
         }
diff --git a/packages/frontend-core/src/components/grid/stores/columns.ts b/packages/frontend-core/src/components/grid/stores/columns.ts
index b201cc7f7b..70b93d93e6 100644
--- a/packages/frontend-core/src/components/grid/stores/columns.ts
+++ b/packages/frontend-core/src/components/grid/stores/columns.ts
@@ -16,7 +16,16 @@ interface DerivedColumnStore {
   hasNonAutoColumn: Readable<boolean>
 }
 
-export type Store = ColumnStore & DerivedColumnStore
+interface ColumnActions {
+  columns: ColumnStore["columns"] & {
+    actions: {
+      changeAllColumnWidths: (width: number) => Promise<void>
+      isReadonly: (column: UIColumn) => boolean
+    }
+  }
+}
+
+export type Store = ColumnStore & DerivedColumnStore & ColumnActions
 
 export const createStores = (): ColumnStore => {
   const columns = writable<UIColumn[]>([])
@@ -95,7 +104,7 @@ export const deriveStores = (context: StoreContext): DerivedColumnStore => {
   }
 }
 
-export const createActions = (context: StoreContext) => {
+export const createActions = (context: StoreContext): ColumnActions => {
   const { columns, datasource } = context
 
   // Updates the width of all columns
@@ -147,11 +156,11 @@ export const initialise = (context: StoreContext) => {
 
   // Merge new schema fields with existing schema in order to preserve widths
   const processColumns = ($enrichedSchema: any) => {
-    if (!$enrichedSchema) {
+    const $definition = get(definition)
+    if (!$enrichedSchema || !$definition) {
       columns.set([])
       return
     }
-    const $definition = get(definition)
     const $columns = get(columns)
     const $displayColumn = get(displayColumn)
 
@@ -180,6 +189,8 @@ export const initialise = (context: StoreContext) => {
             conditions: fieldSchema.conditions,
             related: fieldSchema.related,
             calculationType: fieldSchema.calculationType,
+            __left: undefined as any, // TODO
+            __idx: undefined as any, // TODO
           }
           // Override a few properties for primary display
           if (field === primaryDisplay) {
diff --git a/packages/frontend-core/src/components/grid/stores/conditions.js b/packages/frontend-core/src/components/grid/stores/conditions.ts
similarity index 77%
rename from packages/frontend-core/src/components/grid/stores/conditions.js
rename to packages/frontend-core/src/components/grid/stores/conditions.ts
index 3800f21df1..cf47456b44 100644
--- a/packages/frontend-core/src/components/grid/stores/conditions.js
+++ b/packages/frontend-core/src/components/grid/stores/conditions.ts
@@ -1,15 +1,31 @@
-import { writable, get } from "svelte/store"
+import { writable, get, Writable, Readable } from "svelte/store"
 import { derivedMemo, QueryUtils } from "../../../utils"
-import { FieldType, EmptyFilterOption } from "@budibase/types"
+import {
+  FieldType,
+  EmptyFilterOption,
+  UIRow,
+  UICondition,
+} from "@budibase/types"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
+interface ConditionStore {
+  metadata: Writable<Record<string, any>>
+}
+
+interface ConditionDerivedStore {
+  conditions: Readable<UICondition[]>
+}
+
+export type Store = ConditionStore & ConditionDerivedStore
+
+export const createStores = (): ConditionStore => {
   const metadata = writable({})
   return {
     metadata,
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): ConditionDerivedStore => {
   const { columns } = context
 
   // Derive and memoize the cell conditions present in our columns so that we
@@ -33,12 +49,12 @@ export const deriveStores = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { metadata, conditions, rows } = context
 
   // Recompute all metadata if conditions change
   conditions.subscribe($conditions => {
-    let newMetadata = {}
+    let newMetadata: Record<string, any> = {}
     if ($conditions?.length) {
       for (let row of get(rows)) {
         newMetadata[row._id] = evaluateConditions(row, $conditions)
@@ -54,7 +70,7 @@ export const initialise = context => {
       return
     }
     const $metadata = get(metadata)
-    let metadataUpdates = {}
+    let metadataUpdates: Record<string, any> = {}
     for (let row of $rows) {
       if (!row._rev || $metadata[row._id]?.version !== row._rev) {
         metadataUpdates[row._id] = evaluateConditions(row, $conditions)
@@ -69,15 +85,15 @@ export const initialise = context => {
   })
 }
 
-const TypeCoercionMap = {
+const TypeCoercionMap: Partial<Record<FieldType, (val: string) => any>> = {
   [FieldType.NUMBER]: parseFloat,
-  [FieldType.DATETIME]: val => {
+  [FieldType.DATETIME]: (val: string) => {
     if (val) {
       return new Date(val).toISOString()
     }
     return null
   },
-  [FieldType.BOOLEAN]: val => {
+  [FieldType.BOOLEAN]: (val: string) => {
     if (`${val}`.toLowerCase().trim() === "true") {
       return true
     }
@@ -90,8 +106,12 @@ const TypeCoercionMap = {
 
 // Evaluates an array of cell conditions against a certain row and returns the
 // resultant metadata
-const evaluateConditions = (row, conditions) => {
-  let metadata = {
+const evaluateConditions = (row: UIRow, conditions: UICondition[]) => {
+  const metadata: {
+    version?: string
+    row: Record<string, string>
+    cell: Record<string, any>
+  } = {
     version: row._rev,
     row: {},
     cell: {},
diff --git a/packages/frontend-core/src/components/grid/stores/config.js b/packages/frontend-core/src/components/grid/stores/config.ts
similarity index 77%
rename from packages/frontend-core/src/components/grid/stores/config.js
rename to packages/frontend-core/src/components/grid/stores/config.ts
index 4a60370690..e334b58495 100644
--- a/packages/frontend-core/src/components/grid/stores/config.js
+++ b/packages/frontend-core/src/components/grid/stores/config.ts
@@ -1,10 +1,22 @@
 import { derivedMemo } from "../../../utils"
-import { derived } from "svelte/store"
+import { derived, Readable } from "svelte/store"
 import { ViewV2Type } from "@budibase/types"
+import { BaseStoreProps, Store as StoreContext } from "."
 
-export const createStores = context => {
+type ConfigStore = {
+  [key in keyof BaseStoreProps]: Readable<BaseStoreProps[key]>
+}
+
+interface ConfigDerivedStore {
+  config: Readable<BaseStoreProps>
+}
+
+export type Store = ConfigStore & ConfigDerivedStore
+
+export const createStores = (context: StoreContext): ConfigStore => {
   const { props } = context
-  const getProp = prop => derivedMemo(props, $props => $props[prop])
+  const getProp = <T extends keyof BaseStoreProps>(prop: T) =>
+    derivedMemo(props, $props => $props[prop])
 
   // Derive and memoize some props so that we can react to them in isolation
   const datasource = getProp("datasource")
@@ -15,7 +27,6 @@ export const createStores = context => {
   const schemaOverrides = getProp("schemaOverrides")
   const notifySuccess = getProp("notifySuccess")
   const notifyError = getProp("notifyError")
-  const rowConditions = getProp("rowConditions")
 
   return {
     datasource,
@@ -26,11 +37,10 @@ export const createStores = context => {
     schemaOverrides,
     notifySuccess,
     notifyError,
-    rowConditions,
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): ConfigDerivedStore => {
   const { props, definition, hasNonAutoColumn } = context
 
   // Derive features
diff --git a/packages/frontend-core/src/components/grid/stores/datasource.ts b/packages/frontend-core/src/components/grid/stores/datasource.ts
index 7aee6e8515..74101701ed 100644
--- a/packages/frontend-core/src/components/grid/stores/datasource.ts
+++ b/packages/frontend-core/src/components/grid/stores/datasource.ts
@@ -3,20 +3,20 @@ import { getDatasourceDefinition, getDatasourceSchema } from "../../../fetch"
 import { enrichSchemaWithRelColumns, memo } from "../../../utils"
 import { cloneDeep } from "lodash"
 import {
-  Row,
   SaveRowRequest,
   SaveTableRequest,
   UIDatasource,
   UIFieldMutation,
   UIFieldSchema,
+  UIRow,
   UpdateViewRequest,
   ViewV2Type,
 } from "@budibase/types"
-import { Store as StoreContext } from "."
+import { Store as StoreContext, BaseStoreProps } from "."
 import { DatasourceActions } from "./datasources"
 
 interface DatasourceStore {
-  definition: Writable<UIDatasource>
+  definition: Writable<UIDatasource | null>
   schemaMutations: Writable<Record<string, UIFieldMutation>>
   subSchemaMutations: Writable<Record<string, Record<string, UIFieldMutation>>>
 }
@@ -28,7 +28,7 @@ interface DerivedDatasourceStore {
 }
 
 interface ActionDatasourceStore {
-  datasource: DatasourceStore["definition"] & {
+  datasource: BaseStoreProps["datasource"] & {
     actions: DatasourceActions & {
       refreshDefinition: () => Promise<void>
       changePrimaryDisplay: (column: string) => Promise<void>
@@ -218,7 +218,7 @@ export const createActions = (context: StoreContext): ActionDatasourceStore => {
 
   // Updates the datasources primary display column
   const changePrimaryDisplay = async (column: string) => {
-    let newDefinition = cloneDeep(get(definition))
+    let newDefinition = cloneDeep(get(definition)!)
 
     // Update primary display
     newDefinition.primaryDisplay = column
@@ -327,7 +327,7 @@ export const createActions = (context: StoreContext): ActionDatasourceStore => {
   }
 
   // Deletes rows from the datasource
-  const deleteRows = async (rows: Row[]) => {
+  const deleteRows = async (rows: UIRow[]) => {
     return await getAPI()?.actions.deleteRows(rows)
   }
 
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/index.ts b/packages/frontend-core/src/components/grid/stores/datasources/index.ts
index c58aef37e9..4b04095c8e 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/index.ts
+++ b/packages/frontend-core/src/components/grid/stores/datasources/index.ts
@@ -1,8 +1,8 @@
 import {
-  Row,
   SaveRowRequest,
   SaveTableRequest,
   UIDatasource,
+  UIRow,
   UpdateViewRequest,
 } from "@budibase/types"
 
@@ -10,10 +10,10 @@ interface DatasourceBaseActions<
   TSaveDefinitionRequest = UpdateViewRequest | SaveTableRequest
 > {
   saveDefinition: (newDefinition: TSaveDefinitionRequest) => Promise<void>
-  addRow: (row: SaveRowRequest) => Promise<Row | void>
-  updateRow: (row: SaveRowRequest) => Promise<Row | void>
-  deleteRows: (rows: Row[]) => Promise<void>
-  getRow: (id: string) => Promise<Row | void>
+  addRow: (row: SaveRowRequest) => Promise<UIRow | undefined>
+  updateRow: (row: SaveRowRequest) => Promise<UIRow | undefined>
+  deleteRows: (rows: UIRow[]) => Promise<void>
+  getRow: (id: string) => Promise<UIRow | void>
   isDatasourceValid: (datasource: UIDatasource) => boolean | void
   canUseColumn: (name: string) => boolean | void
 }
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts b/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts
index 17e5e8b8d9..6e81ff3e48 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts
+++ b/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts
@@ -91,7 +91,7 @@ export const initialise = (context: StoreContext) => {
     }
 
     // Wipe state
-    filter.set(get(initialFilter))
+    filter.set(get(initialFilter) ?? undefined)
     inlineFilters.set([])
     sort.set({
       column: get(initialSortColumn),
@@ -106,7 +106,7 @@ export const initialise = (context: StoreContext) => {
         if (!isSameDatasource($fetch?.options?.datasource, $datasource)) {
           return
         }
-        $fetch.update({
+        $fetch?.update({
           filter: $allFilters,
         })
       })
@@ -120,9 +120,9 @@ export const initialise = (context: StoreContext) => {
         if (!isSameDatasource($fetch?.options?.datasource, $datasource)) {
           return
         }
-        $fetch.update({
+        $fetch?.update({
           sortOrder: $sort.order || SortOrder.ASCENDING,
-          sortColumn: $sort.column,
+          sortColumn: $sort.column ?? undefined,
         })
       })
     )
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/table.ts b/packages/frontend-core/src/components/grid/stores/datasources/table.ts
index 894a65ba4c..27fa638596 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/table.ts
+++ b/packages/frontend-core/src/components/grid/stores/datasources/table.ts
@@ -31,7 +31,8 @@ export const createActions = (context: StoreContext): TableActions => {
       ...row,
       tableId: get(datasource)?.tableId,
     }
-    return await API.saveRow(row, SuppressErrors)
+    const newRow = await API.saveRow(row, SuppressErrors)
+    return { ...newRow, _id: newRow._id! }
   }
 
   const deleteRows = async (rows: Row[]) => {
@@ -52,7 +53,12 @@ export const createActions = (context: StoreContext): TableActions => {
       },
       paginate: false,
     })
-    return res?.rows?.[0]
+    const row = res?.rows?.[0]
+    if (!row) {
+      return
+    }
+
+    return { ...row, _id: row._id! }
   }
 
   const canUseColumn = (name: string) => {
@@ -102,7 +108,7 @@ export const initialise = (context: StoreContext) => {
     }
 
     // Wipe state
-    filter.set(get(initialFilter))
+    filter.set(get(initialFilter) ?? undefined)
     inlineFilters.set([])
     sort.set({
       column: get(initialSortColumn),
@@ -133,7 +139,7 @@ export const initialise = (context: StoreContext) => {
         }
         $fetch.update({
           sortOrder: $sort.order || SortOrder.ASCENDING,
-          sortColumn: $sort.column,
+          sortColumn: $sort.column ?? undefined,
         })
       })
     )
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts b/packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts
index d9cac5397d..4dc5a44fd5 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts
+++ b/packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts
@@ -34,8 +34,10 @@ export const createActions = (context: StoreContext): ViewActions => {
       tableId: $datasource?.tableId,
       _viewId: $datasource?.id,
     }
+    const newRow = await API.saveRow(row, SuppressErrors)
     return {
-      ...(await API.saveRow(row, SuppressErrors)),
+      ...newRow,
+      _id: newRow._id!,
       _viewId: row._viewId,
     }
   }
@@ -54,7 +56,12 @@ export const createActions = (context: StoreContext): ViewActions => {
       },
       paginate: false,
     })
-    return res?.rows?.[0]
+    const row = res?.rows?.[0]
+    if (!row) {
+      return
+    }
+
+    return { ...row, _id: row._id! }
   }
 
   const isDatasourceValid = (datasource: UIDatasource) => {
@@ -114,7 +121,7 @@ export const initialise = (context: StoreContext) => {
     }
 
     // Reset state for new view
-    filter.set(get(initialFilter))
+    filter.set(get(initialFilter) ?? undefined)
     inlineFilters.set([])
     sort.set({
       column: get(initialSortColumn),
@@ -166,7 +173,7 @@ export const initialise = (context: StoreContext) => {
           await datasource.actions.saveDefinition({
             ...$view,
             sort: {
-              field: $sort.column,
+              field: $sort.column!,
               order: $sort.order || SortOrder.ASCENDING,
             },
           })
@@ -180,7 +187,7 @@ export const initialise = (context: StoreContext) => {
         }
         $fetch.update({
           sortOrder: $sort.order,
-          sortColumn: $sort.column,
+          sortColumn: $sort.column ?? undefined,
         })
       })
     )
diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.ts
similarity index 57%
rename from packages/frontend-core/src/components/grid/stores/filter.js
rename to packages/frontend-core/src/components/grid/stores/filter.ts
index e7adc356ae..b0a204d42c 100644
--- a/packages/frontend-core/src/components/grid/stores/filter.js
+++ b/packages/frontend-core/src/components/grid/stores/filter.ts
@@ -1,12 +1,32 @@
-import { get, derived } from "svelte/store"
-import { FieldType, UILogicalOperator } from "@budibase/types"
+import { get, derived, Writable, Readable } from "svelte/store"
+import {
+  ArrayOperator,
+  BasicOperator,
+  FieldType,
+  UIColumn,
+  UILegacyFilter,
+  UILogicalOperator,
+  UISearchFilter,
+} from "@budibase/types"
+import { Store as StoreContext } from "."
 import { memo } from "../../../utils/memo"
 
-export const createStores = context => {
+export interface FilterStore {
+  filter: Writable<UISearchFilter | undefined>
+  inlineFilters: Writable<UILegacyFilter[]>
+}
+
+export interface FilterDerivedStore {
+  allFilters: Readable<UISearchFilter | undefined>
+}
+
+export type Store = FilterStore & FilterDerivedStore
+
+export const createStores = (context: StoreContext): FilterStore => {
   const { props } = context
 
   // Initialise to default props
-  const filter = memo(get(props).initialFilter)
+  const filter = memo(get(props).initialFilter ?? undefined)
   const inlineFilters = memo([])
 
   return {
@@ -15,7 +35,7 @@ export const createStores = context => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): FilterDerivedStore => {
   const { filter, inlineFilters } = context
   const allFilters = derived(
     [filter, inlineFilters],
@@ -24,7 +44,7 @@ export const deriveStores = context => {
       if (!$inlineFilters?.length) {
         return $filter
       }
-      let allFilters = {
+      const allFilters: UISearchFilter = {
         logicalOperator: UILogicalOperator.ALL,
         groups: [
           {
@@ -33,12 +53,13 @@ export const deriveStores = context => {
           },
         ],
       }
+
       // Just use inline if no filter
       if (!$filter?.groups?.length) {
         return allFilters
       }
       // Join them together if both
-      allFilters.groups = [...allFilters.groups, ...$filter.groups]
+      allFilters.groups = [...allFilters.groups!, ...$filter.groups]
       return allFilters
     }
   )
@@ -48,16 +69,16 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const { filter, inlineFilters } = context
 
-  const addInlineFilter = (column, value) => {
+  const addInlineFilter = (column: UIColumn, value: string) => {
     const filterId = `inline-${column.name}`
     const type = column.schema.type
-    let inlineFilter = {
+    const inlineFilter: UILegacyFilter = {
       field: column.name,
       id: filterId,
-      operator: "string",
+      operator: BasicOperator.STRING,
       valueType: "value",
       type,
       value,
@@ -66,11 +87,11 @@ export const createActions = context => {
     // Add overrides specific so the certain column type
     if (type === FieldType.NUMBER) {
       inlineFilter.value = parseFloat(value)
-      inlineFilter.operator = "equal"
+      inlineFilter.operator = BasicOperator.EQUAL
     } else if (type === FieldType.BIGINT) {
-      inlineFilter.operator = "equal"
+      inlineFilter.operator = BasicOperator.EQUAL
     } else if (type === FieldType.ARRAY) {
-      inlineFilter.operator = "contains"
+      inlineFilter.operator = ArrayOperator.CONTAINS
     }
 
     inlineFilters.update($inlineFilters => {
@@ -95,9 +116,11 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { filter, initialFilter } = context
 
   // Reset filter when initial filter prop changes
-  initialFilter.subscribe(filter.set)
+  initialFilter.subscribe($initialFilter =>
+    filter.set($initialFilter ?? undefined)
+  )
 }
diff --git a/packages/frontend-core/src/components/grid/stores/index.ts b/packages/frontend-core/src/components/grid/stores/index.ts
index d0413cb80a..5ddf663002 100644
--- a/packages/frontend-core/src/components/grid/stores/index.ts
+++ b/packages/frontend-core/src/components/grid/stores/index.ts
@@ -24,6 +24,8 @@ import * as ViewV2 from "./datasources/viewV2"
 import * as NonPlus from "./datasources/nonPlus"
 import * as Cache from "./cache"
 import * as Conditions from "./conditions"
+import { SortOrder, UIDatasource, UISearchFilter } from "@budibase/types"
+import * as Constants from "../lib/constants"
 
 const DependencyOrderedStores = [
   Sort,
@@ -51,8 +53,37 @@ const DependencyOrderedStores = [
   Cache,
 ]
 
+export interface BaseStoreProps {
+  datasource: UIDatasource
+  initialSortColumn: string | null
+  initialSortOrder: SortOrder | null
+  initialFilter: UISearchFilter | null
+  fixedRowHeight: number | null
+  schemaOverrides: Record<
+    string,
+    {
+      displayName?: string
+      disabled?: boolean
+    }
+  > | null
+  notifySuccess: (message: string) => void
+  notifyError: (message: string) => void
+  canAddRows?: boolean
+  canEditRows?: boolean
+  canDeleteRows?: boolean
+  canEditColumns?: boolean
+  canExpandRows?: boolean
+  canSaveSchema?: boolean
+  minHeight?: number
+}
+
 export interface BaseStore {
   API: APIClient
+  gridID: string
+  props: Writable<BaseStoreProps>
+  subscribe: any
+  dispatch: (event: string, data: any) => any
+  Constants: typeof Constants
 }
 
 export type Store = BaseStore &
@@ -63,32 +94,23 @@ export type Store = BaseStore &
   Datasource.Store &
   Validation.Store &
   Users.Store &
-  Menu.Store & {
-    // TODO while typing the rest of stores
-    fetch: Writable<any>
-    filter: Writable<any>
-    inlineFilters: Writable<any>
-    allFilters: Writable<any>
-    sort: Writable<any>
-    initialFilter: Writable<any>
-    initialSortColumn: Writable<any>
-    initialSortOrder: Writable<any>
-    rows: Writable<any> & { actions: any }
-    subscribe: any
-    config: Writable<any>
-    dispatch: (event: string, data: any) => any
-    notifications: Writable<any>
-    schemaOverrides: Writable<any>
-    focusedCellId: Writable<any>
-    previousFocusedRowId: Writable<string>
-    gridID: string
-    selectedRows: Writable<any>
-    selectedRowCount: Writable<any>
-    selectedCellMap: Writable<any>
-    selectedCellCount: Writable<any>
-  }
+  Menu.Store &
+  Filter.Store &
+  UI.Store &
+  Clipboard.Store &
+  Scroll.Store &
+  Rows.Store &
+  Reorder.Store &
+  Resize.Store &
+  Config.Store &
+  Conditions.Store &
+  Cache.Store &
+  Viewport.Store &
+  Notifications.Store &
+  Sort.Store &
+  Bounds.Store
 
-export const attachStores = (context: Store): Store => {
+export const attachStores = (context: BaseStore): Store => {
   // Atomic store creation
   for (let store of DependencyOrderedStores) {
     if ("createStores" in store) {
diff --git a/packages/frontend-core/src/components/grid/stores/menu.ts b/packages/frontend-core/src/components/grid/stores/menu.ts
index 27e41c412b..ae29ae1de3 100644
--- a/packages/frontend-core/src/components/grid/stores/menu.ts
+++ b/packages/frontend-core/src/components/grid/stores/menu.ts
@@ -15,7 +15,16 @@ interface MenuStore {
   menu: Writable<MenuStoreData>
 }
 
-export type Store = MenuStore
+interface MenuActions {
+  menu: MenuStore["menu"] & {
+    actions: {
+      open: (cellId: string, e: MouseEvent) => void
+      close: () => void
+    }
+  }
+}
+
+export type Store = MenuStore & MenuActions
 
 export const createStores = () => {
   const menu = writable<MenuStoreData>({
@@ -30,7 +39,7 @@ export const createStores = () => {
   }
 }
 
-export const createActions = (context: StoreContext) => {
+export const createActions = (context: StoreContext): MenuActions => {
   const {
     menu,
     focusedCellId,
@@ -60,7 +69,7 @@ export const createActions = (context: StoreContext) => {
     let multiRowMode = false
     if (get(selectedRowCount) > 1) {
       const { rowId } = parseCellID(cellId)
-      if (get(selectedRows)[rowId]) {
+      if (rowId !== undefined && get(selectedRows)[rowId]) {
         multiRowMode = true
       }
     }
diff --git a/packages/frontend-core/src/components/grid/stores/notifications.js b/packages/frontend-core/src/components/grid/stores/notifications.ts
similarity index 64%
rename from packages/frontend-core/src/components/grid/stores/notifications.js
rename to packages/frontend-core/src/components/grid/stores/notifications.ts
index 4e8b49414d..429760ed50 100644
--- a/packages/frontend-core/src/components/grid/stores/notifications.js
+++ b/packages/frontend-core/src/components/grid/stores/notifications.ts
@@ -1,7 +1,17 @@
 import { notifications as BBUINotifications } from "@budibase/bbui"
-import { derived } from "svelte/store"
+import { derived, Readable } from "svelte/store"
+import { Store as StoreContext } from "."
 
-export const createStores = context => {
+interface NotificationStore {
+  notifications: Readable<{
+    success: (message: string) => void
+    error: (message: string) => void
+  }>
+}
+
+export type Store = NotificationStore
+
+export const createStores = (context: StoreContext): NotificationStore => {
   const { notifySuccess, notifyError } = context
 
   // Normally we would not derive a store in "createStores" as it should be
diff --git a/packages/frontend-core/src/components/grid/stores/pagination.js b/packages/frontend-core/src/components/grid/stores/pagination.ts
similarity index 89%
rename from packages/frontend-core/src/components/grid/stores/pagination.js
rename to packages/frontend-core/src/components/grid/stores/pagination.ts
index bcf10ee3df..5a97031147 100644
--- a/packages/frontend-core/src/components/grid/stores/pagination.js
+++ b/packages/frontend-core/src/components/grid/stores/pagination.ts
@@ -1,6 +1,7 @@
 import { derived } from "svelte/store"
+import { Store as StoreContext } from "."
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { scrolledRowCount, rows, visualRowCapacity } = context
 
   // Derive how many rows we have in total
diff --git a/packages/frontend-core/src/components/grid/stores/reorder.js b/packages/frontend-core/src/components/grid/stores/reorder.ts
similarity index 84%
rename from packages/frontend-core/src/components/grid/stores/reorder.js
rename to packages/frontend-core/src/components/grid/stores/reorder.ts
index 8153ee7084..b0bc482afb 100644
--- a/packages/frontend-core/src/components/grid/stores/reorder.js
+++ b/packages/frontend-core/src/components/grid/stores/reorder.ts
@@ -1,7 +1,24 @@
-import { get, writable, derived } from "svelte/store"
+import { get, writable, derived, Writable, Readable } from "svelte/store"
 import { parseEventLocation } from "../lib/utils"
+import { Store as StoreContext } from "."
 
-const reorderInitialState = {
+interface Breakpoint {
+  x: number
+  column: string
+  insertAfter: boolean
+}
+
+interface ReorderInitialStoreData {
+  sourceColumn: string | null
+  targetColumn: string | null
+  insertAfter?: boolean
+  breakpoints: Breakpoint[]
+  gridLeft: number
+  width: number
+  increment?: number
+}
+
+const reorderInitialState: ReorderInitialStoreData = {
   sourceColumn: null,
   targetColumn: null,
   insertAfter: false,
@@ -11,7 +28,14 @@ const reorderInitialState = {
   increment: 0,
 }
 
-export const createStores = () => {
+interface ReorderInitialStore {
+  reorder: Writable<ReorderInitialStoreData>
+  isReordering: Readable<boolean>
+}
+
+export type Store = ReorderInitialStore
+
+export const createStores = (): ReorderInitialStore => {
   const reorder = writable(reorderInitialState)
   const isReordering = derived(
     reorder,
@@ -24,7 +48,7 @@ export const createStores = () => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const {
     reorder,
     columns,
@@ -40,11 +64,11 @@ export const createActions = context => {
     maxScrollLeft,
   } = context
   let latestX = 0
-  let autoScrollInterval
-  let isAutoScrolling
+  let autoScrollInterval: NodeJS.Timeout
+  let isAutoScrolling: boolean
 
   // Callback when dragging on a colum header and starting reordering
-  const startReordering = (column, e) => {
+  const startReordering = (column: string, e: MouseEvent | TouchEvent) => {
     const $scrollableColumns = get(scrollableColumns)
     const $bounds = get(bounds)
     const $stickyWidth = get(stickyWidth)
@@ -87,7 +111,7 @@ export const createActions = context => {
   }
 
   // Callback when moving the mouse when reordering columns
-  const onReorderMouseMove = e => {
+  const onReorderMouseMove = (e: MouseEvent | TouchEvent) => {
     // Immediately handle the current position
     const { x } = parseEventLocation(e)
     latestX = x
@@ -122,7 +146,7 @@ export const createActions = context => {
     const $scrollLeft = get(scrollLeft)
 
     // Compute the closest breakpoint to the current position
-    let breakpoint
+    let breakpoint: Breakpoint | undefined
     let minDistance = Number.MAX_SAFE_INTEGER
     const mouseX = latestX - $reorder.gridLeft + $scrollLeft
     $reorder.breakpoints.forEach(point => {
@@ -139,8 +163,8 @@ export const createActions = context => {
     ) {
       reorder.update(state => ({
         ...state,
-        targetColumn: breakpoint.column,
-        insertAfter: breakpoint.insertAfter,
+        targetColumn: breakpoint!.column,
+        insertAfter: breakpoint!.insertAfter,
       }))
     }
   }
@@ -157,7 +181,7 @@ export const createActions = context => {
       const { increment } = get(reorder)
       scroll.update(state => ({
         ...state,
-        left: Math.max(0, Math.min($maxLeft, state.left + increment)),
+        left: Math.max(0, Math.min($maxLeft, state.left + increment!)),
       }))
       considerReorderPosition()
     }, 10)
@@ -185,7 +209,11 @@ export const createActions = context => {
     const { sourceColumn, targetColumn, insertAfter } = get(reorder)
     reorder.set(reorderInitialState)
     if (sourceColumn !== targetColumn) {
-      await moveColumn({ sourceColumn, targetColumn, insertAfter })
+      await moveColumn({
+        sourceColumn: sourceColumn!,
+        targetColumn: targetColumn!,
+        insertAfter,
+      })
     }
   }
 
@@ -195,6 +223,10 @@ export const createActions = context => {
     sourceColumn,
     targetColumn,
     insertAfter = false,
+  }: {
+    sourceColumn: string
+    targetColumn: string
+    insertAfter?: boolean
   }) => {
     // Find the indices in the overall columns array
     const $columns = get(columns)
@@ -232,7 +264,7 @@ export const createActions = context => {
   }
 
   // Moves a column one place left (as appears visually)
-  const moveColumnLeft = async column => {
+  const moveColumnLeft = async (column: string) => {
     const $visibleColumns = get(visibleColumns)
     const $columnLookupMap = get(columnLookupMap)
     const sourceIdx = $columnLookupMap[column].__idx
@@ -243,7 +275,7 @@ export const createActions = context => {
   }
 
   // Moves a column one place right (as appears visually)
-  const moveColumnRight = async column => {
+  const moveColumnRight = async (column: string) => {
     const $visibleColumns = get(visibleColumns)
     const $columnLookupMap = get(columnLookupMap)
     const sourceIdx = $columnLookupMap[column].__idx
diff --git a/packages/frontend-core/src/components/grid/stores/resize.js b/packages/frontend-core/src/components/grid/stores/resize.ts
similarity index 73%
rename from packages/frontend-core/src/components/grid/stores/resize.js
rename to packages/frontend-core/src/components/grid/stores/resize.ts
index c242dd9a60..90ee659a44 100644
--- a/packages/frontend-core/src/components/grid/stores/resize.js
+++ b/packages/frontend-core/src/components/grid/stores/resize.ts
@@ -1,8 +1,19 @@
-import { writable, get, derived } from "svelte/store"
+import { writable, get, derived, Writable, Readable } from "svelte/store"
 import { MinColumnWidth, DefaultColumnWidth } from "../lib/constants"
 import { parseEventLocation } from "../lib/utils"
+import { Store as StoreContext } from "."
+import { UIColumn } from "@budibase/types"
 
-const initialState = {
+interface ResizeInitialStoreData {
+  initialMouseX: number | null
+  initialWidth: number | null
+  column: string | null
+  width: number
+  left: number
+  related?: UIColumn["related"]
+}
+
+const initialState: ResizeInitialStoreData = {
   initialMouseX: null,
   initialWidth: null,
   column: null,
@@ -10,7 +21,14 @@ const initialState = {
   left: 0,
 }
 
-export const createStores = () => {
+interface ResizeInitialStore {
+  resize: Writable<ResizeInitialStoreData>
+  isResizing: Readable<boolean>
+}
+
+export type Store = ResizeInitialStore
+
+export const createStores = (): ResizeInitialStore => {
   const resize = writable(initialState)
   const isResizing = derived(resize, $resize => $resize.column != null, false)
   return {
@@ -19,11 +37,11 @@ export const createStores = () => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const { resize, ui, datasource } = context
 
   // Starts resizing a certain column
-  const startResizing = (column, e) => {
+  const startResizing = (column: UIColumn, e: MouseEvent | TouchEvent) => {
     const { x } = parseEventLocation(e)
 
     // Prevent propagation to stop reordering triggering
@@ -50,11 +68,11 @@ export const createActions = context => {
   }
 
   // Handler for moving the mouse to resize columns
-  const onResizeMouseMove = e => {
+  const onResizeMouseMove = (e: MouseEvent | TouchEvent) => {
     const { initialMouseX, initialWidth, width, column, related } = get(resize)
     const { x } = parseEventLocation(e)
-    const dx = x - initialMouseX
-    const newWidth = Math.round(Math.max(MinColumnWidth, initialWidth + dx))
+    const dx = x - initialMouseX!
+    const newWidth = Math.round(Math.max(MinColumnWidth, initialWidth! + dx))
 
     // Ignore small changes
     if (Math.abs(width - newWidth) < 5) {
@@ -63,7 +81,7 @@ export const createActions = context => {
 
     // Update column state
     if (!related) {
-      datasource.actions.addSchemaMutation(column, { width })
+      datasource.actions.addSchemaMutation(column!, { width })
     } else {
       datasource.actions.addSubSchemaMutation(related.subField, related.field, {
         width,
@@ -95,7 +113,7 @@ export const createActions = context => {
   }
 
   // Resets a column size back to default
-  const resetSize = async column => {
+  const resetSize = async (column: { name: string }) => {
     datasource.actions.addSchemaMutation(column.name, {
       width: DefaultColumnWidth,
     })
diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.ts
similarity index 77%
rename from packages/frontend-core/src/components/grid/stores/rows.js
rename to packages/frontend-core/src/components/grid/stores/rows.ts
index 122bbc295a..d6b80df885 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.ts
@@ -1,4 +1,4 @@
-import { writable, derived, get } from "svelte/store"
+import { writable, derived, get, Writable, Readable } from "svelte/store"
 import { fetchData } from "../../../fetch"
 import { NewRowID, RowPageSize } from "../lib/constants"
 import {
@@ -10,10 +10,74 @@ import {
 import { tick } from "svelte"
 import { Helpers } from "@budibase/bbui"
 import { sleep } from "../../../utils/utils"
-import { FieldType } from "@budibase/types"
+import { FieldType, Row, UIFetchAPI, UIRow } from "@budibase/types"
 import { getRelatedTableValues } from "../../../utils"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
+interface IndexedUIRow extends UIRow {
+  __idx: number
+}
+
+interface RowStore {
+  rows: Writable<UIRow[]>
+  fetch: Writable<UIFetchAPI | null>
+  loaded: Writable<boolean>
+  refreshing: Writable<boolean>
+  loading: Writable<boolean>
+  rowChangeCache: Writable<Record<string, Record<string, any>>>
+  inProgressChanges: Writable<Record<string, number>>
+  hasNextPage: Writable<boolean>
+  error: Writable<string | null>
+}
+
+interface RowDerivedStore {
+  rows: RowStore["rows"]
+  rowLookupMap: Readable<Record<string, IndexedUIRow>>
+}
+
+interface RowActionStore {
+  rows: RowStore["rows"] & {
+    actions: {
+      addRow: (params: {
+        row: Row
+        idx: number
+        bubble: boolean
+        notify: boolean
+      }) => Promise<UIRow | undefined>
+      duplicateRow: (row: UIRow) => Promise<UIRow | undefined>
+      bulkDuplicate: (
+        rowsToDupe: UIRow[],
+        progressCallback: (progressPercentage: number) => void
+      ) => Promise<UIRow[]>
+      updateValue: (params: {
+        rowId: string
+        column: string
+        value: any
+        apply: boolean
+      }) => Promise<void>
+      applyRowChanges: (params: {
+        rowId: string
+        changes?: Record<string, any>
+        updateState?: boolean
+        handleErrors?: boolean
+      }) => Promise<UIRow | undefined>
+      deleteRows: (rowsToDelete: UIRow[]) => Promise<void>
+      loadNextPage: () => void
+      refreshRow: (id: string) => Promise<void>
+      replaceRow: (id: string, row: UIRow | undefined) => void
+      refreshData: () => Promise<void>
+      cleanRow: (row: UIRow) => Row
+      bulkUpdate: (
+        changeMap: Record<string, Record<string, any>>,
+        progressCallback: (progressPercentage: number) => void
+      ) => Promise<void>
+    }
+  }
+}
+
+export type Store = RowStore & RowDerivedStore & RowActionStore
+
+export const createStores = (): RowStore => {
   const rows = writable([])
   const loading = writable(false)
   const loaded = writable(false)
@@ -47,7 +111,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): RowDerivedStore => {
   const { rows, enrichedSchema } = context
 
   // Enrich rows with an index property and any pending changes
@@ -57,12 +121,16 @@ export const deriveStores = context => {
       const customColumns = Object.values($enrichedSchema || {}).filter(
         f => f.related
       )
-      return $rows.map((row, idx) => ({
+      return $rows.map<IndexedUIRow>((row, idx) => ({
         ...row,
         __idx: idx,
-        ...customColumns.reduce((map, column) => {
-          const fromField = $enrichedSchema[column.related.field]
-          map[column.name] = getRelatedTableValues(row, column, fromField)
+        ...customColumns.reduce<Record<string, string>>((map, column) => {
+          const fromField = $enrichedSchema![column.related!.field]
+          map[column.name] = getRelatedTableValues(
+            row,
+            { ...column, related: column.related! },
+            fromField
+          )
           return map
         }, {}),
       }))
@@ -71,7 +139,7 @@ export const deriveStores = context => {
 
   // Generate a lookup map to quick find a row by ID
   const rowLookupMap = derived(enrichedRows, $enrichedRows => {
-    let map = {}
+    let map: Record<string, IndexedUIRow> = {}
     for (let i = 0; i < $enrichedRows.length; i++) {
       map[$enrichedRows[i]._id] = $enrichedRows[i]
     }
@@ -87,7 +155,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): RowActionStore => {
   const {
     rows,
     rowLookupMap,
@@ -114,11 +182,11 @@ export const createActions = context => {
   const instanceLoaded = writable(false)
 
   // Local cache of row IDs to speed up checking if a row exists
-  let rowCacheMap = {}
+  let rowCacheMap: Record<string, boolean> = {}
 
   // Reset everything when datasource changes
-  let unsubscribe = null
-  let lastResetKey = null
+  let unsubscribe: (() => void) | null = null
+  let lastResetKey: string | null = null
   datasource.subscribe(async $datasource => {
     // Unsub from previous fetch if one exists
     unsubscribe?.()
@@ -157,7 +225,7 @@ export const createActions = context => {
     })
 
     // Subscribe to changes of this fetch model
-    unsubscribe = newFetch.subscribe(async $fetch => {
+    unsubscribe = newFetch.subscribe(async ($fetch: UIFetchAPI) => {
       if ($fetch.error) {
         // Present a helpful error to the user
         let message = "An unknown error occurred"
@@ -214,7 +282,15 @@ export const createActions = context => {
 
   // Handles validation errors from the rows API and updates local validation
   // state, storing error messages against relevant cells
-  const handleValidationError = (rowId, error) => {
+  const handleValidationError = (
+    rowId: string,
+    error:
+      | string
+      | {
+          message?: string
+          json: { validationErrors: Record<string, string | undefined> }
+        }
+  ) => {
     let errorString
     if (typeof error === "string") {
       errorString = error
@@ -224,7 +300,11 @@ export const createActions = context => {
 
     // If the server doesn't reply with a valid error, assume that the source
     // of the error is the focused cell's column
-    if (!error?.json?.validationErrors && errorString) {
+    if (
+      typeof error !== "string" &&
+      !error?.json?.validationErrors &&
+      errorString
+    ) {
       const { field: focusedColumn } = parseCellID(get(focusedCellId))
       if (focusedColumn) {
         error = {
@@ -236,7 +316,7 @@ export const createActions = context => {
         }
       }
     }
-    if (error?.json?.validationErrors) {
+    if (typeof error !== "string" && error?.json?.validationErrors) {
       // Normal validation errors
       const keys = Object.keys(error.json.validationErrors)
       const $columns = get(columns)
@@ -251,11 +331,11 @@ export const createActions = context => {
           missingColumns.push(column)
         }
       }
-
+      const { json } = error
       // Process errors for columns that we have
       for (let column of erroredColumns) {
         // Ensure we have a valid error to display
-        let err = error.json.validationErrors[column]
+        let err = json.validationErrors[column]
         if (Array.isArray(err)) {
           err = err[0]
         }
@@ -287,9 +367,19 @@ export const createActions = context => {
   }
 
   // Adds a new row
-  const addRow = async ({ row, idx, bubble = false, notify = true }) => {
+  const addRow = async ({
+    row,
+    idx,
+    bubble = false,
+    notify = true,
+  }: {
+    row: Row
+    idx: number
+    bubble: boolean
+    notify: boolean
+  }) => {
     try {
-      const newRow = await datasource.actions.addRow(row)
+      const newRow = (await datasource.actions.addRow(row))!
 
       // Update state
       if (idx != null) {
@@ -306,7 +396,7 @@ export const createActions = context => {
         get(notifications).success("Row created successfully")
       }
       return newRow
-    } catch (error) {
+    } catch (error: any) {
       if (bubble) {
         throw error
       } else {
@@ -317,7 +407,7 @@ export const createActions = context => {
   }
 
   // Duplicates a row, inserting the duplicate row after the existing one
-  const duplicateRow = async row => {
+  const duplicateRow = async (row: UIRow) => {
     let clone = cleanRow(row)
     delete clone._id
     delete clone._rev
@@ -330,17 +420,20 @@ export const createActions = context => {
       })
       get(notifications).success("Duplicated 1 row")
       return duped
-    } catch (error) {
+    } catch (error: any) {
       handleValidationError(row._id, error)
       validation.actions.focusFirstRowError(row._id)
     }
   }
 
   // Duplicates multiple rows, inserting them after the last source row
-  const bulkDuplicate = async (rowsToDupe, progressCallback) => {
+  const bulkDuplicate = async (
+    rowsToDupe: UIRow[],
+    progressCallback: (progressPercentage: number) => void
+  ) => {
     // Find index of last row
     const $rowLookupMap = get(rowLookupMap)
-    const indices = rowsToDupe.map(row => $rowLookupMap[row._id]?.__idx)
+    const indices = rowsToDupe.map(row => $rowLookupMap[row._id!]?.__idx)
     const index = Math.max(...indices)
     const count = rowsToDupe.length
 
@@ -357,8 +450,9 @@ export const createActions = context => {
     let failed = 0
     for (let i = 0; i < count; i++) {
       try {
-        saved.push(await datasource.actions.addRow(clones[i]))
-        rowCacheMap[saved._id] = true
+        const newRow = (await datasource.actions.addRow(clones[i]))!
+        saved.push(newRow)
+        rowCacheMap[newRow._id] = true
         await sleep(50) // Small sleep to ensure we avoid rate limiting
       } catch (error) {
         failed++
@@ -385,7 +479,7 @@ export const createActions = context => {
 
   // Replaces a row in state with the newly defined row, handling updates,
   // addition and deletion
-  const replaceRow = (id, row) => {
+  const replaceRow = (id: string, row: UIRow | undefined) => {
     // Get index of row to check if it exists
     const $rows = get(rows)
     const $rowLookupMap = get(rowLookupMap)
@@ -410,22 +504,22 @@ export const createActions = context => {
   }
 
   // Refreshes a specific row
-  const refreshRow = async id => {
+  const refreshRow = async (id: string) => {
     try {
       const row = await datasource.actions.getRow(id)
-      replaceRow(id, row)
+      replaceRow(id, row!)
     } catch {
       // Do nothing - we probably just don't support refreshing individual rows
     }
   }
 
   // Refreshes all data
-  const refreshData = () => {
-    get(fetch)?.getInitialData()
+  const refreshData = async () => {
+    await get(fetch)?.getInitialData()
   }
 
   // Checks if a changeset for a row actually mutates the row or not
-  const changesAreValid = (row, changes) => {
+  const changesAreValid = (row: UIRow, changes: Record<string, any>) => {
     const columns = Object.keys(changes || {})
     if (!row || !columns.length) {
       return false
@@ -437,7 +531,7 @@ export const createActions = context => {
 
   // Patches a row with some changes in local state, and returns whether a
   // valid pending change was made or not
-  const stashRowChanges = (rowId, changes) => {
+  const stashRowChanges = (rowId: string, changes: Record<string, any>) => {
     const $rowLookupMap = get(rowLookupMap)
     const $columnLookupMap = get(columnLookupMap)
     const row = $rowLookupMap[rowId]
@@ -477,13 +571,18 @@ export const createActions = context => {
     changes = null,
     updateState = true,
     handleErrors = true,
+  }: {
+    rowId: string
+    changes?: Record<string, any> | null
+    updateState?: boolean
+    handleErrors?: boolean
   }) => {
     const $rowLookupMap = get(rowLookupMap)
     const row = $rowLookupMap[rowId]
     if (row == null) {
       return
     }
-    let savedRow
+    let savedRow: UIRow | undefined = undefined
 
     // Save change
     try {
@@ -496,13 +595,13 @@ export const createActions = context => {
       // Update row
       const stashedChanges = get(rowChangeCache)[rowId]
       const newRow = { ...cleanRow(row), ...stashedChanges, ...changes }
-      savedRow = await datasource.actions.updateRow(newRow)
+      savedRow = (await datasource.actions.updateRow(newRow))!
 
       // Update row state after a successful change
       if (savedRow?._id) {
         if (updateState) {
           rows.update(state => {
-            state[row.__idx] = savedRow
+            state[row.__idx] = savedRow!
             return state.slice()
           })
         }
@@ -521,7 +620,7 @@ export const createActions = context => {
         })
         return state
       })
-    } catch (error) {
+    } catch (error: any) {
       if (handleErrors) {
         handleValidationError(rowId, error)
         validation.actions.focusFirstRowError(rowId)
@@ -537,14 +636,27 @@ export const createActions = context => {
   }
 
   // Updates a value of a row
-  const updateValue = async ({ rowId, column, value, apply = true }) => {
+  const updateValue = async ({
+    rowId,
+    column,
+    value,
+    apply = true,
+  }: {
+    rowId: string
+    column: string
+    value: any
+    apply: boolean
+  }) => {
     const success = stashRowChanges(rowId, { [column]: value })
     if (success && apply) {
       await applyRowChanges({ rowId })
     }
   }
 
-  const bulkUpdate = async (changeMap, progressCallback) => {
+  const bulkUpdate = async (
+    changeMap: Record<string, Record<string, any>>,
+    progressCallback: (progressPercentage: number) => void
+  ) => {
     const rowIds = Object.keys(changeMap || {})
     const count = rowIds.length
     if (!count) {
@@ -613,7 +725,7 @@ export const createActions = context => {
   }
 
   // Deletes an array of rows
-  const deleteRows = async rowsToDelete => {
+  const deleteRows = async (rowsToDelete: UIRow[]) => {
     if (!rowsToDelete?.length) {
       return
     }
@@ -628,7 +740,7 @@ export const createActions = context => {
 
   // Local handler to process new rows inside the fetch, and append any new
   // rows to state that we haven't encountered before
-  const handleNewRows = (newRows, resetRows) => {
+  const handleNewRows = (newRows: Row[], resetRows?: boolean) => {
     if (resetRows) {
       rowCacheMap = {}
     }
@@ -645,20 +757,20 @@ export const createActions = context => {
         newRow._id = generateRowID()
       }
 
-      if (!rowCacheMap[newRow._id]) {
-        rowCacheMap[newRow._id] = true
+      if (!rowCacheMap[newRow._id!]) {
+        rowCacheMap[newRow._id!] = true
         rowsToAppend.push(newRow)
       }
     }
     if (resetRows) {
-      rows.set(rowsToAppend)
+      rows.set(rowsToAppend as UIRow[])
     } else if (rowsToAppend.length) {
-      rows.update(state => [...state, ...rowsToAppend])
+      rows.update(state => [...state, ...(rowsToAppend as UIRow[])])
     }
   }
 
   // Local handler to remove rows from state
-  const handleRemoveRows = rowsToRemove => {
+  const handleRemoveRows = (rowsToRemove: UIRow[]) => {
     const deletedIds = rowsToRemove.map(row => row._id)
 
     // We deliberately do not remove IDs from the cache map as the data may
@@ -675,11 +787,11 @@ export const createActions = context => {
 
   // Cleans a row by removing any internal grid metadata from it.
   // Call this before passing a row to any sort of external flow.
-  const cleanRow = row => {
-    let clone = { ...row }
+  const cleanRow = (row: UIRow) => {
+    let clone: Row = { ...row }
     delete clone.__idx
     delete clone.__metadata
-    if (!get(hasBudibaseIdentifiers) && isGeneratedRowID(clone._id)) {
+    if (!get(hasBudibaseIdentifiers) && isGeneratedRowID(clone._id!)) {
       delete clone._id
     }
     return clone
@@ -706,7 +818,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     rowChangeCache,
     inProgressChanges,
@@ -733,7 +845,9 @@ export const initialise = context => {
     if (!id) {
       return
     }
-    const { rowId, field } = parseCellID(id)
+    let { rowId, field } = parseCellID(id)
+    rowId = rowId!
+    field = field!
     const hasChanges = field in (get(rowChangeCache)[rowId] || {})
     const hasErrors = validation.actions.rowHasErrors(rowId)
     const isSavingChanges = get(inProgressChanges)[rowId]
diff --git a/packages/frontend-core/src/components/grid/stores/scroll.js b/packages/frontend-core/src/components/grid/stores/scroll.ts
similarity index 86%
rename from packages/frontend-core/src/components/grid/stores/scroll.js
rename to packages/frontend-core/src/components/grid/stores/scroll.ts
index 9411cb93f1..0be8fa4a77 100644
--- a/packages/frontend-core/src/components/grid/stores/scroll.js
+++ b/packages/frontend-core/src/components/grid/stores/scroll.ts
@@ -1,4 +1,4 @@
-import { writable, derived, get } from "svelte/store"
+import { writable, derived, get, Writable, Readable } from "svelte/store"
 import { tick } from "svelte"
 import {
   GutterWidth,
@@ -8,8 +8,31 @@ import {
   VPadding,
 } from "../lib/constants"
 import { parseCellID } from "../lib/utils"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
+interface ScrollStore {
+  scroll: Writable<{
+    left: number
+    top: number
+  }>
+  scrollTop: Readable<number>
+  scrollLeft: Readable<number>
+}
+
+interface ScrollDerivedStore {
+  stickyWidth: Readable<number>
+  contentHeight: Readable<number>
+  contentWidth: Readable<number>
+  screenWidth: Readable<number>
+  maxScrollTop: Readable<number>
+  maxScrollLeft: Readable<number>
+  showHScrollbar: Readable<number>
+  showVScrollbar: Readable<number>
+}
+
+export type Store = ScrollStore & ScrollDerivedStore
+
+export const createStores = (): ScrollStore => {
   const scroll = writable({
     left: 0,
     top: 0,
@@ -26,7 +49,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext) => {
   const {
     rows,
     visibleColumns,
@@ -107,7 +130,7 @@ export const deriveStores = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     focusedCellId,
     focusedRow,
@@ -189,7 +212,7 @@ export const initialise = context => {
     // Ensure horizontal position is viewable
     // Check horizontal position of columns next
     const { field } = parseCellID($focusedCellId)
-    const column = get(columnLookupMap)[field]
+    const column = get(columnLookupMap)[field!]
     if (!column || column.primaryDisplay) {
       return
     }
diff --git a/packages/frontend-core/src/components/grid/stores/sort.js b/packages/frontend-core/src/components/grid/stores/sort.ts
similarity index 76%
rename from packages/frontend-core/src/components/grid/stores/sort.js
rename to packages/frontend-core/src/components/grid/stores/sort.ts
index 9ab393b11f..ab58d7dabe 100644
--- a/packages/frontend-core/src/components/grid/stores/sort.js
+++ b/packages/frontend-core/src/components/grid/stores/sort.ts
@@ -1,8 +1,18 @@
-import { derived, get } from "svelte/store"
+import { derived, get, Writable } from "svelte/store"
 import { memo } from "../../../utils"
 import { SortOrder } from "@budibase/types"
+import { Store as StoreContext } from "."
 
-export const createStores = context => {
+interface SortStore {
+  sort: Writable<{
+    column: string | null | undefined
+    order: SortOrder
+  }>
+}
+
+export type Store = SortStore
+
+export const createStores = (context: StoreContext): SortStore => {
   const { props } = context
   const $props = get(props)
 
@@ -17,7 +27,7 @@ export const createStores = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { sort, initialSortColumn, initialSortOrder, schema } = context
 
   // Reset sort when initial sort props change
diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.ts
similarity index 79%
rename from packages/frontend-core/src/components/grid/stores/ui.js
rename to packages/frontend-core/src/components/grid/stores/ui.ts
index 7f39116b05..f279eb210f 100644
--- a/packages/frontend-core/src/components/grid/stores/ui.js
+++ b/packages/frontend-core/src/components/grid/stores/ui.ts
@@ -1,4 +1,4 @@
-import { writable, get, derived } from "svelte/store"
+import { writable, get, derived, Writable, Readable } from "svelte/store"
 import { tick } from "svelte"
 import {
   DefaultRowHeight,
@@ -7,8 +7,61 @@ import {
   NewRowID,
 } from "../lib/constants"
 import { getCellID, parseCellID } from "../lib/utils"
+import { Store as StoreContext } from "."
+import { Row } from "@budibase/types"
 
-export const createStores = context => {
+export interface UIStore {
+  focusedCellId: Writable<string | null>
+  focusedCellAPI: Writable<{
+    isReadonly: () => boolean
+    getValue: () => any
+    setValue: (val: any) => void
+  } | null>
+  selectedRows: Writable<Record<string, boolean>>
+  hoveredRowId: Writable<string | null>
+  rowHeight: Writable<number>
+  previousFocusedRowId: Writable<string | null>
+  previousFocusedCellId: Writable<string | null>
+  gridFocused: Writable<boolean>
+  keyboardBlocked: Writable<boolean>
+  isDragging: Writable<boolean>
+  buttonColumnWidth: Writable<number>
+  cellSelection: Writable<{
+    active: boolean
+    sourceCellId: string | null
+    targetCellId: string | null
+  }>
+}
+
+export interface UIDerivedStore {
+  focusedRowId: Readable<string | null>
+  focusedRow: Readable<Row | undefined>
+  contentLines: Readable<3 | 2 | 1>
+  compact: Readable<boolean>
+  selectedRowCount: Readable<number>
+  isSelectingCells: Readable<boolean>
+  selectedCells: Readable<string[][]>
+  selectedCellMap: Readable<Record<string, boolean>>
+  selectedCellCount: Readable<number>
+}
+
+interface UIActionStore {
+  selectedCells: UIDerivedStore["selectedCells"] & {
+    actions: {
+      clear: () => void
+      selectRange: (source: string | null, target: string | null) => void
+    }
+  }
+  ui: {
+    actions: {
+      blur: () => void
+    }
+  }
+}
+
+export type Store = UIStore & UIDerivedStore & UIActionStore
+
+export const createStores = (context: StoreContext): UIStore => {
   const { props } = context
   const focusedCellId = writable(null)
   const focusedCellAPI = writable(null)
@@ -43,7 +96,7 @@ export const createStores = context => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): UIDerivedStore => {
   const {
     focusedCellId,
     rows,
@@ -58,13 +111,17 @@ export const deriveStores = context => {
 
   // Derive the current focused row ID
   const focusedRowId = derived(focusedCellId, $focusedCellId => {
-    return parseCellID($focusedCellId).rowId
+    return parseCellID($focusedCellId).rowId ?? null
   })
 
   // Derive the row that contains the selected cell
   const focusedRow = derived(
     [focusedRowId, rowLookupMap],
     ([$focusedRowId, $rowLookupMap]) => {
+      if ($focusedRowId === null) {
+        return
+      }
+
       if ($focusedRowId === NewRowID) {
         return { _id: NewRowID }
       }
@@ -116,8 +173,8 @@ export const deriveStores = context => {
       }
 
       // Row indices
-      const sourceRowIndex = $rowLookupMap[sourceInfo.rowId]?.__idx
-      const targetRowIndex = $rowLookupMap[targetInfo.rowId]?.__idx
+      const sourceRowIndex = $rowLookupMap[sourceInfo.rowId!]?.__idx
+      const targetRowIndex = $rowLookupMap[targetInfo.rowId!]?.__idx
       if (sourceRowIndex == null || targetRowIndex == null) {
         return []
       }
@@ -128,8 +185,8 @@ export const deriveStores = context => {
       upperRowIndex = Math.min(upperRowIndex, lowerRowIndex + 49)
 
       // Column indices
-      const sourceColIndex = $columnLookupMap[sourceInfo.field].__idx
-      const targetColIndex = $columnLookupMap[targetInfo.field].__idx
+      const sourceColIndex = $columnLookupMap[sourceInfo.field!].__idx || 0
+      const targetColIndex = $columnLookupMap[targetInfo.field!].__idx || 0
       const lowerColIndex = Math.min(sourceColIndex, targetColIndex)
       const upperColIndex = Math.max(sourceColIndex, targetColIndex)
 
@@ -151,7 +208,7 @@ export const deriveStores = context => {
 
   // Derive a quick lookup map of the selected cells
   const selectedCellMap = derived(selectedCells, $selectedCells => {
-    let map = {}
+    let map: Record<string, boolean> = {}
     for (let row of $selectedCells) {
       for (let cell of row) {
         map[cell] = true
@@ -178,7 +235,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const {
     focusedCellId,
     hoveredRowId,
@@ -190,7 +247,7 @@ export const createActions = context => {
     selectedCells,
   } = context
   // Keep the last selected index to use with bulk selection
-  let lastSelectedIndex = null
+  let lastSelectedIndex: number | null = null
 
   // Callback when leaving the grid, deselecting all focussed or selected items
   const blur = () => {
@@ -200,7 +257,7 @@ export const createActions = context => {
   }
 
   // Toggles whether a certain row ID is selected or not
-  const toggleSelectedRow = id => {
+  const toggleSelectedRow = (id: string) => {
     selectedRows.update(state => {
       let newState = {
         ...state,
@@ -215,7 +272,7 @@ export const createActions = context => {
     })
   }
 
-  const bulkSelectRows = id => {
+  const bulkSelectRows = (id: string) => {
     if (!get(selectedRowCount)) {
       toggleSelectedRow(id)
       return
@@ -241,7 +298,7 @@ export const createActions = context => {
     })
   }
 
-  const startCellSelection = sourceCellId => {
+  const startCellSelection = (sourceCellId: string) => {
     cellSelection.set({
       active: true,
       sourceCellId,
@@ -249,7 +306,7 @@ export const createActions = context => {
     })
   }
 
-  const updateCellSelection = targetCellId => {
+  const updateCellSelection = (targetCellId: string) => {
     cellSelection.update(state => ({
       ...state,
       targetCellId,
@@ -263,7 +320,7 @@ export const createActions = context => {
     }))
   }
 
-  const selectCellRange = (source, target) => {
+  const selectCellRange = (source: string, target: string) => {
     cellSelection.set({
       active: false,
       sourceCellId: source,
@@ -305,7 +362,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     focusedRowId,
     previousFocusedRowId,
@@ -332,7 +389,7 @@ export const initialise = context => {
     const $focusedRowId = get(focusedRowId)
     const $selectedRows = get(selectedRows)
     const $hoveredRowId = get(hoveredRowId)
-    const hasRow = id => $rowLookupMap[id] != null
+    const hasRow = (id: string) => $rowLookupMap[id] != null
 
     // Check focused cell
     if ($focusedRowId && !hasRow($focusedRowId)) {
@@ -362,13 +419,13 @@ export const initialise = context => {
   })
 
   // Remember the last focused row ID so that we can store the previous one
-  let lastFocusedRowId = null
+  let lastFocusedRowId: string | null = null
   focusedRowId.subscribe(id => {
     previousFocusedRowId.set(lastFocusedRowId)
     lastFocusedRowId = id
   })
 
-  let lastFocusedCellId = null
+  let lastFocusedCellId: string | null = null
   focusedCellId.subscribe(id => {
     // Remember the last focused cell ID so that we can store the previous one
     previousFocusedCellId.set(lastFocusedCellId)
diff --git a/packages/frontend-core/src/components/grid/stores/validation.ts b/packages/frontend-core/src/components/grid/stores/validation.ts
index 32bb1cf978..9db432d1a5 100644
--- a/packages/frontend-core/src/components/grid/stores/validation.ts
+++ b/packages/frontend-core/src/components/grid/stores/validation.ts
@@ -10,7 +10,17 @@ interface DerivedValidationStore {
   validationRowLookupMap: Readable<Record<string, string[]>>
 }
 
-export type Store = ValidationStore & DerivedValidationStore
+interface ValidationActions {
+  validation: ValidationStore["validation"] & {
+    actions: {
+      setError: (cellId: string | undefined, error: string) => void
+      rowHasErrors: (rowId: string) => boolean
+      focusFirstRowError: (rowId: string) => void
+    }
+  }
+}
+
+export type Store = ValidationStore & DerivedValidationStore & ValidationActions
 
 // Normally we would break out actions into the explicit "createActions"
 // function, but for validation all these actions are pure so can go into
@@ -33,10 +43,12 @@ export const deriveStores = (context: StoreContext): DerivedValidationStore => {
       // Extract row ID from all errored cell IDs
       if (error) {
         const { rowId } = parseCellID(key)
-        if (!map[rowId]) {
-          map[rowId] = []
+        if (rowId !== undefined) {
+          if (!map[rowId]) {
+            map[rowId] = []
+          }
+          map[rowId].push(key)
         }
-        map[rowId].push(key)
       }
     })
     return map
@@ -47,7 +59,7 @@ export const deriveStores = (context: StoreContext): DerivedValidationStore => {
   }
 }
 
-export const createActions = (context: StoreContext) => {
+export const createActions = (context: StoreContext): ValidationActions => {
   const { validation, focusedCellId, validationRowLookupMap } = context
 
   const setError = (cellId: string | undefined, error: string) => {
diff --git a/packages/frontend-core/src/components/grid/stores/viewport.js b/packages/frontend-core/src/components/grid/stores/viewport.ts
similarity index 82%
rename from packages/frontend-core/src/components/grid/stores/viewport.js
rename to packages/frontend-core/src/components/grid/stores/viewport.ts
index 0797f38b55..25620c33ef 100644
--- a/packages/frontend-core/src/components/grid/stores/viewport.js
+++ b/packages/frontend-core/src/components/grid/stores/viewport.ts
@@ -1,7 +1,18 @@
-import { derived } from "svelte/store"
+import { derived, Readable } from "svelte/store"
 import { MinColumnWidth } from "../lib/constants"
+import { Store as StoreContext } from "."
+import { Row } from "@budibase/types"
 
-export const deriveStores = context => {
+interface ViewportDerivedStore {
+  scrolledRowCount: Readable<number>
+  visualRowCapacity: Readable<number>
+  renderedRows: Readable<Row>
+  columnRenderMap: Readable<Record<string, true>>
+}
+
+export type Store = ViewportDerivedStore
+
+export const deriveStores = (context: StoreContext): ViewportDerivedStore => {
   const {
     rowHeight,
     scrollableColumns,
@@ -77,7 +88,7 @@ export const deriveStores = context => {
         leftEdge += $scrollableColumns[endColIdx].width
         endColIdx++
       }
-      let next = {}
+      let next: Record<string, true> = {}
       $scrollableColumns
         .slice(Math.max(0, startColIdx), endColIdx)
         .forEach(col => {
diff --git a/packages/frontend-core/src/utils/memo.d.ts b/packages/frontend-core/src/utils/memo.d.ts
new file mode 100644
index 0000000000..04d3416e49
--- /dev/null
+++ b/packages/frontend-core/src/utils/memo.d.ts
@@ -0,0 +1,10 @@
+import { Readable, Writable } from "svelte/store"
+
+declare module "./memo" {
+  export function memo<T>(value: T): Writable<T>
+
+  export function derivedMemo<TStore, TResult>(
+    store: Readable<TStore>,
+    derivation: (store: TStore) => TResult
+  ): Readable<TResult>
+}
diff --git a/packages/frontend-core/src/utils/relatedColumns.ts b/packages/frontend-core/src/utils/relatedColumns.ts
index e7bd3662d3..7bec526605 100644
--- a/packages/frontend-core/src/utils/relatedColumns.ts
+++ b/packages/frontend-core/src/utils/relatedColumns.ts
@@ -46,10 +46,7 @@ const columnTypeManyParser = {
 
 export function enrichSchemaWithRelColumns(
   schema: Record<string, UIFieldSchema>
-): Record<string, UIFieldSchema> | undefined {
-  if (!schema) {
-    return
-  }
+): Record<string, UIFieldSchema> {
   const result = Object.keys(schema).reduce<Record<string, UIFieldSchema>>(
     (result, fieldName) => {
       const field = schema[fieldName]
diff --git a/packages/frontend-core/tsconfig.json b/packages/frontend-core/tsconfig.json
index 8ffb3f19be..d06da5a713 100644
--- a/packages/frontend-core/tsconfig.json
+++ b/packages/frontend-core/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.build.json",
   "compilerOptions": {
     "target": "ESNext",
+    "lib": ["ESNext"],
     "module": "preserve",
     "moduleResolution": "bundler",
     "outDir": "./dist",
diff --git a/packages/server/package.json b/packages/server/package.json
index 1dd3df1d73..8cd49a0fe8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -122,7 +122,7 @@
     "server-destroy": "1.0.1",
     "snowflake-sdk": "^1.15.0",
     "socket.io": "4.8.1",
-    "svelte": "^4.2.10",
+    "svelte": "4.2.19",
     "tar": "6.2.1",
     "tmp": "0.2.3",
     "to-json-schema": "0.2.5",
diff --git a/packages/server/src/api/controllers/view/viewsV2.ts b/packages/server/src/api/controllers/view/viewsV2.ts
index da579efed7..5376ce49c3 100644
--- a/packages/server/src/api/controllers/view/viewsV2.ts
+++ b/packages/server/src/api/controllers/view/viewsV2.ts
@@ -149,6 +149,7 @@ export async function create(ctx: Ctx<CreateViewRequest, CreateViewResponse>) {
     sort: view.sort,
     schema,
     primaryDisplay: view.primaryDisplay,
+    rowHeight: view.rowHeight,
   }
   const result = await sdk.views.create(tableId, parsedView)
 
@@ -229,6 +230,7 @@ export async function update(ctx: Ctx<UpdateViewRequest, UpdateViewResponse>) {
     sort: view.sort,
     schema,
     primaryDisplay: view.primaryDisplay,
+    rowHeight: view.rowHeight,
   }
 
   const { view: result, existingView } = await sdk.views.update(
diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index ba2ad422eb..6ace7e256b 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -162,6 +162,7 @@ if (descriptions.length) {
                     visible: true,
                   },
                 },
+                rowHeight: generator.integer(),
               }
             const res = await config.api.viewV2.create(newView)
 
@@ -224,6 +225,7 @@ if (descriptions.length) {
                   visible: true,
                 },
               },
+              rowHeight: generator.integer(),
             }
             const res = await config.api.viewV2.create(newView)
             expect(events.view.created).toHaveBeenCalledTimes(1)
@@ -1069,6 +1071,7 @@ if (descriptions.length) {
                   readonly: true,
                 },
               },
+              rowHeight: generator.integer(),
             }
             await config.api.viewV2.update(updatedData)
 
diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts
index 1170284b15..fd97cee409 100644
--- a/packages/types/src/documents/app/view.ts
+++ b/packages/types/src/documents/app/view.ts
@@ -99,6 +99,7 @@ export interface ViewV2 {
     type?: SortType
   }
   schema?: ViewV2Schema
+  rowHeight?: number
 }
 
 export interface PublicAPIView extends Omit<ViewV2, "query" | "queryUI"> {
diff --git a/packages/types/src/ui/stores/grid/columns.ts b/packages/types/src/ui/stores/grid/columns.ts
index d12739fffe..7f20145246 100644
--- a/packages/types/src/ui/stores/grid/columns.ts
+++ b/packages/types/src/ui/stores/grid/columns.ts
@@ -9,11 +9,14 @@ export type UIColumn = FieldSchema & {
     subField: string
   }
   primaryDisplay?: boolean
-  schema?: {
+  schema: {
     disabled: boolean
     type: FieldType
     readonly: boolean
     autocolumn: boolean
   }
   calculationType: CalculationType
+  __idx: number
+  __left: number
+  width: number
 }
diff --git a/packages/types/src/ui/stores/grid/condition.ts b/packages/types/src/ui/stores/grid/condition.ts
new file mode 100644
index 0000000000..dfd9ee867c
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/condition.ts
@@ -0,0 +1,11 @@
+import { FieldType, SearchFilter } from "@budibase/types"
+
+export interface UICondition {
+  column: string
+  type: FieldType
+  referenceValue: string
+  operator: SearchFilter["operator"]
+  metadataKey: string
+  metadataValue: string
+  target: string
+}
diff --git a/packages/types/src/ui/stores/grid/datasource.ts b/packages/types/src/ui/stores/grid/datasource.ts
index 1d9b6740a4..9533bbb8f0 100644
--- a/packages/types/src/ui/stores/grid/datasource.ts
+++ b/packages/types/src/ui/stores/grid/datasource.ts
@@ -8,4 +8,5 @@ export interface UIFieldMutation {
   visible?: boolean
   readonly?: boolean
   width?: number
+  order?: number
 }
diff --git a/packages/types/src/ui/stores/grid/fetch.ts b/packages/types/src/ui/stores/grid/fetch.ts
new file mode 100644
index 0000000000..8901acc08b
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/fetch.ts
@@ -0,0 +1,38 @@
+import {
+  Row,
+  SortOrder,
+  UIDatasource,
+  UILegacyFilter,
+  UISearchFilter,
+} from "@budibase/types"
+
+export interface UIFetchAPI {
+  definition: UIDatasource
+
+  getInitialData: () => Promise<void>
+  loading: any
+  loaded: boolean
+
+  resetKey: string | null
+  error: any
+
+  hasNextPage: boolean
+  nextPage: () => Promise<void>
+
+  rows: Row[]
+
+  options?: {
+    datasource?: {
+      tableId: string
+      id: string
+    }
+  }
+  update: ({
+    sortOrder,
+    sortColumn,
+  }: {
+    sortOrder?: SortOrder
+    sortColumn?: string
+    filter?: UILegacyFilter[] | UISearchFilter
+  }) => any
+}
diff --git a/packages/types/src/ui/stores/grid/filters.ts b/packages/types/src/ui/stores/grid/filters.ts
new file mode 100644
index 0000000000..d75f32370c
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/filters.ts
@@ -0,0 +1,5 @@
+import { LegacyFilter } from "@budibase/types"
+
+export type UILegacyFilter = LegacyFilter & {
+  id: string
+}
diff --git a/packages/types/src/ui/stores/grid/index.ts b/packages/types/src/ui/stores/grid/index.ts
index b6a152ed73..f419134452 100644
--- a/packages/types/src/ui/stores/grid/index.ts
+++ b/packages/types/src/ui/stores/grid/index.ts
@@ -1,5 +1,9 @@
 export * from "./columns"
+export * from "./condition"
 export * from "./datasource"
 export * from "./table"
 export * from "./view"
 export * from "./user"
+export * from "./filters"
+export * from "./rows"
+export * from "./fetch"
diff --git a/packages/types/src/ui/stores/grid/rows.ts b/packages/types/src/ui/stores/grid/rows.ts
new file mode 100644
index 0000000000..accb104a1a
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/rows.ts
@@ -0,0 +1,5 @@
+import { Row } from "@budibase/types"
+
+export type UIRow = Row & {
+  _id: string
+}
diff --git a/packages/types/src/ui/stores/grid/table.ts b/packages/types/src/ui/stores/grid/table.ts
index a5a13d5fa2..e69f9fd38f 100644
--- a/packages/types/src/ui/stores/grid/table.ts
+++ b/packages/types/src/ui/stores/grid/table.ts
@@ -27,6 +27,7 @@ export type UIFieldSchema = FieldSchema &
     related?: { field: string; subField: string }
     columns?: Record<string, UIRelationSchemaField>
     cellRenderType?: string
+    disabled?: boolean
   }
 
 interface UIRelationSchemaField extends RelationSchemaField {
diff --git a/tsconfig.build.json b/tsconfig.build.json
index d51625a34f..a05fa2c976 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -19,7 +19,8 @@
       "@budibase/pro": ["./packages/pro/src"],
       "@budibase/string-templates": ["./packages/string-templates/src"],
       "@budibase/string-templates/*": ["./packages/string-templates/*"],
-      "@budibase/frontend-core": ["./packages/frontend-core/src"]
+      "@budibase/frontend-core": ["./packages/frontend-core/src"],
+      "@budibase/bbui": ["./packages/bbui/src"]
     }
   },
   "exclude": []
diff --git a/yarn.lock b/yarn.lock
index f59f89b87c..c6181f7866 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18991,7 +18991,7 @@ svelte-spa-router@^4.0.1:
   dependencies:
     regexparam "2.0.2"
 
-svelte@4.2.19, svelte@^4.2.10:
+svelte@4.2.19:
   version "4.2.19"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.19.tgz#4e6e84a8818e2cd04ae0255fcf395bc211e61d4c"
   integrity sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==