diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index aa4f5f48fd1ed..901fbc18cbbc0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -986,8 +986,6 @@ x-pack/plugins/snapshot_restore @elastic/kibana-management
 x-pack/plugins/spaces @elastic/kibana-security
 x-pack/plugins/stack_alerts @elastic/response-ops
 x-pack/plugins/stack_connectors @elastic/response-ops
-x-pack/plugins/streams @elastic/streams-program-team
-x-pack/plugins/streams_app @elastic/streams-program-team
 x-pack/plugins/task_manager @elastic/response-ops
 x-pack/plugins/telemetry_collection_xpack @elastic/kibana-core
 x-pack/plugins/threat_intelligence @elastic/security-threat-hunting-investigations
@@ -997,6 +995,8 @@ x-pack/plugins/upgrade_assistant @elastic/kibana-management
 x-pack/plugins/watcher @elastic/kibana-management
 x-pack/solutions/observability/plugins/observability_solution/entities_data_access @elastic/obs-entities
 x-pack/solutions/observability/plugins/observability_solution/entity_manager_app @elastic/obs-entities
+x-pack/solutions/observability/plugins/streams @elastic/streams-program-team
+x-pack/solutions/observability/plugins/streams_app @elastic/streams-program-team
 x-pack/test
 x-pack/test_serverless
 x-pack/test/alerting_api_integration/common/plugins/aad @elastic/response-ops
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 7de266985c6d6..3266b5e836b27 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -917,11 +917,11 @@ routes, etc.
 |The stack_connectors plugin provides connector types shipped with Kibana, built on top of the framework provided in the actions plugin.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/streams/README.md[streams]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/streams/README.md[streams]
 |This plugin provides an interface to manage streams
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/streams_app/README.md[streamsApp]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/streams_app/README.md[streamsApp]
 |Home of the Streams app plugin, which allows users to manage Streams via the UI.
 
 
diff --git a/package.json b/package.json
index f08ee6c00536a..a5687c0ae3729 100644
--- a/package.json
+++ b/package.json
@@ -941,8 +941,8 @@
     "@kbn/status-plugin-a-plugin": "link:test/server_integration/plugins/status_plugin_a",
     "@kbn/status-plugin-b-plugin": "link:test/server_integration/plugins/status_plugin_b",
     "@kbn/std": "link:packages/kbn-std",
-    "@kbn/streams-app-plugin": "link:x-pack/plugins/streams_app",
-    "@kbn/streams-plugin": "link:x-pack/plugins/streams",
+    "@kbn/streams-app-plugin": "link:x-pack/solutions/observability/plugins/streams_app",
+    "@kbn/streams-plugin": "link:x-pack/solutions/observability/plugins/streams",
     "@kbn/synthetics-plugin": "link:x-pack/plugins/observability_solution/synthetics",
     "@kbn/synthetics-private-location": "link:x-pack/packages/kbn-synthetics-private-location",
     "@kbn/task-manager-fixture-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index bc77936f8d3b9..6daea879e4151 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1866,10 +1866,10 @@
       "@kbn/stdio-dev-helpers/*": ["packages/kbn-stdio-dev-helpers/*"],
       "@kbn/storybook": ["packages/kbn-storybook"],
       "@kbn/storybook/*": ["packages/kbn-storybook/*"],
-      "@kbn/streams-app-plugin": ["x-pack/plugins/streams_app"],
-      "@kbn/streams-app-plugin/*": ["x-pack/plugins/streams_app/*"],
-      "@kbn/streams-plugin": ["x-pack/plugins/streams"],
-      "@kbn/streams-plugin/*": ["x-pack/plugins/streams/*"],
+      "@kbn/streams-app-plugin": ["x-pack/solutions/observability/plugins/streams_app"],
+      "@kbn/streams-app-plugin/*": ["x-pack/solutions/observability/plugins/streams_app/*"],
+      "@kbn/streams-plugin": ["x-pack/solutions/observability/plugins/streams"],
+      "@kbn/streams-plugin/*": ["x-pack/solutions/observability/plugins/streams/*"],
       "@kbn/synthetics-e2e": ["x-pack/plugins/observability_solution/synthetics/e2e"],
       "@kbn/synthetics-e2e/*": ["x-pack/plugins/observability_solution/synthetics/e2e/*"],
       "@kbn/synthetics-plugin": ["x-pack/plugins/observability_solution/synthetics"],
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index d16cbe9a627dc..c6eab5697fd29 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -151,7 +151,7 @@
     "xpack.securitySolutionServerless": "plugins/security_solution_serverless",
     "xpack.sessionView": "plugins/session_view",
     "xpack.streams": [
-      "plugins/streams_app"
+      "solutions/observability/plugins/streams_app"
     ],
     "xpack.slo": "plugins/observability_solution/slo",
     "xpack.snapshotRestore": "plugins/snapshot_restore",
diff --git a/x-pack/plugins/streams/jest.config.js b/x-pack/plugins/streams/jest.config.js
deleted file mode 100644
index 43d4fd28da9b5..0000000000000
--- a/x-pack/plugins/streams/jest.config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/x-pack/plugins/streams'],
-  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/streams',
-  coverageReporters: ['text', 'html'],
-  collectCoverageFrom: ['<rootDir>/x-pack/plugins/streams/{common,public,server}/**/*.{js,ts,tsx}'],
-};
diff --git a/x-pack/plugins/streams_app/jest.config.js b/x-pack/plugins/streams_app/jest.config.js
deleted file mode 100644
index d9c01c40a322d..0000000000000
--- a/x-pack/plugins/streams_app/jest.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: [
-    '<rootDir>/x-pack/plugins/streams_app/public',
-    '<rootDir>/x-pack/plugins/streams_app/common',
-    '<rootDir>/x-pack/plugins/streams_app/server',
-  ],
-  setupFiles: ['<rootDir>/x-pack/plugins/streams_app/.storybook/jest_setup.js'],
-  collectCoverage: true,
-  collectCoverageFrom: [
-    '<rootDir>/x-pack/plugins/streams_app/{public,common,server}/**/*.{js,ts,tsx}',
-  ],
-
-  coverageReporters: ['html'],
-};
diff --git a/x-pack/plugins/streams/README.md b/x-pack/solutions/observability/plugins/streams/README.md
similarity index 100%
rename from x-pack/plugins/streams/README.md
rename to x-pack/solutions/observability/plugins/streams/README.md
diff --git a/x-pack/plugins/streams/common/config.ts b/x-pack/solutions/observability/plugins/streams/common/config.ts
similarity index 100%
rename from x-pack/plugins/streams/common/config.ts
rename to x-pack/solutions/observability/plugins/streams/common/config.ts
diff --git a/x-pack/plugins/streams/common/constants.ts b/x-pack/solutions/observability/plugins/streams/common/constants.ts
similarity index 100%
rename from x-pack/plugins/streams/common/constants.ts
rename to x-pack/solutions/observability/plugins/streams/common/constants.ts
diff --git a/x-pack/plugins/streams/common/index.ts b/x-pack/solutions/observability/plugins/streams/common/index.ts
similarity index 100%
rename from x-pack/plugins/streams/common/index.ts
rename to x-pack/solutions/observability/plugins/streams/common/index.ts
diff --git a/x-pack/plugins/streams/common/types.ts b/x-pack/solutions/observability/plugins/streams/common/types.ts
similarity index 100%
rename from x-pack/plugins/streams/common/types.ts
rename to x-pack/solutions/observability/plugins/streams/common/types.ts
diff --git a/x-pack/solutions/observability/plugins/streams/jest.config.js b/x-pack/solutions/observability/plugins/streams/jest.config.js
new file mode 100644
index 0000000000000..12f11c9482d5c
--- /dev/null
+++ b/x-pack/solutions/observability/plugins/streams/jest.config.js
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/x-pack/solutions/observability/plugins/streams'],
+  coverageDirectory:
+    '<rootDir>/target/kibana-coverage/jest/x-pack/solutions/observability/plugins/streams',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: [
+    '<rootDir>/x-pack/solutions/observability/plugins/streams/{common,public,server}/**/*.{js,ts,tsx}',
+  ],
+};
diff --git a/x-pack/plugins/streams/kibana.jsonc b/x-pack/solutions/observability/plugins/streams/kibana.jsonc
similarity index 100%
rename from x-pack/plugins/streams/kibana.jsonc
rename to x-pack/solutions/observability/plugins/streams/kibana.jsonc
diff --git a/x-pack/plugins/streams/public/api/index.ts b/x-pack/solutions/observability/plugins/streams/public/api/index.ts
similarity index 100%
rename from x-pack/plugins/streams/public/api/index.ts
rename to x-pack/solutions/observability/plugins/streams/public/api/index.ts
diff --git a/x-pack/plugins/streams/public/index.ts b/x-pack/solutions/observability/plugins/streams/public/index.ts
similarity index 100%
rename from x-pack/plugins/streams/public/index.ts
rename to x-pack/solutions/observability/plugins/streams/public/index.ts
diff --git a/x-pack/plugins/streams/public/plugin.ts b/x-pack/solutions/observability/plugins/streams/public/plugin.ts
similarity index 100%
rename from x-pack/plugins/streams/public/plugin.ts
rename to x-pack/solutions/observability/plugins/streams/public/plugin.ts
diff --git a/x-pack/plugins/streams/public/types.ts b/x-pack/solutions/observability/plugins/streams/public/types.ts
similarity index 100%
rename from x-pack/plugins/streams/public/types.ts
rename to x-pack/solutions/observability/plugins/streams/public/types.ts
diff --git a/x-pack/plugins/streams/server/index.ts b/x-pack/solutions/observability/plugins/streams/server/index.ts
similarity index 100%
rename from x-pack/plugins/streams/server/index.ts
rename to x-pack/solutions/observability/plugins/streams/server/index.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/component_templates/generate_layer.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/generate_layer.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/component_templates/generate_layer.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/generate_layer.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/component_templates/logs_layer.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/logs_layer.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/component_templates/logs_layer.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/logs_layer.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/component_templates/manage_component_templates.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/manage_component_templates.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/component_templates/manage_component_templates.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/manage_component_templates.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/component_templates/name.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/name.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/component_templates/name.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/component_templates/name.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/data_streams/manage_data_streams.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/data_streams/manage_data_streams.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/data_streams/manage_data_streams.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/data_streams/manage_data_streams.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/component_template_not_found.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/component_template_not_found.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/component_template_not_found.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/component_template_not_found.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/definition_id_invalid.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/definition_id_invalid.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/definition_id_invalid.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/definition_id_invalid.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/definition_not_found.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/definition_not_found.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/definition_not_found.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/definition_not_found.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/fork_condition_missing.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/fork_condition_missing.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/fork_condition_missing.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/fork_condition_missing.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/id_conflict_error.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/id_conflict_error.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/id_conflict_error.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/id_conflict_error.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/index.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/index.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/index.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/index.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/index_template_not_found.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/index_template_not_found.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/index_template_not_found.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/index_template_not_found.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/ingest_pipeline_not_found.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/ingest_pipeline_not_found.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/ingest_pipeline_not_found.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/ingest_pipeline_not_found.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/malformed_children.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/malformed_children.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/malformed_children.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/malformed_children.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/malformed_fields.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/malformed_fields.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/malformed_fields.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/malformed_fields.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/malformed_stream_id.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/malformed_stream_id.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/malformed_stream_id.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/malformed_stream_id.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/permission_denied.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/permission_denied.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/permission_denied.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/permission_denied.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/errors/security_exception.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/security_exception.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/errors/security_exception.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/errors/security_exception.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/condition_fields.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_fields.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/condition_fields.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_fields.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/condition_guards.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_guards.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/condition_guards.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_guards.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/condition_to_painless.test.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_to_painless.test.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/condition_to_painless.test.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_to_painless.test.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/condition_to_painless.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_to_painless.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/condition_to_painless.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_to_painless.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/condition_to_query_dsl.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_to_query_dsl.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/condition_to_query_dsl.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/condition_to_query_dsl.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/hierarchy.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/hierarchy.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/hierarchy.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/hierarchy.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/helpers/retry.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/retry.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/helpers/retry.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/helpers/retry.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/index_templates/generate_index_template.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/index_templates/generate_index_template.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/index_templates/generate_index_template.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/index_templates/generate_index_template.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/index_templates/manage_index_templates.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/index_templates/manage_index_templates.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/index_templates/manage_index_templates.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/index_templates/manage_index_templates.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/index_templates/name.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/index_templates/name.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/index_templates/name.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/index_templates/name.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/ingest_pipelines/generate_ingest_pipeline.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/generate_ingest_pipeline.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/ingest_pipelines/generate_ingest_pipeline.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/generate_ingest_pipeline.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/ingest_pipelines/generate_reroute_pipeline.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/generate_reroute_pipeline.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/ingest_pipelines/generate_reroute_pipeline.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/generate_reroute_pipeline.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/ingest_pipelines/logs_default_pipeline.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/logs_default_pipeline.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/ingest_pipelines/logs_default_pipeline.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/logs_default_pipeline.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/ingest_pipelines/manage_ingest_pipelines.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/manage_ingest_pipelines.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/ingest_pipelines/manage_ingest_pipelines.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/manage_ingest_pipelines.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/ingest_pipelines/name.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/name.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/ingest_pipelines/name.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/ingest_pipelines/name.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/internal_stream_mapping.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/internal_stream_mapping.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/internal_stream_mapping.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/internal_stream_mapping.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/root_stream_definition.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/root_stream_definition.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/root_stream_definition.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/root_stream_definition.ts
diff --git a/x-pack/plugins/streams/server/lib/streams/stream_crud.ts b/x-pack/solutions/observability/plugins/streams/server/lib/streams/stream_crud.ts
similarity index 100%
rename from x-pack/plugins/streams/server/lib/streams/stream_crud.ts
rename to x-pack/solutions/observability/plugins/streams/server/lib/streams/stream_crud.ts
diff --git a/x-pack/plugins/streams/server/plugin.ts b/x-pack/solutions/observability/plugins/streams/server/plugin.ts
similarity index 100%
rename from x-pack/plugins/streams/server/plugin.ts
rename to x-pack/solutions/observability/plugins/streams/server/plugin.ts
diff --git a/x-pack/plugins/streams/server/routes/create_server_route.ts b/x-pack/solutions/observability/plugins/streams/server/routes/create_server_route.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/create_server_route.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/create_server_route.ts
diff --git a/x-pack/plugins/streams/server/routes/esql/route.ts b/x-pack/solutions/observability/plugins/streams/server/routes/esql/route.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/esql/route.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/esql/route.ts
diff --git a/x-pack/plugins/streams/server/routes/index.ts b/x-pack/solutions/observability/plugins/streams/server/routes/index.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/index.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/index.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/delete.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/delete.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/delete.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/delete.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/disable.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/disable.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/disable.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/disable.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/edit.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/edit.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/edit.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/edit.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/enable.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/enable.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/enable.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/enable.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/fork.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/fork.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/fork.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/fork.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/list.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/list.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/list.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/list.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/read.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/read.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/read.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/read.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/resync.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/resync.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/resync.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/resync.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/sample.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/sample.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/sample.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/sample.ts
diff --git a/x-pack/plugins/streams/server/routes/streams/settings.ts b/x-pack/solutions/observability/plugins/streams/server/routes/streams/settings.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/streams/settings.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/streams/settings.ts
diff --git a/x-pack/plugins/streams/server/routes/types.ts b/x-pack/solutions/observability/plugins/streams/server/routes/types.ts
similarity index 100%
rename from x-pack/plugins/streams/server/routes/types.ts
rename to x-pack/solutions/observability/plugins/streams/server/routes/types.ts
diff --git a/x-pack/plugins/streams/server/types.ts b/x-pack/solutions/observability/plugins/streams/server/types.ts
similarity index 100%
rename from x-pack/plugins/streams/server/types.ts
rename to x-pack/solutions/observability/plugins/streams/server/types.ts
diff --git a/x-pack/plugins/streams/tsconfig.json b/x-pack/solutions/observability/plugins/streams/tsconfig.json
similarity index 89%
rename from x-pack/plugins/streams/tsconfig.json
rename to x-pack/solutions/observability/plugins/streams/tsconfig.json
index 3f863145f4d22..4cec623f68286 100644
--- a/x-pack/plugins/streams/tsconfig.json
+++ b/x-pack/solutions/observability/plugins/streams/tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types"
   },
   "include": [
-    "../../../typings/**/*",
+    "../../../../../typings/**/*",
     "common/**/*",
     "server/**/*",
     "public/**/*",
diff --git a/x-pack/plugins/streams_app/.storybook/get_mock_streams_app_context.tsx b/x-pack/solutions/observability/plugins/streams_app/.storybook/get_mock_streams_app_context.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/.storybook/get_mock_streams_app_context.tsx
rename to x-pack/solutions/observability/plugins/streams_app/.storybook/get_mock_streams_app_context.tsx
diff --git a/x-pack/plugins/streams_app/.storybook/jest_setup.js b/x-pack/solutions/observability/plugins/streams_app/.storybook/jest_setup.js
similarity index 100%
rename from x-pack/plugins/streams_app/.storybook/jest_setup.js
rename to x-pack/solutions/observability/plugins/streams_app/.storybook/jest_setup.js
diff --git a/x-pack/plugins/streams_app/.storybook/main.js b/x-pack/solutions/observability/plugins/streams_app/.storybook/main.js
similarity index 100%
rename from x-pack/plugins/streams_app/.storybook/main.js
rename to x-pack/solutions/observability/plugins/streams_app/.storybook/main.js
diff --git a/x-pack/plugins/streams_app/.storybook/preview.js b/x-pack/solutions/observability/plugins/streams_app/.storybook/preview.js
similarity index 100%
rename from x-pack/plugins/streams_app/.storybook/preview.js
rename to x-pack/solutions/observability/plugins/streams_app/.storybook/preview.js
diff --git a/x-pack/plugins/streams_app/.storybook/storybook_decorator.tsx b/x-pack/solutions/observability/plugins/streams_app/.storybook/storybook_decorator.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/.storybook/storybook_decorator.tsx
rename to x-pack/solutions/observability/plugins/streams_app/.storybook/storybook_decorator.tsx
diff --git a/x-pack/plugins/streams_app/README.md b/x-pack/solutions/observability/plugins/streams_app/README.md
similarity index 100%
rename from x-pack/plugins/streams_app/README.md
rename to x-pack/solutions/observability/plugins/streams_app/README.md
diff --git a/x-pack/plugins/streams_app/common/entity_source_query.ts b/x-pack/solutions/observability/plugins/streams_app/common/entity_source_query.ts
similarity index 100%
rename from x-pack/plugins/streams_app/common/entity_source_query.ts
rename to x-pack/solutions/observability/plugins/streams_app/common/entity_source_query.ts
diff --git a/x-pack/plugins/streams_app/common/index.ts b/x-pack/solutions/observability/plugins/streams_app/common/index.ts
similarity index 100%
rename from x-pack/plugins/streams_app/common/index.ts
rename to x-pack/solutions/observability/plugins/streams_app/common/index.ts
diff --git a/x-pack/solutions/observability/plugins/streams_app/jest.config.js b/x-pack/solutions/observability/plugins/streams_app/jest.config.js
new file mode 100644
index 0000000000000..f18fb09f5c2f9
--- /dev/null
+++ b/x-pack/solutions/observability/plugins/streams_app/jest.config.js
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../../..',
+  roots: [
+    '<rootDir>/x-pack/solutions/observability/plugins/streams_app/public',
+    '<rootDir>/x-pack/solutions/observability/plugins/streams_app/common',
+    '<rootDir>/x-pack/solutions/observability/plugins/streams_app/server',
+  ],
+  setupFiles: [
+    '<rootDir>/x-pack/solutions/observability/plugins/streams_app/.storybook/jest_setup.js',
+  ],
+  collectCoverage: true,
+  collectCoverageFrom: [
+    '<rootDir>/x-pack/solutions/observability/plugins/streams_app/{public,common,server}/**/*.{js,ts,tsx}',
+  ],
+
+  coverageReporters: ['html'],
+};
diff --git a/x-pack/plugins/streams_app/kibana.jsonc b/x-pack/solutions/observability/plugins/streams_app/kibana.jsonc
similarity index 100%
rename from x-pack/plugins/streams_app/kibana.jsonc
rename to x-pack/solutions/observability/plugins/streams_app/kibana.jsonc
diff --git a/x-pack/plugins/streams_app/public/application.tsx b/x-pack/solutions/observability/plugins/streams_app/public/application.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/application.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/application.tsx
diff --git a/x-pack/plugins/streams_app/public/components/app_root/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/app_root/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/app_root/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/app_root/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/assets/illustration.png b/x-pack/solutions/observability/plugins/streams_app/public/components/assets/illustration.png
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/assets/illustration.png
rename to x-pack/solutions/observability/plugins/streams_app/public/components/assets/illustration.png
diff --git a/x-pack/plugins/streams_app/public/components/condition_editor/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/condition_editor/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/condition_editor/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/condition_editor/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/entity_detail_view/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/entity_detail_view/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/entity_detail_view/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/entity_detail_view/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/entity_detail_view_header_section/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/entity_detail_view_header_section/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/entity_detail_view_header_section/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/entity_detail_view_header_section/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/entity_overview_tab_list/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/entity_overview_tab_list/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/entity_overview_tab_list/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/entity_overview_tab_list/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/esql_chart/controlled_esql_chart.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/esql_chart/controlled_esql_chart.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/esql_chart/controlled_esql_chart.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/esql_chart/controlled_esql_chart.tsx
diff --git a/x-pack/plugins/streams_app/public/components/loading_panel/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/loading_panel/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/loading_panel/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/loading_panel/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/nested_view/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/nested_view/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/nested_view/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/nested_view/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/not_found/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/not_found/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/not_found/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/not_found/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/preview_table/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/preview_table/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/preview_table/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/preview_table/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/redirect_to/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/redirect_to/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/redirect_to/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/redirect_to/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_delete_modal/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_delete_modal/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_delete_modal/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_delete_modal/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_detail_enriching/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_enriching/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_detail_enriching/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_enriching/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_detail_management/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_management/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_detail_management/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_management/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_detail_overview/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_overview/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_detail_overview/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_overview/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_detail_routing/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_routing/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_detail_routing/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_routing/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_detail_schema_editor/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_schema_editor/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_detail_schema_editor/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_schema_editor/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_detail_view/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_view/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_detail_view/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_view/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/stream_list_view/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_list_view/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/stream_list_view/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/stream_list_view/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_context_provider/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_context_provider/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_context_provider/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_context_provider/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_page_body/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_body/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_page_body/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_body/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_page_header/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_header/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_page_header/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_header/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_page_header/streams_app_page_header_title.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_header/streams_app_page_header_title.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_page_header/streams_app_page_header_title.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_header/streams_app_page_header_title.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_page_template/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_template/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_page_template/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_page_template/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_router_breadcrumb/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_router_breadcrumb/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_router_breadcrumb/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_router_breadcrumb/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_app_search_bar/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_search_bar/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_app_search_bar/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_app_search_bar/index.tsx
diff --git a/x-pack/plugins/streams_app/public/components/streams_table/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/streams_table/index.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/components/streams_table/index.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/components/streams_table/index.tsx
diff --git a/x-pack/plugins/streams_app/public/hooks/use_kibana.tsx b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_kibana.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/hooks/use_kibana.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/hooks/use_kibana.tsx
diff --git a/x-pack/plugins/streams_app/public/hooks/use_streams_app_breadcrumbs.ts b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_breadcrumbs.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/hooks/use_streams_app_breadcrumbs.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_breadcrumbs.ts
diff --git a/x-pack/plugins/streams_app/public/hooks/use_streams_app_fetch.ts b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_fetch.ts
similarity index 96%
rename from x-pack/plugins/streams_app/public/hooks/use_streams_app_fetch.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_fetch.ts
index 08b112d4f207a..45911cbda851a 100644
--- a/x-pack/plugins/streams_app/public/hooks/use_streams_app_fetch.ts
+++ b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_fetch.ts
@@ -66,7 +66,7 @@ export const useStreamsAppFetch: UseAbortableAsync<{}, { disableToastOnError?: b
     ({ signal }) => {
       return callback({ signal });
     },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+
     deps,
     optionsForHook
   );
diff --git a/x-pack/plugins/streams_app/public/hooks/use_streams_app_params.ts b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_params.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/hooks/use_streams_app_params.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_params.ts
diff --git a/x-pack/plugins/streams_app/public/hooks/use_streams_app_route_path.ts b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_route_path.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/hooks/use_streams_app_route_path.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_route_path.ts
diff --git a/x-pack/plugins/streams_app/public/hooks/use_streams_app_router.ts b/x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_router.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/hooks/use_streams_app_router.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/hooks/use_streams_app_router.ts
diff --git a/x-pack/plugins/streams_app/public/index.ts b/x-pack/solutions/observability/plugins/streams_app/public/index.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/index.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/index.ts
diff --git a/x-pack/plugins/streams_app/public/plugin.ts b/x-pack/solutions/observability/plugins/streams_app/public/plugin.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/plugin.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/plugin.ts
diff --git a/x-pack/plugins/streams_app/public/routes/config.tsx b/x-pack/solutions/observability/plugins/streams_app/public/routes/config.tsx
similarity index 100%
rename from x-pack/plugins/streams_app/public/routes/config.tsx
rename to x-pack/solutions/observability/plugins/streams_app/public/routes/config.tsx
diff --git a/x-pack/plugins/streams_app/public/services/types.ts b/x-pack/solutions/observability/plugins/streams_app/public/services/types.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/services/types.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/services/types.ts
diff --git a/x-pack/plugins/streams_app/public/types.ts b/x-pack/solutions/observability/plugins/streams_app/public/types.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/types.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/types.ts
diff --git a/x-pack/plugins/streams_app/public/util/esql_result_to_timeseries.ts b/x-pack/solutions/observability/plugins/streams_app/public/util/esql_result_to_timeseries.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/util/esql_result_to_timeseries.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/util/esql_result_to_timeseries.ts
diff --git a/x-pack/plugins/streams_app/public/util/use_debounce.ts b/x-pack/solutions/observability/plugins/streams_app/public/util/use_debounce.ts
similarity index 100%
rename from x-pack/plugins/streams_app/public/util/use_debounce.ts
rename to x-pack/solutions/observability/plugins/streams_app/public/util/use_debounce.ts
diff --git a/x-pack/plugins/streams_app/server/config.ts b/x-pack/solutions/observability/plugins/streams_app/server/config.ts
similarity index 100%
rename from x-pack/plugins/streams_app/server/config.ts
rename to x-pack/solutions/observability/plugins/streams_app/server/config.ts
diff --git a/x-pack/plugins/streams_app/server/index.ts b/x-pack/solutions/observability/plugins/streams_app/server/index.ts
similarity index 100%
rename from x-pack/plugins/streams_app/server/index.ts
rename to x-pack/solutions/observability/plugins/streams_app/server/index.ts
diff --git a/x-pack/plugins/streams_app/server/plugin.ts b/x-pack/solutions/observability/plugins/streams_app/server/plugin.ts
similarity index 100%
rename from x-pack/plugins/streams_app/server/plugin.ts
rename to x-pack/solutions/observability/plugins/streams_app/server/plugin.ts
diff --git a/x-pack/plugins/streams_app/server/types.ts b/x-pack/solutions/observability/plugins/streams_app/server/types.ts
similarity index 100%
rename from x-pack/plugins/streams_app/server/types.ts
rename to x-pack/solutions/observability/plugins/streams_app/server/types.ts
diff --git a/x-pack/plugins/streams_app/tsconfig.json b/x-pack/solutions/observability/plugins/streams_app/tsconfig.json
similarity index 91%
rename from x-pack/plugins/streams_app/tsconfig.json
rename to x-pack/solutions/observability/plugins/streams_app/tsconfig.json
index cba6a2d993bd4..b1184bebbe2bd 100644
--- a/x-pack/plugins/streams_app/tsconfig.json
+++ b/x-pack/solutions/observability/plugins/streams_app/tsconfig.json
@@ -1,10 +1,10 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types"
   },
   "include": [
-    "../../../typings/**/*",
+    "../../../../../typings/**/*",
     "common/**/*",
     "public/**/*",
     "typings/**/*",
diff --git a/yarn.lock b/yarn.lock
index 665a0b19223e7..47aad7866ae0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7548,11 +7548,11 @@
   version "0.0.0"
   uid ""
 
-"@kbn/streams-app-plugin@link:x-pack/plugins/streams_app":
+"@kbn/streams-app-plugin@link:x-pack/solutions/observability/plugins/streams_app":
   version "0.0.0"
   uid ""
 
-"@kbn/streams-plugin@link:x-pack/plugins/streams":
+"@kbn/streams-plugin@link:x-pack/solutions/observability/plugins/streams":
   version "0.0.0"
   uid ""