diff --git a/packages/builder/package.json b/packages/builder/package.json
index cc2a123639..96a5d322f6 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -20,7 +20,9 @@
     "testURL": "http://jest-breaks-if-this-does-not-exist",
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
-      "\\.(css|less|sass|scss)$": "identity-obj-proxy"
+      "\\.(css|less|sass|scss)$": "identity-obj-proxy",
+      "components(.*)$": "<rootDir>/src/components$1",
+      "builderStore(.*)$": "<rootDir>/src/builderStore$1"
     },
     "moduleFileExtensions": [
       "js"
@@ -55,6 +57,7 @@
     "@babel/plugin-transform-runtime": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "@babel/runtime": "^7.5.5",
+    "@rollup/plugin-alias": "^3.0.1",
     "@sveltech/routify": "1.5.0-beta.16",
     "babel-jest": "^24.8.0",
     "browser-sync": "^2.26.7",
@@ -77,4 +80,4 @@
     "svelte": "^3.0.0"
   },
   "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
+}
\ No newline at end of file
diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js
index 615e5b8208..518482b645 100644
--- a/packages/builder/rollup.config.js
+++ b/packages/builder/rollup.config.js
@@ -1,3 +1,4 @@
+import alias from "@rollup/plugin-alias"
 import svelte from "rollup-plugin-svelte"
 import resolve from "rollup-plugin-node-resolve"
 import commonjs from "rollup-plugin-commonjs"
@@ -11,6 +12,8 @@ import browsersync from "rollup-plugin-browsersync"
 import proxy from "http-proxy-middleware"
 import replace from "rollup-plugin-replace"
 
+import path from "path"
+
 const target = "http://localhost:4001"
 const _builderProxy = proxy("/_builder", {
   target: "http://localhost:3000",
@@ -142,6 +145,11 @@ const coreExternal = [
   "@nx-js/compiler-util",
 ]
 
+const customResolver = resolve({
+  extensions: [".mjs", ".js", ".jsx", ".json", ".sass", ".scss", ".svelte"]
+})
+const projectRootDir = path.resolve(__dirname)
+
 export default {
   input: "src/main.js",
   output: {
@@ -151,6 +159,13 @@ export default {
     file: `${outputpath}/bundle.js`,
   },
   plugins: [
+    alias({
+      entries: [
+        { find: "components", replacement: path.resolve(projectRootDir, 'src/components') },
+        { find: "builderStore", replacement: path.resolve(projectRootDir, 'src/builderStore') }
+      ],
+      customResolver
+    }),
     copy({
       targets: [
         { src: "src/index.html", dest: outputpath, rename: "__app.html" },
diff --git a/packages/builder/src/node_modules/builderStore/api.js b/packages/builder/src/builderStore/api.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/api.js
rename to packages/builder/src/builderStore/api.js
diff --git a/packages/builder/src/node_modules/builderStore/buildCodeForScreens.js b/packages/builder/src/builderStore/buildCodeForScreens.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/buildCodeForScreens.js
rename to packages/builder/src/builderStore/buildCodeForScreens.js
diff --git a/packages/builder/src/node_modules/builderStore/buildStateOrigins.js b/packages/builder/src/builderStore/buildStateOrigins.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/buildStateOrigins.js
rename to packages/builder/src/builderStore/buildStateOrigins.js
diff --git a/packages/builder/src/node_modules/builderStore/createPackage.js b/packages/builder/src/builderStore/createPackage.js
similarity index 81%
rename from packages/builder/src/node_modules/builderStore/createPackage.js
rename to packages/builder/src/builderStore/createPackage.js
index c67585af68..d4f4a9e54b 100644
--- a/packages/builder/src/node_modules/builderStore/createPackage.js
+++ b/packages/builder/src/builderStore/createPackage.js
@@ -1,4 +1,4 @@
-import { createNewHierarchy } from "../common/core"
+import { createNewHierarchy } from "components/common/core"
 
 export const createPackage = (packageInfo, store) => {
   packageInfo.createNewPackage("")
diff --git a/packages/builder/src/node_modules/builderStore/generate_css.js b/packages/builder/src/builderStore/generate_css.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/generate_css.js
rename to packages/builder/src/builderStore/generate_css.js
diff --git a/packages/builder/src/node_modules/builderStore/index.js b/packages/builder/src/builderStore/index.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/index.js
rename to packages/builder/src/builderStore/index.js
diff --git a/packages/builder/src/node_modules/builderStore/insertCodeMetadata.js b/packages/builder/src/builderStore/insertCodeMetadata.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/insertCodeMetadata.js
rename to packages/builder/src/builderStore/insertCodeMetadata.js
diff --git a/packages/builder/src/node_modules/builderStore/loadComponentLibraries.js b/packages/builder/src/builderStore/loadComponentLibraries.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/loadComponentLibraries.js
rename to packages/builder/src/builderStore/loadComponentLibraries.js
diff --git a/packages/builder/src/node_modules/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
similarity index 99%
rename from packages/builder/src/node_modules/builderStore/store/backend.js
rename to packages/builder/src/builderStore/store/backend.js
index fa888ca9d5..725da4947f 100644
--- a/packages/builder/src/node_modules/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -1,7 +1,7 @@
 import { writable } from "svelte/store"
 import api from "../api"
 import { cloneDeep, sortBy, find, remove } from "lodash/fp"
-import { hierarchy as hierarchyFunctions } from "../../../../../core/src"
+import { hierarchy as hierarchyFunctions } from "../../../../core/src"
 import {
   getNode,
   validate,
diff --git a/packages/builder/src/node_modules/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/store/index.js
rename to packages/builder/src/builderStore/store/index.js
diff --git a/packages/builder/src/node_modules/builderStore/uuid.js b/packages/builder/src/builderStore/uuid.js
similarity index 100%
rename from packages/builder/src/node_modules/builderStore/uuid.js
rename to packages/builder/src/builderStore/uuid.js
diff --git a/packages/builder/src/node_modules/components/accessLevels/AccessLevelView.svelte b/packages/builder/src/components/accessLevels/AccessLevelView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/accessLevels/AccessLevelView.svelte
rename to packages/builder/src/components/accessLevels/AccessLevelView.svelte
diff --git a/packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte b/packages/builder/src/components/accessLevels/AccessLevelsRoot.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/accessLevels/AccessLevelsRoot.svelte
rename to packages/builder/src/components/accessLevels/AccessLevelsRoot.svelte
diff --git a/packages/builder/src/node_modules/components/actionsAndTriggers/ActionView.svelte b/packages/builder/src/components/actionsAndTriggers/ActionView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/actionsAndTriggers/ActionView.svelte
rename to packages/builder/src/components/actionsAndTriggers/ActionView.svelte
diff --git a/packages/builder/src/node_modules/components/actionsAndTriggers/Actions.svelte b/packages/builder/src/components/actionsAndTriggers/Actions.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/actionsAndTriggers/Actions.svelte
rename to packages/builder/src/components/actionsAndTriggers/Actions.svelte
diff --git a/packages/builder/src/node_modules/components/actionsAndTriggers/ActionsAndTriggersRoot.svelte b/packages/builder/src/components/actionsAndTriggers/ActionsAndTriggersRoot.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/actionsAndTriggers/ActionsAndTriggersRoot.svelte
rename to packages/builder/src/components/actionsAndTriggers/ActionsAndTriggersRoot.svelte
diff --git a/packages/builder/src/node_modules/components/actionsAndTriggers/TriggerView.svelte b/packages/builder/src/components/actionsAndTriggers/TriggerView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/actionsAndTriggers/TriggerView.svelte
rename to packages/builder/src/components/actionsAndTriggers/TriggerView.svelte
diff --git a/packages/builder/src/node_modules/components/actionsAndTriggers/Triggers.svelte b/packages/builder/src/components/actionsAndTriggers/Triggers.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/actionsAndTriggers/Triggers.svelte
rename to packages/builder/src/components/actionsAndTriggers/Triggers.svelte
diff --git a/packages/builder/src/node_modules/components/common/ActionButton.svelte b/packages/builder/src/components/common/ActionButton.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/ActionButton.svelte
rename to packages/builder/src/components/common/ActionButton.svelte
diff --git a/packages/builder/src/node_modules/components/common/AppNotification.svelte b/packages/builder/src/components/common/AppNotification.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/AppNotification.svelte
rename to packages/builder/src/components/common/AppNotification.svelte
diff --git a/packages/builder/src/node_modules/components/common/Button.svelte b/packages/builder/src/components/common/Button.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Button.svelte
rename to packages/builder/src/components/common/Button.svelte
diff --git a/packages/builder/src/node_modules/components/common/ButtonGroup.svelte b/packages/builder/src/components/common/ButtonGroup.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/ButtonGroup.svelte
rename to packages/builder/src/components/common/ButtonGroup.svelte
diff --git a/packages/builder/src/node_modules/components/common/Checkbox.svelte b/packages/builder/src/components/common/Checkbox.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Checkbox.svelte
rename to packages/builder/src/components/common/Checkbox.svelte
diff --git a/packages/builder/src/node_modules/components/common/CodeArea.svelte b/packages/builder/src/components/common/CodeArea.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/CodeArea.svelte
rename to packages/builder/src/components/common/CodeArea.svelte
diff --git a/packages/builder/src/node_modules/components/common/ComingSoon.svelte b/packages/builder/src/components/common/ComingSoon.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/ComingSoon.svelte
rename to packages/builder/src/components/common/ComingSoon.svelte
diff --git a/packages/builder/src/node_modules/components/common/ConfirmDialog.svelte b/packages/builder/src/components/common/ConfirmDialog.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/ConfirmDialog.svelte
rename to packages/builder/src/components/common/ConfirmDialog.svelte
diff --git a/packages/builder/src/node_modules/components/common/DatePicker.svelte b/packages/builder/src/components/common/DatePicker.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/DatePicker.svelte
rename to packages/builder/src/components/common/DatePicker.svelte
diff --git a/packages/builder/src/node_modules/components/common/Dropdown.svelte b/packages/builder/src/components/common/Dropdown.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Dropdown.svelte
rename to packages/builder/src/components/common/Dropdown.svelte
diff --git a/packages/builder/src/node_modules/components/common/DropdownButton.svelte b/packages/builder/src/components/common/DropdownButton.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/DropdownButton.svelte
rename to packages/builder/src/components/common/DropdownButton.svelte
diff --git a/packages/builder/src/node_modules/components/common/ErrorsBox.svelte b/packages/builder/src/components/common/ErrorsBox.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/ErrorsBox.svelte
rename to packages/builder/src/components/common/ErrorsBox.svelte
diff --git a/packages/builder/src/node_modules/components/common/IconButton.svelte b/packages/builder/src/components/common/IconButton.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/IconButton.svelte
rename to packages/builder/src/components/common/IconButton.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Add.svelte b/packages/builder/src/components/common/Icons/Add.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Add.svelte
rename to packages/builder/src/components/common/Icons/Add.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/ArrowDown.svelte b/packages/builder/src/components/common/Icons/ArrowDown.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/ArrowDown.svelte
rename to packages/builder/src/components/common/Icons/ArrowDown.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Check.svelte b/packages/builder/src/components/common/Icons/Check.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Check.svelte
rename to packages/builder/src/components/common/Icons/Check.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/ChevronDown.svelte b/packages/builder/src/components/common/Icons/ChevronDown.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/ChevronDown.svelte
rename to packages/builder/src/components/common/Icons/ChevronDown.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/ChevronUp.svelte b/packages/builder/src/components/common/Icons/ChevronUp.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/ChevronUp.svelte
rename to packages/builder/src/components/common/Icons/ChevronUp.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/CircleIndicator.svelte b/packages/builder/src/components/common/Icons/CircleIndicator.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/CircleIndicator.svelte
rename to packages/builder/src/components/common/Icons/CircleIndicator.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Copy.svelte b/packages/builder/src/components/common/Icons/Copy.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Copy.svelte
rename to packages/builder/src/components/common/Icons/Copy.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Events.svelte b/packages/builder/src/components/common/Icons/Events.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Events.svelte
rename to packages/builder/src/components/common/Icons/Events.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Grid.svelte b/packages/builder/src/components/common/Icons/Grid.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Grid.svelte
rename to packages/builder/src/components/common/Icons/Grid.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Image.svelte b/packages/builder/src/components/common/Icons/Image.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Image.svelte
rename to packages/builder/src/components/common/Icons/Image.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Input.svelte b/packages/builder/src/components/common/Icons/Input.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Input.svelte
rename to packages/builder/src/components/common/Icons/Input.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/JavaScript.svelte b/packages/builder/src/components/common/Icons/JavaScript.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/JavaScript.svelte
rename to packages/builder/src/components/common/Icons/JavaScript.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Layout.svelte b/packages/builder/src/components/common/Icons/Layout.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Layout.svelte
rename to packages/builder/src/components/common/Icons/Layout.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Paint.svelte b/packages/builder/src/components/common/Icons/Paint.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Paint.svelte
rename to packages/builder/src/components/common/Icons/Paint.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Pencil.svelte b/packages/builder/src/components/common/Icons/Pencil.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Pencil.svelte
rename to packages/builder/src/components/common/Icons/Pencil.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Preview.svelte b/packages/builder/src/components/common/Icons/Preview.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Preview.svelte
rename to packages/builder/src/components/common/Icons/Preview.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Settings.svelte b/packages/builder/src/components/common/Icons/Settings.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Settings.svelte
rename to packages/builder/src/components/common/Icons/Settings.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Shape.svelte b/packages/builder/src/components/common/Icons/Shape.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Shape.svelte
rename to packages/builder/src/components/common/Icons/Shape.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/Terminal.svelte b/packages/builder/src/components/common/Icons/Terminal.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/Terminal.svelte
rename to packages/builder/src/components/common/Icons/Terminal.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/XCircle.svelte b/packages/builder/src/components/common/Icons/XCircle.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/XCircle.svelte
rename to packages/builder/src/components/common/Icons/XCircle.svelte
diff --git a/packages/builder/src/node_modules/components/common/Icons/index.js b/packages/builder/src/components/common/Icons/index.js
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Icons/index.js
rename to packages/builder/src/components/common/Icons/index.js
diff --git a/packages/builder/src/node_modules/components/common/Input.svelte b/packages/builder/src/components/common/Input.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Input.svelte
rename to packages/builder/src/components/common/Input.svelte
diff --git a/packages/builder/src/node_modules/components/common/Inputs/InputGroup.svelte b/packages/builder/src/components/common/Inputs/InputGroup.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Inputs/InputGroup.svelte
rename to packages/builder/src/components/common/Inputs/InputGroup.svelte
diff --git a/packages/builder/src/node_modules/components/common/Modal.svelte b/packages/builder/src/components/common/Modal.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Modal.svelte
rename to packages/builder/src/components/common/Modal.svelte
diff --git a/packages/builder/src/node_modules/components/common/NumberBox.svelte b/packages/builder/src/components/common/NumberBox.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/NumberBox.svelte
rename to packages/builder/src/components/common/NumberBox.svelte
diff --git a/packages/builder/src/node_modules/components/common/PlusButton.svelte b/packages/builder/src/components/common/PlusButton.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/PlusButton.svelte
rename to packages/builder/src/components/common/PlusButton.svelte
diff --git a/packages/builder/src/node_modules/components/common/Select.svelte b/packages/builder/src/components/common/Select.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Select.svelte
rename to packages/builder/src/components/common/Select.svelte
diff --git a/packages/builder/src/node_modules/components/common/Spinner.svelte b/packages/builder/src/components/common/Spinner.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Spinner.svelte
rename to packages/builder/src/components/common/Spinner.svelte
diff --git a/packages/builder/src/node_modules/components/common/Textbox.svelte b/packages/builder/src/components/common/Textbox.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/Textbox.svelte
rename to packages/builder/src/components/common/Textbox.svelte
diff --git a/packages/builder/src/node_modules/components/common/ValuesList.svelte b/packages/builder/src/components/common/ValuesList.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/common/ValuesList.svelte
rename to packages/builder/src/components/common/ValuesList.svelte
diff --git a/packages/builder/src/node_modules/components/common/binding.js b/packages/builder/src/components/common/binding.js
similarity index 100%
rename from packages/builder/src/node_modules/components/common/binding.js
rename to packages/builder/src/components/common/binding.js
diff --git a/packages/builder/src/node_modules/components/common/core.js b/packages/builder/src/components/common/core.js
similarity index 85%
rename from packages/builder/src/node_modules/components/common/core.js
rename to packages/builder/src/components/common/core.js
index af627a7931..9988531620 100644
--- a/packages/builder/src/node_modules/components/common/core.js
+++ b/packages/builder/src/components/common/core.js
@@ -3,17 +3,17 @@ import {
   common,
   getTemplateApi,
   getAuthApi,
-} from "../../../../../core/src"
-import { _getNew } from "../../../../../core/src/recordApi/getNew"
+} from "../../../../core/src"
+import { _getNew } from "../../../../core/src/recordApi/getNew"
 import { find, filter, keyBy, flatten, map } from "lodash/fp"
-import { generateSchema } from "../../../../../core/src/indexing/indexSchemaCreator"
+import { generateSchema } from "../../../../core/src/indexing/indexSchemaCreator"
 import { generate } from "shortid"
 
-export { canDeleteIndex } from "../../../../../core/src/templateApi/canDeleteIndex"
-export { canDeleteRecord } from "../../../../../core/src/templateApi/canDeleteRecord"
-export { userWithFullAccess } from "../../../../../core/src/index"
-export { joinKey } from "../../../../../core/src/common"
-export { getExactNodeForKey } from "../../../../../core/src/templateApi/hierarchy"
+export { canDeleteIndex } from "../../../../core/src/templateApi/canDeleteIndex"
+export { canDeleteRecord } from "../../../../core/src/templateApi/canDeleteRecord"
+export { userWithFullAccess } from "../../../../core/src/index"
+export { joinKey } from "../../../../core/src/common"
+export { getExactNodeForKey } from "../../../../core/src/templateApi/hierarchy"
 export const pipe = common.$
 
 export const events = common.eventsList
diff --git a/packages/builder/src/node_modules/components/common/eventHandlers.js b/packages/builder/src/components/common/eventHandlers.js
similarity index 68%
rename from packages/builder/src/node_modules/components/common/eventHandlers.js
rename to packages/builder/src/components/common/eventHandlers.js
index 3ddfe084d7..69290b10ad 100644
--- a/packages/builder/src/node_modules/components/common/eventHandlers.js
+++ b/packages/builder/src/components/common/eventHandlers.js
@@ -1,7 +1,7 @@
-import { eventHandlers } from "../../../../../client/src/state/eventHandlers"
+import { eventHandlers } from "../../../../client/src/state/eventHandlers"
 import { writable } from "svelte/store"
-export { EVENT_TYPE_MEMBER_NAME } from "../../../../../client/src/state/eventHandlers"
-import { createCoreApi } from "../../../../../client/src/core"
+export { EVENT_TYPE_MEMBER_NAME } from "../../../../client/src/state/eventHandlers"
+import { createCoreApi } from "../../../../client/src/core"
 
 export const allHandlers = (appDefinition, user) => {
   const coreApi = createCoreApi(appDefinition, user)
diff --git a/packages/builder/src/node_modules/components/common/icon.js b/packages/builder/src/components/common/icon.js
similarity index 100%
rename from packages/builder/src/node_modules/components/common/icon.js
rename to packages/builder/src/components/common/icon.js
diff --git a/packages/builder/src/node_modules/components/database/CollectionView.svelte b/packages/builder/src/components/database/CollectionView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/CollectionView.svelte
rename to packages/builder/src/components/database/CollectionView.svelte
diff --git a/packages/builder/src/node_modules/components/database/DatabaseRoot.svelte b/packages/builder/src/components/database/DatabaseRoot.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/DatabaseRoot.svelte
rename to packages/builder/src/components/database/DatabaseRoot.svelte
diff --git a/packages/builder/src/node_modules/components/database/FieldView.svelte b/packages/builder/src/components/database/FieldView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/FieldView.svelte
rename to packages/builder/src/components/database/FieldView.svelte
diff --git a/packages/builder/src/node_modules/components/database/IndexView.svelte b/packages/builder/src/components/database/IndexView.svelte
similarity index 99%
rename from packages/builder/src/node_modules/components/database/IndexView.svelte
rename to packages/builder/src/components/database/IndexView.svelte
index 30b6907500..c094aaa840 100644
--- a/packages/builder/src/node_modules/components/database/IndexView.svelte
+++ b/packages/builder/src/components/database/IndexView.svelte
@@ -8,7 +8,7 @@
   import {
     hierarchy as hierarchyFunctions,
     common,
-  } from "../../../../../core/src/"
+  } from "../../../../core/src/"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
   import ActionButton from "components/common/ActionButton.svelte"
 
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/ModelDataTable.svelte
rename to packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/TablePagination.svelte b/packages/builder/src/components/database/ModelDataTable/TablePagination.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/TablePagination.svelte
rename to packages/builder/src/components/database/ModelDataTable/TablePagination.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/api.js b/packages/builder/src/components/database/ModelDataTable/api.js
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/api.js
rename to packages/builder/src/components/database/ModelDataTable/api.js
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/index.js b/packages/builder/src/components/database/ModelDataTable/index.js
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/index.js
rename to packages/builder/src/components/database/ModelDataTable/index.js
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateDatabase.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateDatabase.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateDatabase.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/CreateDatabase.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditModel.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditModel.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditRecord.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditView.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateEditView.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/CreateEditView.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateUser.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateUser.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/CreateUser.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/CreateUser.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/DeleteRecord.svelte b/packages/builder/src/components/database/ModelDataTable/modals/DeleteRecord.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/DeleteRecord.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/DeleteRecord.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/RecordFieldControl.svelte b/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/RecordFieldControl.svelte
rename to packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.svelte
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/modals/index.js b/packages/builder/src/components/database/ModelDataTable/modals/index.js
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/modals/index.js
rename to packages/builder/src/components/database/ModelDataTable/modals/index.js
diff --git a/packages/builder/src/node_modules/components/database/ModelDataTable/test/ModelDataTable.spec.js b/packages/builder/src/components/database/ModelDataTable/test/ModelDataTable.spec.js
similarity index 100%
rename from packages/builder/src/node_modules/components/database/ModelDataTable/test/ModelDataTable.spec.js
rename to packages/builder/src/components/database/ModelDataTable/test/ModelDataTable.spec.js
diff --git a/packages/builder/src/node_modules/components/database/ModelView.svelte b/packages/builder/src/components/database/ModelView.svelte
similarity index 98%
rename from packages/builder/src/node_modules/components/database/ModelView.svelte
rename to packages/builder/src/components/database/ModelView.svelte
index a67293c4d1..f8e0601252 100644
--- a/packages/builder/src/node_modules/components/database/ModelView.svelte
+++ b/packages/builder/src/components/database/ModelView.svelte
@@ -19,7 +19,7 @@
     isDate,
   } from "lodash/fp"
   import { store, backendUiStore } from "builderStore"
-  import { common, hierarchy } from "../../../../../core/src/"
+  import { common, hierarchy } from "../../../../core/src/"
   import { getNode } from "components/common/core"
   import { templateApi, pipe, validate } from "components/common/core"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
diff --git a/packages/builder/src/node_modules/components/nav/BackendNav.svelte b/packages/builder/src/components/nav/BackendNav.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/nav/BackendNav.svelte
rename to packages/builder/src/components/nav/BackendNav.svelte
diff --git a/packages/builder/src/node_modules/components/nav/DatabasesList.svelte b/packages/builder/src/components/nav/DatabasesList.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/nav/DatabasesList.svelte
rename to packages/builder/src/components/nav/DatabasesList.svelte
diff --git a/packages/builder/src/node_modules/components/nav/HierarchyRow.svelte b/packages/builder/src/components/nav/HierarchyRow.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/nav/HierarchyRow.svelte
rename to packages/builder/src/components/nav/HierarchyRow.svelte
diff --git a/packages/builder/src/node_modules/components/nav/NavItem.svelte b/packages/builder/src/components/nav/NavItem.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/nav/NavItem.svelte
rename to packages/builder/src/components/nav/NavItem.svelte
diff --git a/packages/builder/src/node_modules/components/nav/SchemaManagementDrawer.svelte b/packages/builder/src/components/nav/SchemaManagementDrawer.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/nav/SchemaManagementDrawer.svelte
rename to packages/builder/src/components/nav/SchemaManagementDrawer.svelte
diff --git a/packages/builder/src/node_modules/components/nav/UsersList.svelte b/packages/builder/src/components/nav/UsersList.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/nav/UsersList.svelte
rename to packages/builder/src/components/nav/UsersList.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/CodeEditor.svelte b/packages/builder/src/components/userInterface/CodeEditor.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/CodeEditor.svelte
rename to packages/builder/src/components/userInterface/CodeEditor.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentPropertiesPanel.svelte
rename to packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentSearch.svelte b/packages/builder/src/components/userInterface/ComponentSearch.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentSearch.svelte
rename to packages/builder/src/components/userInterface/ComponentSearch.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentSelectionList.svelte b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentSelectionList.svelte
rename to packages/builder/src/components/userInterface/ComponentSelectionList.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentSelector.svelte b/packages/builder/src/components/userInterface/ComponentSelector.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentSelector.svelte
rename to packages/builder/src/components/userInterface/ComponentSelector.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentsHierarchy.svelte
rename to packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentsHierarchyChildren.svelte
rename to packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/ComponentsPaneSwitcher.svelte
rename to packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/CurrentItemPreview.svelte b/packages/builder/src/components/userInterface/CurrentItemPreview.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/CurrentItemPreview.svelte
rename to packages/builder/src/components/userInterface/CurrentItemPreview.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/EditComponentProps.svelte b/packages/builder/src/components/userInterface/EditComponentProps.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/EditComponentProps.svelte
rename to packages/builder/src/components/userInterface/EditComponentProps.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/EventsEditor/EventEditorModal.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/EventsEditor/EventEditorModal.svelte
rename to packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/EventsEditor/EventsEditor.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/EventsEditor/EventsEditor.svelte
rename to packages/builder/src/components/userInterface/EventsEditor/EventsEditor.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/EventsEditor/HandlerSelector.svelte b/packages/builder/src/components/userInterface/EventsEditor/HandlerSelector.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/EventsEditor/HandlerSelector.svelte
rename to packages/builder/src/components/userInterface/EventsEditor/HandlerSelector.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/EventsEditor/StateBindingCascader.svelte
rename to packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/EventsEditor/index.js b/packages/builder/src/components/userInterface/EventsEditor/index.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/EventsEditor/index.js
rename to packages/builder/src/components/userInterface/EventsEditor/index.js
diff --git a/packages/builder/src/node_modules/components/userInterface/LayoutEditor.svelte b/packages/builder/src/components/userInterface/LayoutEditor.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/LayoutEditor.svelte
rename to packages/builder/src/components/userInterface/LayoutEditor.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/LayoutTemplateControls.svelte b/packages/builder/src/components/userInterface/LayoutTemplateControls.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/LayoutTemplateControls.svelte
rename to packages/builder/src/components/userInterface/LayoutTemplateControls.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/MasterLayout.svelte b/packages/builder/src/components/userInterface/MasterLayout.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/MasterLayout.svelte
rename to packages/builder/src/components/userInterface/MasterLayout.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/NewScreen.svelte b/packages/builder/src/components/userInterface/NewScreen.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/NewScreen.svelte
rename to packages/builder/src/components/userInterface/NewScreen.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PageView.svelte b/packages/builder/src/components/userInterface/PageView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PageView.svelte
rename to packages/builder/src/components/userInterface/PageView.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PagesComponents.svelte b/packages/builder/src/components/userInterface/PagesComponents.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PagesComponents.svelte
rename to packages/builder/src/components/userInterface/PagesComponents.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PagesList.svelte b/packages/builder/src/components/userInterface/PagesList.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PagesList.svelte
rename to packages/builder/src/components/userInterface/PagesList.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PropControl.svelte b/packages/builder/src/components/userInterface/PropControl.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PropControl.svelte
rename to packages/builder/src/components/userInterface/PropControl.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PropertyCascader/PropertyCascader.svelte b/packages/builder/src/components/userInterface/PropertyCascader/PropertyCascader.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PropertyCascader/PropertyCascader.svelte
rename to packages/builder/src/components/userInterface/PropertyCascader/PropertyCascader.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PropertyCascader/StateBindingOptions.svelte b/packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PropertyCascader/StateBindingOptions.svelte
rename to packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/PropertyCascader/index.js b/packages/builder/src/components/userInterface/PropertyCascader/index.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PropertyCascader/index.js
rename to packages/builder/src/components/userInterface/PropertyCascader/index.js
diff --git a/packages/builder/src/node_modules/components/userInterface/PropsView.svelte b/packages/builder/src/components/userInterface/PropsView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/PropsView.svelte
rename to packages/builder/src/components/userInterface/PropsView.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/SettingsView.svelte b/packages/builder/src/components/userInterface/SettingsView.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/SettingsView.svelte
rename to packages/builder/src/components/userInterface/SettingsView.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/StateBindingControl.svelte b/packages/builder/src/components/userInterface/StateBindingControl.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/StateBindingControl.svelte
rename to packages/builder/src/components/userInterface/StateBindingControl.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/UserInterfaceRoot.svelte
rename to packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/createProps.js b/packages/builder/src/components/userInterface/pagesParsing/createProps.js
similarity index 98%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/createProps.js
rename to packages/builder/src/components/userInterface/pagesParsing/createProps.js
index cda6ec760a..cd31b2e3b9 100644
--- a/packages/builder/src/node_modules/components/userInterface/pagesParsing/createProps.js
+++ b/packages/builder/src/components/userInterface/pagesParsing/createProps.js
@@ -1,7 +1,7 @@
 import { isString, isUndefined } from "lodash/fp"
 import { types } from "./types"
 import { assign } from "lodash"
-import { uuid } from "builderStore/uuid"
+import { uuid } from "../src/builderStore/uuid"
 
 export const getBuiltin = name => {
   const { props } = createProps({ name })
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/defaultPagesObject.js b/packages/builder/src/components/userInterface/pagesParsing/defaultPagesObject.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/defaultPagesObject.js
rename to packages/builder/src/components/userInterface/pagesParsing/defaultPagesObject.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/findDependencies.js b/packages/builder/src/components/userInterface/pagesParsing/findDependencies.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/findDependencies.js
rename to packages/builder/src/components/userInterface/pagesParsing/findDependencies.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/getRootComponent.js b/packages/builder/src/components/userInterface/pagesParsing/getRootComponent.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/getRootComponent.js
rename to packages/builder/src/components/userInterface/pagesParsing/getRootComponent.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/renameScreen.js b/packages/builder/src/components/userInterface/pagesParsing/renameScreen.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/renameScreen.js
rename to packages/builder/src/components/userInterface/pagesParsing/renameScreen.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/searchComponents.js b/packages/builder/src/components/userInterface/pagesParsing/searchComponents.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/searchComponents.js
rename to packages/builder/src/components/userInterface/pagesParsing/searchComponents.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/splitRootComponentName.js b/packages/builder/src/components/userInterface/pagesParsing/splitRootComponentName.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/splitRootComponentName.js
rename to packages/builder/src/components/userInterface/pagesParsing/splitRootComponentName.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/types.js b/packages/builder/src/components/userInterface/pagesParsing/types.js
similarity index 100%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/types.js
rename to packages/builder/src/components/userInterface/pagesParsing/types.js
diff --git a/packages/builder/src/node_modules/components/userInterface/pagesParsing/validatePages.js b/packages/builder/src/components/userInterface/pagesParsing/validatePages.js
similarity index 96%
rename from packages/builder/src/node_modules/components/userInterface/pagesParsing/validatePages.js
rename to packages/builder/src/components/userInterface/pagesParsing/validatePages.js
index 3eeec4b84a..6d02b6a2b7 100644
--- a/packages/builder/src/node_modules/components/userInterface/pagesParsing/validatePages.js
+++ b/packages/builder/src/components/userInterface/pagesParsing/validatePages.js
@@ -1,5 +1,5 @@
 import { isString, keys, flatten, isArray, map, filter } from "lodash/fp"
-import { common } from "../../../../core/src"
+import { common } from "../../../../../core/src"
 const pipe = common.$
 
 export const validatePage = page => {
diff --git a/packages/builder/tests/componentDependencies.spec.js b/packages/builder/tests/componentDependencies.spec.js
index 267f395b2a..45cd891699 100644
--- a/packages/builder/tests/componentDependencies.spec.js
+++ b/packages/builder/tests/componentDependencies.spec.js
@@ -1,4 +1,4 @@
-import { componentDependencies } from "../src/userInterface/pagesParsing/findDependencies"
+import { componentDependencies } from "../src/components/userInterface/pagesParsing/findDependencies"
 import { componentsAndScreens } from "./testData"
 import { some, find } from "lodash/fp"
 
diff --git a/packages/builder/tests/createProps.spec.js b/packages/builder/tests/createProps.spec.js
index 7acfa38b48..7ef13e5062 100644
--- a/packages/builder/tests/createProps.spec.js
+++ b/packages/builder/tests/createProps.spec.js
@@ -1,4 +1,4 @@
-import { createProps } from "../src/userInterface/pagesParsing/createProps"
+import { createProps } from "../src/components/userInterface/pagesParsing/createProps"
 import { keys, some } from "lodash/fp"
 import { BB_STATE_BINDINGPATH } from "@budibase/client/src/state/parseBinding"
 import { stripStandardProps } from "./testData"
diff --git a/packages/builder/tests/expandPropDef.spec.js b/packages/builder/tests/expandPropDef.spec.js
index 08c3eb3327..a46aa368e1 100644
--- a/packages/builder/tests/expandPropDef.spec.js
+++ b/packages/builder/tests/expandPropDef.spec.js
@@ -1,4 +1,4 @@
-import { expandComponentDefinition } from "../src/userInterface/pagesParsing/types"
+import { expandComponentDefinition } from "../src/components/userInterface/pagesParsing/types"
 
 const componentDef = () => ({
   name: "comp",
diff --git a/packages/builder/tests/getNewScreen.spec.js b/packages/builder/tests/getNewScreen.spec.js
index 04f58c2c0c..6614753eab 100644
--- a/packages/builder/tests/getNewScreen.spec.js
+++ b/packages/builder/tests/getNewScreen.spec.js
@@ -1,4 +1,4 @@
-import { getNewScreen } from "../src/userInterface/pagesParsing/createProps"
+import { getNewScreen } from "../src/components/userInterface/pagesParsing/createProps"
 import { componentsAndScreens, stripStandardProps } from "./testData"
 
 describe("geNewScreen", () => {
diff --git a/packages/builder/tests/renameScreen.spec.js b/packages/builder/tests/renameScreen.spec.js
index 8f5aea2109..9091c029ce 100644
--- a/packages/builder/tests/renameScreen.spec.js
+++ b/packages/builder/tests/renameScreen.spec.js
@@ -1,5 +1,5 @@
-import { getExactComponent } from "../src/userInterface/pagesParsing/searchComponents"
-import { rename } from "../src/userInterface/pagesParsing/renameScreen"
+import { getExactComponent } from "../src/components/userInterface/pagesParsing/searchComponents"
+import { rename } from "../src/components/userInterface/pagesParsing/renameScreen"
 import { componentsAndScreens } from "./testData"
 
 describe("rename component", () => {
diff --git a/packages/builder/tests/searchComponentsProps.spec.js b/packages/builder/tests/searchComponentsProps.spec.js
index e81d1c2533..65f05b064e 100644
--- a/packages/builder/tests/searchComponentsProps.spec.js
+++ b/packages/builder/tests/searchComponentsProps.spec.js
@@ -2,7 +2,7 @@ import {
   searchAllComponents,
   getExactComponent,
   getAncestorProps,
-} from "../src/userInterface/pagesParsing/searchComponents"
+} from "../src/components/userInterface/pagesParsing/searchComponents"
 import { componentsAndScreens } from "./testData"
 
 describe("searchAllComponents", () => {
diff --git a/packages/builder/tests/validatePages.spec.js b/packages/builder/tests/validatePages.spec.js
index deb86d84ad..695ee51259 100644
--- a/packages/builder/tests/validatePages.spec.js
+++ b/packages/builder/tests/validatePages.spec.js
@@ -1,7 +1,7 @@
 import {
   validatePages,
   validatePage,
-} from "../src/userInterface/pagesParsing/validatePages"
+} from "../src/components/userInterface/pagesParsing/validatePages"
 
 const validPages = () => ({
   main: {