diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index 870d057ace..5c7124fd24 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -2,11 +2,13 @@
   import NoPackage from "./NoPackage.svelte"
   import PackageRoot from "./PackageRoot.svelte"
   import Settings from "./Settings.svelte"
-  import { store, initialise } from "./builderStore"
+  import { store, initialise } from "builderStore"
   import { onMount } from "svelte"
-  import IconButton from "./common/IconButton.svelte"
-  import Spinner from "./common/Spinner.svelte"
-  import AppNotification, { showAppNotification } from "./common/AppNotification.svelte"
+  import IconButton from "components/common/IconButton.svelte"
+  import Spinner from "components/common/Spinner.svelte"
+  import AppNotification, {
+    showAppNotification,
+  } from "components/AppNotification.svelte"
 
   let init = initialise()
 
diff --git a/packages/builder/src/BackendRoot.svelte b/packages/builder/src/BackendRoot.svelte
index d37e774a96..48b612790b 100644
--- a/packages/builder/src/BackendRoot.svelte
+++ b/packages/builder/src/BackendRoot.svelte
@@ -1,13 +1,13 @@
 <script>
-  import BackendNav from "./nav/BackendNav.svelte"
-  import SchemaManagementDrawer from "./nav/SchemaManagementDrawer.svelte"
-  import Database from "./database/DatabaseRoot.svelte"
-  import UserInterface from "./userInterface/UserInterfaceRoot.svelte"
-  import ActionsAndTriggers from "./actionsAndTriggers/ActionsAndTriggersRoot.svelte"
-  import AccessLevels from "./accessLevels/AccessLevelsRoot.svelte"
-  import ComingSoon from "./common/ComingSoon.svelte"
+  import BackendNav from "components/nav/BackendNav.svelte"
+  import SchemaManagementDrawer from "components/nav/SchemaManagementDrawer.svelte"
+  import Database from "components/database/DatabaseRoot.svelte"
+  import UserInterface from "components/userInterface/UserInterfaceRoot.svelte"
+  import ActionsAndTriggers from "components/actionsAndTriggers/ActionsAndTriggersRoot.svelte"
+  import AccessLevels from "components/accessLevels/AccessLevelsRoot.svelte"
+  import ComingSoon from "components/common/ComingSoon.svelte"
 
-  import { store, backendUiStore } from "./builderStore"
+  import { store, backendUiStore } from "builderStore"
 </script>
 
 <div class="root">
diff --git a/packages/builder/src/NoPackage.svelte b/packages/builder/src/NoPackage.svelte
index d8cc119108..188051b42c 100644
--- a/packages/builder/src/NoPackage.svelte
+++ b/packages/builder/src/NoPackage.svelte
@@ -1,6 +1,6 @@
 <script>
-  import Button from "./common/Button.svelte"
-  import { store } from "./builderStore"
+  import Button from "components/common/Button.svelte"
+  import { store } from "builderStore"
 
   let errors = []
 </script>
diff --git a/packages/builder/src/PackageRoot.svelte b/packages/builder/src/PackageRoot.svelte
index f7a134ed9a..71660ec2e8 100644
--- a/packages/builder/src/PackageRoot.svelte
+++ b/packages/builder/src/PackageRoot.svelte
@@ -1,10 +1,10 @@
 <script>
-  import IconButton from "./common/IconButton.svelte"
-  import { store } from "./builderStore"
-  import UserInterfaceRoot from "./userInterface/UserInterfaceRoot.svelte"
+  import IconButton from "components/common/IconButton.svelte"
+  import { store } from "builderStore"
+  import UserInterfaceRoot from "components/userInterface/UserInterfaceRoot.svelte"
   import BackendRoot from "./BackendRoot.svelte"
   import { fade } from "svelte/transition"
-  import { SettingsIcon, PreviewIcon } from "./common/Icons/"
+  import { SettingsIcon, PreviewIcon } from "components/common/Icons/"
 
   const TABS = {
     BACKEND: "backend",
diff --git a/packages/builder/src/Settings.svelte b/packages/builder/src/Settings.svelte
index 0959eb651c..ad40b64c55 100644
--- a/packages/builder/src/Settings.svelte
+++ b/packages/builder/src/Settings.svelte
@@ -1,7 +1,7 @@
 <script>
-  import IconButton from "./common/IconButton.svelte"
-  import { store } from "./builderStore"
-  import UserInterfaceRoot from "./userInterface/UserInterfaceRoot.svelte"
+  import IconButton from "components/common/IconButton.svelte"
+  import { store } from "builderStore"
+  import UserInterfaceRoot from "components/userInterface/UserInterfaceRoot.svelte"
   import { fade } from "svelte/transition"
 </script>