diff --git a/packages/builder/routify.config.cjs b/packages/builder/routify.config.js
similarity index 100%
rename from packages/builder/routify.config.cjs
rename to packages/builder/routify.config.js
diff --git a/packages/builder/src/components/settings/tabs/DangerZone.svelte b/packages/builder/src/components/settings/tabs/DangerZone.svelte
index 5cdfaae7eb..4ad6ba3605 100644
--- a/packages/builder/src/components/settings/tabs/DangerZone.svelte
+++ b/packages/builder/src/components/settings/tabs/DangerZone.svelte
@@ -11,7 +11,7 @@
     const id = $params.application
     await del(`/api/applications/${id}`)
     loading = false
-    $goto("/")
+    $goto("/builder/")
   }
 </script>
 
diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index f1efe382bc..8b8dd65cae 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -31,7 +31,11 @@
   <Heading small black>{name}</Heading>
   <Spacer medium />
   <div class="card-footer" data-cy={`app-${name}`}>
-    <TextButton text medium blue href="/{_id}">Open {name} →</TextButton>
+    <TextButton text medium blue href="/builder/{_id}">
+      Open
+      {name}
+      →
+    </TextButton>
     {#if appExportLoading}
       <Spinner size="10" />
     {:else}<i class="ri-folder-download-line" on:click={exportApp} />{/if}
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 15f450bc93..f060450f69 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -167,7 +167,7 @@
       }
       const userResp = await api.post(`/api/users`, user)
       const json = await userResp.json()
-      $goto(`/${appJson._id}`)
+      $goto(`./${appJson._id}`)
     } catch (error) {
       console.error(error)
       notifier.danger(error)
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/builder/[application]/_reset.svelte
similarity index 99%
rename from packages/builder/src/pages/[application]/_reset.svelte
rename to packages/builder/src/pages/builder/[application]/_reset.svelte
index 3d8effcf33..b8504e4f21 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/builder/[application]/_reset.svelte
@@ -51,7 +51,7 @@
         <img
           src="/assets/bb-logo.svg"
           alt="budibase icon"
-          on:click={() => $goto(`/`)} />
+          on:click={() => $goto(`/builder/`)} />
       </button>
 
       <!-- This gets all indexable subroutes and sticks them in the top nav. -->
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/automate/[automation]/index.svelte
rename to packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte
diff --git a/packages/builder/src/pages/[application]/automate/_layout.svelte b/packages/builder/src/pages/builder/[application]/automate/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/automate/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/automate/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/automate/index.svelte b/packages/builder/src/pages/builder/[application]/automate/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/automate/index.svelte
rename to packages/builder/src/pages/builder/[application]/automate/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/data/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/datasource/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/index.svelte b/packages/builder/src/pages/builder/[application]/data/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/table/[selectedTable]/relationship/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/table/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/table/index.svelte
diff --git a/packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte b/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte
rename to packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte
diff --git a/packages/builder/src/pages/[application]/deploy/_layout.svelte b/packages/builder/src/pages/builder/[application]/deploy/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/deploy/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/deploy/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/deploy/index.svelte b/packages/builder/src/pages/builder/[application]/deploy/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/deploy/index.svelte
rename to packages/builder/src/pages/builder/[application]/deploy/index.svelte
diff --git a/packages/builder/src/pages/[application]/design/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/design/[assetType]/[asset]/_fallback.svelte
rename to packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte
diff --git a/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/design/[assetType]/index.svelte
rename to packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte
diff --git a/packages/builder/src/pages/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/[application]/design/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/design/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/design/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/design/index.svelte b/packages/builder/src/pages/builder/[application]/design/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/design/index.svelte
rename to packages/builder/src/pages/builder/[application]/design/index.svelte
diff --git a/packages/builder/src/pages/[application]/index.svelte b/packages/builder/src/pages/builder/[application]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/index.svelte
rename to packages/builder/src/pages/builder/[application]/index.svelte
diff --git a/packages/builder/src/pages/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/[application]/settings/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/settings/_layout.svelte
rename to packages/builder/src/pages/builder/[application]/settings/_layout.svelte
diff --git a/packages/builder/src/pages/[application]/settings/index.svelte b/packages/builder/src/pages/builder/[application]/settings/index.svelte
similarity index 100%
rename from packages/builder/src/pages/[application]/settings/index.svelte
rename to packages/builder/src/pages/builder/[application]/settings/index.svelte
diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/_layout.svelte
rename to packages/builder/src/pages/builder/_layout.svelte
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/builder/index.svelte
similarity index 97%
rename from packages/builder/src/pages/index.svelte
rename to packages/builder/src/pages/builder/index.svelte
index cd216fd4f6..35ebbf60e2 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/builder/index.svelte
@@ -56,7 +56,7 @@
 
 <div class="container">
   <div class="header">
-    <Heading medium black>Welcome to the Budibase Beta 123</Heading>
+    <Heading medium black>Welcome to the Budibase Beta</Heading>
     <div class="button-group">
       <Button secondary on:click={initiateAppImport}>Import Web App</Button>
       <Spacer medium />
diff --git a/packages/builder/tests/testData.js b/packages/builder/tests/testData.js
deleted file mode 100644
index 02b4e59da2..0000000000
--- a/packages/builder/tests/testData.js
+++ /dev/null
@@ -1,111 +0,0 @@
-export const componentsAndScreens = () => ({
-  components: [
-    {
-      _instanceName: "TextBox",
-      tags: ["Text", "input"],
-      children: false,
-      props: {
-        size: { type: "options", options: ["small", "medium", "large"] },
-        isPassword: "bool",
-        placeholder: "string",
-        label: "string",
-      },
-    },
-    {
-      _instanceName: "Button",
-      tags: ["input"],
-      children: true,
-      props: {
-        size: { type: "options", options: ["small", "medium", "large"] },
-        css: "string",
-        contentText: "string",
-      },
-    },
-    {
-      _instanceName: "div",
-      tags: ["input"],
-      props: {
-        width: "number",
-      },
-    },
-    {
-      _instanceName: "Row View",
-      tags: ["row"],
-      props: {
-        data: "state",
-      },
-    },
-  ],
-  screens: [
-    {
-      props: {
-        _component: "budibase-components/TextBox",
-        _instanceName: "SmallTextbox",
-        size: "small",
-      },
-    },
-
-    {
-      name: "common/PasswordBox",
-      tags: ["mask"],
-      props: {
-        _component: "budibase-components/TextBox",
-        _instanceName: "PasswordBox",
-        isPassword: true,
-        size: "small",
-      },
-    },
-
-    {
-      props: {
-        _component: "budibase-components/Button",
-        _instanceName: "PrimaryButton",
-        css: "btn-primary",
-      },
-    },
-
-    {
-      route: "",
-      props: {
-        _component: "budibase-components/div",
-        width: 100,
-        _instanceName: "Screen 1",
-        _children: [
-          {
-            _component: "budibase-components/Button",
-            contentText: "Button 1",
-            _instanceName: "Button 1",
-          },
-          {
-            _component: "budibase-components/Button",
-            contentText: "Button 2",
-            _instanceName: "Button 2",
-          },
-          {
-            _component: "budibase-components/TextBox",
-            _instanceName: "TextBox",
-            isPassword: true,
-            size: "small",
-          },
-        ],
-      },
-    },
-
-    {
-      props: {
-        _component: "budibase-components/div",
-        _instanceName: "Field",
-        _children: [
-          {
-            _component: "common/SmallTextbox",
-          },
-        ],
-      },
-    },
-  ],
-})
-
-export const stripStandardProps = props => {
-  delete props._id
-  delete props._styles
-}
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index 7943e029ca..18c3e3122d 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -6,6 +6,7 @@ import path from "path"
 export default ({ mode }) => {
   const isProduction = mode === "production"
   return {
+    base: "/builder/",
     build: {
       minify: isProduction,
     },