diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index 9afa197c8bb08..b3344c1e76ce3 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -33,9 +33,9 @@ disabled:
   - x-pack/test/defend_workflows_cypress/cli_config.ts
   - x-pack/test/defend_workflows_cypress/config.ts
   - x-pack/test/defend_workflows_cypress/serverless_config.ts
-  - x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts
-  - x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
-  - x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
+  - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_open.ts
+  - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_runner.ts
+  - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
   - x-pack/test/osquery_cypress/cli_config.ts
   - x-pack/test/osquery_cypress/serverless_cli_config.ts
   - x-pack/test/osquery_cypress/config.ts
diff --git a/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh b/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh
index 1155cfdae07f7..095ef5c723392 100644
--- a/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh
+++ b/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh
@@ -13,5 +13,5 @@ echo "--- Observability onboarding Cypress Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_onboarding/scripts/test/e2e.js \
+node plugins/observability_solution/observability_onboarding/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
index 5fb122e5ea4cc..55dcdcca53499 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -915,8 +915,9 @@ module.exports = {
         'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
         'x-pack/plugins/infra/**/*.tsx',
         'x-pack/plugins/observability/**/*.tsx',
-        'x-pack/plugins/observability_shared/observability_ai_assistant/**/*.tsx',
-        'x-pack/plugins/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
         'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
         'x-pack/plugins/observability_solution/profiling/**/*.tsx',
         'x-pack/plugins/synthetics/**/*.tsx',
@@ -933,8 +934,9 @@ module.exports = {
         'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability_solution/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 890001df314c6..8121ca6706baf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -575,7 +575,7 @@ x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
 x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
 x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team
 x-pack/plugins/observability_solution/observability_logs_explorer @elastic/obs-ux-logs-team
-x-pack/plugins/observability_onboarding @elastic/obs-ux-logs-team
+x-pack/plugins/observability_solution/observability_onboarding @elastic/obs-ux-logs-team
 x-pack/plugins/observability @elastic/obs-ux-management-team
 x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
 x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index 4a06c9a1045c5..7460aeaea1b4d 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -1212,8 +1212,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_onboarding/public/application/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_onboarding/public/application/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_onboarding/public/application/app.tsx#:~:text=KibanaThemeProvider) | - |
-| <DocLink id="kibKbnCoreElasticsearchServerPluginApi" section="def-common.ElasticsearchServiceSetup.legacy" text="legacy"/> | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_onboarding/server/plugin.ts#:~:text=legacy) | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx#:~:text=KibanaThemeProvider) | - |
+| <DocLink id="kibKbnCoreElasticsearchServerPluginApi" section="def-common.ElasticsearchServiceSetup.legacy" text="legacy"/> | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/observability_onboarding/server/plugin.ts#:~:text=legacy) | - |
 
 
 
diff --git a/api_docs/kbn_core_elasticsearch_server.devdocs.json b/api_docs/kbn_core_elasticsearch_server.devdocs.json
index 8688cc553176a..1390913099a44 100644
--- a/api_docs/kbn_core_elasticsearch_server.devdocs.json
+++ b/api_docs/kbn_core_elasticsearch_server.devdocs.json
@@ -26,9 +26,7 @@
         "type": "Interface",
         "tags": [],
         "label": "ElasticsearchApiToRedactInLogs",
-        "description": [
-          "\nDefinition of an API that should redact the requested body in the logs"
-        ],
+        "description": ["\nDefinition of an API that should redact the requested body in the logs"],
         "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
         "deprecated": false,
         "trackAdoption": false,
@@ -42,9 +40,7 @@
             "description": [
               "\nThe ES path.\n- If specified as a string, it'll be checked as `contains`.\n- If specified as a RegExp, it'll be tested against the path."
             ],
-            "signature": [
-              "string | RegExp"
-            ],
+            "signature": ["string | RegExp"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -58,9 +54,7 @@
             "description": [
               "\nHTTP method.\nIf not provided, the path will be checked for all methods."
             ],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -74,9 +68,7 @@
         "type": "Interface",
         "tags": [],
         "label": "ElasticsearchCapabilities",
-        "description": [
-          "\nRepresent the capabilities supported by a given ES cluster.\n"
-        ],
+        "description": ["\nRepresent the capabilities supported by a given ES cluster.\n"],
         "path": "packages/core/elasticsearch/core-elasticsearch-server/src/contracts.ts",
         "deprecated": false,
         "trackAdoption": false,
@@ -117,9 +109,7 @@
             "tags": [],
             "label": "customHeaders",
             "description": [],
-            "signature": [
-              "{ [x: string]: string; }"
-            ],
+            "signature": ["{ [x: string]: string; }"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -131,9 +121,7 @@
             "tags": [],
             "label": "requestHeadersWhitelist",
             "description": [],
-            "signature": [
-              "string[]"
-            ],
+            "signature": ["string[]"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -167,9 +155,7 @@
             "tags": [],
             "label": "idleSocketTimeout",
             "description": [],
-            "signature": [
-              "moment.Duration"
-            ],
+            "signature": ["moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -214,9 +200,7 @@
             "tags": [],
             "label": "sniffInterval",
             "description": [],
-            "signature": [
-              "false | moment.Duration"
-            ],
+            "signature": ["false | moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -228,9 +212,7 @@
             "tags": [],
             "label": "username",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -242,9 +224,7 @@
             "tags": [],
             "label": "password",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -256,9 +236,7 @@
             "tags": [],
             "label": "serviceAccountToken",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -270,9 +248,7 @@
             "tags": [],
             "label": "hosts",
             "description": [],
-            "signature": [
-              "string[]"
-            ],
+            "signature": ["string[]"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -284,9 +260,7 @@
             "tags": [],
             "label": "keepAlive",
             "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
+            "signature": ["boolean | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -298,9 +272,7 @@
             "tags": [],
             "label": "pingTimeout",
             "description": [],
-            "signature": [
-              "number | moment.Duration | undefined"
-            ],
+            "signature": ["number | moment.Duration | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -312,9 +284,7 @@
             "tags": [],
             "label": "requestTimeout",
             "description": [],
-            "signature": [
-              "number | moment.Duration | undefined"
-            ],
+            "signature": ["number | moment.Duration | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -326,9 +296,7 @@
             "tags": [],
             "label": "caFingerprint",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -396,9 +364,7 @@
             "tags": [],
             "label": "verificationMode",
             "description": [],
-            "signature": [
-              "\"none\" | \"full\" | \"certificate\" | undefined"
-            ],
+            "signature": ["\"none\" | \"full\" | \"certificate\" | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -410,9 +376,7 @@
             "tags": [],
             "label": "certificate",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -424,9 +388,7 @@
             "tags": [],
             "label": "certificateAuthorities",
             "description": [],
-            "signature": [
-              "string[] | undefined"
-            ],
+            "signature": ["string[] | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -438,9 +400,7 @@
             "tags": [],
             "label": "key",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -452,9 +412,7 @@
             "tags": [],
             "label": "keyPassphrase",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -466,9 +424,7 @@
             "tags": [],
             "label": "alwaysPresentCertificate",
             "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
+            "signature": ["boolean | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/client_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -498,9 +454,7 @@
             "description": [
               "\nHosts that the client will connect to. If sniffing is enabled, this list will\nbe used as seeds to discover the rest of your cluster."
             ],
-            "signature": [
-              "string[]"
-            ],
+            "signature": ["string[]"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/contracts.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -527,9 +481,7 @@
         "type": "Interface",
         "tags": [],
         "label": "ElasticsearchRequestHandlerContext",
-        "description": [
-          "\nCore's `elasticsearch` request handler context."
-        ],
+        "description": ["\nCore's `elasticsearch` request handler context."],
         "path": "packages/core/elasticsearch/core-elasticsearch-server/src/request_handler_context.ts",
         "deprecated": false,
         "trackAdoption": false,
@@ -574,12 +526,8 @@
             "type": "Object",
             "tags": [],
             "label": "config",
-            "description": [
-              "\nA limited set of Elasticsearch configuration entries.\n"
-            ],
-            "signature": [
-              "{ readonly hosts: string[]; readonly credentialsSpecified: boolean; }"
-            ],
+            "description": ["\nA limited set of Elasticsearch configuration entries.\n"],
+            "signature": ["{ readonly hosts: string[]; readonly credentialsSpecified: boolean; }"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/contracts.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -621,12 +569,8 @@
                 "type": "string",
                 "tags": [],
                 "label": "type",
-                "description": [
-                  "Unique identifier of the client"
-                ],
-                "signature": [
-                  "string"
-                ],
+                "description": ["Unique identifier of the client"],
+                "signature": ["string"],
                 "path": "packages/core/elasticsearch/core-elasticsearch-server/src/contracts.ts",
                 "deprecated": false,
                 "trackAdoption": false,
@@ -726,9 +670,7 @@
             "parentPluginId": "@kbn/core-elasticsearch-server",
             "id": "def-common.ElasticsearchServiceSetup.legacy",
             "type": "Object",
-            "tags": [
-              "deprecated"
-            ],
+            "tags": ["deprecated"],
             "label": "legacy",
             "description": [],
             "signature": [
@@ -766,7 +708,7 @@
               },
               {
                 "plugin": "observabilityOnboarding",
-                "path": "x-pack/plugins/observability_onboarding/server/plugin.ts"
+                "path": "x-pack/plugins/observability_solution/observability_onboarding/server/plugin.ts"
               },
               {
                 "plugin": "console",
@@ -798,9 +740,7 @@
             "type": "Object",
             "tags": [],
             "label": "client",
-            "description": [
-              "\nA pre-configured {@link IClusterClient | Elasticsearch client}\n"
-            ],
+            "description": ["\nA pre-configured {@link IClusterClient | Elasticsearch client}\n"],
             "signature": [
               {
                 "pluginId": "@kbn/core-elasticsearch-server",
@@ -851,12 +791,8 @@
                 "type": "string",
                 "tags": [],
                 "label": "type",
-                "description": [
-                  "Unique identifier of the client"
-                ],
-                "signature": [
-                  "string"
-                ],
+                "description": ["Unique identifier of the client"],
+                "signature": ["string"],
                 "path": "packages/core/elasticsearch/core-elasticsearch-server/src/contracts.ts",
                 "deprecated": false,
                 "trackAdoption": false,
@@ -896,9 +832,7 @@
             "type": "Function",
             "tags": [],
             "label": "getCapabilities",
-            "description": [
-              "\nReturns the capabilities for the default cluster."
-            ],
+            "description": ["\nReturns the capabilities for the default cluster."],
             "signature": [
               "() => ",
               {
@@ -936,9 +870,7 @@
             "tags": [],
             "label": "verificationMode",
             "description": [],
-            "signature": [
-              "\"none\" | \"full\" | \"certificate\""
-            ],
+            "signature": ["\"none\" | \"full\" | \"certificate\""],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -950,9 +882,7 @@
             "tags": [],
             "label": "certificate",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -964,9 +894,7 @@
             "tags": [],
             "label": "certificateAuthorities",
             "description": [],
-            "signature": [
-              "string[] | undefined"
-            ],
+            "signature": ["string[] | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -978,9 +906,7 @@
             "tags": [],
             "label": "key",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -992,9 +918,7 @@
             "tags": [],
             "label": "keyPassphrase",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -1019,9 +943,7 @@
         "type": "Interface",
         "tags": [],
         "label": "FakeRequest",
-        "description": [
-          "\nFake request object created manually by Kibana plugins."
-        ],
+        "description": ["\nFake request object created manually by Kibana plugins."],
         "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/scopeable_request.ts",
         "deprecated": false,
         "trackAdoption": false,
@@ -1032,9 +954,7 @@
             "type": "CompoundType",
             "tags": [],
             "label": "headers",
-            "description": [
-              "Headers used for authentication against Elasticsearch"
-            ],
+            "description": ["Headers used for authentication against Elasticsearch"],
             "signature": [
               "{ date?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; range?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
             ],
@@ -2354,9 +2274,7 @@
         "type": "Interface",
         "tags": [],
         "label": "ICustomClusterClient",
-        "description": [
-          "\nSee {@link IClusterClient}\n"
-        ],
+        "description": ["\nSee {@link IClusterClient}\n"],
         "signature": [
           {
             "pluginId": "@kbn/core-elasticsearch-server",
@@ -2387,9 +2305,7 @@
             "description": [
               "\nCloses the cluster client. After that client cannot be used and one should\ncreate a new client instance to be able to interact with Elasticsearch API."
             ],
-            "signature": [
-              "() => Promise<void>"
-            ],
+            "signature": ["() => Promise<void>"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/cluster_client.ts",
             "deprecated": false,
             "trackAdoption": false,
@@ -2419,9 +2335,7 @@
             "description": [
               "\nThe interval between health check requests Kibana sends to the Elasticsearch."
             ],
-            "signature": [
-              "moment.Duration"
-            ],
+            "signature": ["moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2487,9 +2401,7 @@
             "description": [
               "\nThe timeout for idle sockets kept open between Kibana and Elasticsearch. If the socket is idle for longer than this timeout, it will be closed."
             ],
-            "signature": [
-              "moment.Duration"
-            ],
+            "signature": ["moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2500,9 +2412,7 @@
             "type": "boolean",
             "tags": [],
             "label": "compression",
-            "description": [
-              "\nWhether to use compression for communications with elasticsearch."
-            ],
+            "description": ["\nWhether to use compression for communications with elasticsearch."],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2516,9 +2426,7 @@
             "description": [
               "\nHosts that the client will connect to. If sniffing is enabled, this list will\nbe used as seeds to discover the rest of your cluster."
             ],
-            "signature": [
-              "string[]"
-            ],
+            "signature": ["string[]"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2532,9 +2440,7 @@
             "description": [
               "\nList of Kibana client-side headers to send to Elasticsearch when request\nscoped cluster client is used. If this is an empty array then *no* client-side\nwill be sent."
             ],
-            "signature": [
-              "string[]"
-            ],
+            "signature": ["string[]"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2545,12 +2451,8 @@
             "type": "Object",
             "tags": [],
             "label": "pingTimeout",
-            "description": [
-              "\nTimeout after which PING HTTP request will be aborted and retried."
-            ],
-            "signature": [
-              "moment.Duration"
-            ],
+            "description": ["\nTimeout after which PING HTTP request will be aborted and retried."],
+            "signature": ["moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2561,12 +2463,8 @@
             "type": "Object",
             "tags": [],
             "label": "requestTimeout",
-            "description": [
-              "\nTimeout after which HTTP request will be aborted and retried."
-            ],
-            "signature": [
-              "moment.Duration"
-            ],
+            "description": ["\nTimeout after which HTTP request will be aborted and retried."],
+            "signature": ["moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2580,9 +2478,7 @@
             "description": [
               "\nTimeout for Elasticsearch to wait for responses from shards. Set to 0 to disable."
             ],
-            "signature": [
-              "moment.Duration"
-            ],
+            "signature": ["moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2609,9 +2505,7 @@
             "description": [
               "\nInterval to perform a sniff operation and make sure the list of nodes is complete.\nIf `false` then sniffing is disabled."
             ],
-            "signature": [
-              "false | moment.Duration"
-            ],
+            "signature": ["false | moment.Duration"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2638,9 +2532,7 @@
             "description": [
               "\nIf Elasticsearch is protected with basic authentication, this setting provides\nthe username that the Kibana server uses to perform its administrative functions.\nCannot be used in conjunction with serviceAccountToken."
             ],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2654,9 +2546,7 @@
             "description": [
               "\nIf Elasticsearch is protected with basic authentication, this setting provides\nthe password that the Kibana server uses to perform its administrative functions."
             ],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2670,9 +2560,7 @@
             "description": [
               "\nIf Elasticsearch security features are enabled, this setting provides the service account\ntoken that the Kibana server users to perform its administrative functions.\n\nThis is an alternative to specifying a username and password."
             ],
-            "signature": [
-              "string | undefined"
-            ],
+            "signature": ["string | undefined"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2686,9 +2574,7 @@
             "description": [
               "\nHeader names and values to send to Elasticsearch with every request. These\nheaders cannot be overwritten by client-side headers and aren't affected by\n`requestHeadersWhitelist` configuration."
             ],
-            "signature": [
-              "{ [x: string]: string; }"
-            ],
+            "signature": ["{ [x: string]: string; }"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/elasticsearch_config.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -2721,9 +2607,7 @@
             "type": "Array",
             "tags": [],
             "label": "apisToRedactInLogs",
-            "description": [
-              "\nExtends the list of APIs that should be redacted in logs."
-            ],
+            "description": ["\nExtends the list of APIs that should be redacted in logs."],
             "signature": [
               {
                 "pluginId": "@kbn/core-elasticsearch-server",
@@ -5239,9 +5123,7 @@
             "tags": [],
             "label": "type",
             "description": [],
-            "signature": [
-              "\"notHandled\""
-            ],
+            "signature": ["\"notHandled\""],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/unauthorized_error_handler.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -5267,10 +5149,7 @@
             "tags": [],
             "label": "error",
             "description": [],
-            "signature": [
-              "ResponseError",
-              " & { statusCode: 401; }"
-            ],
+            "signature": ["ResponseError", " & { statusCode: 401; }"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/unauthorized_error_handler.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -5317,9 +5196,7 @@
             "tags": [],
             "label": "authHeaders",
             "description": [],
-            "signature": [
-              "{ [x: string]: string | string[]; }"
-            ],
+            "signature": ["{ [x: string]: string | string[]; }"],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/unauthorized_error_handler.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -5362,9 +5239,7 @@
             "tags": [],
             "label": "type",
             "description": [],
-            "signature": [
-              "\"retry\""
-            ],
+            "signature": ["\"retry\""],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/unauthorized_error_handler.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -5477,9 +5352,7 @@
         "type": "Type",
         "tags": [],
         "label": "ElasticsearchClient",
-        "description": [
-          "\nClient used to query the elasticsearch cluster.\n"
-        ],
+        "description": ["\nClient used to query the elasticsearch cluster.\n"],
         "signature": [
           "{ create: { <TDocument = unknown>(this: That, params: ",
           "CreateRequest",
@@ -6859,4 +6732,4 @@
     ],
     "objects": []
   }
-}
\ No newline at end of file
+}
diff --git a/api_docs/kibana_react.devdocs.json b/api_docs/kibana_react.devdocs.json
index 5578e82bf7f5d..d396b44108b01 100644
--- a/api_docs/kibana_react.devdocs.json
+++ b/api_docs/kibana_react.devdocs.json
@@ -1515,15 +1515,15 @@
           },
           {
             "plugin": "observabilityOnboarding",
-            "path": "x-pack/plugins/observability_onboarding/public/application/app.tsx"
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx"
           },
           {
             "plugin": "observabilityOnboarding",
-            "path": "x-pack/plugins/observability_onboarding/public/application/app.tsx"
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx"
           },
           {
             "plugin": "observabilityOnboarding",
-            "path": "x-pack/plugins/observability_onboarding/public/application/app.tsx"
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx"
           },
           {
             "plugin": "painlessLab",
diff --git a/api_docs/observability_onboarding.devdocs.json b/api_docs/observability_onboarding.devdocs.json
index 2058dd185fc76..e2dcaa32f56e4 100644
--- a/api_docs/observability_onboarding.devdocs.json
+++ b/api_docs/observability_onboarding.devdocs.json
@@ -11,7 +11,7 @@
         "tags": [],
         "label": "ConfigSchema",
         "description": [],
-        "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+        "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -22,10 +22,8 @@
             "tags": [],
             "label": "ui",
             "description": [],
-            "signature": [
-              "{ enabled: boolean; }"
-            ],
-            "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+            "signature": ["{ enabled: boolean; }"],
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -36,10 +34,8 @@
             "tags": [],
             "label": "serverless",
             "description": [],
-            "signature": [
-              "{ enabled: boolean; }"
-            ],
-            "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+            "signature": ["{ enabled: boolean; }"],
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -53,7 +49,7 @@
         "tags": [],
         "label": "ObservabilityOnboardingAppServices",
         "description": [],
-        "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+        "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -73,7 +69,7 @@
                 "text": "ApplicationStart"
               }
             ],
-            "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -93,7 +89,7 @@
                 "text": "HttpSetup"
               }
             ],
-            "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -113,7 +109,7 @@
                 "text": "ConfigSchema"
               }
             ],
-            "path": "x-pack/plugins/observability_onboarding/public/index.ts",
+            "path": "x-pack/plugins/observability_solution/observability_onboarding/public/index.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -131,10 +127,8 @@
       "tags": [],
       "label": "ObservabilityOnboardingPluginStart",
       "description": [],
-      "signature": [
-        "void"
-      ],
-      "path": "x-pack/plugins/observability_onboarding/public/plugin.ts",
+      "signature": ["void"],
+      "path": "x-pack/plugins/observability_solution/observability_onboarding/public/plugin.ts",
       "deprecated": false,
       "trackAdoption": false,
       "lifecycle": "start",
@@ -157,7 +151,7 @@
         "signature": [
           "{ readonly ui: Readonly<{} & { enabled: boolean; }>; readonly serverless: Readonly<{} & { enabled: true; }>; }"
         ],
-        "path": "x-pack/plugins/observability_onboarding/server/index.ts",
+        "path": "x-pack/plugins/observability_solution/observability_onboarding/server/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -171,7 +165,7 @@
       "tags": [],
       "label": "ObservabilityOnboardingPluginSetup",
       "description": [],
-      "path": "x-pack/plugins/observability_onboarding/server/types.ts",
+      "path": "x-pack/plugins/observability_solution/observability_onboarding/server/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [],
@@ -185,7 +179,7 @@
       "tags": [],
       "label": "ObservabilityOnboardingPluginStart",
       "description": [],
-      "path": "x-pack/plugins/observability_onboarding/server/types.ts",
+      "path": "x-pack/plugins/observability_solution/observability_onboarding/server/types.ts",
       "deprecated": false,
       "trackAdoption": false,
       "children": [],
@@ -206,10 +200,8 @@
         "tags": [],
         "label": "PLUGIN_ID",
         "description": [],
-        "signature": [
-          "\"observabilityOnboarding\""
-        ],
-        "path": "x-pack/plugins/observability_onboarding/common/index.ts",
+        "signature": ["\"observabilityOnboarding\""],
+        "path": "x-pack/plugins/observability_solution/observability_onboarding/common/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -221,10 +213,8 @@
         "tags": [],
         "label": "PLUGIN_NAME",
         "description": [],
-        "signature": [
-          "\"observabilityOnboarding\""
-        ],
-        "path": "x-pack/plugins/observability_onboarding/common/index.ts",
+        "signature": ["\"observabilityOnboarding\""],
+        "path": "x-pack/plugins/observability_solution/observability_onboarding/common/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -232,4 +222,4 @@
     ],
     "objects": []
   }
-}
\ No newline at end of file
+}
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 835ea55744632..6c526849d9e42 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -696,7 +696,7 @@ Elastic.
 |This plugin provides an app based on the LogsExplorer component from the logs_explorer plugin, but adds observability-specific affordances.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_onboarding/README.md[observabilityOnboarding]
+|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability_onboarding/README.md[observabilityOnboarding]
 |This plugin provides an onboarding framework for observability solutions: Logs and APM.
 
 
diff --git a/package.json b/package.json
index 5bcbf5b2f8ce8..70a368af47a1f 100644
--- a/package.json
+++ b/package.json
@@ -594,7 +594,7 @@
     "@kbn/observability-fixtures-plugin": "link:x-pack/test/cases_api_integration/common/plugins/observability",
     "@kbn/observability-get-padded-alert-time-range-util": "link:x-pack/packages/observability/get_padded_alert_time_range_util",
     "@kbn/observability-logs-explorer-plugin": "link:x-pack/plugins/observability_solution/observability_logs_explorer",
-    "@kbn/observability-onboarding-plugin": "link:x-pack/plugins/observability_onboarding",
+    "@kbn/observability-onboarding-plugin": "link:x-pack/plugins/observability_solution/observability_onboarding",
     "@kbn/observability-plugin": "link:x-pack/plugins/observability",
     "@kbn/observability-shared-plugin": "link:x-pack/plugins/observability_solution/observability_shared",
     "@kbn/oidc-provider-plugin": "link:x-pack/test/security_api_integration/plugins/oidc_provider",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 9e6564cb24ccb..47b498951deca 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1144,8 +1144,8 @@
       "@kbn/observability-get-padded-alert-time-range-util/*": ["x-pack/packages/observability/get_padded_alert_time_range_util/*"],
       "@kbn/observability-logs-explorer-plugin": ["x-pack/plugins/observability_solution/observability_logs_explorer"],
       "@kbn/observability-logs-explorer-plugin/*": ["x-pack/plugins/observability_solution/observability_logs_explorer/*"],
-      "@kbn/observability-onboarding-plugin": ["x-pack/plugins/observability_onboarding"],
-      "@kbn/observability-onboarding-plugin/*": ["x-pack/plugins/observability_onboarding/*"],
+      "@kbn/observability-onboarding-plugin": ["x-pack/plugins/observability_solution/observability_onboarding"],
+      "@kbn/observability-onboarding-plugin/*": ["x-pack/plugins/observability_solution/observability_onboarding/*"],
       "@kbn/observability-plugin": ["x-pack/plugins/observability"],
       "@kbn/observability-plugin/*": ["x-pack/plugins/observability/*"],
       "@kbn/observability-shared-plugin": ["x-pack/plugins/observability_solution/observability_shared"],
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index bd16ac5211b9f..0e41b18df3853 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -68,8 +68,8 @@
     "xpack.monitoring": ["plugins/monitoring"],
     "xpack.observability": "plugins/observability",
     "xpack.observabilityLogsExplorer": "plugins/observability_solution/observability_logs_explorer",
+    "xpack.observability_onboarding": "plugins/observability_solution/observability_onboarding",
     "xpack.observabilityShared": "plugins/observability_solution/observability_shared",
-    "xpack.observability_onboarding": "plugins/observability_onboarding",
     "xpack.observabilityAiAssistant": "plugins/observability_solution/observability_ai_assistant",
     "xpack.osquery": ["plugins/osquery"],
     "xpack.painlessLab": "plugins/painless_lab",
diff --git a/x-pack/plugins/observability_onboarding/.prettierrc b/x-pack/plugins/observability_solution/observability_onboarding/.prettierrc
similarity index 100%
rename from x-pack/plugins/observability_onboarding/.prettierrc
rename to x-pack/plugins/observability_solution/observability_onboarding/.prettierrc
diff --git a/x-pack/plugins/observability_onboarding/README.md b/x-pack/plugins/observability_solution/observability_onboarding/README.md
similarity index 100%
rename from x-pack/plugins/observability_onboarding/README.md
rename to x-pack/plugins/observability_solution/observability_onboarding/README.md
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/custom_logs/__snapshots__/generate_custom_logs_yml.test.ts.snap b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/custom_logs/__snapshots__/generate_custom_logs_yml.test.ts.snap
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/custom_logs/__snapshots__/generate_custom_logs_yml.test.ts.snap
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/custom_logs/__snapshots__/generate_custom_logs_yml.test.ts.snap
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.test.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.test.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.test.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.test.ts
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/custom_logs/generate_custom_logs_yml.ts
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/index.ts
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/system_logs/__snapshots__/generate_system_logs_yml.test.ts.snap b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/system_logs/__snapshots__/generate_system_logs_yml.test.ts.snap
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/system_logs/__snapshots__/generate_system_logs_yml.test.ts.snap
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/system_logs/__snapshots__/generate_system_logs_yml.test.ts.snap
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.test.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.test.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.test.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.test.ts
diff --git a/x-pack/plugins/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/elastic_agent_logs/system_logs/generate_system_logs_yml.ts
diff --git a/x-pack/plugins/observability_onboarding/common/es_fields.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/es_fields.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/es_fields.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/es_fields.ts
diff --git a/x-pack/plugins/observability_onboarding/common/fetch_options.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/fetch_options.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/fetch_options.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/fetch_options.ts
diff --git a/x-pack/plugins/observability_onboarding/common/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/common/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/common/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/common/index.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/README.md b/x-pack/plugins/observability_solution/observability_onboarding/e2e/README.md
similarity index 69%
rename from x-pack/plugins/observability_onboarding/e2e/README.md
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/README.md
index 4d3e15318c64f..5270b499d2db1 100644
--- a/x-pack/plugins/observability_onboarding/e2e/README.md
+++ b/x-pack/plugins/observability_solution/observability_onboarding/e2e/README.md
@@ -1,10 +1,10 @@
 # Observability onboarding E2E tests
 
-Observability onboarding uses [FTR](../../../../packages/kbn-test/README.mdx) (functional test runner) and [Cypress](https://www.cypress.io/) to run the e2e tests. The tests are located at `kibana/x-pack/plugins/observability_onboarding/e2e/cypress/e2e`.
+Observability onboarding uses [FTR](../../../../packages/kbn-test/README.mdx) (functional test runner) and [Cypress](https://www.cypress.io/) to run the e2e tests. The tests are located at `kibana/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e`.
 
 ## E2E Tests (Cypress)
 
-The E2E tests are located in [`x-pack/plugins/observability_onboarding/e2e`](./cypress/e2e).
+The E2E tests are located in [`x-pack/plugins/observability_solution/observability_onboarding/e2e`](./cypress/e2e).
 
 Tests run on buildkite PR pipeline are parallelized (2 parallel jobs) and are orchestrated by the Cypress dashboard service. It can be configured in [.buildkite/pipelines/pull_request/observability_onboarding_cypress.yml](https://github.com/elastic/kibana/blob/main/.buildkite/pipelines/pull_request/observability_onboarding_cypress.yml) with the property `parallelism`.
 
@@ -20,21 +20,21 @@ Tests run on buildkite PR pipeline are parallelized (2 parallel jobs) and are or
 ### Start test server
 
 ```
-node x-pack/plugins/observability_onboarding/scripts/test/e2e --server
+node x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e --server
 ```
 
 ### Run tests
 Runs all tests in the terminal
 
 ```
-node x-pack/plugins/observability_onboarding/scripts/test/e2e --runner
+node x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e --runner
 ```
 
 ### Open cypress dashboard
 Opens cypress dashboard, there it's possible to select what test you want to run.
 
 ```
-node x-pack/plugins/observability_onboarding/scripts/test/e2e --open
+node x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e --open
 ```
 ### Arguments
 
@@ -47,5 +47,5 @@ node x-pack/plugins/observability_onboarding/scripts/test/e2e --open
 | --bail       | stop tests after the first failure              |
 
 ```
-node x-pack/plugins/observability_onboarding/scripts/test/e2e.js --runner --spec cypress/e2e/home.cy.ts --times 2
-```
\ No newline at end of file
+node x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e.js --runner --spec cypress/e2e/home.cy.ts --times 2
+```
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress.config.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress.config.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress.config.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress.config.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/e2e/home.cy.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/home.cy.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/e2e/home.cy.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/home.cy.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/configure.cy.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/configure.cy.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/configure.cy.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/configure.cy.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/install_elastic_agent.cy.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/install_elastic_agent.cy.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/install_elastic_agent.cy.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/custom_logs/install_elastic_agent.cy.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/feedback.cy.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/feedback.cy.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/feedback.cy.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/feedback.cy.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/system_logs.cy.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/system_logs.cy.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/e2e/logs/system_logs.cy.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/logs/system_logs.cy.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/e2e/navigation.cy.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/navigation.cy.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/e2e/navigation.cy.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/e2e/navigation.cy.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/support/commands.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/support/commands.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/support/commands.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/support/commands.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/support/e2e.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/support/e2e.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/support/e2e.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/support/e2e.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress/support/types.d.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/support/types.d.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress/support/types.d.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress/support/types.d.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress_test_runner.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress_test_runner.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/cypress_test_runner.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/cypress_test_runner.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/ftr_config.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
similarity index 92%
rename from x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
index c042c085b37d0..876ca1d2abfe4 100644
--- a/x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
@@ -13,10 +13,10 @@ const kibanaYamlFilePath = path.join(__dirname, './ftr_kibana.yml');
 
 async function ftrConfig({ readConfigFile }: FtrConfigProviderContext) {
   const kibanaCommonTestsConfig = await readConfigFile(
-    require.resolve('../../../../test/common/config.js')
+    require.resolve('../../../../../test/common/config.js')
   );
   const xpackFunctionalTestsConfig = await readConfigFile(
-    require.resolve('../../../test/functional/config.base.js')
+    require.resolve('../../../../test/functional/config.base.js')
   );
 
   return {
diff --git a/x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_open.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_open.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_runner.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_runner.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/ftr_kibana.yml b/x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_kibana.yml
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/ftr_kibana.yml
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_kibana.yml
diff --git a/x-pack/plugins/observability_onboarding/e2e/ftr_provider_context.d.ts b/x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_provider_context.d.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/e2e/ftr_provider_context.d.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_provider_context.d.ts
diff --git a/x-pack/plugins/observability_onboarding/e2e/tsconfig.json b/x-pack/plugins/observability_solution/observability_onboarding/e2e/tsconfig.json
similarity index 51%
rename from x-pack/plugins/observability_onboarding/e2e/tsconfig.json
rename to x-pack/plugins/observability_solution/observability_onboarding/e2e/tsconfig.json
index c4de3fff85cfd..3f586efcfc2d9 100644
--- a/x-pack/plugins/observability_onboarding/e2e/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability_onboarding/e2e/tsconfig.json
@@ -1,19 +1,10 @@
 {
-  "extends": "../../../../tsconfig.base.json",
-  "include": [
-    "**/*"
-  ],
-  "exclude": [
-    "tmp",
-    "target/**/*"
-  ],
+  "extends": "../../../../../tsconfig.base.json",
+  "include": ["**/*"],
+  "exclude": ["tmp", "target/**/*"],
   "compilerOptions": {
     "outDir": "target/types",
-    "types": [
-      "cypress",
-      "node",
-      "cypress-real-events"
-    ],
+    "types": ["cypress", "node", "cypress-real-events"],
     "isolatedModules": false
   },
   "kbn_references": [
@@ -21,6 +12,6 @@
     { "path": "../../../../test/tsconfig.json" },
     "@kbn/test",
     "@kbn/dev-utils",
-    "@kbn/cypress-config",
+    "@kbn/cypress-config"
   ]
 }
diff --git a/x-pack/plugins/observability_onboarding/jest.config.js b/x-pack/plugins/observability_solution/observability_onboarding/jest.config.js
similarity index 69%
rename from x-pack/plugins/observability_onboarding/jest.config.js
rename to x-pack/plugins/observability_solution/observability_onboarding/jest.config.js
index 66a2f768ca0ff..dac775b60d25b 100644
--- a/x-pack/plugins/observability_onboarding/jest.config.js
+++ b/x-pack/plugins/observability_solution/observability_onboarding/jest.config.js
@@ -9,6 +9,8 @@ const path = require('path');
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: path.resolve(__dirname, '../../..'),
-  roots: ['<rootDir>/x-pack/plugins/observability_onboarding'],
+  rootDir: path.resolve(__dirname, '../../../..'),
+  roots: [
+    '<rootDir>/x-pack/plugins/observability_solution/observability_onboarding',
+  ],
 };
diff --git a/x-pack/plugins/observability_onboarding/kibana.jsonc b/x-pack/plugins/observability_solution/observability_onboarding/kibana.jsonc
similarity index 100%
rename from x-pack/plugins/observability_onboarding/kibana.jsonc
rename to x-pack/plugins/observability_solution/observability_onboarding/kibana.jsonc
diff --git a/x-pack/plugins/observability_onboarding/public/application/app.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/application/app.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/application/app.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/assets/standalone_agent_setup.sh b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/standalone_agent_setup.sh
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/assets/standalone_agent_setup.sh
rename to x-pack/plugins/observability_solution/observability_onboarding/public/assets/standalone_agent_setup.sh
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/api_key_banner.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/api_key_banner.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/api_key_banner.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/api_key_banner.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/configure_logs.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/configure_logs.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/configure_logs.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/configure_logs.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/get_filename.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/get_filename.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/get_filename.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/get_filename.ts
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/index.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/index.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/index.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/inspect.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/inspect.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/inspect.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/inspect.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/select_logs.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/select_logs.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/custom_logs/select_logs.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/custom_logs/select_logs.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/header_action_menu/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/header_action_menu/index.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/header_action_menu/index.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/header_action_menu/index.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/home/index.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/index.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/home/index.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/system_logs/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/system_logs/index.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/system_logs/index.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/system_logs/index.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/system_logs/install_elastic_agent.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/system_logs/install_elastic_agent.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/system_logs/install_elastic_agent.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/system_logs/install_elastic_agent.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/system_logs/system_integration_banner.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/app/system_logs/system_integration_banner.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/system_logs/system_integration_banner.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/app/system_logs/system_integration_banner.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/back_button.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/back_button.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/back_button.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/back_button.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/filmstrip_transition.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/filmstrip_transition.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/filmstrip_transition.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/filmstrip_transition.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/get_elastic_agent_setup_command.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/get_elastic_agent_setup_command.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/get_elastic_agent_setup_command.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/get_elastic_agent_setup_command.ts
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/install_elastic_agent_steps.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/install_elastic_agent_steps.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/install_elastic_agent_steps.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/install_elastic_agent_steps.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/optional_form_row.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/optional_form_row.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/optional_form_row.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/optional_form_row.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/popover_tooltip.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/popover_tooltip.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/popover_tooltip.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/popover_tooltip.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/step_panel.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/step_panel.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/step_panel.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/step_panel.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/step_status.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/step_status.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/step_status.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/step_status.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/troubleshooting_link.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/troubleshooting_link.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/troubleshooting_link.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/troubleshooting_link.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/shared/windows_install_step.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/windows_install_step.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/shared/windows_install_step.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/components/shared/windows_install_step.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/context/create_wizard_context.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/context/create_wizard_context.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/context/create_wizard_context.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/context/create_wizard_context.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/context/nav_events.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/context/nav_events.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/context/nav_events.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/context/nav_events.ts
diff --git a/x-pack/plugins/observability_onboarding/public/context/path.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/context/path.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/context/path.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/context/path.ts
diff --git a/x-pack/plugins/observability_onboarding/public/hooks/use_fetcher.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_fetcher.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/hooks/use_fetcher.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_fetcher.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/hooks/use_install_system_integration.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_install_system_integration.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/hooks/use_install_system_integration.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_install_system_integration.ts
diff --git a/x-pack/plugins/observability_onboarding/public/hooks/use_kibana.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_kibana.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/hooks/use_kibana.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_kibana.ts
diff --git a/x-pack/plugins/observability_onboarding/public/hooks/use_kibana_navigation.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_kibana_navigation.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/hooks/use_kibana_navigation.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_kibana_navigation.ts
diff --git a/x-pack/plugins/observability_onboarding/public/icons/apache.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/apache.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/apache.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/apache.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/apm.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/apm.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/apm.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/apm.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/aws.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/aws.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/aws.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/aws.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/azure.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/azure.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/azure.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/azure.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/gcp.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/gcp.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/gcp.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/gcp.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/kinesis.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/kinesis.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/kinesis.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/kinesis.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/kubernetes.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/kubernetes.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/kubernetes.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/kubernetes.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/logging.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/logging.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/logging.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/logging.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/nginx.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/nginx.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/nginx.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/nginx.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/opentelemetry.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/opentelemetry.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/opentelemetry.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/opentelemetry.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/system.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/system.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/system.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/system.svg
diff --git a/x-pack/plugins/observability_onboarding/public/icons/universal_profiling.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/icons/universal_profiling.svg
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/icons/universal_profiling.svg
rename to x-pack/plugins/observability_solution/observability_onboarding/public/icons/universal_profiling.svg
diff --git a/x-pack/plugins/observability_onboarding/public/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/index.ts
diff --git a/x-pack/plugins/observability_onboarding/public/locators/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/locators/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/locators/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/locators/index.ts
diff --git a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/get_location.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/get_location.ts
diff --git a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/locator_definition.test.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/locator_definition.test.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/locator_definition.test.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/locator_definition.test.ts
diff --git a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/locator_definition.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/locator_definition.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/locator_definition.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/locator_definition.ts
diff --git a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/types.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/types.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/types.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/locators/onboarding_locator/types.ts
diff --git a/x-pack/plugins/observability_onboarding/public/plugin.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/plugin.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/plugin.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/plugin.ts
diff --git a/x-pack/plugins/observability_onboarding/public/routes/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/routes/index.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/routes/index.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/routes/index.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/routes/templates/custom_logs.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/routes/templates/custom_logs.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/routes/templates/custom_logs.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/routes/templates/custom_logs.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/routes/templates/system_logs.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/routes/templates/system_logs.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/routes/templates/system_logs.tsx
rename to x-pack/plugins/observability_solution/observability_onboarding/public/routes/templates/system_logs.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/services/rest/call_api.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/services/rest/call_api.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/services/rest/call_api.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/services/rest/call_api.ts
diff --git a/x-pack/plugins/observability_onboarding/public/services/rest/create_call_api.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/services/rest/create_call_api.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/services/rest/create_call_api.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/public/services/rest/create_call_api.ts
diff --git a/x-pack/plugins/observability_onboarding/scripts/test/api.js b/x-pack/plugins/observability_solution/observability_onboarding/scripts/test/api.js
similarity index 100%
rename from x-pack/plugins/observability_onboarding/scripts/test/api.js
rename to x-pack/plugins/observability_solution/observability_onboarding/scripts/test/api.js
diff --git a/x-pack/plugins/observability_onboarding/scripts/test/e2e.js b/x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e.js
similarity index 98%
rename from x-pack/plugins/observability_onboarding/scripts/test/e2e.js
rename to x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e.js
index 8a584a84bdc87..b727c63d8328e 100644
--- a/x-pack/plugins/observability_onboarding/scripts/test/e2e.js
+++ b/x-pack/plugins/observability_solution/observability_onboarding/scripts/test/e2e.js
@@ -65,7 +65,7 @@ if (cypressCliArgs.grep) {
 
 const ftrConfig = argv.open ? './ftr_config_open.ts' : './ftr_config_runner.ts';
 const spawnArgs = [
-  `../../../../scripts/${ftrScript}`,
+  `../../../../../scripts/${ftrScript}`,
   `--config=${ftrConfig}`,
   `--kibana-install-dir=${argv.kibanaInstallDir}`,
   ...(argv.bail ? [`--bail`] : []),
diff --git a/x-pack/plugins/observability_onboarding/scripts/test/jest.js b/x-pack/plugins/observability_solution/observability_onboarding/scripts/test/jest.js
similarity index 100%
rename from x-pack/plugins/observability_onboarding/scripts/test/jest.js
rename to x-pack/plugins/observability_solution/observability_onboarding/scripts/test/jest.js
diff --git a/x-pack/plugins/observability_onboarding/server/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/index.ts
diff --git a/x-pack/plugins/observability_onboarding/server/lib/get_authentication_api_key.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/get_authentication_api_key.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/lib/get_authentication_api_key.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/get_authentication_api_key.ts
diff --git a/x-pack/plugins/observability_onboarding/server/lib/get_fallback_urls.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/get_fallback_urls.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/lib/get_fallback_urls.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/get_fallback_urls.ts
diff --git a/x-pack/plugins/observability_onboarding/server/lib/state/get_observability_onboarding_flow.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/state/get_observability_onboarding_flow.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/lib/state/get_observability_onboarding_flow.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/state/get_observability_onboarding_flow.ts
diff --git a/x-pack/plugins/observability_onboarding/server/lib/state/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/state/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/lib/state/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/state/index.ts
diff --git a/x-pack/plugins/observability_onboarding/server/lib/state/save_observability_onboarding_flow.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/state/save_observability_onboarding_flow.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/lib/state/save_observability_onboarding_flow.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/state/save_observability_onboarding_flow.ts
diff --git a/x-pack/plugins/observability_onboarding/server/plugin.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/plugin.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/plugin.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/plugin.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/create_observability_onboarding_server_route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/create_observability_onboarding_server_route.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/create_observability_onboarding_server_route.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/create_observability_onboarding_server_route.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/elastic_agent/route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/elastic_agent/route.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/elastic_agent/route.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/elastic_agent/route.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/flow/get_has_logs.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/get_has_logs.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/flow/get_has_logs.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/get_has_logs.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/flow/route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/route.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/flow/route.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/route.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/index.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/logs/api_key/has_log_monitoring_privileges.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/has_log_monitoring_privileges.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/logs/api_key/has_log_monitoring_privileges.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/has_log_monitoring_privileges.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/logs/api_key/monitoring_config.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/monitoring_config.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/logs/api_key/monitoring_config.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/monitoring_config.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/logs/route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/logs/route.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/register_routes.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/register_routes.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/register_routes.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/register_routes.ts
diff --git a/x-pack/plugins/observability_onboarding/server/routes/types.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/types.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/routes/types.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/routes/types.ts
diff --git a/x-pack/plugins/observability_onboarding/server/saved_objects/observability_onboarding_status.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/saved_objects/observability_onboarding_status.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/saved_objects/observability_onboarding_status.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/saved_objects/observability_onboarding_status.ts
diff --git a/x-pack/plugins/observability_onboarding/server/services/es_legacy_config_service.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/services/es_legacy_config_service.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/services/es_legacy_config_service.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/services/es_legacy_config_service.ts
diff --git a/x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts
diff --git a/x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/call_kibana.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/call_kibana.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/call_kibana.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/call_kibana.ts
diff --git a/x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_custom_role.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_custom_role.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_custom_role.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_custom_role.ts
diff --git a/x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_or_update_user.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_or_update_user.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_or_update_user.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/helpers/create_or_update_user.ts
diff --git a/x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/index.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/test_helpers/create_observability_onboarding_users/index.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/index.ts
diff --git a/x-pack/plugins/observability_onboarding/server/types.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/types.ts
similarity index 100%
rename from x-pack/plugins/observability_onboarding/server/types.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/types.ts
diff --git a/x-pack/plugins/observability_onboarding/tsconfig.json b/x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json
similarity index 85%
rename from x-pack/plugins/observability_onboarding/tsconfig.json
rename to x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json
index 08ede6f201fc2..cdd0998bf444c 100644
--- a/x-pack/plugins/observability_onboarding/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "target/types",
+    "outDir": "target/types"
   },
   "include": [
-    "../../../typings/**/*",
+    "../../../../typings/**/*",
     "common/**/*",
     "public/**/*",
     "typings/**/*",
@@ -36,7 +36,5 @@
     "@kbn/fleet-plugin",
     "@kbn/shared-ux-link-redirect-app"
   ],
-  "exclude": [
-    "target/**/*",
-  ]
+  "exclude": ["target/**/*"]
 }
diff --git a/yarn.lock b/yarn.lock
index 792db279506fa..9403440e3362d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5356,7 +5356,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/observability-onboarding-plugin@link:x-pack/plugins/observability_onboarding":
+"@kbn/observability-onboarding-plugin@link:x-pack/plugins/observability_solution/observability_onboarding":
   version "0.0.0"
   uid ""