diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bc804fbb46b33..d1a66003d777e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -120,23 +120,23 @@ packages/kbn-content-management-utils @elastic/kibana-data-discovery
 examples/controls_example @elastic/kibana-presentation
 src/plugins/controls @elastic/kibana-presentation
 src/core @elastic/kibana-core
-packages/core/analytics/core-analytics-browser @elastic/kibana-core
-packages/core/analytics/core-analytics-browser-internal @elastic/kibana-core
+src/core/packages/analytics/browser @elastic/kibana-core
+src/core/packages/analytics/browser-internal @elastic/kibana-core
 packages/core/analytics/core-analytics-browser-mocks @elastic/kibana-core
-packages/core/analytics/core-analytics-server @elastic/kibana-core
-packages/core/analytics/core-analytics-server-internal @elastic/kibana-core
+src/core/packages/analytics/server @elastic/kibana-core
+src/core/packages/analytics/server-internal @elastic/kibana-core
 packages/core/analytics/core-analytics-server-mocks @elastic/kibana-core
 test/plugin_functional/plugins/core_app_status @elastic/kibana-core
-packages/core/application/core-application-browser @elastic/kibana-core
-packages/core/application/core-application-browser-internal @elastic/kibana-core
+src/core/packages/application/browser @elastic/kibana-core
+src/core/packages/application/browser-internal @elastic/kibana-core
 packages/core/application/core-application-browser-mocks @elastic/kibana-core
-packages/core/application/core-application-common @elastic/kibana-core
-packages/core/apps/core-apps-browser-internal @elastic/kibana-core
+src/core/packages/application/common @elastic/kibana-core
+src/core/packages/apps/browser-internal @elastic/kibana-core
 packages/core/apps/core-apps-browser-mocks @elastic/kibana-core
-packages/core/apps/core-apps-server-internal @elastic/kibana-core
-packages/core/base/core-base-browser-internal @elastic/kibana-core
+src/core/packages/apps/server-internal @elastic/kibana-core
+src/core/packages/base/browser-internal @elastic/kibana-core
 packages/core/base/core-base-browser-mocks @elastic/kibana-core
-packages/core/base/core-base-common @elastic/kibana-core
+src/core/packages/base/common @elastic/kibana-core
 packages/core/base/core-base-common-internal @elastic/kibana-core
 packages/core/base/core-base-server-internal @elastic/kibana-core
 packages/core/base/core-base-server-mocks @elastic/kibana-core
diff --git a/docs/developer/architecture/core/application_service.asciidoc b/docs/developer/architecture/core/application_service.asciidoc
index 31b0a3d2a4356..66a0c09c60eb3 100644
--- a/docs/developer/architecture/core/application_service.asciidoc
+++ b/docs/developer/architecture/core/application_service.asciidoc
@@ -29,7 +29,7 @@ export class MyPlugin implements Plugin {
   }
 }
 ----
-<1> Refer to {kib-repo}/blob/8.9/packages/core/application/core-application-browser/src/contracts.ts[application.register interface]
+<1> Refer to  {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/contracts.ts[application.register interface]
 <2> Application specific URL.
 <3> `mount` callback is invoked when a user navigates to the application-specific URL.
 <4> `core.getStartServices` method provides API available during `start` lifecycle.
diff --git a/docs/developer/architecture/security/feature-registration.asciidoc b/docs/developer/architecture/security/feature-registration.asciidoc
index b16142311cc75..b53df66f9a94e 100644
--- a/docs/developer/architecture/security/feature-registration.asciidoc
+++ b/docs/developer/architecture/security/feature-registration.asciidoc
@@ -39,7 +39,7 @@ Registering a feature consists of the following fields. For more information, co
 |A human readable name for your feature.
 
 |`category` (required)
-|{kib-repo}blob/{branch}/packages/core/application/core-application-common/src/app_category.ts[`AppCategory`]
+|{kib-repo}blob/{branch}/src/core/packages/application/common/src/app_category.ts[`AppCategory`]
 |`DEFAULT_APP_CATEGORIES.kibana`
 |The `AppCategory` which best represents your feature. Used to organize the display
 of features within the management screens.
diff --git a/docs/developer/best-practices/navigation.asciidoc b/docs/developer/best-practices/navigation.asciidoc
index 6d6ebb38e558b..05247574641af 100644
--- a/docs/developer/best-practices/navigation.asciidoc
+++ b/docs/developer/best-practices/navigation.asciidoc
@@ -87,13 +87,13 @@ window.location.href = urlToADashboard;
 
 To navigate between different {kib} apps without a page reload (by default) there are APIs in `core`:
 
-* {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/contracts.ts[core.application.navigateToApp]
-* {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/contracts.ts[core.application.navigateToUrl]
+* {kib-repo}tree/{branch}/src/core/packages/application/browser/src/contracts.ts[core.application.navigateToApp]
+* {kib-repo}tree/{branch}/src/core/packages/application/browser/src/contracts.ts[core.application.navigateToUrl]
 
 Both methods offer customization such as opening the target in a new page, with an `options` parameter. All the options are optional be default.
 
-* {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/contracts.ts[core.application.navigateToApp options]
-* {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/contracts.ts[core.application.navigateToUrl options]
+* {kib-repo}tree/{branch}/src/core/packages/application/browser/src/contracts.ts[core.application.navigateToApp options]
+* {kib-repo}tree/{branch}/src/core/packages/application/browser/src/contracts.ts[core.application.navigateToUrl options]
 
 *Rendering a link to a different {kib} app on its own would also cause a full page reload:*
 
@@ -163,8 +163,8 @@ Common rules to follow in this scenario:
 
 This is required to make sure `core` is aware of navigations triggered inside your app, so it could act accordingly when needed.
 
-* `Core`'s {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/scoped_history.ts[ScopedHistory] instance.
-* {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/app_mount.ts[Example usage]
+* `Core`'s {kib-repo}tree/{branch}/src/core/packages/application/browser/src/scoped_history.ts[ScopedHistory] instance.
+* {kib-repo}tree/{branch}/src/core/packages/application/browser/src/app_mount.ts[Example usage]
 * {kib-repo}tree/{branch}/test/plugin_functional/plugins/core_plugin_a/public/application.tsx#L120[Example plugin]
 
 Relative links will be resolved relative to your app's route (e.g.: `http://localhost5601/app/{your-app-id}`)
@@ -181,14 +181,14 @@ const MyInternalLink = () => <Link to="/my-other-page"></Link>
 === Using history and browser location
 
 Try to avoid using `window.location` and `window.history` directly. +  
-Instead, consider using {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/scoped_history.ts[ScopedHistory]
+Instead, consider using {kib-repo}tree/{branch}/src/core/packages/application/browser/src/scoped_history.ts[ScopedHistory]
 instance provided by `core`.
 
 * This way `core` will know about location changes triggered within your app, and it would act accordingly.
 * Some plugins are listening to location changes. Triggering location change manually could lead to unpredictable and hard-to-catch bugs.
 
 Common use-case for using 
-`core`'s {kib-repo}tree/{branch}/packages/core/application/core-application-browser/src/scoped_history.ts[ScopedHistory] directly: 
+`core`'s {kib-repo}tree/{branch}/src/core/packages/application/browser/src/scoped_history.ts[ScopedHistory] directly: 
 
 * Reading/writing query params or hash.
 * Imperatively triggering internal navigations within your app.
diff --git a/package.json b/package.json
index 1177ae768e8d5..82bf7d6e42f9d 100644
--- a/package.json
+++ b/package.json
@@ -245,18 +245,18 @@
     "@kbn/controls-example-plugin": "link:examples/controls_example",
     "@kbn/controls-plugin": "link:src/plugins/controls",
     "@kbn/core": "link:src/core",
-    "@kbn/core-analytics-browser": "link:packages/core/analytics/core-analytics-browser",
-    "@kbn/core-analytics-browser-internal": "link:packages/core/analytics/core-analytics-browser-internal",
-    "@kbn/core-analytics-server": "link:packages/core/analytics/core-analytics-server",
-    "@kbn/core-analytics-server-internal": "link:packages/core/analytics/core-analytics-server-internal",
+    "@kbn/core-analytics-browser": "link:src/core/packages/analytics/browser",
+    "@kbn/core-analytics-browser-internal": "link:src/core/packages/analytics/browser-internal",
+    "@kbn/core-analytics-server": "link:src/core/packages/analytics/server",
+    "@kbn/core-analytics-server-internal": "link:src/core/packages/analytics/server-internal",
     "@kbn/core-app-status-plugin": "link:test/plugin_functional/plugins/core_app_status",
-    "@kbn/core-application-browser": "link:packages/core/application/core-application-browser",
-    "@kbn/core-application-browser-internal": "link:packages/core/application/core-application-browser-internal",
-    "@kbn/core-application-common": "link:packages/core/application/core-application-common",
-    "@kbn/core-apps-browser-internal": "link:packages/core/apps/core-apps-browser-internal",
-    "@kbn/core-apps-server-internal": "link:packages/core/apps/core-apps-server-internal",
-    "@kbn/core-base-browser-internal": "link:packages/core/base/core-base-browser-internal",
-    "@kbn/core-base-common": "link:packages/core/base/core-base-common",
+    "@kbn/core-application-browser": "link:src/core/packages/application/browser",
+    "@kbn/core-application-browser-internal": "link:src/core/packages/application/browser-internal",
+    "@kbn/core-application-common": "link:src/core/packages/application/common",
+    "@kbn/core-apps-browser-internal": "link:src/core/packages/apps/browser-internal",
+    "@kbn/core-apps-server-internal": "link:src/core/packages/apps/server-internal",
+    "@kbn/core-base-browser-internal": "link:src/core/packages/base/browser-internal",
+    "@kbn/core-base-common": "link:src/core/packages/base/common",
     "@kbn/core-base-common-internal": "link:packages/core/base/core-base-common-internal",
     "@kbn/core-base-server-internal": "link:packages/core/base/core-base-server-internal",
     "@kbn/core-capabilities-browser-internal": "link:packages/core/capabilities/core-capabilities-browser-internal",
diff --git a/packages/core/analytics/core-analytics-browser-internal/jest.config.js b/packages/core/analytics/core-analytics-browser-internal/jest.config.js
deleted file mode 100644
index 4432335062f1e..0000000000000
--- a/packages/core/analytics/core-analytics-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/analytics/core-analytics-browser-internal'],
-};
diff --git a/packages/core/application/core-application-browser-internal/jest.config.js b/packages/core/application/core-application-browser-internal/jest.config.js
deleted file mode 100644
index 223e310d5daf3..0000000000000
--- a/packages/core/application/core-application-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/application/core-application-browser-internal'],
-};
diff --git a/packages/core/application/core-application-browser/jest.config.js b/packages/core/application/core-application-browser/jest.config.js
deleted file mode 100644
index 13f7c9e97b7e1..0000000000000
--- a/packages/core/application/core-application-browser/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/application/core-application-browser'],
-};
diff --git a/packages/core/analytics/core-analytics-browser-internal/README.md b/src/core/packages/analytics/browser-internal/README.md
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/README.md
rename to src/core/packages/analytics/browser-internal/README.md
diff --git a/packages/core/analytics/core-analytics-browser-internal/index.ts b/src/core/packages/analytics/browser-internal/index.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/index.ts
rename to src/core/packages/analytics/browser-internal/index.ts
diff --git a/packages/core/application/core-application-common/jest.config.js b/src/core/packages/analytics/browser-internal/jest.config.js
similarity index 83%
rename from packages/core/application/core-application-common/jest.config.js
rename to src/core/packages/analytics/browser-internal/jest.config.js
index bf825b81c6e01..53a81b4d9c6ef 100644
--- a/packages/core/application/core-application-common/jest.config.js
+++ b/src/core/packages/analytics/browser-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/application/core-application-common'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/analytics/browser-internal'],
 };
diff --git a/packages/core/analytics/core-analytics-browser-internal/kibana.jsonc b/src/core/packages/analytics/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/kibana.jsonc
rename to src/core/packages/analytics/browser-internal/kibana.jsonc
diff --git a/packages/core/analytics/core-analytics-browser-internal/package.json b/src/core/packages/analytics/browser-internal/package.json
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/package.json
rename to src/core/packages/analytics/browser-internal/package.json
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/analytics_service.test.mocks.ts b/src/core/packages/analytics/browser-internal/src/analytics_service.test.mocks.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/analytics_service.test.mocks.ts
rename to src/core/packages/analytics/browser-internal/src/analytics_service.test.mocks.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/analytics_service.test.ts b/src/core/packages/analytics/browser-internal/src/analytics_service.test.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/analytics_service.test.ts
rename to src/core/packages/analytics/browser-internal/src/analytics_service.test.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/analytics_service.ts b/src/core/packages/analytics/browser-internal/src/analytics_service.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/analytics_service.ts
rename to src/core/packages/analytics/browser-internal/src/analytics_service.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/get_session_id.test.ts b/src/core/packages/analytics/browser-internal/src/get_session_id.test.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/get_session_id.test.ts
rename to src/core/packages/analytics/browser-internal/src/get_session_id.test.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/get_session_id.ts b/src/core/packages/analytics/browser-internal/src/get_session_id.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/get_session_id.ts
rename to src/core/packages/analytics/browser-internal/src/get_session_id.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_clicks.test.ts b/src/core/packages/analytics/browser-internal/src/track_clicks.test.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/track_clicks.test.ts
rename to src/core/packages/analytics/browser-internal/src/track_clicks.test.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_clicks.ts b/src/core/packages/analytics/browser-internal/src/track_clicks.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/track_clicks.ts
rename to src/core/packages/analytics/browser-internal/src/track_clicks.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_performance_measure_entries.test.ts b/src/core/packages/analytics/browser-internal/src/track_performance_measure_entries.test.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/track_performance_measure_entries.test.ts
rename to src/core/packages/analytics/browser-internal/src/track_performance_measure_entries.test.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_performance_measure_entries.ts b/src/core/packages/analytics/browser-internal/src/track_performance_measure_entries.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/track_performance_measure_entries.ts
rename to src/core/packages/analytics/browser-internal/src/track_performance_measure_entries.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_viewport_size.test.ts b/src/core/packages/analytics/browser-internal/src/track_viewport_size.test.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/track_viewport_size.test.ts
rename to src/core/packages/analytics/browser-internal/src/track_viewport_size.test.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_viewport_size.ts b/src/core/packages/analytics/browser-internal/src/track_viewport_size.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser-internal/src/track_viewport_size.ts
rename to src/core/packages/analytics/browser-internal/src/track_viewport_size.ts
diff --git a/packages/core/analytics/core-analytics-browser-internal/tsconfig.json b/src/core/packages/analytics/browser-internal/tsconfig.json
similarity index 89%
rename from packages/core/analytics/core-analytics-browser-internal/tsconfig.json
rename to src/core/packages/analytics/browser-internal/tsconfig.json
index 152fbeeaa9edd..9dc1d2c37c791 100644
--- a/packages/core/analytics/core-analytics-browser-internal/tsconfig.json
+++ b/src/core/packages/analytics/browser-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": ["jest", "node"]
diff --git a/packages/core/analytics/core-analytics-browser/README.md b/src/core/packages/analytics/browser/README.md
similarity index 100%
rename from packages/core/analytics/core-analytics-browser/README.md
rename to src/core/packages/analytics/browser/README.md
diff --git a/packages/core/analytics/core-analytics-browser/index.ts b/src/core/packages/analytics/browser/index.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser/index.ts
rename to src/core/packages/analytics/browser/index.ts
diff --git a/packages/core/apps/core-apps-browser-internal/jest.config.js b/src/core/packages/analytics/browser/jest.config.js
similarity index 84%
rename from packages/core/apps/core-apps-browser-internal/jest.config.js
rename to src/core/packages/analytics/browser/jest.config.js
index 70aafc13bdadb..67d507722acad 100644
--- a/packages/core/apps/core-apps-browser-internal/jest.config.js
+++ b/src/core/packages/analytics/browser/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/apps/core-apps-browser-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/analytics/browser'],
 };
diff --git a/packages/core/analytics/core-analytics-browser/kibana.jsonc b/src/core/packages/analytics/browser/kibana.jsonc
similarity index 100%
rename from packages/core/analytics/core-analytics-browser/kibana.jsonc
rename to src/core/packages/analytics/browser/kibana.jsonc
diff --git a/packages/core/analytics/core-analytics-browser/package.json b/src/core/packages/analytics/browser/package.json
similarity index 100%
rename from packages/core/analytics/core-analytics-browser/package.json
rename to src/core/packages/analytics/browser/package.json
diff --git a/packages/core/analytics/core-analytics-browser/src/types.ts b/src/core/packages/analytics/browser/src/types.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-browser/src/types.ts
rename to src/core/packages/analytics/browser/src/types.ts
diff --git a/packages/core/analytics/core-analytics-server/tsconfig.json b/src/core/packages/analytics/browser/tsconfig.json
similarity index 80%
rename from packages/core/analytics/core-analytics-server/tsconfig.json
rename to src/core/packages/analytics/browser/tsconfig.json
index 99505f519996c..c6bb0972b56ae 100644
--- a/packages/core/analytics/core-analytics-server/tsconfig.json
+++ b/src/core/packages/analytics/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/analytics/core-analytics-server-internal/README.md b/src/core/packages/analytics/server-internal/README.md
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/README.md
rename to src/core/packages/analytics/server-internal/README.md
diff --git a/packages/core/analytics/core-analytics-server-internal/index.ts b/src/core/packages/analytics/server-internal/index.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/index.ts
rename to src/core/packages/analytics/server-internal/index.ts
diff --git a/packages/core/analytics/core-analytics-server-internal/jest.config.js b/src/core/packages/analytics/server-internal/jest.config.js
similarity index 83%
rename from packages/core/analytics/core-analytics-server-internal/jest.config.js
rename to src/core/packages/analytics/server-internal/jest.config.js
index 8999f9acbc468..c272930b953d6 100644
--- a/packages/core/analytics/core-analytics-server-internal/jest.config.js
+++ b/src/core/packages/analytics/server-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/analytics/core-analytics-server-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/analytics/server-internal'],
 };
diff --git a/packages/core/analytics/core-analytics-server-internal/kibana.jsonc b/src/core/packages/analytics/server-internal/kibana.jsonc
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/kibana.jsonc
rename to src/core/packages/analytics/server-internal/kibana.jsonc
diff --git a/packages/core/analytics/core-analytics-server-internal/package.json b/src/core/packages/analytics/server-internal/package.json
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/package.json
rename to src/core/packages/analytics/server-internal/package.json
diff --git a/packages/core/analytics/core-analytics-server-internal/src/analytics_service.test.mocks.ts b/src/core/packages/analytics/server-internal/src/analytics_service.test.mocks.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/src/analytics_service.test.mocks.ts
rename to src/core/packages/analytics/server-internal/src/analytics_service.test.mocks.ts
diff --git a/packages/core/analytics/core-analytics-server-internal/src/analytics_service.test.ts b/src/core/packages/analytics/server-internal/src/analytics_service.test.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/src/analytics_service.test.ts
rename to src/core/packages/analytics/server-internal/src/analytics_service.test.ts
diff --git a/packages/core/analytics/core-analytics-server-internal/src/analytics_service.ts b/src/core/packages/analytics/server-internal/src/analytics_service.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-server-internal/src/analytics_service.ts
rename to src/core/packages/analytics/server-internal/src/analytics_service.ts
diff --git a/packages/core/analytics/core-analytics-server-internal/tsconfig.json b/src/core/packages/analytics/server-internal/tsconfig.json
similarity index 87%
rename from packages/core/analytics/core-analytics-server-internal/tsconfig.json
rename to src/core/packages/analytics/server-internal/tsconfig.json
index a9d2e7cf47b9d..d62b5cf6aea65 100644
--- a/packages/core/analytics/core-analytics-server-internal/tsconfig.json
+++ b/src/core/packages/analytics/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/analytics/core-analytics-server/README.md b/src/core/packages/analytics/server/README.md
similarity index 100%
rename from packages/core/analytics/core-analytics-server/README.md
rename to src/core/packages/analytics/server/README.md
diff --git a/packages/core/analytics/core-analytics-server/index.ts b/src/core/packages/analytics/server/index.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-server/index.ts
rename to src/core/packages/analytics/server/index.ts
diff --git a/packages/core/apps/core-apps-server-internal/jest.config.js b/src/core/packages/analytics/server/jest.config.js
similarity index 84%
rename from packages/core/apps/core-apps-server-internal/jest.config.js
rename to src/core/packages/analytics/server/jest.config.js
index a8f73275f70a8..d9d5d56cdb9d0 100644
--- a/packages/core/apps/core-apps-server-internal/jest.config.js
+++ b/src/core/packages/analytics/server/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/apps/core-apps-server-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/analytics/server'],
 };
diff --git a/packages/core/analytics/core-analytics-server/kibana.jsonc b/src/core/packages/analytics/server/kibana.jsonc
similarity index 100%
rename from packages/core/analytics/core-analytics-server/kibana.jsonc
rename to src/core/packages/analytics/server/kibana.jsonc
diff --git a/packages/core/analytics/core-analytics-server/package.json b/src/core/packages/analytics/server/package.json
similarity index 100%
rename from packages/core/analytics/core-analytics-server/package.json
rename to src/core/packages/analytics/server/package.json
diff --git a/packages/core/analytics/core-analytics-server/src/contracts.ts b/src/core/packages/analytics/server/src/contracts.ts
similarity index 100%
rename from packages/core/analytics/core-analytics-server/src/contracts.ts
rename to src/core/packages/analytics/server/src/contracts.ts
diff --git a/packages/core/analytics/core-analytics-browser/tsconfig.json b/src/core/packages/analytics/server/tsconfig.json
similarity index 80%
rename from packages/core/analytics/core-analytics-browser/tsconfig.json
rename to src/core/packages/analytics/server/tsconfig.json
index 99505f519996c..c6bb0972b56ae 100644
--- a/packages/core/analytics/core-analytics-browser/tsconfig.json
+++ b/src/core/packages/analytics/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/application/core-application-browser-internal/README.md b/src/core/packages/application/browser-internal/README.md
similarity index 100%
rename from packages/core/application/core-application-browser-internal/README.md
rename to src/core/packages/application/browser-internal/README.md
diff --git a/packages/core/application/core-application-browser-internal/index.ts b/src/core/packages/application/browser-internal/index.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/index.ts
rename to src/core/packages/application/browser-internal/index.ts
diff --git a/packages/core/application/core-application-browser-internal/integration_tests/application_service.test.tsx b/src/core/packages/application/browser-internal/integration_tests/application_service.test.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/integration_tests/application_service.test.tsx
rename to src/core/packages/application/browser-internal/integration_tests/application_service.test.tsx
diff --git a/packages/core/application/core-application-browser-internal/integration_tests/router.test.tsx b/src/core/packages/application/browser-internal/integration_tests/router.test.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/integration_tests/router.test.tsx
rename to src/core/packages/application/browser-internal/integration_tests/router.test.tsx
diff --git a/packages/core/application/core-application-browser-internal/integration_tests/utils.tsx b/src/core/packages/application/browser-internal/integration_tests/utils.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/integration_tests/utils.tsx
rename to src/core/packages/application/browser-internal/integration_tests/utils.tsx
diff --git a/src/core/packages/application/browser-internal/jest.config.js b/src/core/packages/application/browser-internal/jest.config.js
new file mode 100644
index 0000000000000..fac6160093b0a
--- /dev/null
+++ b/src/core/packages/application/browser-internal/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/application/browser-internal'],
+};
diff --git a/packages/core/application/core-application-browser-internal/jest.integration.config.js b/src/core/packages/application/browser-internal/jest.integration.config.js
similarity index 82%
rename from packages/core/application/core-application-browser-internal/jest.integration.config.js
rename to src/core/packages/application/browser-internal/jest.integration.config.js
index dac107a009695..ba7f5c3320f66 100644
--- a/packages/core/application/core-application-browser-internal/jest.integration.config.js
+++ b/src/core/packages/application/browser-internal/jest.integration.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_integration',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/application/core-application-browser-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/application/browser-internal'],
 };
diff --git a/packages/core/application/core-application-browser-internal/kibana.jsonc b/src/core/packages/application/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/application/core-application-browser-internal/kibana.jsonc
rename to src/core/packages/application/browser-internal/kibana.jsonc
diff --git a/packages/core/application/core-application-browser-internal/package.json b/src/core/packages/application/browser-internal/package.json
similarity index 100%
rename from packages/core/application/core-application-browser-internal/package.json
rename to src/core/packages/application/browser-internal/package.json
diff --git a/packages/core/application/core-application-browser-internal/src/__snapshots__/application_service.test.ts.snap b/src/core/packages/application/browser-internal/src/__snapshots__/application_service.test.ts.snap
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/__snapshots__/application_service.test.ts.snap
rename to src/core/packages/application/browser-internal/src/__snapshots__/application_service.test.ts.snap
diff --git a/packages/core/application/core-application-browser-internal/src/application_leave.test.ts b/src/core/packages/application/browser-internal/src/application_leave.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/application_leave.test.ts
rename to src/core/packages/application/browser-internal/src/application_leave.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/application_leave.tsx b/src/core/packages/application/browser-internal/src/application_leave.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/application_leave.tsx
rename to src/core/packages/application/browser-internal/src/application_leave.tsx
diff --git a/packages/core/application/core-application-browser-internal/src/application_service.test.mocks.ts b/src/core/packages/application/browser-internal/src/application_service.test.mocks.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/application_service.test.mocks.ts
rename to src/core/packages/application/browser-internal/src/application_service.test.mocks.ts
diff --git a/packages/core/application/core-application-browser-internal/src/application_service.test.ts b/src/core/packages/application/browser-internal/src/application_service.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/application_service.test.ts
rename to src/core/packages/application/browser-internal/src/application_service.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/application_service.tsx b/src/core/packages/application/browser-internal/src/application_service.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/application_service.tsx
rename to src/core/packages/application/browser-internal/src/application_service.tsx
diff --git a/packages/core/application/core-application-browser-internal/src/navigation_confirm.test.ts b/src/core/packages/application/browser-internal/src/navigation_confirm.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/navigation_confirm.test.ts
rename to src/core/packages/application/browser-internal/src/navigation_confirm.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/navigation_confirm.ts b/src/core/packages/application/browser-internal/src/navigation_confirm.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/navigation_confirm.ts
rename to src/core/packages/application/browser-internal/src/navigation_confirm.ts
diff --git a/packages/core/application/core-application-browser-internal/src/register_analytics_context_provider.test.ts b/src/core/packages/application/browser-internal/src/register_analytics_context_provider.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/register_analytics_context_provider.test.ts
rename to src/core/packages/application/browser-internal/src/register_analytics_context_provider.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/register_analytics_context_provider.ts b/src/core/packages/application/browser-internal/src/register_analytics_context_provider.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/register_analytics_context_provider.ts
rename to src/core/packages/application/browser-internal/src/register_analytics_context_provider.ts
diff --git a/packages/core/application/core-application-browser-internal/src/scoped_history.test.ts b/src/core/packages/application/browser-internal/src/scoped_history.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/scoped_history.test.ts
rename to src/core/packages/application/browser-internal/src/scoped_history.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/scoped_history.ts b/src/core/packages/application/browser-internal/src/scoped_history.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/scoped_history.ts
rename to src/core/packages/application/browser-internal/src/scoped_history.ts
diff --git a/packages/core/application/core-application-browser-internal/src/test_helpers/test_types.ts b/src/core/packages/application/browser-internal/src/test_helpers/test_types.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/test_helpers/test_types.ts
rename to src/core/packages/application/browser-internal/src/test_helpers/test_types.ts
diff --git a/packages/core/application/core-application-browser-internal/src/types.ts b/src/core/packages/application/browser-internal/src/types.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/types.ts
rename to src/core/packages/application/browser-internal/src/types.ts
diff --git a/packages/core/application/core-application-browser-internal/src/ui/app_container.scss b/src/core/packages/application/browser-internal/src/ui/app_container.scss
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/ui/app_container.scss
rename to src/core/packages/application/browser-internal/src/ui/app_container.scss
diff --git a/packages/core/application/core-application-browser-internal/src/ui/app_container.test.tsx b/src/core/packages/application/browser-internal/src/ui/app_container.test.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/ui/app_container.test.tsx
rename to src/core/packages/application/browser-internal/src/ui/app_container.test.tsx
diff --git a/packages/core/application/core-application-browser-internal/src/ui/app_container.tsx b/src/core/packages/application/browser-internal/src/ui/app_container.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/ui/app_container.tsx
rename to src/core/packages/application/browser-internal/src/ui/app_container.tsx
diff --git a/packages/core/application/core-application-browser-internal/src/ui/app_not_found_screen.tsx b/src/core/packages/application/browser-internal/src/ui/app_not_found_screen.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/ui/app_not_found_screen.tsx
rename to src/core/packages/application/browser-internal/src/ui/app_not_found_screen.tsx
diff --git a/packages/core/application/core-application-browser-internal/src/ui/app_router.tsx b/src/core/packages/application/browser-internal/src/ui/app_router.tsx
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/ui/app_router.tsx
rename to src/core/packages/application/browser-internal/src/ui/app_router.tsx
diff --git a/packages/core/application/core-application-browser-internal/src/ui/index.ts b/src/core/packages/application/browser-internal/src/ui/index.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/ui/index.ts
rename to src/core/packages/application/browser-internal/src/ui/index.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/append_app_path.test.ts b/src/core/packages/application/browser-internal/src/utils/append_app_path.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/append_app_path.test.ts
rename to src/core/packages/application/browser-internal/src/utils/append_app_path.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/append_app_path.ts b/src/core/packages/application/browser-internal/src/utils/append_app_path.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/append_app_path.ts
rename to src/core/packages/application/browser-internal/src/utils/append_app_path.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/constants.ts b/src/core/packages/application/browser-internal/src/utils/constants.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/constants.ts
rename to src/core/packages/application/browser-internal/src/utils/constants.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/get_app_info.test.ts b/src/core/packages/application/browser-internal/src/utils/get_app_info.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/get_app_info.test.ts
rename to src/core/packages/application/browser-internal/src/utils/get_app_info.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/get_app_info.ts b/src/core/packages/application/browser-internal/src/utils/get_app_info.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/get_app_info.ts
rename to src/core/packages/application/browser-internal/src/utils/get_app_info.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/get_location_observable.test.ts b/src/core/packages/application/browser-internal/src/utils/get_location_observable.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/get_location_observable.test.ts
rename to src/core/packages/application/browser-internal/src/utils/get_location_observable.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/get_location_observable.ts b/src/core/packages/application/browser-internal/src/utils/get_location_observable.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/get_location_observable.ts
rename to src/core/packages/application/browser-internal/src/utils/get_location_observable.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/index.ts b/src/core/packages/application/browser-internal/src/utils/index.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/index.ts
rename to src/core/packages/application/browser-internal/src/utils/index.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/parse_app_url.test.ts b/src/core/packages/application/browser-internal/src/utils/parse_app_url.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/parse_app_url.test.ts
rename to src/core/packages/application/browser-internal/src/utils/parse_app_url.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/parse_app_url.ts b/src/core/packages/application/browser-internal/src/utils/parse_app_url.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/parse_app_url.ts
rename to src/core/packages/application/browser-internal/src/utils/parse_app_url.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/relative_to_absolute.test.ts b/src/core/packages/application/browser-internal/src/utils/relative_to_absolute.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/relative_to_absolute.test.ts
rename to src/core/packages/application/browser-internal/src/utils/relative_to_absolute.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/relative_to_absolute.ts b/src/core/packages/application/browser-internal/src/utils/relative_to_absolute.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/relative_to_absolute.ts
rename to src/core/packages/application/browser-internal/src/utils/relative_to_absolute.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/remove_slashes.test.ts b/src/core/packages/application/browser-internal/src/utils/remove_slashes.test.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/remove_slashes.test.ts
rename to src/core/packages/application/browser-internal/src/utils/remove_slashes.test.ts
diff --git a/packages/core/application/core-application-browser-internal/src/utils/remove_slashes.ts b/src/core/packages/application/browser-internal/src/utils/remove_slashes.ts
similarity index 100%
rename from packages/core/application/core-application-browser-internal/src/utils/remove_slashes.ts
rename to src/core/packages/application/browser-internal/src/utils/remove_slashes.ts
diff --git a/packages/core/application/core-application-browser-internal/tsconfig.json b/src/core/packages/application/browser-internal/tsconfig.json
similarity index 95%
rename from packages/core/application/core-application-browser-internal/tsconfig.json
rename to src/core/packages/application/browser-internal/tsconfig.json
index 497d069efc596..8db83fe2e2e2e 100644
--- a/packages/core/application/core-application-browser-internal/tsconfig.json
+++ b/src/core/packages/application/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/application/core-application-browser/README.md b/src/core/packages/application/browser/README.md
similarity index 100%
rename from packages/core/application/core-application-browser/README.md
rename to src/core/packages/application/browser/README.md
diff --git a/packages/core/application/core-application-browser/index.ts b/src/core/packages/application/browser/index.ts
similarity index 100%
rename from packages/core/application/core-application-browser/index.ts
rename to src/core/packages/application/browser/index.ts
diff --git a/packages/core/base/core-base-browser-internal/jest.config.js b/src/core/packages/application/browser/jest.config.js
similarity index 84%
rename from packages/core/base/core-base-browser-internal/jest.config.js
rename to src/core/packages/application/browser/jest.config.js
index 3456994fafa4b..21356fe119018 100644
--- a/packages/core/base/core-base-browser-internal/jest.config.js
+++ b/src/core/packages/application/browser/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/base/core-base-browser-internal'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/application/browser'],
 };
diff --git a/packages/core/application/core-application-browser/kibana.jsonc b/src/core/packages/application/browser/kibana.jsonc
similarity index 100%
rename from packages/core/application/core-application-browser/kibana.jsonc
rename to src/core/packages/application/browser/kibana.jsonc
diff --git a/packages/core/application/core-application-browser/package.json b/src/core/packages/application/browser/package.json
similarity index 100%
rename from packages/core/application/core-application-browser/package.json
rename to src/core/packages/application/browser/package.json
diff --git a/packages/core/application/core-application-browser/src/app_leave.ts b/src/core/packages/application/browser/src/app_leave.ts
similarity index 100%
rename from packages/core/application/core-application-browser/src/app_leave.ts
rename to src/core/packages/application/browser/src/app_leave.ts
diff --git a/packages/core/application/core-application-browser/src/app_mount.ts b/src/core/packages/application/browser/src/app_mount.ts
similarity index 100%
rename from packages/core/application/core-application-browser/src/app_mount.ts
rename to src/core/packages/application/browser/src/app_mount.ts
diff --git a/packages/core/application/core-application-browser/src/application.ts b/src/core/packages/application/browser/src/application.ts
similarity index 100%
rename from packages/core/application/core-application-browser/src/application.ts
rename to src/core/packages/application/browser/src/application.ts
diff --git a/packages/core/application/core-application-browser/src/contracts.ts b/src/core/packages/application/browser/src/contracts.ts
similarity index 98%
rename from packages/core/application/core-application-browser/src/contracts.ts
rename to src/core/packages/application/browser/src/contracts.ts
index e8b2cd77028f6..7aada384d8378 100644
--- a/packages/core/application/core-application-browser/src/contracts.ts
+++ b/src/core/packages/application/browser/src/contracts.ts
@@ -109,7 +109,7 @@ export interface ApplicationStart {
    * application.navigateToUrl('/app/discover/some-path') // does not include the current basePath
    * application.navigateToUrl('/base-path/s/my-space/app/unknown-app/some-path') // unknown application
    * application.navigateToUrl('../discover') // resolve to `/base-path/s/my-space/discover` which is not a path of a known app.
-   * application.navigateToUrl('../../other-space/discover') // resolve to `/base-path/s/other-space/discover` which is not within the current basePath.
+   * application.navigateToUrl('../../../other-space/discover') // resolve to `/base-path/s/other-space/discover` which is not within the current basePath.
    * ```
    *
    * @param url - an absolute URL, an absolute path or a relative path, to navigate to.
diff --git a/packages/core/application/core-application-browser/src/scoped_history.ts b/src/core/packages/application/browser/src/scoped_history.ts
similarity index 100%
rename from packages/core/application/core-application-browser/src/scoped_history.ts
rename to src/core/packages/application/browser/src/scoped_history.ts
diff --git a/packages/core/application/core-application-browser/tsconfig.json b/src/core/packages/application/browser/tsconfig.json
similarity index 88%
rename from packages/core/application/core-application-browser/tsconfig.json
rename to src/core/packages/application/browser/tsconfig.json
index d22e0c337382a..c7b86c46c1ee2 100644
--- a/packages/core/application/core-application-browser/tsconfig.json
+++ b/src/core/packages/application/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/application/core-application-common/README.md b/src/core/packages/application/common/README.md
similarity index 100%
rename from packages/core/application/core-application-common/README.md
rename to src/core/packages/application/common/README.md
diff --git a/packages/core/application/core-application-common/index.ts b/src/core/packages/application/common/index.ts
similarity index 100%
rename from packages/core/application/core-application-common/index.ts
rename to src/core/packages/application/common/index.ts
diff --git a/packages/core/analytics/core-analytics-browser/jest.config.js b/src/core/packages/application/common/jest.config.js
similarity index 84%
rename from packages/core/analytics/core-analytics-browser/jest.config.js
rename to src/core/packages/application/common/jest.config.js
index 3d19085e50e12..4724ccc6350c8 100644
--- a/packages/core/analytics/core-analytics-browser/jest.config.js
+++ b/src/core/packages/application/common/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/analytics/core-analytics-browser'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/application/common'],
 };
diff --git a/packages/core/application/core-application-common/kibana.jsonc b/src/core/packages/application/common/kibana.jsonc
similarity index 100%
rename from packages/core/application/core-application-common/kibana.jsonc
rename to src/core/packages/application/common/kibana.jsonc
diff --git a/packages/core/application/core-application-common/package.json b/src/core/packages/application/common/package.json
similarity index 100%
rename from packages/core/application/core-application-common/package.json
rename to src/core/packages/application/common/package.json
diff --git a/packages/core/application/core-application-common/src/app_category.ts b/src/core/packages/application/common/src/app_category.ts
similarity index 100%
rename from packages/core/application/core-application-common/src/app_category.ts
rename to src/core/packages/application/common/src/app_category.ts
diff --git a/packages/core/application/core-application-common/src/app_wrapper_class.ts b/src/core/packages/application/common/src/app_wrapper_class.ts
similarity index 100%
rename from packages/core/application/core-application-common/src/app_wrapper_class.ts
rename to src/core/packages/application/common/src/app_wrapper_class.ts
diff --git a/packages/core/application/core-application-common/src/default_app_categories.ts b/src/core/packages/application/common/src/default_app_categories.ts
similarity index 100%
rename from packages/core/application/core-application-common/src/default_app_categories.ts
rename to src/core/packages/application/common/src/default_app_categories.ts
diff --git a/packages/core/application/core-application-common/tsconfig.json b/src/core/packages/application/common/tsconfig.json
similarity index 82%
rename from packages/core/application/core-application-common/tsconfig.json
rename to src/core/packages/application/common/tsconfig.json
index da0657512bb06..e4d2c85fd93d6 100644
--- a/packages/core/application/core-application-common/tsconfig.json
+++ b/src/core/packages/application/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/apps/core-apps-browser-internal/README.md b/src/core/packages/apps/browser-internal/README.md
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/README.md
rename to src/core/packages/apps/browser-internal/README.md
diff --git a/packages/core/apps/core-apps-browser-internal/index.ts b/src/core/packages/apps/browser-internal/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/index.ts
rename to src/core/packages/apps/browser-internal/index.ts
diff --git a/src/core/packages/apps/browser-internal/jest.config.js b/src/core/packages/apps/browser-internal/jest.config.js
new file mode 100644
index 0000000000000..8346aa238f169
--- /dev/null
+++ b/src/core/packages/apps/browser-internal/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/apps/browser-internal'],
+};
diff --git a/packages/core/apps/core-apps-browser-internal/kibana.jsonc b/src/core/packages/apps/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/kibana.jsonc
rename to src/core/packages/apps/browser-internal/kibana.jsonc
diff --git a/packages/core/apps/core-apps-browser-internal/package.json b/src/core/packages/apps/browser-internal/package.json
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/package.json
rename to src/core/packages/apps/browser-internal/package.json
diff --git a/packages/core/apps/core-apps-browser-internal/src/core_app.ts b/src/core/packages/apps/browser-internal/src/core_app.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/core_app.ts
rename to src/core/packages/apps/browser-internal/src/core_app.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/error_application.test.ts b/src/core/packages/apps/browser-internal/src/errors/error_application.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/error_application.test.ts
rename to src/core/packages/apps/browser-internal/src/errors/error_application.test.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/error_application.tsx b/src/core/packages/apps/browser-internal/src/errors/error_application.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/error_application.tsx
rename to src/core/packages/apps/browser-internal/src/errors/error_application.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/index.ts b/src/core/packages/apps/browser-internal/src/errors/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/index.ts
rename to src/core/packages/apps/browser-internal/src/errors/index.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/public_base_url.test.tsx b/src/core/packages/apps/browser-internal/src/errors/public_base_url.test.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/public_base_url.test.tsx
rename to src/core/packages/apps/browser-internal/src/errors/public_base_url.test.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/public_base_url.tsx b/src/core/packages/apps/browser-internal/src/errors/public_base_url.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/public_base_url.tsx
rename to src/core/packages/apps/browser-internal/src/errors/public_base_url.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/url_overflow.test.ts b/src/core/packages/apps/browser-internal/src/errors/url_overflow.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/url_overflow.test.ts
rename to src/core/packages/apps/browser-internal/src/errors/url_overflow.test.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/url_overflow.tsx b/src/core/packages/apps/browser-internal/src/errors/url_overflow.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/url_overflow.tsx
rename to src/core/packages/apps/browser-internal/src/errors/url_overflow.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/errors/url_overflow_ui.tsx b/src/core/packages/apps/browser-internal/src/errors/url_overflow_ui.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/errors/url_overflow_ui.tsx
rename to src/core/packages/apps/browser-internal/src/errors/url_overflow_ui.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/index.ts b/src/core/packages/apps/browser-internal/src/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/index.ts
rename to src/core/packages/apps/browser-internal/src/index.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/__snapshots__/metric_tiles.test.tsx.snap b/src/core/packages/apps/browser-internal/src/status/components/__snapshots__/metric_tiles.test.tsx.snap
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/__snapshots__/metric_tiles.test.tsx.snap
rename to src/core/packages/apps/browser-internal/src/status/components/__snapshots__/metric_tiles.test.tsx.snap
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/__snapshots__/server_status.test.tsx.snap b/src/core/packages/apps/browser-internal/src/status/components/__snapshots__/server_status.test.tsx.snap
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/__snapshots__/server_status.test.tsx.snap
rename to src/core/packages/apps/browser-internal/src/status/components/__snapshots__/server_status.test.tsx.snap
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/__snapshots__/status_table.test.tsx.snap b/src/core/packages/apps/browser-internal/src/status/components/__snapshots__/status_table.test.tsx.snap
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/__snapshots__/status_table.test.tsx.snap
rename to src/core/packages/apps/browser-internal/src/status/components/__snapshots__/status_table.test.tsx.snap
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/index.ts b/src/core/packages/apps/browser-internal/src/status/components/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/index.ts
rename to src/core/packages/apps/browser-internal/src/status/components/index.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/metric_tiles.test.tsx b/src/core/packages/apps/browser-internal/src/status/components/metric_tiles.test.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/metric_tiles.test.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/metric_tiles.test.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/metric_tiles.tsx b/src/core/packages/apps/browser-internal/src/status/components/metric_tiles.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/metric_tiles.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/metric_tiles.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/server_status.test.tsx b/src/core/packages/apps/browser-internal/src/status/components/server_status.test.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/server_status.test.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/server_status.test.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/server_status.tsx b/src/core/packages/apps/browser-internal/src/status/components/server_status.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/server_status.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/server_status.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/status_badge.test.tsx b/src/core/packages/apps/browser-internal/src/status/components/status_badge.test.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/status_badge.test.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/status_badge.test.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/status_badge.tsx b/src/core/packages/apps/browser-internal/src/status/components/status_badge.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/status_badge.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/status_badge.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/status_expanded_row.tsx b/src/core/packages/apps/browser-internal/src/status/components/status_expanded_row.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/status_expanded_row.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/status_expanded_row.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/status_section.tsx b/src/core/packages/apps/browser-internal/src/status/components/status_section.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/status_section.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/status_section.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/status_table.test.tsx b/src/core/packages/apps/browser-internal/src/status/components/status_table.test.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/status_table.test.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/status_table.test.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/status_table.tsx b/src/core/packages/apps/browser-internal/src/status/components/status_table.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/status_table.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/status_table.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/version_header.test.tsx b/src/core/packages/apps/browser-internal/src/status/components/version_header.test.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/version_header.test.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/version_header.test.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/components/version_header.tsx b/src/core/packages/apps/browser-internal/src/status/components/version_header.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/components/version_header.tsx
rename to src/core/packages/apps/browser-internal/src/status/components/version_header.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/index.ts b/src/core/packages/apps/browser-internal/src/status/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/index.ts
rename to src/core/packages/apps/browser-internal/src/status/index.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/format_number.test.ts b/src/core/packages/apps/browser-internal/src/status/lib/format_number.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/format_number.test.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/format_number.test.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/format_number.ts b/src/core/packages/apps/browser-internal/src/status/lib/format_number.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/format_number.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/format_number.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/index.ts b/src/core/packages/apps/browser-internal/src/status/lib/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/index.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/index.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/load_status.test.ts b/src/core/packages/apps/browser-internal/src/status/lib/load_status.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/load_status.test.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/load_status.test.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/load_status.ts b/src/core/packages/apps/browser-internal/src/status/lib/load_status.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/load_status.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/load_status.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/status_level.test.ts b/src/core/packages/apps/browser-internal/src/status/lib/status_level.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/status_level.test.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/status_level.test.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/lib/status_level.ts b/src/core/packages/apps/browser-internal/src/status/lib/status_level.ts
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/lib/status_level.ts
rename to src/core/packages/apps/browser-internal/src/status/lib/status_level.ts
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/render_app.tsx b/src/core/packages/apps/browser-internal/src/status/render_app.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/render_app.tsx
rename to src/core/packages/apps/browser-internal/src/status/render_app.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/src/status/status_app.tsx b/src/core/packages/apps/browser-internal/src/status/status_app.tsx
similarity index 100%
rename from packages/core/apps/core-apps-browser-internal/src/status/status_app.tsx
rename to src/core/packages/apps/browser-internal/src/status/status_app.tsx
diff --git a/packages/core/apps/core-apps-browser-internal/tsconfig.json b/src/core/packages/apps/browser-internal/tsconfig.json
similarity index 96%
rename from packages/core/apps/core-apps-browser-internal/tsconfig.json
rename to src/core/packages/apps/browser-internal/tsconfig.json
index 499f4b975f6d8..23c8d34721eaa 100644
--- a/packages/core/apps/core-apps-browser-internal/tsconfig.json
+++ b/src/core/packages/apps/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/apps/core-apps-server-internal/README.md b/src/core/packages/apps/server-internal/README.md
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/README.md
rename to src/core/packages/apps/server-internal/README.md
diff --git a/packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.ico b/src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.ico
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.ico
rename to src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.ico
diff --git a/packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.png b/src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.png
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.png
rename to src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.png
diff --git a/packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.svg b/src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.svg
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.svg
rename to src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.svg
diff --git a/packages/core/apps/core-apps-server-internal/assets/favicons/favicon.ico b/src/core/packages/apps/server-internal/assets/favicons/favicon.ico
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/favicons/favicon.ico
rename to src/core/packages/apps/server-internal/assets/favicons/favicon.ico
diff --git a/packages/core/apps/core-apps-server-internal/assets/favicons/favicon.png b/src/core/packages/apps/server-internal/assets/favicons/favicon.png
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/favicons/favicon.png
rename to src/core/packages/apps/server-internal/assets/favicons/favicon.png
diff --git a/packages/core/apps/core-apps-server-internal/assets/favicons/favicon.svg b/src/core/packages/apps/server-internal/assets/favicons/favicon.svg
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/favicons/favicon.svg
rename to src/core/packages/apps/server-internal/assets/favicons/favicon.svg
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Black.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Black.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Black.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Black.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Black.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Black.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Black.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Black.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BlackItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BlackItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BlackItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BlackItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BlackItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BlackItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BlackItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BlackItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Bold.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Bold.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Bold.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Bold.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Bold.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Bold.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Bold.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Bold.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BoldItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BoldItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BoldItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BoldItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BoldItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BoldItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-BoldItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-BoldItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBold.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBold.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBold.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBold.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBold.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBold.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBold.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBold.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraBoldItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLight.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLight.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLight.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLight.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLight.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLight.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLight.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLight.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ExtraLightItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Italic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Italic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Italic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Italic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Italic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Italic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Italic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Italic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Light.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Light.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Light.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Light.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Light.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Light.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Light.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Light.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-LightItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-LightItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-LightItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-LightItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-LightItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-LightItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-LightItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-LightItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Medium.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Medium.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Medium.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Medium.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Medium.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Medium.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Medium.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Medium.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-MediumItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-MediumItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-MediumItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-MediumItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-MediumItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-MediumItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-MediumItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-MediumItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Regular.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Regular.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Regular.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Regular.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Regular.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Regular.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Regular.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Regular.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBold.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBold.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBold.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBold.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBold.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBold.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBold.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBold.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-SemiBoldItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Thin.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Thin.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Thin.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Thin.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Thin.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Thin.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-Thin.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-Thin.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ThinItalic.woff b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ThinItalic.woff
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ThinItalic.woff
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ThinItalic.woff
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ThinItalic.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ThinItalic.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-ThinItalic.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-ThinItalic.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-italic.var.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-italic.var.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-italic.var.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-italic.var.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-roman.var.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter-roman.var.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter-roman.var.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter-roman.var.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter.var.woff2 b/src/core/packages/apps/server-internal/assets/fonts/inter/Inter.var.woff2
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/Inter.var.woff2
rename to src/core/packages/apps/server-internal/assets/fonts/inter/Inter.var.woff2
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/inter/LICENSE.txt b/src/core/packages/apps/server-internal/assets/fonts/inter/LICENSE.txt
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/inter/LICENSE.txt
rename to src/core/packages/apps/server-internal/assets/fonts/inter/LICENSE.txt
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/readme.md b/src/core/packages/apps/server-internal/assets/fonts/readme.md
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/readme.md
rename to src/core/packages/apps/server-internal/assets/fonts/readme.md
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/LICENSE.txt b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/LICENSE.txt
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/LICENSE.txt
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/LICENSE.txt
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Bold.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Bold.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Bold.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Bold.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-BoldItalic.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Italic.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Italic.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Italic.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Italic.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Light.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Light.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Light.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Light.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-LightItalic.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Medium.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Medium.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Medium.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Medium.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-MediumItalic.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Regular.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Regular.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Regular.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Regular.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Thin.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Thin.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-Thin.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-Thin.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf b/src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf
rename to src/core/packages/apps/server-internal/assets/fonts/roboto_mono/RobotoMono-ThinItalic.ttf
diff --git a/packages/core/apps/core-apps-server-internal/assets/legacy_dark_theme.css b/src/core/packages/apps/server-internal/assets/legacy_dark_theme.css
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/legacy_dark_theme.css
rename to src/core/packages/apps/server-internal/assets/legacy_dark_theme.css
diff --git a/packages/core/apps/core-apps-server-internal/assets/legacy_dark_theme.min.css b/src/core/packages/apps/server-internal/assets/legacy_dark_theme.min.css
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/legacy_dark_theme.min.css
rename to src/core/packages/apps/server-internal/assets/legacy_dark_theme.min.css
diff --git a/packages/core/apps/core-apps-server-internal/assets/legacy_light_theme.css b/src/core/packages/apps/server-internal/assets/legacy_light_theme.css
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/legacy_light_theme.css
rename to src/core/packages/apps/server-internal/assets/legacy_light_theme.css
diff --git a/packages/core/apps/core-apps-server-internal/assets/legacy_light_theme.min.css b/src/core/packages/apps/server-internal/assets/legacy_light_theme.min.css
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/legacy_light_theme.min.css
rename to src/core/packages/apps/server-internal/assets/legacy_light_theme.min.css
diff --git a/packages/core/apps/core-apps-server-internal/assets/legacy_styles.css b/src/core/packages/apps/server-internal/assets/legacy_styles.css
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/legacy_styles.css
rename to src/core/packages/apps/server-internal/assets/legacy_styles.css
diff --git a/packages/core/apps/core-apps-server-internal/assets/legacy_theme.js b/src/core/packages/apps/server-internal/assets/legacy_theme.js
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/assets/legacy_theme.js
rename to src/core/packages/apps/server-internal/assets/legacy_theme.js
diff --git a/packages/core/apps/core-apps-server-internal/index.ts b/src/core/packages/apps/server-internal/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/index.ts
rename to src/core/packages/apps/server-internal/index.ts
diff --git a/packages/core/analytics/core-analytics-server/jest.config.js b/src/core/packages/apps/server-internal/jest.config.js
similarity index 84%
rename from packages/core/analytics/core-analytics-server/jest.config.js
rename to src/core/packages/apps/server-internal/jest.config.js
index 92cead0f9e0a7..50706961a694a 100644
--- a/packages/core/analytics/core-analytics-server/jest.config.js
+++ b/src/core/packages/apps/server-internal/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/analytics/core-analytics-server'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/apps/server-internal'],
 };
diff --git a/packages/core/apps/core-apps-server-internal/kibana.jsonc b/src/core/packages/apps/server-internal/kibana.jsonc
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/kibana.jsonc
rename to src/core/packages/apps/server-internal/kibana.jsonc
diff --git a/packages/core/apps/core-apps-server-internal/package.json b/src/core/packages/apps/server-internal/package.json
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/package.json
rename to src/core/packages/apps/server-internal/package.json
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.mocks.ts b/src/core/packages/apps/server-internal/src/bundle_routes/bundle_route.test.mocks.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.mocks.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/bundle_route.test.mocks.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.ts b/src/core/packages/apps/server-internal/src/bundle_routes/bundle_route.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/bundle_route.test.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/bundle_route.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/bundles_route.ts b/src/core/packages/apps/server-internal/src/bundle_routes/bundles_route.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/bundles_route.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/bundles_route.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/dynamic_asset_response.test.ts b/src/core/packages/apps/server-internal/src/bundle_routes/dynamic_asset_response.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/dynamic_asset_response.test.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/dynamic_asset_response.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/dynamic_asset_response.ts b/src/core/packages/apps/server-internal/src/bundle_routes/dynamic_asset_response.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/dynamic_asset_response.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/dynamic_asset_response.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash.test.mocks.ts b/src/core/packages/apps/server-internal/src/bundle_routes/file_hash.test.mocks.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash.test.mocks.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/file_hash.test.mocks.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash.test.ts b/src/core/packages/apps/server-internal/src/bundle_routes/file_hash.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash.test.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/file_hash.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash.ts b/src/core/packages/apps/server-internal/src/bundle_routes/file_hash.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/file_hash.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash_cache.test.ts b/src/core/packages/apps/server-internal/src/bundle_routes/file_hash_cache.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash_cache.test.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/file_hash_cache.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash_cache.ts b/src/core/packages/apps/server-internal/src/bundle_routes/file_hash_cache.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/file_hash_cache.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/file_hash_cache.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/fs.ts b/src/core/packages/apps/server-internal/src/bundle_routes/fs.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/fs.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/fs.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/index.ts b/src/core/packages/apps/server-internal/src/bundle_routes/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/index.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/index.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.test.mocks.ts b/src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.test.mocks.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.test.mocks.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.test.mocks.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.test.ts b/src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.test.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.ts b/src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/select_compressed_file.ts b/src/core/packages/apps/server-internal/src/bundle_routes/select_compressed_file.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/select_compressed_file.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/select_compressed_file.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/utils.ts b/src/core/packages/apps/server-internal/src/bundle_routes/utils.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/bundle_routes/utils.ts
rename to src/core/packages/apps/server-internal/src/bundle_routes/utils.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/core_app.test.mocks.ts b/src/core/packages/apps/server-internal/src/core_app.test.mocks.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/core_app.test.mocks.ts
rename to src/core/packages/apps/server-internal/src/core_app.test.mocks.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/core_app.test.ts b/src/core/packages/apps/server-internal/src/core_app.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/core_app.test.ts
rename to src/core/packages/apps/server-internal/src/core_app.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/core_app.ts b/src/core/packages/apps/server-internal/src/core_app.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/core_app.ts
rename to src/core/packages/apps/server-internal/src/core_app.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/core_app_config.test.ts b/src/core/packages/apps/server-internal/src/core_app_config.test.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/core_app_config.test.ts
rename to src/core/packages/apps/server-internal/src/core_app_config.test.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/core_app_config.ts b/src/core/packages/apps/server-internal/src/core_app_config.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/core_app_config.ts
rename to src/core/packages/apps/server-internal/src/core_app_config.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/index.ts b/src/core/packages/apps/server-internal/src/index.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/index.ts
rename to src/core/packages/apps/server-internal/src/index.ts
diff --git a/packages/core/apps/core-apps-server-internal/src/internal_types.ts b/src/core/packages/apps/server-internal/src/internal_types.ts
similarity index 100%
rename from packages/core/apps/core-apps-server-internal/src/internal_types.ts
rename to src/core/packages/apps/server-internal/src/internal_types.ts
diff --git a/packages/core/apps/core-apps-server-internal/tsconfig.json b/src/core/packages/apps/server-internal/tsconfig.json
similarity index 95%
rename from packages/core/apps/core-apps-server-internal/tsconfig.json
rename to src/core/packages/apps/server-internal/tsconfig.json
index cc84d62f4faa4..5fc120ad7dc15 100644
--- a/packages/core/apps/core-apps-server-internal/tsconfig.json
+++ b/src/core/packages/apps/server-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "stripInternal": false,
diff --git a/packages/core/base/core-base-browser-internal/README.md b/src/core/packages/base/browser-internal/README.md
similarity index 100%
rename from packages/core/base/core-base-browser-internal/README.md
rename to src/core/packages/base/browser-internal/README.md
diff --git a/packages/core/base/core-base-browser-internal/index.ts b/src/core/packages/base/browser-internal/index.ts
similarity index 100%
rename from packages/core/base/core-base-browser-internal/index.ts
rename to src/core/packages/base/browser-internal/index.ts
diff --git a/src/core/packages/base/browser-internal/jest.config.js b/src/core/packages/base/browser-internal/jest.config.js
new file mode 100644
index 0000000000000..b4bdea09b3803
--- /dev/null
+++ b/src/core/packages/base/browser-internal/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/base/browser-internal'],
+};
diff --git a/packages/core/base/core-base-browser-internal/kibana.jsonc b/src/core/packages/base/browser-internal/kibana.jsonc
similarity index 100%
rename from packages/core/base/core-base-browser-internal/kibana.jsonc
rename to src/core/packages/base/browser-internal/kibana.jsonc
diff --git a/packages/core/base/core-base-browser-internal/package.json b/src/core/packages/base/browser-internal/package.json
similarity index 100%
rename from packages/core/base/core-base-browser-internal/package.json
rename to src/core/packages/base/browser-internal/package.json
diff --git a/packages/core/base/core-base-browser-internal/src/core_context.ts b/src/core/packages/base/browser-internal/src/core_context.ts
similarity index 100%
rename from packages/core/base/core-base-browser-internal/src/core_context.ts
rename to src/core/packages/base/browser-internal/src/core_context.ts
diff --git a/packages/core/base/core-base-browser-internal/src/services.ts b/src/core/packages/base/browser-internal/src/services.ts
similarity index 100%
rename from packages/core/base/core-base-browser-internal/src/services.ts
rename to src/core/packages/base/browser-internal/src/services.ts
diff --git a/packages/core/base/core-base-browser-internal/tsconfig.json b/src/core/packages/base/browser-internal/tsconfig.json
similarity index 86%
rename from packages/core/base/core-base-browser-internal/tsconfig.json
rename to src/core/packages/base/browser-internal/tsconfig.json
index a3e5d5fc950b9..6ee4dfcc17547 100644
--- a/packages/core/base/core-base-browser-internal/tsconfig.json
+++ b/src/core/packages/base/browser-internal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/src/core/packages/base/common/BUILD.bazel b/src/core/packages/base/common/BUILD.bazel
new file mode 100644
index 0000000000000..88cb5bbe5b9e8
--- /dev/null
+++ b/src/core/packages/base/common/BUILD.bazel
@@ -0,0 +1,35 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+
+SRCS = glob(
+  [
+    "**/*.ts",
+    "**/*.tsx",
+  ],
+  exclude = [
+    "**/test_helpers.ts",
+    "**/*.config.js",
+    "**/*.mock.*",
+    "**/*.test.*",
+    "**/*.stories.*",
+    "**/__snapshots__/**",
+    "**/integration_tests/**",
+    "**/mocks/**",
+    "**/scripts/**",
+    "**/storybook/**",
+    "**/test_fixtures/**",
+    "**/test_helpers/**",
+  ],
+)
+
+BUNDLER_DEPS = [
+  "//packages/kbn-i18n",
+  "@npm//tslib",
+]
+
+js_library(
+  name = "kbn-bfetch-error",
+  package_name = "@kbn/bfetch-error",
+  srcs = ["package.json"] + SRCS,
+  deps = BUNDLER_DEPS,
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/core/base/core-base-common/README.md b/src/core/packages/base/common/README.md
similarity index 100%
rename from packages/core/base/core-base-common/README.md
rename to src/core/packages/base/common/README.md
diff --git a/packages/core/base/core-base-common/index.ts b/src/core/packages/base/common/index.ts
similarity index 100%
rename from packages/core/base/core-base-common/index.ts
rename to src/core/packages/base/common/index.ts
diff --git a/packages/core/base/core-base-common/jest.config.js b/src/core/packages/base/common/jest.config.js
similarity index 85%
rename from packages/core/base/core-base-common/jest.config.js
rename to src/core/packages/base/common/jest.config.js
index 2d868d29fa4bf..8d4d5a7856044 100644
--- a/packages/core/base/core-base-common/jest.config.js
+++ b/src/core/packages/base/common/jest.config.js
@@ -9,6 +9,6 @@
 
 module.exports = {
   preset: '@kbn/test/jest_node',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/packages/core/base/core-base-common'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/src/core/packages/base/common'],
 };
diff --git a/packages/core/base/core-base-common/kibana.jsonc b/src/core/packages/base/common/kibana.jsonc
similarity index 100%
rename from packages/core/base/core-base-common/kibana.jsonc
rename to src/core/packages/base/common/kibana.jsonc
diff --git a/packages/core/base/core-base-common/package.json b/src/core/packages/base/common/package.json
similarity index 100%
rename from packages/core/base/core-base-common/package.json
rename to src/core/packages/base/common/package.json
diff --git a/packages/core/base/core-base-common/src/eui.ts b/src/core/packages/base/common/src/eui.ts
similarity index 100%
rename from packages/core/base/core-base-common/src/eui.ts
rename to src/core/packages/base/common/src/eui.ts
diff --git a/packages/core/base/core-base-common/src/plugins.ts b/src/core/packages/base/common/src/plugins.ts
similarity index 100%
rename from packages/core/base/core-base-common/src/plugins.ts
rename to src/core/packages/base/common/src/plugins.ts
diff --git a/packages/core/base/core-base-common/tsconfig.json b/src/core/packages/base/common/tsconfig.json
similarity index 81%
rename from packages/core/base/core-base-common/tsconfig.json
rename to src/core/packages/base/common/tsconfig.json
index 40ac62b671e04..20ffd85947c56 100644
--- a/packages/core/base/core-base-common/tsconfig.json
+++ b/src/core/packages/base/common/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
     "types": [
diff --git a/src/dev/build/tasks/create_cdn_assets_task.ts b/src/dev/build/tasks/create_cdn_assets_task.ts
index c7316a9030c98..97e6dc884fd1e 100644
--- a/src/dev/build/tasks/create_cdn_assets_task.ts
+++ b/src/dev/build/tasks/create_cdn_assets_task.ts
@@ -51,7 +51,7 @@ export const CreateCdnAssets: Task = {
       const manifest = Jsonc.parse(readFileSync(path, 'utf8')) as any;
       if (manifest?.plugin?.id) {
         const pluginRoot = resolve(dirname(path));
-        // packages/core/apps/core-apps-server-internal/src/core_app.ts
+        // src/core/packages/apps/server-internal/src/core_app.ts
         const assetsSource = resolve(pluginRoot, 'public', 'assets');
         const assetsDest = resolve(assets, buildSha, 'plugins', manifest.plugin.id, 'assets');
         try {
@@ -63,7 +63,7 @@ export const CreateCdnAssets: Task = {
         }
 
         try {
-          // packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.ts
+          // src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.ts
           const bundlesSource = resolve(pluginRoot, 'target', 'public');
           const bundlesDest = resolve(bundles, 'plugin', manifest.plugin.id, '1.0.0');
           await access(bundlesSource);
@@ -76,7 +76,7 @@ export const CreateCdnAssets: Task = {
       }
     });
 
-    // packages/core/apps/core-apps-server-internal/src/bundle_routes/register_bundle_routes.ts
+    // src/core/packages/apps/server-internal/src/bundle_routes/register_bundle_routes.ts
     await copyAll(
       resolve(buildSource, 'node_modules/@kbn/ui-shared-deps-npm/shared_built_assets'),
       resolve(bundles, 'kbn-ui-shared-deps-npm')
@@ -94,7 +94,7 @@ export const CreateCdnAssets: Task = {
       resolve(bundles, 'kbn-monaco')
     );
 
-    // packages/core/apps/core-apps-server-internal/src/core_app.ts
+    // src/core/packages/apps/server-internal/src/core_app.ts
     await copyAll(
       resolve(buildSource, 'node_modules/@kbn/core-apps-server-internal/assets'),
       resolve(assets, buildSha, 'ui')
diff --git a/src/dev/build/tasks/replace_favicon.ts b/src/dev/build/tasks/replace_favicon.ts
index b2f63d40aba1c..4b55c0a6b749d 100644
--- a/src/dev/build/tasks/replace_favicon.ts
+++ b/src/dev/build/tasks/replace_favicon.ts
@@ -15,23 +15,23 @@ export const ReplaceFavicon: Task = {
   async run(config, log, build) {
     await copy(
       config.resolveFromRepo(
-        'packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.ico'
+        'src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.ico'
       ),
-      build.resolvePath('packages/core/apps/core-apps-server-internal/assets/favicons/favicon.ico')
+      build.resolvePath('src/core/packages/apps/server-internal/assets/favicons/favicon.ico')
     );
 
     await copy(
       config.resolveFromRepo(
-        'packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.png'
+        'src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.png'
       ),
-      build.resolvePath('packages/core/apps/core-apps-server-internal/assets/favicons/favicon.png')
+      build.resolvePath('src/core/packages/apps/server-internal/assets/favicons/favicon.png')
     );
 
     await copy(
       config.resolveFromRepo(
-        'packages/core/apps/core-apps-server-internal/assets/favicons/favicon.distribution.svg'
+        'src/core/packages/apps/server-internal/assets/favicons/favicon.distribution.svg'
       ),
-      build.resolvePath('packages/core/apps/core-apps-server-internal/assets/favicons/favicon.svg')
+      build.resolvePath('src/core/packages/apps/server-internal/assets/favicons/favicon.svg')
     );
   },
 };
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index c6c91aba10eed..c3ead95fb7375 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -36,7 +36,7 @@ export const IGNORE_FILE_GLOBS = [
   '**/.*',
   '**/__mocks__/**/*',
   'x-pack/docs/**/*',
-  'packages/core/apps/core-apps-server-internal/assets/fonts/**/*',
+  'src/core/packages/apps/server-internal/assets/fonts/**/*',
   'src/dev/code_coverage/ingest_coverage/integration_tests/mocks/**/*',
   'packages/kbn-utility-types/test-d/**/*',
   'Dockerfile*',
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 0d86b59157e6f..148f367e32d3d 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -234,40 +234,40 @@
       "@kbn/controls-plugin/*": ["src/plugins/controls/*"],
       "@kbn/core": ["src/core"],
       "@kbn/core/*": ["src/core/*"],
-      "@kbn/core-analytics-browser": ["packages/core/analytics/core-analytics-browser"],
-      "@kbn/core-analytics-browser/*": ["packages/core/analytics/core-analytics-browser/*"],
-      "@kbn/core-analytics-browser-internal": ["packages/core/analytics/core-analytics-browser-internal"],
-      "@kbn/core-analytics-browser-internal/*": ["packages/core/analytics/core-analytics-browser-internal/*"],
+      "@kbn/core-analytics-browser": ["src/core/packages/analytics/browser"],
+      "@kbn/core-analytics-browser/*": ["src/core/packages/analytics/browser/*"],
+      "@kbn/core-analytics-browser-internal": ["src/core/packages/analytics/browser-internal"],
+      "@kbn/core-analytics-browser-internal/*": ["src/core/packages/analytics/browser-internal/*"],
       "@kbn/core-analytics-browser-mocks": ["packages/core/analytics/core-analytics-browser-mocks"],
       "@kbn/core-analytics-browser-mocks/*": ["packages/core/analytics/core-analytics-browser-mocks/*"],
-      "@kbn/core-analytics-server": ["packages/core/analytics/core-analytics-server"],
-      "@kbn/core-analytics-server/*": ["packages/core/analytics/core-analytics-server/*"],
-      "@kbn/core-analytics-server-internal": ["packages/core/analytics/core-analytics-server-internal"],
-      "@kbn/core-analytics-server-internal/*": ["packages/core/analytics/core-analytics-server-internal/*"],
+      "@kbn/core-analytics-server": ["src/core/packages/analytics/server"],
+      "@kbn/core-analytics-server/*": ["src/core/packages/analytics/server/*"],
+      "@kbn/core-analytics-server-internal": ["src/core/packages/analytics/server-internal"],
+      "@kbn/core-analytics-server-internal/*": ["src/core/packages/analytics/server-internal/*"],
       "@kbn/core-analytics-server-mocks": ["packages/core/analytics/core-analytics-server-mocks"],
       "@kbn/core-analytics-server-mocks/*": ["packages/core/analytics/core-analytics-server-mocks/*"],
       "@kbn/core-app-status-plugin": ["test/plugin_functional/plugins/core_app_status"],
       "@kbn/core-app-status-plugin/*": ["test/plugin_functional/plugins/core_app_status/*"],
-      "@kbn/core-application-browser": ["packages/core/application/core-application-browser"],
-      "@kbn/core-application-browser/*": ["packages/core/application/core-application-browser/*"],
-      "@kbn/core-application-browser-internal": ["packages/core/application/core-application-browser-internal"],
-      "@kbn/core-application-browser-internal/*": ["packages/core/application/core-application-browser-internal/*"],
+      "@kbn/core-application-browser": ["src/core/packages/application/browser"],
+      "@kbn/core-application-browser/*": ["src/core/packages/application/browser/*"],
+      "@kbn/core-application-browser-internal": ["src/core/packages/application/browser-internal"],
+      "@kbn/core-application-browser-internal/*": ["src/core/packages/application/browser-internal/*"],
       "@kbn/core-application-browser-mocks": ["packages/core/application/core-application-browser-mocks"],
       "@kbn/core-application-browser-mocks/*": ["packages/core/application/core-application-browser-mocks/*"],
-      "@kbn/core-application-common": ["packages/core/application/core-application-common"],
-      "@kbn/core-application-common/*": ["packages/core/application/core-application-common/*"],
-      "@kbn/core-apps-browser-internal": ["packages/core/apps/core-apps-browser-internal"],
-      "@kbn/core-apps-browser-internal/*": ["packages/core/apps/core-apps-browser-internal/*"],
+      "@kbn/core-application-common": ["src/core/packages/application/common"],
+      "@kbn/core-application-common/*": ["src/core/packages/application/common/*"],
+      "@kbn/core-apps-browser-internal": ["src/core/packages/apps/browser-internal"],
+      "@kbn/core-apps-browser-internal/*": ["src/core/packages/apps/browser-internal/*"],
       "@kbn/core-apps-browser-mocks": ["packages/core/apps/core-apps-browser-mocks"],
       "@kbn/core-apps-browser-mocks/*": ["packages/core/apps/core-apps-browser-mocks/*"],
-      "@kbn/core-apps-server-internal": ["packages/core/apps/core-apps-server-internal"],
-      "@kbn/core-apps-server-internal/*": ["packages/core/apps/core-apps-server-internal/*"],
-      "@kbn/core-base-browser-internal": ["packages/core/base/core-base-browser-internal"],
-      "@kbn/core-base-browser-internal/*": ["packages/core/base/core-base-browser-internal/*"],
+      "@kbn/core-apps-server-internal": ["src/core/packages/apps/server-internal"],
+      "@kbn/core-apps-server-internal/*": ["src/core/packages/apps/server-internal/*"],
+      "@kbn/core-base-browser-internal": ["src/core/packages/base/browser-internal"],
+      "@kbn/core-base-browser-internal/*": ["src/core/packages/base/browser-internal/*"],
       "@kbn/core-base-browser-mocks": ["packages/core/base/core-base-browser-mocks"],
       "@kbn/core-base-browser-mocks/*": ["packages/core/base/core-base-browser-mocks/*"],
-      "@kbn/core-base-common": ["packages/core/base/core-base-common"],
-      "@kbn/core-base-common/*": ["packages/core/base/core-base-common/*"],
+      "@kbn/core-base-common": ["src/core/packages/base/common"],
+      "@kbn/core-base-common/*": ["src/core/packages/base/common/*"],
       "@kbn/core-base-common-internal": ["packages/core/base/core-base-common-internal"],
       "@kbn/core-base-common-internal/*": ["packages/core/base/core-base-common-internal/*"],
       "@kbn/core-base-server-internal": ["packages/core/base/core-base-server-internal"],
diff --git a/yarn.lock b/yarn.lock
index 1b549d84d2241..c047674bd6dbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4271,7 +4271,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-analytics-browser-internal@link:packages/core/analytics/core-analytics-browser-internal":
+"@kbn/core-analytics-browser-internal@link:src/core/packages/analytics/browser-internal":
   version "0.0.0"
   uid ""
 
@@ -4279,11 +4279,11 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-analytics-browser@link:packages/core/analytics/core-analytics-browser":
+"@kbn/core-analytics-browser@link:src/core/packages/analytics/browser":
   version "0.0.0"
   uid ""
 
-"@kbn/core-analytics-server-internal@link:packages/core/analytics/core-analytics-server-internal":
+"@kbn/core-analytics-server-internal@link:src/core/packages/analytics/server-internal":
   version "0.0.0"
   uid ""
 
@@ -4291,7 +4291,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-analytics-server@link:packages/core/analytics/core-analytics-server":
+"@kbn/core-analytics-server@link:src/core/packages/analytics/server":
   version "0.0.0"
   uid ""
 
@@ -4299,7 +4299,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-application-browser-internal@link:packages/core/application/core-application-browser-internal":
+"@kbn/core-application-browser-internal@link:src/core/packages/application/browser-internal":
   version "0.0.0"
   uid ""
 
@@ -4307,15 +4307,15 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-application-browser@link:packages/core/application/core-application-browser":
+"@kbn/core-application-browser@link:src/core/packages/application/browser":
   version "0.0.0"
   uid ""
 
-"@kbn/core-application-common@link:packages/core/application/core-application-common":
+"@kbn/core-application-common@link:src/core/packages/application/common":
   version "0.0.0"
   uid ""
 
-"@kbn/core-apps-browser-internal@link:packages/core/apps/core-apps-browser-internal":
+"@kbn/core-apps-browser-internal@link:src/core/packages/apps/browser-internal":
   version "0.0.0"
   uid ""
 
@@ -4323,11 +4323,11 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-apps-server-internal@link:packages/core/apps/core-apps-server-internal":
+"@kbn/core-apps-server-internal@link:src/core/packages/apps/server-internal":
   version "0.0.0"
   uid ""
 
-"@kbn/core-base-browser-internal@link:packages/core/base/core-base-browser-internal":
+"@kbn/core-base-browser-internal@link:src/core/packages/base/browser-internal":
   version "0.0.0"
   uid ""
 
@@ -4339,7 +4339,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/core-base-common@link:packages/core/base/core-base-common":
+"@kbn/core-base-common@link:src/core/packages/base/common":
   version "0.0.0"
   uid ""