diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e57bfee2fccd0..e758b05f236c1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -61,15 +61,7 @@ packages/core/base/core-base-server-mocks @elastic/kibana-core
 packages/core/capabilities/core-capabilities-browser-mocks @elastic/kibana-core
 packages/core/capabilities/core-capabilities-server-mocks @elastic/kibana-core
 packages/core/chrome/core-chrome-browser @elastic/appex-sharedux
-packages/core/chrome/core-chrome-browser-internal @elastic/appex-sharedux
 packages/core/chrome/core-chrome-browser-mocks @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-browser @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-browser-internal @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-browser-mocks @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-common @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-server @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-server-internal @elastic/appex-sharedux
-packages/core/custom-branding/core-custom-branding-server-mocks @elastic/appex-sharedux
 packages/core/deprecations/core-deprecations-browser-mocks @elastic/kibana-core
 packages/core/deprecations/core-deprecations-server-mocks @elastic/kibana-core
 packages/core/doc-links/core-doc-links-browser-mocks @elastic/kibana-core
@@ -113,12 +105,7 @@ packages/core/status/core-status-server-mocks @elastic/kibana-core
 packages/core/test-helpers/core-test-helpers-kbn-server @elastic/kibana-core
 packages/core/test-helpers/core-test-helpers-model-versions @elastic/kibana-core
 packages/core/theme/core-theme-browser-mocks @elastic/kibana-core
-packages/core/ui-settings/core-ui-settings-browser @elastic/appex-sharedux
-packages/core/ui-settings/core-ui-settings-browser-internal @elastic/appex-sharedux
 packages/core/ui-settings/core-ui-settings-browser-mocks @elastic/appex-sharedux
-packages/core/ui-settings/core-ui-settings-common @elastic/appex-sharedux
-packages/core/ui-settings/core-ui-settings-server @elastic/appex-sharedux
-packages/core/ui-settings/core-ui-settings-server-internal @elastic/appex-sharedux
 packages/core/ui-settings/core-ui-settings-server-mocks @elastic/appex-sharedux
 packages/core/usage-data/core-usage-data-server-mocks @elastic/kibana-core
 packages/core/user-settings/core-user-settings-server @elastic/kibana-security
@@ -307,7 +294,15 @@ src/core/packages/capabilities/browser-internal @elastic/kibana-core
 src/core/packages/capabilities/common @elastic/kibana-core
 src/core/packages/capabilities/server @elastic/kibana-core
 src/core/packages/capabilities/server-internal @elastic/kibana-core
+src/core/packages/chrome/browser-internal @elastic/appex-sharedux
 src/core/packages/config/server-internal @elastic/kibana-core
+src/core/packages/custom-branding/browser @elastic/appex-sharedux
+src/core/packages/custom-branding/browser-internal @elastic/appex-sharedux
+src/core/packages/custom-branding/browser-mocks @elastic/appex-sharedux
+src/core/packages/custom-branding/common @elastic/appex-sharedux
+src/core/packages/custom-branding/server @elastic/appex-sharedux
+src/core/packages/custom-branding/server-internal @elastic/appex-sharedux
+src/core/packages/custom-branding/server-mocks @elastic/appex-sharedux
 src/core/packages/deprecations/browser @elastic/kibana-core
 src/core/packages/deprecations/browser-internal @elastic/kibana-core
 src/core/packages/deprecations/common @elastic/kibana-core
@@ -414,6 +409,11 @@ src/core/packages/test-helpers/so-type-serializer @elastic/kibana-core
 src/core/packages/test-helpers/test-utils @elastic/kibana-core
 src/core/packages/theme/browser @elastic/kibana-core
 src/core/packages/theme/browser-internal @elastic/kibana-core
+src/core/packages/ui-settings/browser @elastic/appex-sharedux
+src/core/packages/ui-settings/browser-internal @elastic/appex-sharedux
+src/core/packages/ui-settings/common @elastic/appex-sharedux
+src/core/packages/ui-settings/server @elastic/appex-sharedux
+src/core/packages/ui-settings/server-internal @elastic/appex-sharedux
 src/core/packages/usage-data/base-server-internal @elastic/kibana-core
 src/core/packages/usage-data/server @elastic/kibana-core
 src/core/packages/usage-data/server-internal @elastic/kibana-core
diff --git a/docs/developer/architecture/core/patterns-scoped-services.asciidoc b/docs/developer/architecture/core/patterns-scoped-services.asciidoc
index 51b6ecba5cdbe..61631f8c73f48 100644
--- a/docs/developer/architecture/core/patterns-scoped-services.asciidoc
+++ b/docs/developer/architecture/core/patterns-scoped-services.asciidoc
@@ -20,7 +20,7 @@ The {kib-repo}/blob/8.9/src/core/packages/http/server/src/router/request_handler
 
 * {kib-repo}/blob/8.9/src/core/packages/saved-objects/api-server/src/saved_objects_client.ts[`context.savedObjects.client`]
 * {kib-repo}/blob/8.9/src/core/packages/elasticsearch/server/src/client/scoped_cluster_client.ts[`context.elasticsearch.client`]
-* {kib-repo}/blob/8.9/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts[`context.uiSettings.client`]
+* {kib-repo}/blob/8.9/src/core/packages/ui-settings/server/src/ui_settings_client.ts[`context.uiSettings.client`]
 
 ==== Declare a custom scoped service
 
diff --git a/docs/developer/architecture/core/uisettings-service.asciidoc b/docs/developer/architecture/core/uisettings-service.asciidoc
index f70180b72d928..088a8cc7c570f 100644
--- a/docs/developer/architecture/core/uisettings-service.asciidoc
+++ b/docs/developer/architecture/core/uisettings-service.asciidoc
@@ -38,10 +38,10 @@ uiSettings:
 
 [[client-side-usage]]
 === Client side usage
-On the client, the `uiSettings` service is exposed directly from `core` and the {kib-repo}/blob/8.9/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts[client]
+On the client, the `uiSettings` service is exposed directly from `core` and the {kib-repo}/blob/8.9/src/core/packages/ui-settings/server/src/ui_settings_client.ts[client]
 provides plugins access to the `config` entries stored in {es}.
 
-In the interest of performance, `uiSettings` are cached. Any changes that require cache refreshes should register an instruction to reload the page when settings are configured in Advanced Settings using the `requiresPageReload` {kib-repo}/blob/8.9/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts[parameter].
+In the interest of performance, `uiSettings` are cached. Any changes that require cache refreshes should register an instruction to reload the page when settings are configured in Advanced Settings using the `requiresPageReload` {kib-repo}/blob/8.9/src/core/packages/ui-settings/common/src/ui_settings.ts[parameter].
 
 [source,typescript]
 ----
@@ -78,7 +78,7 @@ export class MyPlugin implements Plugin<MyPluginSetup, MyPluginStart> {
 === Server side usage
 On the server, `uiSettings` are exposed directly from `core`.
 
-The following example shows how to register a new `custom` setting with a default value of '42'. When registering a new setting, you must provide a schema against which validations are performed on read and write. All the other {kib-repo}/blob/8.9/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts[parameters] are optional.
+The following example shows how to register a new `custom` setting with a default value of '42'. When registering a new setting, you must provide a schema against which validations are performed on read and write. All the other {kib-repo}/blob/8.9/src/core/packages/ui-settings/common/src/ui_settings.ts[parameters] are optional.
 
 [source,typescript]
 ----
diff --git a/package.json b/package.json
index ac133a6136d77..329ecad237846 100644
--- a/package.json
+++ b/package.json
@@ -264,15 +264,15 @@
     "@kbn/core-capabilities-server": "link:src/core/packages/capabilities/server",
     "@kbn/core-capabilities-server-internal": "link:src/core/packages/capabilities/server-internal",
     "@kbn/core-chrome-browser": "link:packages/core/chrome/core-chrome-browser",
-    "@kbn/core-chrome-browser-internal": "link:packages/core/chrome/core-chrome-browser-internal",
+    "@kbn/core-chrome-browser-internal": "link:src/core/packages/chrome/browser-internal",
     "@kbn/core-config-server-internal": "link:src/core/packages/config/server-internal",
-    "@kbn/core-custom-branding-browser": "link:packages/core/custom-branding/core-custom-branding-browser",
-    "@kbn/core-custom-branding-browser-internal": "link:packages/core/custom-branding/core-custom-branding-browser-internal",
-    "@kbn/core-custom-branding-browser-mocks": "link:packages/core/custom-branding/core-custom-branding-browser-mocks",
-    "@kbn/core-custom-branding-common": "link:packages/core/custom-branding/core-custom-branding-common",
-    "@kbn/core-custom-branding-server": "link:packages/core/custom-branding/core-custom-branding-server",
-    "@kbn/core-custom-branding-server-internal": "link:packages/core/custom-branding/core-custom-branding-server-internal",
-    "@kbn/core-custom-branding-server-mocks": "link:packages/core/custom-branding/core-custom-branding-server-mocks",
+    "@kbn/core-custom-branding-browser": "link:src/core/packages/custom-branding/browser",
+    "@kbn/core-custom-branding-browser-internal": "link:src/core/packages/custom-branding/browser-internal",
+    "@kbn/core-custom-branding-browser-mocks": "link:src/core/packages/custom-branding/browser-mocks",
+    "@kbn/core-custom-branding-common": "link:src/core/packages/custom-branding/common",
+    "@kbn/core-custom-branding-server": "link:src/core/packages/custom-branding/server",
+    "@kbn/core-custom-branding-server-internal": "link:src/core/packages/custom-branding/server-internal",
+    "@kbn/core-custom-branding-server-mocks": "link:src/core/packages/custom-branding/server-mocks",
     "@kbn/core-deprecations-browser": "link:src/core/packages/deprecations/browser",
     "@kbn/core-deprecations-browser-internal": "link:src/core/packages/deprecations/browser-internal",
     "@kbn/core-deprecations-common": "link:src/core/packages/deprecations/common",
@@ -395,11 +395,11 @@
     "@kbn/core-test-helpers-test-utils": "link:src/core/packages/test-helpers/test-utils",
     "@kbn/core-theme-browser": "link:src/core/packages/theme/browser",
     "@kbn/core-theme-browser-internal": "link:src/core/packages/theme/browser-internal",
-    "@kbn/core-ui-settings-browser": "link:packages/core/ui-settings/core-ui-settings-browser",
-    "@kbn/core-ui-settings-browser-internal": "link:packages/core/ui-settings/core-ui-settings-browser-internal",
-    "@kbn/core-ui-settings-common": "link:packages/core/ui-settings/core-ui-settings-common",
-    "@kbn/core-ui-settings-server": "link:packages/core/ui-settings/core-ui-settings-server",
-    "@kbn/core-ui-settings-server-internal": "link:packages/core/ui-settings/core-ui-settings-server-internal",
+    "@kbn/core-ui-settings-browser": "link:src/core/packages/ui-settings/browser",
+    "@kbn/core-ui-settings-browser-internal": "link:src/core/packages/ui-settings/browser-internal",
+    "@kbn/core-ui-settings-common": "link:src/core/packages/ui-settings/common",
+    "@kbn/core-ui-settings-server": "link:src/core/packages/ui-settings/server",
+    "@kbn/core-ui-settings-server-internal": "link:src/core/packages/ui-settings/server-internal",
     "@kbn/core-usage-data-base-server-internal": "link:src/core/packages/usage-data/base-server-internal",
     "@kbn/core-usage-data-server": "link:src/core/packages/usage-data/server",
     "@kbn/core-usage-data-server-internal": "link:src/core/packages/usage-data/server-internal",
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/jest.config.js b/packages/core/custom-branding/core-custom-branding-browser-internal/jest.config.js
deleted file mode 100644
index 47b7978afceca..0000000000000
--- a/packages/core/custom-branding/core-custom-branding-browser-internal/jest.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../../../',
-  roots: ['<rootDir>/packages/core/custom-branding/core-custom-branding-browser-internal'],
-};
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/jest.config.js b/packages/core/custom-branding/core-custom-branding-browser-mocks/jest.config.js
deleted file mode 100644
index a4e6b5245af40..0000000000000
--- a/packages/core/custom-branding/core-custom-branding-browser-mocks/jest.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/custom-branding/core-custom-branding-browser-mocks'],
-};
diff --git a/packages/shared-ux/chrome/solution_navigation.mdx b/packages/shared-ux/chrome/solution_navigation.mdx
index c4d0743c59800..e7e2e883df9ba 100644
--- a/packages/shared-ux/chrome/solution_navigation.mdx
+++ b/packages/shared-ux/chrome/solution_navigation.mdx
@@ -182,7 +182,7 @@ navigation.addSolutionNavigation({
 #### Navigation tree API
 
 > **Warning**
-> The API reference is manually maintained and might be out of date. Please refer [to the source](https://github.com/elastic/kibana/blob/main/packages/core/chrome/core-chrome-browser/src/project_navigation.ts) for the most up-to-date information, until we have automated the API reference.
+> The API reference is manually maintained and might be out of date. Please refer [to the source](https://github.com/elastic/kibana/blob/main/src/core/packages/chrome/browser/src/project_navigation.ts) for the most up-to-date information, until we have automated the API reference.
 
 ##### `NavigationTreeDefinition`
 
diff --git a/packages/core/chrome/core-chrome-browser-internal/README.md b/src/core/packages/chrome/browser-internal/README.md
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/README.md
rename to src/core/packages/chrome/browser-internal/README.md
diff --git a/packages/core/chrome/core-chrome-browser-internal/index.ts b/src/core/packages/chrome/browser-internal/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/index.ts
rename to src/core/packages/chrome/browser-internal/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/jest.config.js b/src/core/packages/chrome/browser-internal/jest.config.js
similarity index 83%
rename from packages/core/chrome/core-chrome-browser-internal/jest.config.js
rename to src/core/packages/chrome/browser-internal/jest.config.js
index 06a23a0ee8b55..308662ce4bc16 100644
--- a/packages/core/chrome/core-chrome-browser-internal/jest.config.js
+++ b/src/core/packages/chrome/browser-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/chrome/core-chrome-browser-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/chrome/browser-internal'],
 };
diff --git a/packages/core/chrome/core-chrome-browser-internal/kibana.jsonc b/src/core/packages/chrome/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/kibana.jsonc
rename to src/core/packages/chrome/browser-internal/kibana.jsonc
diff --git a/packages/core/chrome/core-chrome-browser-internal/package.json b/src/core/packages/chrome/browser-internal/package.json
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/package.json
rename to src/core/packages/chrome/browser-internal/package.json
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.mocks.ts b/src/core/packages/chrome/browser-internal/src/chrome_service.test.mocks.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.mocks.ts
rename to src/core/packages/chrome/browser-internal/src/chrome_service.test.mocks.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx b/src/core/packages/chrome/browser-internal/src/chrome_service.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
rename to src/core/packages/chrome/browser-internal/src/chrome_service.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/src/core/packages/chrome/browser-internal/src/chrome_service.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
rename to src/core/packages/chrome/browser-internal/src/chrome_service.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/doc_title/doc_title_service.test.ts b/src/core/packages/chrome/browser-internal/src/doc_title/doc_title_service.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/doc_title/doc_title_service.test.ts
rename to src/core/packages/chrome/browser-internal/src/doc_title/doc_title_service.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/doc_title/doc_title_service.ts b/src/core/packages/chrome/browser-internal/src/doc_title/doc_title_service.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/doc_title/doc_title_service.ts
rename to src/core/packages/chrome/browser-internal/src/doc_title/doc_title_service.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/doc_title/index.ts b/src/core/packages/chrome/browser-internal/src/doc_title/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/doc_title/index.ts
rename to src/core/packages/chrome/browser-internal/src/doc_title/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/handle_system_colormode_change.test.ts b/src/core/packages/chrome/browser-internal/src/handle_system_colormode_change.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/handle_system_colormode_change.test.ts
rename to src/core/packages/chrome/browser-internal/src/handle_system_colormode_change.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/handle_system_colormode_change.tsx b/src/core/packages/chrome/browser-internal/src/handle_system_colormode_change.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/handle_system_colormode_change.tsx
rename to src/core/packages/chrome/browser-internal/src/handle_system_colormode_change.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/index.ts b/src/core/packages/chrome/browser-internal/src/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/index.ts
rename to src/core/packages/chrome/browser-internal/src/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/index.ts b/src/core/packages/chrome/browser-internal/src/nav_controls/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_controls/index.ts
rename to src/core/packages/chrome/browser-internal/src/nav_controls/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.test.ts b/src/core/packages/chrome/browser-internal/src/nav_controls/nav_controls_service.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.test.ts
rename to src/core/packages/chrome/browser-internal/src/nav_controls/nav_controls_service.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.ts b/src/core/packages/chrome/browser-internal/src/nav_controls/nav_controls_service.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.ts
rename to src/core/packages/chrome/browser-internal/src/nav_controls/nav_controls_service.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/index.ts b/src/core/packages/chrome/browser-internal/src/nav_links/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_links/index.ts
rename to src/core/packages/chrome/browser-internal/src/nav_links/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_link.ts b/src/core/packages/chrome/browser-internal/src/nav_links/nav_link.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_link.ts
rename to src/core/packages/chrome/browser-internal/src/nav_links/nav_link.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.test.ts b/src/core/packages/chrome/browser-internal/src/nav_links/nav_links_service.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.test.ts
rename to src/core/packages/chrome/browser-internal/src/nav_links/nav_links_service.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.ts b/src/core/packages/chrome/browser-internal/src/nav_links/nav_links_service.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.ts
rename to src/core/packages/chrome/browser-internal/src/nav_links/nav_links_service.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/to_nav_link.test.ts b/src/core/packages/chrome/browser-internal/src/nav_links/to_nav_link.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_links/to_nav_link.test.ts
rename to src/core/packages/chrome/browser-internal/src/nav_links/to_nav_link.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/to_nav_link.ts b/src/core/packages/chrome/browser-internal/src/nav_links/to_nav_link.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/nav_links/to_nav_link.ts
rename to src/core/packages/chrome/browser-internal/src/nav_links/to_nav_link.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/breadcrumbs.tsx b/src/core/packages/chrome/browser-internal/src/project_navigation/breadcrumbs.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/breadcrumbs.tsx
rename to src/core/packages/chrome/browser-internal/src/project_navigation/breadcrumbs.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/cloud_links.tsx b/src/core/packages/chrome/browser-internal/src/project_navigation/cloud_links.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/cloud_links.tsx
rename to src/core/packages/chrome/browser-internal/src/project_navigation/cloud_links.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts b/src/core/packages/chrome/browser-internal/src/project_navigation/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts
rename to src/core/packages/chrome/browser-internal/src/project_navigation/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/navigation_presets.ts b/src/core/packages/chrome/browser-internal/src/project_navigation/navigation_presets.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/navigation_presets.ts
rename to src/core/packages/chrome/browser-internal/src/project_navigation/navigation_presets.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.test.ts b/src/core/packages/chrome/browser-internal/src/project_navigation/project_navigation_service.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.test.ts
rename to src/core/packages/chrome/browser-internal/src/project_navigation/project_navigation_service.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts b/src/core/packages/chrome/browser-internal/src/project_navigation/project_navigation_service.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
rename to src/core/packages/chrome/browser-internal/src/project_navigation/project_navigation_service.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/utils.test.ts b/src/core/packages/chrome/browser-internal/src/project_navigation/utils.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/utils.test.ts
rename to src/core/packages/chrome/browser-internal/src/project_navigation/utils.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/utils.ts b/src/core/packages/chrome/browser-internal/src/project_navigation/utils.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/project_navigation/utils.ts
rename to src/core/packages/chrome/browser-internal/src/project_navigation/utils.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/register_analytics_context_provider.test.ts b/src/core/packages/chrome/browser-internal/src/register_analytics_context_provider.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/register_analytics_context_provider.test.ts
rename to src/core/packages/chrome/browser-internal/src/register_analytics_context_provider.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/register_analytics_context_provider.ts b/src/core/packages/chrome/browser-internal/src/register_analytics_context_provider.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/register_analytics_context_provider.ts
rename to src/core/packages/chrome/browser-internal/src/register_analytics_context_provider.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/types.ts b/src/core/packages/chrome/browser-internal/src/types.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/types.ts
rename to src/core/packages/chrome/browser-internal/src/types.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/__snapshots__/loading_indicator.test.tsx.snap b/src/core/packages/chrome/browser-internal/src/ui/__snapshots__/loading_indicator.test.tsx.snap
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/__snapshots__/loading_indicator.test.tsx.snap
rename to src/core/packages/chrome/browser-internal/src/ui/__snapshots__/loading_indicator.test.tsx.snap
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
rename to src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/header.test.tsx.snap b/src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/header.test.tsx.snap
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/header.test.tsx.snap
rename to src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/header.test.tsx.snap
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/screen_reader_a11y.test.tsx.snap b/src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/screen_reader_a11y.test.tsx.snap
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/screen_reader_a11y.test.tsx.snap
rename to src/core/packages/chrome/browser-internal/src/ui/header/__snapshots__/screen_reader_a11y.test.tsx.snap
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/collapsible_nav.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/collapsible_nav.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/collapsible_nav.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/collapsible_nav.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/elastic_mark.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/elastic_mark.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/elastic_mark.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/elastic_mark.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/get_collapsible_nav_styles.ts b/src/core/packages/chrome/browser-internal/src/ui/header/get_collapsible_nav_styles.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/get_collapsible_nav_styles.ts
rename to src/core/packages/chrome/browser-internal/src/ui/header/get_collapsible_nav_styles.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_action_menu.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_action_menu.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_action_menu.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_action_menu.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_action_menu.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_action_menu.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_action_menu.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_action_menu.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_badge.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_badge.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_badge.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_badge.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_breadcrumbs.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_breadcrumbs.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_breadcrumbs.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_breadcrumbs.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_breadcrumbs.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_breadcrumbs.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_breadcrumbs.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_breadcrumbs.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_extension.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_extension.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_extension.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_extension.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_extension.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_extension.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_extension.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_extension.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_help_menu.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_help_menu.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_help_menu.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_help_menu.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_help_menu.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_help_menu.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_help_menu.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_help_menu.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_logo.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_logo.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_logo.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_logo.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_menu_button.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_menu_button.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_menu_button.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_menu_button.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_nav_controls.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_nav_controls.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_nav_controls.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_nav_controls.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_top_banner.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_top_banner.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/header_top_banner.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/header_top_banner.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/index.ts b/src/core/packages/chrome/browser-internal/src/ui/header/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/index.ts
rename to src/core/packages/chrome/browser-internal/src/ui/header/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/nav_link.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/nav_link.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/nav_link.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/nav_link.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/screen_reader_a11y.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/screen_reader_a11y.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/screen_reader_a11y.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/screen_reader_a11y.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/screen_reader_a11y.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/screen_reader_a11y.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/screen_reader_a11y.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/header/screen_reader_a11y.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/types.ts b/src/core/packages/chrome/browser-internal/src/ui/header/types.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/header/types.ts
rename to src/core/packages/chrome/browser-internal/src/ui/header/types.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts b/src/core/packages/chrome/browser-internal/src/ui/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
rename to src/core/packages/chrome/browser-internal/src/ui/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/loading_indicator.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/loading_indicator.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/loading_indicator.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/loading_indicator.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/loading_indicator.tsx b/src/core/packages/chrome/browser-internal/src/ui/loading_indicator.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/loading_indicator.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/loading_indicator.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/app_menu.tsx b/src/core/packages/chrome/browser-internal/src/ui/project/app_menu.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/project/app_menu.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/project/app_menu.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/breadcrumbs.tsx b/src/core/packages/chrome/browser-internal/src/ui/project/breadcrumbs.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/project/breadcrumbs.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/project/breadcrumbs.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.test.tsx b/src/core/packages/chrome/browser-internal/src/ui/project/header.test.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.test.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/project/header.test.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx b/src/core/packages/chrome/browser-internal/src/ui/project/header.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/project/header.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts b/src/core/packages/chrome/browser-internal/src/ui/project/index.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
rename to src/core/packages/chrome/browser-internal/src/ui/project/index.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx b/src/core/packages/chrome/browser-internal/src/ui/project/navigation.tsx
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
rename to src/core/packages/chrome/browser-internal/src/ui/project/navigation.tsx
diff --git a/packages/core/chrome/core-chrome-browser-internal/tsconfig.json b/src/core/packages/chrome/browser-internal/tsconfig.json
similarity index 97%
rename from packages/core/chrome/core-chrome-browser-internal/tsconfig.json
rename to src/core/packages/chrome/browser-internal/tsconfig.json
index 6960b8961561e..781811ed682e9 100644
--- a/packages/core/chrome/core-chrome-browser-internal/tsconfig.json
+++ b/src/core/packages/chrome/browser-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/README.md b/src/core/packages/custom-branding/browser-internal/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/README.md
rename to src/core/packages/custom-branding/browser-internal/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/index.ts b/src/core/packages/custom-branding/browser-internal/index.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/index.ts
rename to src/core/packages/custom-branding/browser-internal/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/jest.config.js b/src/core/packages/custom-branding/browser-internal/jest.config.js
similarity index 82%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/jest.config.js
rename to src/core/packages/custom-branding/browser-internal/jest.config.js
index 0204543fb8a6c..98c324b2063ce 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/jest.config.js
+++ b/src/core/packages/custom-branding/browser-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-browser-internal'],
+  rootDir: '../../../../../',
+  roots: ['<rootDir>/src/core/packages/custom-branding/browser-internal'],
 };
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/kibana.jsonc b/src/core/packages/custom-branding/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/kibana.jsonc
rename to src/core/packages/custom-branding/browser-internal/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/package.json b/src/core/packages/custom-branding/browser-internal/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/package.json
rename to src/core/packages/custom-branding/browser-internal/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.test.ts b/src/core/packages/custom-branding/browser-internal/src/custom_branding_service.test.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.test.ts
rename to src/core/packages/custom-branding/browser-internal/src/custom_branding_service.test.ts
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.ts b/src/core/packages/custom-branding/browser-internal/src/custom_branding_service.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.ts
rename to src/core/packages/custom-branding/browser-internal/src/custom_branding_service.ts
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/tsconfig.json b/src/core/packages/custom-branding/browser-internal/tsconfig.json
similarity index 85%
rename from packages/core/custom-branding/core-custom-branding-browser-internal/tsconfig.json
rename to src/core/packages/custom-branding/browser-internal/tsconfig.json
index cf46904936bc0..35904d0027e0f 100644
--- a/packages/core/custom-branding/core-custom-branding-browser-internal/tsconfig.json
+++ b/src/core/packages/custom-branding/browser-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/README.md b/src/core/packages/custom-branding/browser-mocks/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/README.md
rename to src/core/packages/custom-branding/browser-mocks/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/custom_branding_service.mock.ts b/src/core/packages/custom-branding/browser-mocks/custom_branding_service.mock.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/custom_branding_service.mock.ts
rename to src/core/packages/custom-branding/browser-mocks/custom_branding_service.mock.ts
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/index.ts b/src/core/packages/custom-branding/browser-mocks/index.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/index.ts
rename to src/core/packages/custom-branding/browser-mocks/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser/jest.config.js b/src/core/packages/custom-branding/browser-mocks/jest.config.js
similarity index 83%
rename from packages/core/ui-settings/core-ui-settings-browser/jest.config.js
rename to src/core/packages/custom-branding/browser-mocks/jest.config.js
index dbe69a6ec8efc..90eab8eae1c38 100644
--- a/packages/core/ui-settings/core-ui-settings-browser/jest.config.js
+++ b/src/core/packages/custom-branding/browser-mocks/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-browser'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/custom-branding/browser-mocks'],
 };
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/kibana.jsonc b/src/core/packages/custom-branding/browser-mocks/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/kibana.jsonc
rename to src/core/packages/custom-branding/browser-mocks/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/package.json b/src/core/packages/custom-branding/browser-mocks/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/package.json
rename to src/core/packages/custom-branding/browser-mocks/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/service_contract.mock.ts b/src/core/packages/custom-branding/browser-mocks/service_contract.mock.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/service_contract.mock.ts
rename to src/core/packages/custom-branding/browser-mocks/service_contract.mock.ts
diff --git a/packages/core/custom-branding/core-custom-branding-browser-mocks/tsconfig.json b/src/core/packages/custom-branding/browser-mocks/tsconfig.json
similarity index 84%
rename from packages/core/custom-branding/core-custom-branding-browser-mocks/tsconfig.json
rename to src/core/packages/custom-branding/browser-mocks/tsconfig.json
index 2f4b2bdd8cb31..d422554872c69 100644
--- a/packages/core/custom-branding/core-custom-branding-browser-mocks/tsconfig.json
+++ b/src/core/packages/custom-branding/browser-mocks/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-browser/README.md b/src/core/packages/custom-branding/browser/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser/README.md
rename to src/core/packages/custom-branding/browser/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-browser/index.ts b/src/core/packages/custom-branding/browser/index.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser/index.ts
rename to src/core/packages/custom-branding/browser/index.ts
diff --git a/packages/core/custom-branding/core-custom-branding-browser/kibana.jsonc b/src/core/packages/custom-branding/browser/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser/kibana.jsonc
rename to src/core/packages/custom-branding/browser/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-browser/package.json b/src/core/packages/custom-branding/browser/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser/package.json
rename to src/core/packages/custom-branding/browser/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-browser/tsconfig.json b/src/core/packages/custom-branding/browser/tsconfig.json
similarity index 86%
rename from packages/core/custom-branding/core-custom-branding-browser/tsconfig.json
rename to src/core/packages/custom-branding/browser/tsconfig.json
index c1e8bfe33ab5d..36e9c630b983e 100644
--- a/packages/core/custom-branding/core-custom-branding-browser/tsconfig.json
+++ b/src/core/packages/custom-branding/browser/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-browser/types.ts b/src/core/packages/custom-branding/browser/types.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-browser/types.ts
rename to src/core/packages/custom-branding/browser/types.ts
diff --git a/packages/core/custom-branding/core-custom-branding-common/README.md b/src/core/packages/custom-branding/common/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-common/README.md
rename to src/core/packages/custom-branding/common/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-common/index.ts b/src/core/packages/custom-branding/common/index.ts
similarity index 90%
rename from packages/core/custom-branding/core-custom-branding-common/index.ts
rename to src/core/packages/custom-branding/common/index.ts
index d741255ccb240..ced5c73c5e29b 100644
--- a/packages/core/custom-branding/core-custom-branding-common/index.ts
+++ b/src/core/packages/custom-branding/common/index.ts
@@ -22,7 +22,7 @@ export interface CustomBranding {
   pageTitle?: string;
   /**
    * Custom replacement for Elastic Mark
-   * @link packages/core/chrome/core-chrome-browser-internal/src/ui/header/elastic_mark.tsx
+   * @link src/core/packages/chrome/browser-internal/src/ui/header/elastic_mark.tsx
    */
   customizedLogo?: string;
   /**
diff --git a/packages/core/custom-branding/core-custom-branding-common/kibana.jsonc b/src/core/packages/custom-branding/common/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-common/kibana.jsonc
rename to src/core/packages/custom-branding/common/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-common/package.json b/src/core/packages/custom-branding/common/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-common/package.json
rename to src/core/packages/custom-branding/common/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-common/tsconfig.json b/src/core/packages/custom-branding/common/tsconfig.json
similarity index 79%
rename from packages/core/custom-branding/core-custom-branding-common/tsconfig.json
rename to src/core/packages/custom-branding/common/tsconfig.json
index 931451997d24a..fb05929eb6a5f 100644
--- a/packages/core/custom-branding/core-custom-branding-common/tsconfig.json
+++ b/src/core/packages/custom-branding/common/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/README.md b/src/core/packages/custom-branding/server-internal/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-internal/README.md
rename to src/core/packages/custom-branding/server-internal/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/custom_branding_service.test.ts b/src/core/packages/custom-branding/server-internal/custom_branding_service.test.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-internal/custom_branding_service.test.ts
rename to src/core/packages/custom-branding/server-internal/custom_branding_service.test.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/custom_branding_service.ts b/src/core/packages/custom-branding/server-internal/custom_branding_service.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-internal/custom_branding_service.ts
rename to src/core/packages/custom-branding/server-internal/custom_branding_service.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/index.ts b/src/core/packages/custom-branding/server-internal/index.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-internal/index.ts
rename to src/core/packages/custom-branding/server-internal/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/jest.config.js b/src/core/packages/custom-branding/server-internal/jest.config.js
similarity index 82%
rename from packages/core/ui-settings/core-ui-settings-server-internal/jest.config.js
rename to src/core/packages/custom-branding/server-internal/jest.config.js
index bb2b0493be9be..9a28302c8f38c 100644
--- a/packages/core/ui-settings/core-ui-settings-server-internal/jest.config.js
+++ b/src/core/packages/custom-branding/server-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-server-internal'],
+  rootDir: '../../../../../',
+  roots: ['<rootDir>/src/core/packages/custom-branding/server-internal'],
 };
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/kibana.jsonc b/src/core/packages/custom-branding/server-internal/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-internal/kibana.jsonc
rename to src/core/packages/custom-branding/server-internal/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/package.json b/src/core/packages/custom-branding/server-internal/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-internal/package.json
rename to src/core/packages/custom-branding/server-internal/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/tsconfig.json b/src/core/packages/custom-branding/server-internal/tsconfig.json
similarity index 89%
rename from packages/core/custom-branding/core-custom-branding-server-internal/tsconfig.json
rename to src/core/packages/custom-branding/server-internal/tsconfig.json
index aa2e232129bcc..25b21716093a9 100644
--- a/packages/core/custom-branding/core-custom-branding-server-internal/tsconfig.json
+++ b/src/core/packages/custom-branding/server-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/README.md b/src/core/packages/custom-branding/server-mocks/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/README.md
rename to src/core/packages/custom-branding/server-mocks/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/index.ts b/src/core/packages/custom-branding/server-mocks/index.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/index.ts
rename to src/core/packages/custom-branding/server-mocks/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server/jest.config.js b/src/core/packages/custom-branding/server-mocks/jest.config.js
similarity index 83%
rename from packages/core/ui-settings/core-ui-settings-server/jest.config.js
rename to src/core/packages/custom-branding/server-mocks/jest.config.js
index ec4710b138d0e..a96674175abb3 100644
--- a/packages/core/ui-settings/core-ui-settings-server/jest.config.js
+++ b/src/core/packages/custom-branding/server-mocks/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-server'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/custom-branding/server-mocks'],
 };
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/kibana.jsonc b/src/core/packages/custom-branding/server-mocks/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/kibana.jsonc
rename to src/core/packages/custom-branding/server-mocks/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/package.json b/src/core/packages/custom-branding/server-mocks/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/package.json
rename to src/core/packages/custom-branding/server-mocks/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/src/custom_branding_service.mock.ts b/src/core/packages/custom-branding/server-mocks/src/custom_branding_service.mock.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/src/custom_branding_service.mock.ts
rename to src/core/packages/custom-branding/server-mocks/src/custom_branding_service.mock.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/src/service_contract.mock.ts b/src/core/packages/custom-branding/server-mocks/src/service_contract.mock.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/src/service_contract.mock.ts
rename to src/core/packages/custom-branding/server-mocks/src/service_contract.mock.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/tsconfig.json b/src/core/packages/custom-branding/server-mocks/tsconfig.json
similarity index 83%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/tsconfig.json
rename to src/core/packages/custom-branding/server-mocks/tsconfig.json
index 1b31b9f15ec66..23b5924ecb761 100644
--- a/packages/core/custom-branding/core-custom-branding-server-mocks/tsconfig.json
+++ b/src/core/packages/custom-branding/server-mocks/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-server/README.md b/src/core/packages/custom-branding/server/README.md
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server/README.md
rename to src/core/packages/custom-branding/server/README.md
diff --git a/packages/core/custom-branding/core-custom-branding-server/index.ts b/src/core/packages/custom-branding/server/index.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server/index.ts
rename to src/core/packages/custom-branding/server/index.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server/kibana.jsonc b/src/core/packages/custom-branding/server/kibana.jsonc
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server/kibana.jsonc
rename to src/core/packages/custom-branding/server/kibana.jsonc
diff --git a/packages/core/custom-branding/core-custom-branding-server/package.json b/src/core/packages/custom-branding/server/package.json
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server/package.json
rename to src/core/packages/custom-branding/server/package.json
diff --git a/packages/core/custom-branding/core-custom-branding-server/tsconfig.json b/src/core/packages/custom-branding/server/tsconfig.json
similarity index 85%
rename from packages/core/custom-branding/core-custom-branding-server/tsconfig.json
rename to src/core/packages/custom-branding/server/tsconfig.json
index fa1ec74e80cb8..08febae9247ea 100644
--- a/packages/core/custom-branding/core-custom-branding-server/tsconfig.json
+++ b/src/core/packages/custom-branding/server/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/custom-branding/core-custom-branding-server/types.ts b/src/core/packages/custom-branding/server/types.ts
similarity index 100%
rename from packages/core/custom-branding/core-custom-branding-server/types.ts
rename to src/core/packages/custom-branding/server/types.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/README.md b/src/core/packages/ui-settings/browser-internal/README.md
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/README.md
rename to src/core/packages/ui-settings/browser-internal/README.md
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/index.ts b/src/core/packages/ui-settings/browser-internal/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/index.ts
rename to src/core/packages/ui-settings/browser-internal/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-common/jest.config.js b/src/core/packages/ui-settings/browser-internal/jest.config.js
similarity index 83%
rename from packages/core/ui-settings/core-ui-settings-common/jest.config.js
rename to src/core/packages/ui-settings/browser-internal/jest.config.js
index df213211e2d11..193b6fe2d6163 100644
--- a/packages/core/ui-settings/core-ui-settings-common/jest.config.js
+++ b/src/core/packages/ui-settings/browser-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-common'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/ui-settings/browser-internal'],
 };
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/kibana.jsonc b/src/core/packages/ui-settings/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/kibana.jsonc
rename to src/core/packages/ui-settings/browser-internal/kibana.jsonc
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/package.json b/src/core/packages/ui-settings/browser-internal/package.json
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/package.json
rename to src/core/packages/ui-settings/browser-internal/package.json
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/__snapshots__/ui_settings_api.test.ts.snap b/src/core/packages/ui-settings/browser-internal/src/__snapshots__/ui_settings_api.test.ts.snap
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/__snapshots__/ui_settings_api.test.ts.snap
rename to src/core/packages/ui-settings/browser-internal/src/__snapshots__/ui_settings_api.test.ts.snap
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/__snapshots__/ui_settings_client.test.ts.snap b/src/core/packages/ui-settings/browser-internal/src/__snapshots__/ui_settings_client.test.ts.snap
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/__snapshots__/ui_settings_client.test.ts.snap
rename to src/core/packages/ui-settings/browser-internal/src/__snapshots__/ui_settings_client.test.ts.snap
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/settings_service.test.ts b/src/core/packages/ui-settings/browser-internal/src/settings_service.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/settings_service.test.ts
rename to src/core/packages/ui-settings/browser-internal/src/settings_service.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/settings_service.ts b/src/core/packages/ui-settings/browser-internal/src/settings_service.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/settings_service.ts
rename to src/core/packages/ui-settings/browser-internal/src/settings_service.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_api.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_api.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_api.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_api.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_client.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_client.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_client_common.ts
similarity index 99%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_client_common.ts
index 6ece79b0a675c..527eee34ece15 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts
+++ b/src/core/packages/ui-settings/browser-internal/src/ui_settings_client_common.ts
@@ -107,7 +107,7 @@ You can use \`IUiSettingsClient.get("${key}", defaultValue)\`, which will just r
 
   isDeclared(key: string) {
     return (
-      // @ts-ignore
+      // @ts-expect-error
       (key !== '__proto__' || key !== 'constructor' || key !== 'prototype') && key in this.cache
     );
   }
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.test.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_global_client.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.test.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_global_client.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_global_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_global_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_service.test.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_service.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_service.test.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_service.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_service.ts b/src/core/packages/ui-settings/browser-internal/src/ui_settings_service.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_service.ts
rename to src/core/packages/ui-settings/browser-internal/src/ui_settings_service.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/tsconfig.json b/src/core/packages/ui-settings/browser-internal/tsconfig.json
similarity index 91%
rename from packages/core/ui-settings/core-ui-settings-browser-internal/tsconfig.json
rename to src/core/packages/ui-settings/browser-internal/tsconfig.json
index bcedc9db9175e..21c641ded6a99 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/tsconfig.json
+++ b/src/core/packages/ui-settings/browser-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/ui-settings/core-ui-settings-browser/README.md b/src/core/packages/ui-settings/browser/README.md
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser/README.md
rename to src/core/packages/ui-settings/browser/README.md
diff --git a/packages/core/ui-settings/core-ui-settings-browser/index.ts b/src/core/packages/ui-settings/browser/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser/index.ts
rename to src/core/packages/ui-settings/browser/index.ts
diff --git a/src/core/packages/ui-settings/browser/jest.config.js b/src/core/packages/ui-settings/browser/jest.config.js
new file mode 100644
index 0000000000000..17a9641c1f027
--- /dev/null
+++ b/src/core/packages/ui-settings/browser/jest.config.js
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/ui-settings/browser'],
+};
diff --git a/packages/core/ui-settings/core-ui-settings-browser/kibana.jsonc b/src/core/packages/ui-settings/browser/kibana.jsonc
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser/kibana.jsonc
rename to src/core/packages/ui-settings/browser/kibana.jsonc
diff --git a/packages/core/ui-settings/core-ui-settings-browser/package.json b/src/core/packages/ui-settings/browser/package.json
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser/package.json
rename to src/core/packages/ui-settings/browser/package.json
diff --git a/packages/core/ui-settings/core-ui-settings-browser/src/types.ts b/src/core/packages/ui-settings/browser/src/types.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-browser/src/types.ts
rename to src/core/packages/ui-settings/browser/src/types.ts
diff --git a/packages/core/ui-settings/core-ui-settings-browser/tsconfig.json b/src/core/packages/ui-settings/browser/tsconfig.json
similarity index 83%
rename from packages/core/ui-settings/core-ui-settings-browser/tsconfig.json
rename to src/core/packages/ui-settings/browser/tsconfig.json
index 95fe1b5c6ea01..e83551fb883bf 100644
--- a/packages/core/ui-settings/core-ui-settings-browser/tsconfig.json
+++ b/src/core/packages/ui-settings/browser/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/ui-settings/core-ui-settings-common/README.md b/src/core/packages/ui-settings/common/README.md
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/README.md
rename to src/core/packages/ui-settings/common/README.md
diff --git a/packages/core/ui-settings/core-ui-settings-common/index.ts b/src/core/packages/ui-settings/common/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/index.ts
rename to src/core/packages/ui-settings/common/index.ts
diff --git a/src/core/packages/ui-settings/common/jest.config.js b/src/core/packages/ui-settings/common/jest.config.js
new file mode 100644
index 0000000000000..cf9a12d4af8ca
--- /dev/null
+++ b/src/core/packages/ui-settings/common/jest.config.js
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/ui-settings/common'],
+};
diff --git a/packages/core/ui-settings/core-ui-settings-common/kibana.jsonc b/src/core/packages/ui-settings/common/kibana.jsonc
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/kibana.jsonc
rename to src/core/packages/ui-settings/common/kibana.jsonc
diff --git a/packages/core/ui-settings/core-ui-settings-common/package.json b/src/core/packages/ui-settings/common/package.json
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/package.json
rename to src/core/packages/ui-settings/common/package.json
diff --git a/packages/core/ui-settings/core-ui-settings-common/src/dark_mode.test.ts b/src/core/packages/ui-settings/common/src/dark_mode.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/src/dark_mode.test.ts
rename to src/core/packages/ui-settings/common/src/dark_mode.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-common/src/dark_mode.ts b/src/core/packages/ui-settings/common/src/dark_mode.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/src/dark_mode.ts
rename to src/core/packages/ui-settings/common/src/dark_mode.ts
diff --git a/packages/core/ui-settings/core-ui-settings-common/src/theme.ts b/src/core/packages/ui-settings/common/src/theme.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/src/theme.ts
rename to src/core/packages/ui-settings/common/src/theme.ts
diff --git a/packages/core/ui-settings/core-ui-settings-common/src/timezones.ts b/src/core/packages/ui-settings/common/src/timezones.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/src/timezones.ts
rename to src/core/packages/ui-settings/common/src/timezones.ts
diff --git a/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts b/src/core/packages/ui-settings/common/src/ui_settings.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts
rename to src/core/packages/ui-settings/common/src/ui_settings.ts
diff --git a/packages/core/ui-settings/core-ui-settings-common/tsconfig.json b/src/core/packages/ui-settings/common/tsconfig.json
similarity index 85%
rename from packages/core/ui-settings/core-ui-settings-common/tsconfig.json
rename to src/core/packages/ui-settings/common/tsconfig.json
index 733581728ddb8..6c8e347002ca3 100644
--- a/packages/core/ui-settings/core-ui-settings-common/tsconfig.json
+++ b/src/core/packages/ui-settings/common/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/README.md b/src/core/packages/ui-settings/server-internal/README.md
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/README.md
rename to src/core/packages/ui-settings/server-internal/README.md
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/index.ts b/src/core/packages/ui-settings/server-internal/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/index.ts
rename to src/core/packages/ui-settings/server-internal/index.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server-mocks/jest.config.js b/src/core/packages/ui-settings/server-internal/jest.config.js
similarity index 82%
rename from packages/core/custom-branding/core-custom-branding-server-mocks/jest.config.js
rename to src/core/packages/ui-settings/server-internal/jest.config.js
index 6344e12e0ffac..0d97ff05f27c3 100644
--- a/packages/core/custom-branding/core-custom-branding-server-mocks/jest.config.js
+++ b/src/core/packages/ui-settings/server-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/custom-branding/core-custom-branding-server-mocks'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/ui-settings/server-internal'],
 };
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/kibana.jsonc b/src/core/packages/ui-settings/server-internal/kibana.jsonc
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/kibana.jsonc
rename to src/core/packages/ui-settings/server-internal/kibana.jsonc
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/package.json b/src/core/packages/ui-settings/server-internal/package.json
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/package.json
rename to src/core/packages/ui-settings/server-internal/package.json
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/cache.test.ts b/src/core/packages/ui-settings/server-internal/src/cache.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/cache.test.ts
rename to src/core/packages/ui-settings/server-internal/src/cache.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/cache.ts b/src/core/packages/ui-settings/server-internal/src/cache.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/cache.ts
rename to src/core/packages/ui-settings/server-internal/src/cache.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/base_ui_settings_client.ts b/src/core/packages/ui-settings/server-internal/src/clients/base_ui_settings_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/base_ui_settings_client.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/base_ui_settings_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/index.ts b/src/core/packages/ui-settings/server-internal/src/clients/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/index.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client.test.mock.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client.test.mock.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client.test.mock.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client.test.mock.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client.test.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client.test.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client_common.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client_common.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client_common.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client_common.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client_factory.test.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client_factory.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client_factory.test.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client_factory.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client_factory.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client_factory.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_client_factory.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_client_factory.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_defaults_client.test.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_defaults_client.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_defaults_client.test.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_defaults_client.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_defaults_client.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_defaults_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_defaults_client.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_defaults_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_global_client.test.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_global_client.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_global_client.test.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_global_client.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_global_client.ts b/src/core/packages/ui-settings/server-internal/src/clients/ui_settings_global_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/clients/ui_settings_global_client.ts
rename to src/core/packages/ui-settings/server-internal/src/clients/ui_settings_global_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.mock.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.mock.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.mock.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.mock.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.test.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.test.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/get_upgradeable_config.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/index.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/index.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.test.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.test.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.ts b/src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.ts
rename to src/core/packages/ui-settings/server-internal/src/create_or_upgrade_saved_config/is_config_version_upgradeable.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/index.ts b/src/core/packages/ui-settings/server-internal/src/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/index.ts
rename to src/core/packages/ui-settings/server-internal/src/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/internal_types.ts b/src/core/packages/ui-settings/server-internal/src/internal_types.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/internal_types.ts
rename to src/core/packages/ui-settings/server-internal/src/internal_types.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/delete.ts b/src/core/packages/ui-settings/server-internal/src/routes/delete.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/delete.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/delete.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/get.ts b/src/core/packages/ui-settings/server-internal/src/routes/get.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/get.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/get.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/index.ts b/src/core/packages/ui-settings/server-internal/src/routes/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/index.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/delete.ts b/src/core/packages/ui-settings/server-internal/src/routes/internal/delete.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/delete.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/internal/delete.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/get.ts b/src/core/packages/ui-settings/server-internal/src/routes/internal/get.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/get.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/internal/get.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/index.ts b/src/core/packages/ui-settings/server-internal/src/routes/internal/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/index.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/internal/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/set.ts b/src/core/packages/ui-settings/server-internal/src/routes/internal/set.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/set.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/internal/set.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/set_many.ts b/src/core/packages/ui-settings/server-internal/src/routes/internal/set_many.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/set_many.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/internal/set_many.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/validate.ts b/src/core/packages/ui-settings/server-internal/src/routes/internal/validate.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/internal/validate.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/internal/validate.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/set.ts b/src/core/packages/ui-settings/server-internal/src/routes/set.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/set.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/set.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/routes/set_many.ts b/src/core/packages/ui-settings/server-internal/src/routes/set_many.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/routes/set_many.ts
rename to src/core/packages/ui-settings/server-internal/src/routes/set_many.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/index.ts b/src/core/packages/ui-settings/server-internal/src/saved_objects/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/index.ts
rename to src/core/packages/ui-settings/server-internal/src/saved_objects/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/migrations.test.ts b/src/core/packages/ui-settings/server-internal/src/saved_objects/migrations.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/migrations.test.ts
rename to src/core/packages/ui-settings/server-internal/src/saved_objects/migrations.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/migrations.ts b/src/core/packages/ui-settings/server-internal/src/saved_objects/migrations.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/migrations.ts
rename to src/core/packages/ui-settings/server-internal/src/saved_objects/migrations.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/transforms.test.ts b/src/core/packages/ui-settings/server-internal/src/saved_objects/transforms.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/transforms.test.ts
rename to src/core/packages/ui-settings/server-internal/src/saved_objects/transforms.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/transforms.ts b/src/core/packages/ui-settings/server-internal/src/saved_objects/transforms.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/transforms.ts
rename to src/core/packages/ui-settings/server-internal/src/saved_objects/transforms.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/ui_settings.ts b/src/core/packages/ui-settings/server-internal/src/saved_objects/ui_settings.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/saved_objects/ui_settings.ts
rename to src/core/packages/ui-settings/server-internal/src/saved_objects/ui_settings.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/accessibility.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/accessibility.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/accessibility.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/accessibility.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/accessibility.ts b/src/core/packages/ui-settings/server-internal/src/settings/accessibility.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/accessibility.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/accessibility.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/announcements.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/announcements.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/announcements.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/announcements.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/announcements.ts b/src/core/packages/ui-settings/server-internal/src/settings/announcements.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/announcements.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/announcements.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/date_formats.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/date_formats.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/date_formats.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/date_formats.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/date_formats.ts b/src/core/packages/ui-settings/server-internal/src/settings/date_formats.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/date_formats.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/date_formats.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/index.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/index.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/index.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/index.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/index.ts b/src/core/packages/ui-settings/server-internal/src/settings/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/index.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/misc.ts b/src/core/packages/ui-settings/server-internal/src/settings/misc.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/misc.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/misc.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/notifications.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/notifications.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/notifications.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/notifications.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/notifications.ts b/src/core/packages/ui-settings/server-internal/src/settings/notifications.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/notifications.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/notifications.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/state.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/state.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/state.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/state.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/state.ts b/src/core/packages/ui-settings/server-internal/src/settings/state.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/state.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/state.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/theme.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.test.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/theme.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.ts b/src/core/packages/ui-settings/server-internal/src/settings/theme.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.ts
rename to src/core/packages/ui-settings/server-internal/src/settings/theme.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/types.ts b/src/core/packages/ui-settings/server-internal/src/types.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/types.ts
rename to src/core/packages/ui-settings/server-internal/src/types.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_config.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_config.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_config.ts
rename to src/core/packages/ui-settings/server-internal/src/ui_settings_config.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_errors.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_errors.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_errors.ts
rename to src/core/packages/ui-settings/server-internal/src/ui_settings_errors.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_route_handler_context.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_route_handler_context.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_route_handler_context.ts
rename to src/core/packages/ui-settings/server-internal/src/ui_settings_route_handler_context.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_service.test.mock.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_service.test.mock.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_service.test.mock.ts
rename to src/core/packages/ui-settings/server-internal/src/ui_settings_service.test.mock.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_service.test.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_service.test.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_service.test.ts
rename to src/core/packages/ui-settings/server-internal/src/ui_settings_service.test.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_service.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_service.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server-internal/src/ui_settings_service.ts
rename to src/core/packages/ui-settings/server-internal/src/ui_settings_service.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/tsconfig.json b/src/core/packages/ui-settings/server-internal/tsconfig.json
similarity index 94%
rename from packages/core/ui-settings/core-ui-settings-server-internal/tsconfig.json
rename to src/core/packages/ui-settings/server-internal/tsconfig.json
index 8786943d0f6da..09887438dda56 100644
--- a/packages/core/ui-settings/core-ui-settings-server-internal/tsconfig.json
+++ b/src/core/packages/ui-settings/server-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/packages/core/ui-settings/core-ui-settings-server/README.md b/src/core/packages/ui-settings/server/README.md
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/README.md
rename to src/core/packages/ui-settings/server/README.md
diff --git a/packages/core/ui-settings/core-ui-settings-server/index.ts b/src/core/packages/ui-settings/server/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/index.ts
rename to src/core/packages/ui-settings/server/index.ts
diff --git a/packages/core/custom-branding/core-custom-branding-server-internal/jest.config.js b/src/core/packages/ui-settings/server/jest.config.js
similarity index 81%
rename from packages/core/custom-branding/core-custom-branding-server-internal/jest.config.js
rename to src/core/packages/ui-settings/server/jest.config.js
index ebd41954f7d9f..8660b7cfb7725 100644
--- a/packages/core/custom-branding/core-custom-branding-server-internal/jest.config.js
+++ b/src/core/packages/ui-settings/server/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../../',
-  roots: ['<rootDir>/packages/core/custom-branding/core-custom-branding-server-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/ui-settings/server'],
 };
diff --git a/packages/core/ui-settings/core-ui-settings-server/kibana.jsonc b/src/core/packages/ui-settings/server/kibana.jsonc
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/kibana.jsonc
rename to src/core/packages/ui-settings/server/kibana.jsonc
diff --git a/packages/core/ui-settings/core-ui-settings-server/package.json b/src/core/packages/ui-settings/server/package.json
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/package.json
rename to src/core/packages/ui-settings/server/package.json
diff --git a/packages/core/ui-settings/core-ui-settings-server/src/contracts.ts b/src/core/packages/ui-settings/server/src/contracts.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/src/contracts.ts
rename to src/core/packages/ui-settings/server/src/contracts.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server/src/index.ts b/src/core/packages/ui-settings/server/src/index.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/src/index.ts
rename to src/core/packages/ui-settings/server/src/index.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server/src/request_handler_context.ts b/src/core/packages/ui-settings/server/src/request_handler_context.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/src/request_handler_context.ts
rename to src/core/packages/ui-settings/server/src/request_handler_context.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts b/src/core/packages/ui-settings/server/src/ui_settings_client.ts
similarity index 100%
rename from packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts
rename to src/core/packages/ui-settings/server/src/ui_settings_client.ts
diff --git a/packages/core/ui-settings/core-ui-settings-server/tsconfig.json b/src/core/packages/ui-settings/server/tsconfig.json
similarity index 85%
rename from packages/core/ui-settings/core-ui-settings-server/tsconfig.json
rename to src/core/packages/ui-settings/server/tsconfig.json
index 0895961777aa9..8ef6bf03f1191 100644
--- a/packages/core/ui-settings/core-ui-settings-server/tsconfig.json
+++ b/src/core/packages/ui-settings/server/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/src/platform/packages/shared/kbn-management/settings/components/field_row/README.mdx b/src/platform/packages/shared/kbn-management/settings/components/field_row/README.mdx
index d8febe27dd674..6653797b18434 100644
--- a/src/platform/packages/shared/kbn-management/settings/components/field_row/README.mdx
+++ b/src/platform/packages/shared/kbn-management/settings/components/field_row/README.mdx
@@ -28,7 +28,7 @@ A `FormRow` represents a single UiSetting, and is responsible for rendering the
 ## Notes
 
 - This implementation was extracted from the `advancedSettings` plugin.
-- The type for a `UiSettingMetadata` is limited due to the permissive nature of the [`UiSettingsParam` type](packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts).
+- The type for a `UiSettingMetadata` is limited due to the permissive nature of the [`UiSettingsParam` type](src/core/packages/ui-settings/common/src/ui_settings.ts).
 - The source includes notations of several bugs which will surface if the assumptions about default settings from Kibana change.
 
 ## Testing 
diff --git a/src/platform/packages/shared/kbn-management/settings/components/field_row/description/description.tsx b/src/platform/packages/shared/kbn-management/settings/components/field_row/description/description.tsx
index cced9d3b7acc0..1a5cf52d0ed7f 100644
--- a/src/platform/packages/shared/kbn-management/settings/components/field_row/description/description.tsx
+++ b/src/platform/packages/shared/kbn-management/settings/components/field_row/description/description.tsx
@@ -49,7 +49,7 @@ export const FieldDescription = <T extends SettingType>({
   const { description, name } = field;
 
   // TODO - this does *not* match the `UiSetting` type.
-  // @see packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts
+  // @see src/core/packages/ui-settings/common/src/ui_settings.ts
   let content: ReactElement | string | undefined = description;
 
   if (!React.isValidElement(content)) {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index d13e38f233218..4996d94c0bc99 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -286,26 +286,26 @@
       "@kbn/core-capabilities-server-mocks/*": ["packages/core/capabilities/core-capabilities-server-mocks/*"],
       "@kbn/core-chrome-browser": ["packages/core/chrome/core-chrome-browser"],
       "@kbn/core-chrome-browser/*": ["packages/core/chrome/core-chrome-browser/*"],
-      "@kbn/core-chrome-browser-internal": ["packages/core/chrome/core-chrome-browser-internal"],
-      "@kbn/core-chrome-browser-internal/*": ["packages/core/chrome/core-chrome-browser-internal/*"],
+      "@kbn/core-chrome-browser-internal": ["src/core/packages/chrome/browser-internal"],
+      "@kbn/core-chrome-browser-internal/*": ["src/core/packages/chrome/browser-internal/*"],
       "@kbn/core-chrome-browser-mocks": ["packages/core/chrome/core-chrome-browser-mocks"],
       "@kbn/core-chrome-browser-mocks/*": ["packages/core/chrome/core-chrome-browser-mocks/*"],
       "@kbn/core-config-server-internal": ["src/core/packages/config/server-internal"],
       "@kbn/core-config-server-internal/*": ["src/core/packages/config/server-internal/*"],
-      "@kbn/core-custom-branding-browser": ["packages/core/custom-branding/core-custom-branding-browser"],
-      "@kbn/core-custom-branding-browser/*": ["packages/core/custom-branding/core-custom-branding-browser/*"],
-      "@kbn/core-custom-branding-browser-internal": ["packages/core/custom-branding/core-custom-branding-browser-internal"],
-      "@kbn/core-custom-branding-browser-internal/*": ["packages/core/custom-branding/core-custom-branding-browser-internal/*"],
-      "@kbn/core-custom-branding-browser-mocks": ["packages/core/custom-branding/core-custom-branding-browser-mocks"],
-      "@kbn/core-custom-branding-browser-mocks/*": ["packages/core/custom-branding/core-custom-branding-browser-mocks/*"],
-      "@kbn/core-custom-branding-common": ["packages/core/custom-branding/core-custom-branding-common"],
-      "@kbn/core-custom-branding-common/*": ["packages/core/custom-branding/core-custom-branding-common/*"],
-      "@kbn/core-custom-branding-server": ["packages/core/custom-branding/core-custom-branding-server"],
-      "@kbn/core-custom-branding-server/*": ["packages/core/custom-branding/core-custom-branding-server/*"],
-      "@kbn/core-custom-branding-server-internal": ["packages/core/custom-branding/core-custom-branding-server-internal"],
-      "@kbn/core-custom-branding-server-internal/*": ["packages/core/custom-branding/core-custom-branding-server-internal/*"],
-      "@kbn/core-custom-branding-server-mocks": ["packages/core/custom-branding/core-custom-branding-server-mocks"],
-      "@kbn/core-custom-branding-server-mocks/*": ["packages/core/custom-branding/core-custom-branding-server-mocks/*"],
+      "@kbn/core-custom-branding-browser": ["src/core/packages/custom-branding/browser"],
+      "@kbn/core-custom-branding-browser/*": ["src/core/packages/custom-branding/browser/*"],
+      "@kbn/core-custom-branding-browser-internal": ["src/core/packages/custom-branding/browser-internal"],
+      "@kbn/core-custom-branding-browser-internal/*": ["src/core/packages/custom-branding/browser-internal/*"],
+      "@kbn/core-custom-branding-browser-mocks": ["src/core/packages/custom-branding/browser-mocks"],
+      "@kbn/core-custom-branding-browser-mocks/*": ["src/core/packages/custom-branding/browser-mocks/*"],
+      "@kbn/core-custom-branding-common": ["src/core/packages/custom-branding/common"],
+      "@kbn/core-custom-branding-common/*": ["src/core/packages/custom-branding/common/*"],
+      "@kbn/core-custom-branding-server": ["src/core/packages/custom-branding/server"],
+      "@kbn/core-custom-branding-server/*": ["src/core/packages/custom-branding/server/*"],
+      "@kbn/core-custom-branding-server-internal": ["src/core/packages/custom-branding/server-internal"],
+      "@kbn/core-custom-branding-server-internal/*": ["src/core/packages/custom-branding/server-internal/*"],
+      "@kbn/core-custom-branding-server-mocks": ["src/core/packages/custom-branding/server-mocks"],
+      "@kbn/core-custom-branding-server-mocks/*": ["src/core/packages/custom-branding/server-mocks/*"],
       "@kbn/core-deprecations-browser": ["src/core/packages/deprecations/browser"],
       "@kbn/core-deprecations-browser/*": ["src/core/packages/deprecations/browser/*"],
       "@kbn/core-deprecations-browser-internal": ["src/core/packages/deprecations/browser-internal"],
@@ -636,18 +636,18 @@
       "@kbn/core-theme-browser-internal/*": ["src/core/packages/theme/browser-internal/*"],
       "@kbn/core-theme-browser-mocks": ["packages/core/theme/core-theme-browser-mocks"],
       "@kbn/core-theme-browser-mocks/*": ["packages/core/theme/core-theme-browser-mocks/*"],
-      "@kbn/core-ui-settings-browser": ["packages/core/ui-settings/core-ui-settings-browser"],
-      "@kbn/core-ui-settings-browser/*": ["packages/core/ui-settings/core-ui-settings-browser/*"],
-      "@kbn/core-ui-settings-browser-internal": ["packages/core/ui-settings/core-ui-settings-browser-internal"],
-      "@kbn/core-ui-settings-browser-internal/*": ["packages/core/ui-settings/core-ui-settings-browser-internal/*"],
+      "@kbn/core-ui-settings-browser": ["src/core/packages/ui-settings/browser"],
+      "@kbn/core-ui-settings-browser/*": ["src/core/packages/ui-settings/browser/*"],
+      "@kbn/core-ui-settings-browser-internal": ["src/core/packages/ui-settings/browser-internal"],
+      "@kbn/core-ui-settings-browser-internal/*": ["src/core/packages/ui-settings/browser-internal/*"],
       "@kbn/core-ui-settings-browser-mocks": ["packages/core/ui-settings/core-ui-settings-browser-mocks"],
       "@kbn/core-ui-settings-browser-mocks/*": ["packages/core/ui-settings/core-ui-settings-browser-mocks/*"],
-      "@kbn/core-ui-settings-common": ["packages/core/ui-settings/core-ui-settings-common"],
-      "@kbn/core-ui-settings-common/*": ["packages/core/ui-settings/core-ui-settings-common/*"],
-      "@kbn/core-ui-settings-server": ["packages/core/ui-settings/core-ui-settings-server"],
-      "@kbn/core-ui-settings-server/*": ["packages/core/ui-settings/core-ui-settings-server/*"],
-      "@kbn/core-ui-settings-server-internal": ["packages/core/ui-settings/core-ui-settings-server-internal"],
-      "@kbn/core-ui-settings-server-internal/*": ["packages/core/ui-settings/core-ui-settings-server-internal/*"],
+      "@kbn/core-ui-settings-common": ["src/core/packages/ui-settings/common"],
+      "@kbn/core-ui-settings-common/*": ["src/core/packages/ui-settings/common/*"],
+      "@kbn/core-ui-settings-server": ["src/core/packages/ui-settings/server"],
+      "@kbn/core-ui-settings-server/*": ["src/core/packages/ui-settings/server/*"],
+      "@kbn/core-ui-settings-server-internal": ["src/core/packages/ui-settings/server-internal"],
+      "@kbn/core-ui-settings-server-internal/*": ["src/core/packages/ui-settings/server-internal/*"],
       "@kbn/core-ui-settings-server-mocks": ["packages/core/ui-settings/core-ui-settings-server-mocks"],
       "@kbn/core-ui-settings-server-mocks/*": ["packages/core/ui-settings/core-ui-settings-server-mocks/*"],
       "@kbn/core-usage-data-base-server-internal": ["src/core/packages/usage-data/base-server-internal"],
diff --git a/x-pack/platform/plugins/private/transform/public/app/common/time_zone_utils.ts b/x-pack/platform/plugins/private/transform/public/app/common/time_zone_utils.ts
index 5d8d5b61b7686..23afbf1ce085b 100644
--- a/x-pack/platform/plugins/private/transform/public/app/common/time_zone_utils.ts
+++ b/x-pack/platform/plugins/private/transform/public/app/common/time_zone_utils.ts
@@ -8,7 +8,7 @@
 import moment from 'moment-timezone';
 import { isDefined } from '@kbn/ml-is-defined';
 
-// Partial list of packages/core/ui-settings/core-ui-settings-common/src/timezones.ts
+// Partial list of src/core/packages/ui-settings/common/src/timezones.ts
 export const ACCEPTED_TIMEZONES = new Set([
   ...moment.tz
     .names()
diff --git a/yarn.lock b/yarn.lock
index cd4006a47fdaa..c2107ca7ec693 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4417,7 +4417,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-chrome-browser-internal@link:packages/core/chrome/core-chrome-browser-internal":
+"@kbn/core-chrome-browser-internal@link:src/core/packages/chrome/browser-internal":
   version "0.0.0"
   uid ""
 
@@ -4433,31 +4433,31 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-browser-internal@link:packages/core/custom-branding/core-custom-branding-browser-internal":
+"@kbn/core-custom-branding-browser-internal@link:src/core/packages/custom-branding/browser-internal":
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-browser-mocks@link:packages/core/custom-branding/core-custom-branding-browser-mocks":
+"@kbn/core-custom-branding-browser-mocks@link:src/core/packages/custom-branding/browser-mocks":
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-browser@link:packages/core/custom-branding/core-custom-branding-browser":
+"@kbn/core-custom-branding-browser@link:src/core/packages/custom-branding/browser":
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-common@link:packages/core/custom-branding/core-custom-branding-common":
+"@kbn/core-custom-branding-common@link:src/core/packages/custom-branding/common":
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-server-internal@link:packages/core/custom-branding/core-custom-branding-server-internal":
+"@kbn/core-custom-branding-server-internal@link:src/core/packages/custom-branding/server-internal":
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-server-mocks@link:packages/core/custom-branding/core-custom-branding-server-mocks":
+"@kbn/core-custom-branding-server-mocks@link:src/core/packages/custom-branding/server-mocks":
   version "0.0.0"
   uid ""
 
-"@kbn/core-custom-branding-server@link:packages/core/custom-branding/core-custom-branding-server":
+"@kbn/core-custom-branding-server@link:src/core/packages/custom-branding/server":
   version "0.0.0"
   uid ""
 
@@ -5121,7 +5121,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-ui-settings-browser-internal@link:packages/core/ui-settings/core-ui-settings-browser-internal":
+"@kbn/core-ui-settings-browser-internal@link:src/core/packages/ui-settings/browser-internal":
   version "0.0.0"
   uid ""
 
@@ -5129,15 +5129,15 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-ui-settings-browser@link:packages/core/ui-settings/core-ui-settings-browser":
+"@kbn/core-ui-settings-browser@link:src/core/packages/ui-settings/browser":
   version "0.0.0"
   uid ""
 
-"@kbn/core-ui-settings-common@link:packages/core/ui-settings/core-ui-settings-common":
+"@kbn/core-ui-settings-common@link:src/core/packages/ui-settings/common":
   version "0.0.0"
   uid ""
 
-"@kbn/core-ui-settings-server-internal@link:packages/core/ui-settings/core-ui-settings-server-internal":
+"@kbn/core-ui-settings-server-internal@link:src/core/packages/ui-settings/server-internal":
   version "0.0.0"
   uid ""
 
@@ -5145,7 +5145,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-ui-settings-server@link:packages/core/ui-settings/core-ui-settings-server":
+"@kbn/core-ui-settings-server@link:src/core/packages/ui-settings/server":
   version "0.0.0"
   uid ""