diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index bd553a1ce6..fdc7df0931 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -9,14 +9,10 @@
     ".": {
       "import": "./dist/bbui.es.js"
     },
-    "./internal": {
-      "import": "./dist/internal.es.js"
-    },
     "./package.json": "./package.json",
     "./dist/style.css": "./dist/style.css"
   },
   "scripts": {
-    "dev:builder": "rollup -cw",
     "build": "rollup -c"
   },
   "devDependencies": {
diff --git a/packages/bbui/rollup.config.js b/packages/bbui/rollup.config.js
index 617df856b4..e285d548d6 100644
--- a/packages/bbui/rollup.config.js
+++ b/packages/bbui/rollup.config.js
@@ -5,12 +5,12 @@ import json from "@rollup/plugin-json"
 import { terser } from "rollup-plugin-terser"
 import postcss from "rollup-plugin-postcss"
 
-const makeConfig = ({ input, name }) => ({
-  input,
+export default {
+  input: "src/index.js",
   output: {
     sourcemap: true,
     format: "esm",
-    file: `dist/${name}.es.js`,
+    file: "dist/bbui.es.js",
   },
   plugins: [
     resolve(),
@@ -22,9 +22,4 @@ const makeConfig = ({ input, name }) => ({
     terser(),
     json(),
   ],
-})
-
-export default [
-  makeConfig({ input: "src/index.js", name: "bbui" }),
-  makeConfig({ input: "src/Form/internal/index.js", name: "internal" }),
-]
+}
diff --git a/packages/bbui/src/Form/internal/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
similarity index 100%
rename from packages/bbui/src/Form/internal/Multiselect.svelte
rename to packages/bbui/src/Form/Core/Multiselect.svelte
diff --git a/packages/bbui/src/Form/internal/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
similarity index 100%
rename from packages/bbui/src/Form/internal/Picker.svelte
rename to packages/bbui/src/Form/Core/Picker.svelte
diff --git a/packages/bbui/src/Form/internal/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
similarity index 100%
rename from packages/bbui/src/Form/internal/Select.svelte
rename to packages/bbui/src/Form/Core/Select.svelte
diff --git a/packages/bbui/src/Form/internal/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte
similarity index 100%
rename from packages/bbui/src/Form/internal/TextField.svelte
rename to packages/bbui/src/Form/Core/TextField.svelte
diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js
new file mode 100644
index 0000000000..1570f4e298
--- /dev/null
+++ b/packages/bbui/src/Form/Core/index.js
@@ -0,0 +1,3 @@
+export { default as CoreTextField } from "./TextField.svelte"
+export { default as CoreSelect } from "./Select.svelte"
+export { default as CoreMultiselect } from "./Multiselect.svelte"
diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte
index db3774ce0a..3e81b09755 100644
--- a/packages/bbui/src/Form/Input.svelte
+++ b/packages/bbui/src/Form/Input.svelte
@@ -1,6 +1,6 @@
 <script>
   import Field from "./Field.svelte"
-  import TextField from "./internal/TextField.svelte"
+  import TextField from "./Core/TextField.svelte"
   import { createEventDispatcher } from "svelte"
 
   export let value = null
diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte
index 19a99ba816..75f1601952 100644
--- a/packages/bbui/src/Form/Multiselect.svelte
+++ b/packages/bbui/src/Form/Multiselect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import Multiselect from "./internal/Multiselect.svelte"
+  import Multiselect from "./Core/Multiselect.svelte"
   import Field from "./Field.svelte"
 
   export let value = null
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index b0c1b9dc4d..f412df6ce0 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -1,6 +1,6 @@
 <script>
   import Field from "./Field.svelte"
-  import Select from "./internal/Select.svelte"
+  import Select from "./Core/Select.svelte"
   import { createEventDispatcher } from "svelte"
 
   export let value = null
diff --git a/packages/bbui/src/Form/internal/index.js b/packages/bbui/src/Form/internal/index.js
deleted file mode 100644
index 3b8d6609ff..0000000000
--- a/packages/bbui/src/Form/internal/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as TextField } from "./TextField.svelte"
-export { default as Select } from "./Select.svelte"
-export { default as Multiselect } from "./Multiselect.svelte"
diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js
index c120199273..76fbe46d07 100644
--- a/packages/bbui/src/index.js
+++ b/packages/bbui/src/index.js
@@ -40,6 +40,9 @@ export { default as Slider } from "./Form/Slider.svelte"
 export { default as Context } from "./context"
 export { default as Table } from "./Table/Table.svelte"
 
+// Core form components to be used elsewhere (standard components)
+export * from "./Form/Core"
+
 // Actions
 export { default as autoResizeTextArea } from "./Actions/autoresize_textarea"
 export { default as positionDropdown } from "./Actions/position_dropdown"
diff --git a/packages/builder/src/components/start/Steps/API.svelte b/packages/builder/src/components/start/Steps/API.svelte
deleted file mode 100644
index dfb530e86b..0000000000
--- a/packages/builder/src/components/start/Steps/API.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script>
-  import { Input } from "@budibase/bbui"
-  export let validationErrors
-
-  let blurred = { api: false }
-</script>
-
-<h2>Set up your API Key</h2>
-<div class="container">
-  <Input
-    on:input={() => (blurred.api = true)}
-    label="API Key"
-    name="apiKey"
-    placeholder="Use command-V to paste your API Key"
-    type="password"
-    error={blurred.api && validationErrors.apiKey} />
-  <a target="_blank" href="https://portal.budi.live/">Get API Key</a>
-</div>
-
-<style>
-  .container {
-    display: grid;
-    grid-gap: 40px;
-  }
-  a {
-    color: var(--grey-7);
-    font-weight: 500;
-    font-size: var(--font-size-s);
-  }
-  a:hover {
-    color: var(--ink);
-  }
-</style>