diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9699c23bb3..52db8e11bc 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -23,7 +23,6 @@
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy",
       "components(.*)$": "<rootDir>/src/components$1",
-      "builder(.*)$": "<rootDir>/src/builder$1",
       "stores(.*)$": "<rootDir>/src/stores$1",
       "analytics(.*)$": "<rootDir>/src/analytics$1",
       "constants/backend": "<rootDir>/src/constants/backend/index.js"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index b364add2fe..a8711d220b 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -13,7 +13,7 @@
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
-  import { checkForCollectStep } from "builder/utils"
+  import { checkForCollectStep } from "helpers/utils"
 
   export let blockIdx
   export let lastStep
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 6ddfc932cd..acb3d8db19 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -42,7 +42,7 @@
   import {
     getSchemaForDatasourcePlus,
     getEnvironmentBindings,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
   import { onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index a4b5aa553a..09245b06c5 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -28,7 +28,7 @@
     PrettyRelationshipDefinitions,
     DB_TYPE_EXTERNAL,
   } from "constants/backend"
-  import { getAutoColumnInformation, buildAutoColumn } from "builder/utils"
+  import { getAutoColumnInformation, buildAutoColumn } from "helpers/utils"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
   import { getBindings } from "components/backend/DataTable/formula"
diff --git a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
index 85f3c7c1be..0b2eb58748 100644
--- a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
@@ -13,7 +13,7 @@
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
   import { FIELDS } from "constants/backend"
-  import { generate } from "builder/schemaGenerator"
+  import { generate } from "helpers/schemaGenerator"
 
   export let schema = {}
   export let json
diff --git a/packages/builder/src/components/common/bindings/BindableCombobox.svelte b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
index 2e37aec613..f344879b60 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 "builder/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 165ebb7660..1fd3f21b24 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -19,7 +19,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
 
   import { admin } from "stores/portal"
   import CodeEditor from "../CodeEditor/CodeEditor.svelte"
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
index d6ff4ce738..f24bf12464 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } 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 debf7609e2..cf11bf48a8 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
 
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
index ea76b16705..b8fe5def88 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
 
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
diff --git a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
index 786bdf4d2b..f87dc92946 100644
--- a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../dataBinding"
   import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
diff --git a/packages/builder/src/components/design/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
index dee28a2458..295f03c518 100644
--- a/packages/builder/src/components/design/ScreenDetailsModal.svelte
+++ b/packages/builder/src/components/design/ScreenDetailsModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Input } from "@budibase/bbui"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { get } from "svelte/store"
   import { screenStore } from "stores/builder"
 
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 41b6d18366..af2e1f776a 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 "builder/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 03f0ab8767..647ee1f9dd 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,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
index 19d4cb376a..5838f4d53c 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 { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested
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 f1f245be0f..c6d0cd93c3 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
   import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
-  import { getSchemaForDatasourcePlus } from "builder/dataBinding"
+  import { getSchemaForDatasourcePlus } from "../../../../../../dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 
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 7acf4dd6fc..77dc95b1c4 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
@@ -9,7 +9,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../../dataBinding"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
index 0cdc6eb992..848324ad4a 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 { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested
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 a1e3aae297..7a09e11b52 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
   import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
-  import { getSchemaForDatasourcePlus } from "builder/dataBinding"
+  import { getSchemaForDatasourcePlus } from "../../../../../../dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 
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 b671f305eb..a305f7ab41 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,7 +1,10 @@
 <script>
   import { currentAsset, componentStore } from "stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
-  import { getActionProviders, buildFormSchema } from "builder/dataBinding"
+  import {
+    getActionProviders,
+    buildFormSchema,
+  } from "../../../../../../dataBinding"
   import { findComponent } from "stores/builder/components/utils"
 
   export let parameters
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 1708a7e458..e5d58d227e 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
@@ -3,7 +3,10 @@
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders, buildFormSchema } from "builder/dataBinding"
+  import {
+    getActionProviders,
+    buildFormSchema,
+  } from "../../../../../../dataBinding"
   import { findComponent } from "stores/builder/components/utils"
 
   export let parameters
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 a13f7f045d..1d27b31eef 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
@@ -2,7 +2,7 @@
   import { Select, Label, Combobox, Checkbox, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getAllStateVariables } from "builder/dataBinding"
+  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 07f63101db..88dacf4f96 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 { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "builder/dataBinding"
+  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 daa2fb1a8b..9e39ca8d00 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,4 +1,4 @@
-import { getComponentContexts } from "builder/dataBinding"
+import { getComponentContexts } from "../../../../../../dataBinding"
 import { capitalise } from "helpers"
 
 // Generates bindings for all components that provider "datasource like"
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 3057e48def..141c4038c4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -4,7 +4,7 @@
   import { createEventDispatcher } from "svelte"
   import { Helpers } from "@budibase/bbui"
   import { componentStore } from "stores/builder"
-  import { getEventContextBindings } from "builder/dataBinding"
+  import { getEventContextBindings } from "../../../../../dataBinding"
   import { cloneDeep, isEqual } from "lodash/fp"
 
   export let componentInstance
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 a2515be96b..29f3682895 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 "builder/dataBinding"
+  import { runtimeToReadableBinding } from "../../../../../dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
 
   export let item
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 0f75fa6870..6cf558798f 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -6,7 +6,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { getFields } from "helpers/searchFields"
 
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 c35d8a85a3..1309769d63 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 "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import {
     Button,
     Popover,
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 80c78099c8..9e55e30e46 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -6,7 +6,7 @@
     getSchemaForDatasource,
     getBindableProperties,
     getComponentBindableProperties,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { selectedScreen, currentAsset, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "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 b5fd6ee82d..beaa3d23f7 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
@@ -3,7 +3,7 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { runtimeToReadableBinding } from "builder/dataBinding"
+  import { runtimeToReadableBinding } from "../../../../../dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
   import { componentStore } from "stores/builder"
 
diff --git a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
index c185f73963..e1f63af1af 100644
--- a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
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 682a54389f..cdcb488834 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -4,7 +4,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import FilterDrawer from "./FilterDrawer.svelte"
   import { currentAsset } from "stores/builder"
 
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index da651df309..db9c91d91a 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher, setContext } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getDatasourceForProvider } from "builder/dataBinding"
+  import { getDatasourceForProvider } from "../../../../dataBinding"
   import { currentAsset, componentStore, previewStore } from "stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"
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 d50bf393f7..06b51e05d5 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
@@ -2,7 +2,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import { currentAsset, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index c1b36a6375..b322e629a7 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index e16c88ae4a..e93a267267 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { builderStore } from "stores/builder"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
index 1b9fc53edf..b7d4fb7dbc 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -6,7 +6,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { tables, currentAsset, componentStore } from "stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 
diff --git a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
index 26f79e757a..e268873452 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -2,7 +2,7 @@
   import { ActionButton, notifications } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
   import { findClosestMatchingComponent } from "stores/builder/components/utils"
-  import { makeDatasourceFormComponents } from "builder/store/screenTemplates/utils/commonComponents"
+  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/SearchFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
index b7633c1895..89f059ea78 100644
--- a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset, tables } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { getFields } from "helpers/searchFields"
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index 9f7382f410..f31c2f3260 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -3,7 +3,7 @@
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
-  } from "builder/dataBinding"
+  } from "../../../../dataBinding"
   import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index 4bf9c48d8c..6f2d52384f 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -15,7 +15,7 @@
   import {
     getSchemaForDatasource,
     getDatasourceForProvider,
-  } from "builder/dataBinding"
+  } from "../../../../../dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
 
diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index d0f9c5bad6..63152ff8cf 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { createEventDispatcher } from "svelte"
 
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
index 68ddb460ab..4e7c33ad78 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 "builder/dataBinding"
+  import { getUserBindings } from "../../dataBinding"
 
   export let queryBindings = []
 
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index bdc4b657f2..6a4b644845 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -48,7 +48,7 @@
     runtimeToReadableBinding,
     runtimeToReadableMap,
     toBindingsArray,
-  } from "builder/dataBinding"
+  } from "../../dataBinding"
 
   export let queryId
 
diff --git a/packages/builder/src/builder/dataBinding.js b/packages/builder/src/dataBinding.js
similarity index 99%
rename from packages/builder/src/builder/dataBinding.js
rename to packages/builder/src/dataBinding.js
index 746781c364..b7e67e6ad3 100644
--- a/packages/builder/src/builder/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -22,7 +22,7 @@ import {
   decodeJSBinding,
   encodeJSBinding,
 } from "@budibase/string-templates"
-import { TableNames } from "../constants"
+import { TableNames } from "constants"
 import { JSONUtils } from "@budibase/frontend-core"
 import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
 import { environment, licensing } from "stores/portal"
diff --git a/packages/builder/src/builder/dataBinding.test.js b/packages/builder/src/dataBinding.test.js
similarity index 99%
rename from packages/builder/src/builder/dataBinding.test.js
rename to packages/builder/src/dataBinding.test.js
index dee98167d1..2885d6cd01 100644
--- a/packages/builder/src/builder/dataBinding.test.js
+++ b/packages/builder/src/dataBinding.test.js
@@ -3,7 +3,7 @@ import {
   runtimeToReadableBinding,
   readableToRuntimeBinding,
   updateReferencesInObject,
-} from "builder/dataBinding"
+} from "./dataBinding"
 
 describe("Builder dataBinding", () => {
   beforeEach(() => {
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
index a626f10188..d2fab02691 100644
--- a/packages/builder/src/helpers/formFields.js
+++ b/packages/builder/src/helpers/formFields.js
@@ -2,7 +2,7 @@ import { findClosestMatchingComponent } from "stores/builder/components/utils"
 import {
   getDatasourceForProvider,
   getSchemaForDatasource,
-} from "builder/dataBinding"
+} from "../dataBinding"
 
 export const getComponentFieldOptions = (asset, id, type, loose = true) => {
   const form = findClosestMatchingComponent(
diff --git a/packages/builder/src/builder/store/screenTemplates/utils/sanitizeUrl.js b/packages/builder/src/helpers/sanitizeUrl.js
similarity index 100%
rename from packages/builder/src/builder/store/screenTemplates/utils/sanitizeUrl.js
rename to packages/builder/src/helpers/sanitizeUrl.js
diff --git a/packages/builder/src/builder/schemaGenerator.js b/packages/builder/src/helpers/schemaGenerator.js
similarity index 100%
rename from packages/builder/src/builder/schemaGenerator.js
rename to packages/builder/src/helpers/schemaGenerator.js
diff --git a/packages/builder/src/builder/utils.js b/packages/builder/src/helpers/utils.js
similarity index 95%
rename from packages/builder/src/builder/utils.js
rename to packages/builder/src/helpers/utils.js
index 86c63f20ee..6bb333f3c4 100644
--- a/packages/builder/src/builder/utils.js
+++ b/packages/builder/src/helpers/utils.js
@@ -1,11 +1,11 @@
 import { ActionStepID } from "constants/backend/automations"
-import { TableNames } from "../constants"
+import { TableNames } from "constants"
 import {
   AUTO_COLUMN_DISPLAY_NAMES,
   AUTO_COLUMN_SUB_TYPES,
   FIELDS,
   isAutoColumnUserRelationship,
-} from "../constants/backend"
+} from "constants/backend"
 
 export function getAutoColumnInformation(enabled = true) {
   let info = {}
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 fc7c107833..19f78523de 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
@@ -12,7 +12,10 @@
   } from "@budibase/bbui"
   import { AUTH_TYPE_LABELS, AUTH_TYPES } from "./authTypes"
   import BindableCombobox from "components/common/bindings/BindableCombobox.svelte"
-  import { getAuthBindings, getEnvironmentBindings } from "builder/dataBinding"
+  import {
+    getAuthBindings,
+    getEnvironmentBindings,
+  } from "../../../../../../../../../../dataBinding"
   import { environment, licensing, auth } from "stores/portal"
   import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
 
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 9d1bb2f4f1..39af4d7c3a 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
@@ -5,7 +5,7 @@
     getRestBindings,
     readableToRuntimeBinding,
     runtimeToReadableMap,
-  } from "builder/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/Variables/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
index 9303384c7d..7bbd8734a0 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
@@ -2,7 +2,7 @@
   import { Heading, Layout } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import ViewDynamicVariables from "./ViewDynamicVariables.svelte"
-  import { getEnvironmentBindings } from "builder/dataBinding"
+  import { getEnvironmentBindings } from "../../../../../../../../../../dataBinding"
   import { licensing } from "stores/portal"
   import { queries } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
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 cc9d0fbf31..0ebc433093 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
@@ -13,7 +13,7 @@
   import {
     getBindableProperties,
     getComponentBindableProperties,
-  } from "builder/dataBinding"
+  } from "../../../../../../../../../dataBinding"
   import { ActionButton, notifications } from "@budibase/bbui"
   import { capitalise } from "helpers"
 
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 5dea5a9917..138b14c9d4 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
@@ -15,7 +15,7 @@
     getBindableProperties,
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builder/dataBinding"
+  } from "../../../../../../../../../dataBinding"
 
   export let componentInstance
   export let componentDefinition
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 edd1e1f97b..0240c4367d 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
@@ -11,9 +11,9 @@
   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 "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import ButtonActionEditor from "components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
-  import { getBindableProperties } from "builder/dataBinding"
+  import { getBindableProperties } from "../../../../../../../../../dataBinding"
 
   $: bindings = getBindableProperties($selectedScreen, null)
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
index 10576af68b..f0e2851a8e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
@@ -10,7 +10,7 @@
     notifications,
   } from "@budibase/bbui"
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { makeComponentUnique } from "stores/builder/components/utils"
 
   export let screenId
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 9f12a90f51..ca0c247b3b 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
@@ -2,11 +2,11 @@
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
   import ScreenRoleModal from "./ScreenRoleModal.svelte"
-  import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { Modal, notifications } from "@budibase/bbui"
   import { screenStore, navigationStore, tables } from "stores/builder"
   import { get } from "svelte/store"
-  import getTemplates from "builder/store/screenTemplates"
+  import getTemplates from "templates"
   import { Roles } from "constants/backend"
   import { capitalise } from "helpers"
   import { goto } from "@roxi/routify"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
index 3e77c7ab55..8f9ff141c3 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
@@ -4,7 +4,7 @@
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import { IntegrationNames } from "constants"
   import { onMount } from "svelte"
-  import rowListScreen from "builder/store/screenTemplates/rowListScreen"
+  import rowListScreen from "../../../../../../../templates/rowListScreen"
   import DatasourceTemplateRow from "./DatasourceTemplateRow.svelte"
 
   export let mode
diff --git a/packages/builder/src/stores/builder/automations.js b/packages/builder/src/stores/builder/automations.js
index 392af46edb..0989a521ff 100644
--- a/packages/builder/src/stores/builder/automations.js
+++ b/packages/builder/src/stores/builder/automations.js
@@ -4,7 +4,7 @@ import { cloneDeep } from "lodash/fp"
 import { generate } from "shortid"
 import { createHistoryStore } from "stores/builder/history"
 import { notifications } from "@budibase/bbui"
-import { updateReferencesInObject } from "builder/dataBinding"
+import { updateReferencesInObject } from "../../dataBinding"
 
 const initialAutomationState = {
   automations: [],
diff --git a/packages/builder/src/stores/builder/components/index.js b/packages/builder/src/stores/builder/components/index.js
index 9a4ffde6f6..a87d95dc13 100644
--- a/packages/builder/src/stores/builder/components/index.js
+++ b/packages/builder/src/stores/builder/components/index.js
@@ -15,7 +15,7 @@ import {
 import { getComponentFieldOptions } from "helpers/formFields"
 import { selectedScreen } from "../screens"
 import { screenStore, appStore, previewStore, tables } from "stores/builder"
-import { buildFormSchema, getSchemaForDatasource } from "builder/dataBinding"
+import { buildFormSchema, getSchemaForDatasource } from "../../../dataBinding"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DEFAULT_BB_DATASOURCE_ID,
diff --git a/packages/builder/src/stores/builder/tests/fixtures/index.js b/packages/builder/src/stores/builder/tests/fixtures/index.js
index 87cfa5a43f..8eed737c62 100644
--- a/packages/builder/src/stores/builder/tests/fixtures/index.js
+++ b/packages/builder/src/stores/builder/tests/fixtures/index.js
@@ -1,6 +1,6 @@
 import { v4 } from "uuid"
-import { Component } from "builder/store/screenTemplates/utils/Component"
-import { Screen } from "builder/store/screenTemplates/utils/Screen"
+import { Component } from "../../../../templates/Component"
+import { Screen } from "../../../../templates/Screen"
 import { get } from "svelte/store"
 import {
   BUDIBASE_INTERNAL_DB_ID,
diff --git a/packages/builder/src/builder/store/screenTemplates/utils/BaseStructure.js b/packages/builder/src/templates/BaseStructure.js
similarity index 100%
rename from packages/builder/src/builder/store/screenTemplates/utils/BaseStructure.js
rename to packages/builder/src/templates/BaseStructure.js
diff --git a/packages/builder/src/builder/store/screenTemplates/utils/Component.js b/packages/builder/src/templates/Component.js
similarity index 100%
rename from packages/builder/src/builder/store/screenTemplates/utils/Component.js
rename to packages/builder/src/templates/Component.js
diff --git a/packages/builder/src/builder/store/screenTemplates/utils/Screen.js b/packages/builder/src/templates/Screen.js
similarity index 100%
rename from packages/builder/src/builder/store/screenTemplates/utils/Screen.js
rename to packages/builder/src/templates/Screen.js
diff --git a/packages/builder/src/builder/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/templates/commonComponents.js
similarity index 97%
rename from packages/builder/src/builder/store/screenTemplates/utils/commonComponents.js
rename to packages/builder/src/templates/commonComponents.js
index ace5196bba..f260ce7f79 100644
--- a/packages/builder/src/builder/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/templates/commonComponents.js
@@ -1,5 +1,5 @@
 import { Component } from "./Component"
-import { getSchemaForDatasource } from "../../../dataBinding"
+import { getSchemaForDatasource } from "../dataBinding"
 
 const fieldTypeToComponentMap = {
   string: "stringfield",
diff --git a/packages/builder/src/builder/store/screenTemplates/createFromScratchScreen.js b/packages/builder/src/templates/createFromScratchScreen.js
similarity index 85%
rename from packages/builder/src/builder/store/screenTemplates/createFromScratchScreen.js
rename to packages/builder/src/templates/createFromScratchScreen.js
index eee423ef86..13e2a98908 100644
--- a/packages/builder/src/builder/store/screenTemplates/createFromScratchScreen.js
+++ b/packages/builder/src/templates/createFromScratchScreen.js
@@ -1,4 +1,4 @@
-import { Screen } from "./utils/Screen"
+import { Screen } from "./Screen"
 
 export default {
   name: `Create from scratch`,
diff --git a/packages/builder/src/builder/store/screenTemplates/index.js b/packages/builder/src/templates/index.js
similarity index 100%
rename from packages/builder/src/builder/store/screenTemplates/index.js
rename to packages/builder/src/templates/index.js
diff --git a/packages/builder/src/builder/store/screenTemplates/rowListScreen.js b/packages/builder/src/templates/rowListScreen.js
similarity index 92%
rename from packages/builder/src/builder/store/screenTemplates/rowListScreen.js
rename to packages/builder/src/templates/rowListScreen.js
index 59bcd0d5e8..7781a3d067 100644
--- a/packages/builder/src/builder/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/templates/rowListScreen.js
@@ -1,6 +1,6 @@
-import sanitizeUrl from "./utils/sanitizeUrl"
-import { Screen } from "./utils/Screen"
-import { Component } from "./utils/Component"
+import sanitizeUrl from "helpers/sanitizeUrl"
+import { Screen } from "./Screen"
+import { Component } from "./Component"
 
 export default function (datasources, mode = "table") {
   if (!Array.isArray(datasources)) {
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index c7e6070eb5..9c68d317a5 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -99,8 +99,8 @@ export default defineConfig(({ mode }) => {
           replacement: path.resolve("./src/components"),
         },
         {
-          find: "builder",
-          replacement: path.resolve("./src/builder"),
+          find: "templates",
+          replacement: path.resolve("./src/templates"),
         },
         {
           find: "stores",