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 77dc95b1c4..f5985a0d29 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
@@ -1,9 +1,6 @@
 <script>
   import { Label, Select, Body, Multiselect } from "@budibase/bbui"
-  import {
-    findAllMatchingComponents,
-    findComponent,
-  } from "stores/builder/components/utils"
+  import { findAllMatchingComponents, findComponent } from "helpers/components"
   import { currentAsset } from "stores/builder"
   import { onMount } from "svelte"
   import {
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 0a347fc6bb..1eb1c1116b 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 "stores/builder/components/utils"
+  import { findAllMatchingComponents } from "helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
index 9f9d91b682..4a406b8dca 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset } from "stores/builder"
-  import { findAllMatchingComponents } from "stores/builder/components/utils"
+  import { findAllMatchingComponents } from "helpers/components"
 
   export let parameters
 
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 a305f7ab41..dfd6c6f0b9 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
@@ -5,7 +5,7 @@
     getActionProviders,
     buildFormSchema,
   } from "../../../../../../dataBinding"
-  import { findComponent } from "stores/builder/components/utils"
+  import { findComponent } from "helpers/components"
 
   export let parameters
   export let nested
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 e5d58d227e..8c30189fcd 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
@@ -7,7 +7,7 @@
     getActionProviders,
     buildFormSchema,
   } from "../../../../../../dataBinding"
-  import { findComponent } from "stores/builder/components/utils"
+  import { findComponent } from "helpers/components"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index e108549dd1..163ebfcd53 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -2,7 +2,7 @@
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
   import { currentAsset } from "stores/builder"
-  import { findAllMatchingComponents } from "stores/builder/components/utils"
+  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 1309769d63..a366feb03b 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -30,7 +30,7 @@
   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 "stores/builder/components/utils"
+  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"
diff --git a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
index b7d4fb7dbc..f37f9c4844 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -2,7 +2,7 @@
   import {
     findClosestMatchingComponent,
     findComponent,
-  } from "stores/builder/components/utils"
+  } from "helpers/components"
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
diff --git a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
index e268873452..d077dfd1ed 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
   import { currentAsset, componentStore } from "stores/builder"
-  import { findClosestMatchingComponent } from "stores/builder/components/utils"
+  import { findClosestMatchingComponent } from "helpers/components"
   import { makeDatasourceFormComponents } from "../../../../templates/commonComponents"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
 
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 6f2d52384f..bd6184e2ea 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -11,7 +11,7 @@
     DatePicker,
   } from "@budibase/bbui"
   import { currentAsset, selectedComponent } from "stores/builder"
-  import { findClosestMatchingComponent } from "stores/builder/components/utils"
+  import { findClosestMatchingComponent } from "helpers/components"
   import {
     getSchemaForDatasource,
     getDatasourceForProvider,
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index b7e67e6ad3..e426e47dde 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -5,7 +5,7 @@ import {
   findAllMatchingComponents,
   findComponent,
   findComponentPath,
-} from "stores/builder/components/utils"
+} from "helpers/components"
 import {
   currentAsset,
   componentStore,
diff --git a/packages/builder/src/stores/builder/components/utils.js b/packages/builder/src/helpers/components.js
similarity index 99%
rename from packages/builder/src/stores/builder/components/utils.js
rename to packages/builder/src/helpers/components.js
index 484adadd06..a5ca1c1694 100644
--- a/packages/builder/src/stores/builder/components/utils.js
+++ b/packages/builder/src/helpers/components.js
@@ -6,7 +6,7 @@ import {
   encodeJSBinding,
   findHBSBlocks,
 } from "@budibase/string-templates"
-import { capitalise } from "helpers"
+import { capitalise } from "./index"
 
 /**
  * Recursively searches for a specific component ID
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
index d2fab02691..9856140297 100644
--- a/packages/builder/src/helpers/formFields.js
+++ b/packages/builder/src/helpers/formFields.js
@@ -1,4 +1,4 @@
-import { findClosestMatchingComponent } from "stores/builder/components/utils"
+import { findClosestMatchingComponent } from "helpers/components"
 import {
   getDatasourceForProvider,
   getSchemaForDatasource,
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 0ebc433093..08d4dfe064 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
@@ -9,7 +9,7 @@
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
   import ConditionalUISection from "./ConditionalUISection.svelte"
-  import { getComponentName } from "stores/builder/components/utils"
+  import { getComponentName } from "helpers/components"
   import {
     getBindableProperties,
     getComponentBindableProperties,
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 81300c56af..15a9c773ef 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
@@ -8,7 +8,7 @@
   } from "stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { findComponent } from "stores/builder/components/utils"
+  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 d6b948713f..c5b4aa7b9e 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
@@ -11,7 +11,7 @@
   } from "stores/builder"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
-  import { findComponentPath } from "stores/builder/components/utils"
+  import { findComponentPath } from "helpers/components"
 
   let searchString
   let searchRef
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 3483418ea5..8e27d08d25 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
@@ -22,10 +22,7 @@
     notifications,
   } from "@budibase/bbui"
   import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw"
-  import {
-    findComponent,
-    findComponentPath,
-  } from "stores/builder/components/utils"
+  import { findComponent, findComponentPath } from "helpers/components"
   import { isActive, goto } from "@roxi/routify"
 
   let iframe
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 5f524b80ad..406650f715 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,7 +5,7 @@
     componentStore,
     selectedComponent,
   } from "stores/builder"
-  import { findComponent } from "stores/builder/components/utils"
+  import { findComponent } from "helpers/components"
   import { goto, isActive } from "@roxi/routify"
   import { notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
index eff2c85541..bf1b7f21d7 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
@@ -14,7 +14,7 @@
     findComponentPath,
     getComponentText,
     getComponentName,
-  } from "stores/builder/components/utils"
+  } from "helpers/components"
   import { get } from "svelte/store"
   import { dndStore } from "./dndStore"
 
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 d48e6bdf81..0ab78b387f 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,8 +1,5 @@
 import { writable, get } from "svelte/store"
-import {
-  findComponentParent,
-  findComponentPath,
-} from "stores/builder/components/utils"
+import { findComponentParent, findComponentPath } from "helpers/components"
 import { selectedScreen, componentStore } from "stores/builder"
 
 export const DropPosition = {
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 f0e2851a8e..0d96dcda93 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
@@ -11,7 +11,7 @@
   } from "@budibase/bbui"
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import sanitizeUrl from "helpers/sanitizeUrl"
-  import { makeComponentUnique } from "stores/builder/components/utils"
+  import { makeComponentUnique } from "helpers/components"
 
   export let screenId
 
diff --git a/packages/builder/src/stores/builder/components/index.js b/packages/builder/src/stores/builder/components.js
similarity index 99%
rename from packages/builder/src/stores/builder/components/index.js
rename to packages/builder/src/stores/builder/components.js
index a87d95dc13..a01eadd38f 100644
--- a/packages/builder/src/stores/builder/components/index.js
+++ b/packages/builder/src/stores/builder/components.js
@@ -11,18 +11,23 @@ import {
   findComponentParent,
   findAllMatchingComponents,
   makeComponentUnique,
-} from "stores/builder/components/utils"
+} from "helpers/components"
 import { getComponentFieldOptions } from "helpers/formFields"
-import { selectedScreen } from "../screens"
-import { screenStore, appStore, previewStore, tables } from "stores/builder"
-import { buildFormSchema, getSchemaForDatasource } from "../../../dataBinding"
+import { selectedScreen } from "./screens"
+import {
+  screenStore,
+  appStore,
+  previewStore,
+  tables,
+} from "stores/builder/index"
+import { buildFormSchema, getSchemaForDatasource } from "../../dataBinding"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DEFAULT_BB_DATASOURCE_ID,
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
 } from "constants/backend"
-import BudiStore from "../BudiStore"
+import BudiStore from "./BudiStore"
 import { Utils } from "@budibase/frontend-core"
 
 export const INITIAL_COMPONENTS_STATE = {
diff --git a/packages/builder/src/stores/builder/screens.js b/packages/builder/src/stores/builder/screens.js
index 468e255a4b..7afa1d3136 100644
--- a/packages/builder/src/stores/builder/screens.js
+++ b/packages/builder/src/stores/builder/screens.js
@@ -2,7 +2,7 @@ import { derived, get } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
 import { Helpers } from "@budibase/bbui"
 import { RoleUtils, Utils } from "@budibase/frontend-core"
-import { findAllMatchingComponents } from "stores/builder/components/utils"
+import { findAllMatchingComponents } from "helpers/components"
 import {
   layoutStore,
   appStore,