diff --git a/packages/builder/src/pages/builder/portal/email/[template].svelte b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
similarity index 91%
rename from packages/builder/src/pages/builder/portal/email/[template].svelte
rename to packages/builder/src/pages/builder/portal/manage/email/[template].svelte
index e819aafae4..ff5b2d4737 100644
--- a/packages/builder/src/pages/builder/portal/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
@@ -1,32 +1,19 @@
 <script>
   import {
-    Menu,
-    MenuItem,
     Button,
     Detail,
     Heading,
-    Divider,
-    Label,
-    Modal,
-    ModalContent,
     notifications,
-    Layout,
     Icon,
-    Body,
     Page,
-    Select,
     Tabs,
     Tab,
-    MenuSection,
-    MenuSeparator,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { onMount } from "svelte"
   import { fade } from "svelte/transition"
   import { email } from "stores/portal"
   import Editor from "components/integration/QueryEditor.svelte"
-  import TemplateBindings from "./TemplateBindings.svelte"
-  import api from "builderStore/api"
+  import TemplateBindings from "./_components/TemplateBindings.svelte"
 
   const ConfigTypes = {
     SMTP: "smtp",
diff --git a/packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte b/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte
rename to packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte
diff --git a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte b/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateLink.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
rename to packages/builder/src/pages/builder/portal/manage/email/_components/TemplateLink.svelte
diff --git a/packages/builder/src/pages/builder/portal/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
similarity index 97%
rename from packages/builder/src/pages/builder/portal/email/index.svelte
rename to packages/builder/src/pages/builder/portal/manage/email/index.svelte
index d72659f644..91d57c306d 100644
--- a/packages/builder/src/pages/builder/portal/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@@ -23,8 +23,8 @@
   import { onMount } from "svelte"
   import { email } from "stores/portal"
   import Editor from "components/integration/QueryEditor.svelte"
-  import TemplateBindings from "./TemplateBindings.svelte"
-  import TemplateLink from "./TemplateLink.svelte"
+  import TemplateBindings from "./_components/TemplateBindings.svelte"
+  import TemplateLink from "./_components/TemplateLink.svelte"
   import api from "builderStore/api"
 
   const ConfigTypes = {
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
index 1734bbcecf..868c455a67 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@@ -21,7 +21,6 @@
   const schema = {
     email: {},
     status: {},
-    builder: {},
     // access: {},
     // group: {}
   }