diff --git a/cmd/plugin-backend.go b/cmd/plugin-backend.go
index 71c38e024..9392d6934 100644
--- a/cmd/plugin-backend.go
+++ b/cmd/plugin-backend.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	server "github.com/openshift/monitoring-plugin/pkg"
+	server "github.com/openshift/monitoring-plugin/pkg/server"
 )
 
 var (
diff --git a/pkg/proxy/proxy.go b/pkg/monitoring/proxy.go
similarity index 99%
rename from pkg/proxy/proxy.go
rename to pkg/monitoring/proxy.go
index abdcfa0b3..4bc4aea96 100644
--- a/pkg/proxy/proxy.go
+++ b/pkg/monitoring/proxy.go
@@ -1,4 +1,4 @@
-package proxy
+package monitoring
 
 import (
 	"context"
diff --git a/pkg/proxy/sanitize.go b/pkg/monitoring/sanitize.go
similarity index 97%
rename from pkg/proxy/sanitize.go
rename to pkg/monitoring/sanitize.go
index d0262ceb0..e0e2f342a 100644
--- a/pkg/proxy/sanitize.go
+++ b/pkg/monitoring/sanitize.go
@@ -1,5 +1,5 @@
 // source: https://github.com/grafana/tempo-operator/blob/4ec7e8b4cb102f52de1e101174f4490b1505eaa1/internal/manifests/naming/sanitize.go
-package proxy
+package monitoring
 
 import (
 	"regexp"
diff --git a/pkg/plugin_handler.go b/pkg/server/plugin_handler.go
similarity index 100%
rename from pkg/plugin_handler.go
rename to pkg/server/plugin_handler.go
diff --git a/pkg/server.go b/pkg/server/server.go
similarity index 93%
rename from pkg/server.go
rename to pkg/server/server.go
index c3714b2c4..eb90ea1a0 100644
--- a/pkg/server.go
+++ b/pkg/server/server.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
 
-	"github.com/openshift/monitoring-plugin/pkg/proxy"
+	"github.com/openshift/monitoring-plugin/pkg/monitoring"
 )
 
 var log = logrus.WithField("module", "server")
@@ -114,7 +114,7 @@ func createHTTPServer(ctx context.Context, cfg *Config) (*http.Server, error) {
 		return nil, fmt.Errorf("alertmanager and thanos-querier must be set to use the 'acm-alerting' feature flag")
 	}
 
-	if cfg.Port == int(proxy.AlertmanagerPort) || cfg.Port == int(proxy.ThanosQuerierPort) {
+	if cfg.Port == int(monitoring.AlertmanagerPort) || cfg.Port == int(monitoring.ThanosQuerierPort) {
 		return nil, fmt.Errorf("cannot set default port to reserved port %d", cfg.Port)
 	}
 
@@ -223,8 +223,8 @@ func createHTTPServer(ctx context.Context, cfg *Config) (*http.Server, error) {
 
 	// Start proxy servers if in ACM mode
 	if tlsEnabled && acmMode {
-		startProxy(cfg, k8sclient, tlsConfig, timeout, proxy.AlertManagerKind, proxy.AlertmanagerPort)
-		startProxy(cfg, k8sclient, tlsConfig, timeout, proxy.ThanosQuerierKind, proxy.ThanosQuerierPort)
+		startProxy(cfg, k8sclient, tlsConfig, timeout, monitoring.AlertManagerKind, monitoring.AlertmanagerPort)
+		startProxy(cfg, k8sclient, tlsConfig, timeout, monitoring.ThanosQuerierKind, monitoring.ThanosQuerierPort)
 	}
 
 	return httpServer, nil
@@ -246,17 +246,17 @@ func setupRoutes(cfg *Config) (*mux.Router, *PluginConfig) {
 	return router, pluginConfig
 }
 
-func setupProxyRoutes(cfg *Config, k8sclient *dynamic.DynamicClient, kind proxy.KindType) *mux.Router {
+func setupProxyRoutes(cfg *Config, k8sclient *dynamic.DynamicClient, kind monitoring.KindType) *mux.Router {
 	router := mux.NewRouter()
 	var proxyUrl string
 	switch kind {
-	case proxy.AlertManagerKind:
+	case monitoring.AlertManagerKind:
 		proxyUrl = cfg.AlertmanagerUrl
-	case proxy.ThanosQuerierKind:
+	case monitoring.ThanosQuerierKind:
 		proxyUrl = cfg.ThanosQuerierUrl
 	}
 
-	router.PathPrefix("/").Handler(proxy.NewProxyHandler(
+	router.PathPrefix("/").Handler(monitoring.NewProxyHandler(
 		k8sclient,
 		cfg.CertFile,
 		kind,
@@ -364,7 +364,7 @@ func configHandler(cfg *Config) (http.HandlerFunc, *PluginConfig) {
 	}), &pluginConfig
 }
 
-func startProxy(cfg *Config, k8sclient *dynamic.DynamicClient, tlsConfig *tls.Config, timeout time.Duration, kind proxy.KindType, port proxy.ProxyPort) {
+func startProxy(cfg *Config, k8sclient *dynamic.DynamicClient, tlsConfig *tls.Config, timeout time.Duration, kind monitoring.KindType, port monitoring.ProxyPort) {
 	proxyRouter := setupProxyRoutes(cfg, k8sclient, kind)
 	proxyRouter.Use(corsHeaderMiddleware())
 	proxyServer := &http.Server{
diff --git a/pkg/server_test.go b/pkg/server/server_test.go
similarity index 100%
rename from pkg/server_test.go
rename to pkg/server/server_test.go
diff --git a/web/cypress/component/labels.cy.tsx b/web/cypress/component/labels.cy.tsx
index fbe7009c1..4cf898f46 100644
--- a/web/cypress/component/labels.cy.tsx
+++ b/web/cypress/component/labels.cy.tsx
@@ -1,4 +1,4 @@
-import { Labels } from '../../src/components/labels';
+import { Labels } from '../../src/shared/components/labels';
 
 describe('Labels', () => {
   it('renders "No labels" when labels is empty', () => {
diff --git a/web/cypress/component/mocks/AddToDashboardButton.tsx b/web/cypress/component/mocks/AddToDashboardButton.tsx
index 6076b1691..a482858dc 100644
--- a/web/cypress/component/mocks/AddToDashboardButton.tsx
+++ b/web/cypress/component/mocks/AddToDashboardButton.tsx
@@ -1,4 +1,4 @@
-import { AddToDashboardButtonProps } from '../../../src/components/ols-tool-ui/helpers/AddToDashboardButton';
+import { AddToDashboardButtonProps } from '../../../src/features/perses-dashboards/ols-tool-ui/helpers/AddToDashboardButton';
 
 export const AddToDashboardButton = ({ query, name, description }: AddToDashboardButtonProps) => (
   <button
diff --git a/web/cypress/component/mocks/OlsToolUIPersesWrapper.tsx b/web/cypress/component/mocks/OlsToolUIPersesWrapper.tsx
index 353bbf114..962e02c28 100644
--- a/web/cypress/component/mocks/OlsToolUIPersesWrapper.tsx
+++ b/web/cypress/component/mocks/OlsToolUIPersesWrapper.tsx
@@ -1,4 +1,4 @@
-import { OlsToolUIPersesWrapperProps } from '../../../src/components/ols-tool-ui/helpers/OlsToolUIPersesWrapper';
+import { OlsToolUIPersesWrapperProps } from '../../../src/features/perses-dashboards/ols-tool-ui/helpers/OlsToolUIPersesWrapper';
 
 export const OlsToolUIPersesWrapper = ({
   children,
diff --git a/web/cypress/component/ols-tool-ui/ShowTimeseries.cy.tsx b/web/cypress/component/ols-tool-ui/ShowTimeseries.cy.tsx
index ff18b62da..bad02ea40 100644
--- a/web/cypress/component/ols-tool-ui/ShowTimeseries.cy.tsx
+++ b/web/cypress/component/ols-tool-ui/ShowTimeseries.cy.tsx
@@ -1,4 +1,4 @@
-import { ShowTimeseries } from '../../../src/components/ols-tool-ui/ShowTimeseries';
+import { ShowTimeseries } from '../../../src/features/perses-dashboards/ols-tool-ui/ShowTimeseries';
 
 describe('ShowTimeseries', () => {
   const tool = {
diff --git a/web/cypress/e2e/coo/03.coo_lightspeed_show_timeseries.cy.ts b/web/cypress/e2e/coo/03.coo_lightspeed_show_timeseries.cy.ts
index 2d641886e..9d64ad7d5 100644
--- a/web/cypress/e2e/coo/03.coo_lightspeed_show_timeseries.cy.ts
+++ b/web/cypress/e2e/coo/03.coo_lightspeed_show_timeseries.cy.ts
@@ -4,7 +4,7 @@ import { commonPages } from '../../views/common';
 import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
 import { persesCreateDashboardsPage } from '../../views/perses-dashboards-create-dashboard';
 import { persesDashboardsPage } from '../../views/perses-dashboards';
-import { persesMUIDataTestIDs } from '../../../src/components/data-test';
+import { persesMUIDataTestIDs } from '../../../src/shared/constants/data-test';
 
 const PROMPT = 'visualize CPU consumption in the openshift-monitoring namespace in last 2 hours';
 
diff --git a/web/cypress/support/commands/dashboards-commands.ts b/web/cypress/support/commands/dashboards-commands.ts
index 7e978278d..eeb9a7a43 100644
--- a/web/cypress/support/commands/dashboards-commands.ts
+++ b/web/cypress/support/commands/dashboards-commands.ts
@@ -1,5 +1,5 @@
 import 'cypress-wait-until';
-import { DataTestIDs, LegacyTestIDs } from '../../../src/components/data-test';
+import { DataTestIDs, LegacyTestIDs } from '../../../src/shared/constants/data-test';
 import { waitForPodsReady, waitForResourceCondition } from './wait-utils';
 
 export {};
diff --git a/web/cypress/support/commands/perses-commands.ts b/web/cypress/support/commands/perses-commands.ts
index ecbafaa57..0e7245420 100644
--- a/web/cypress/support/commands/perses-commands.ts
+++ b/web/cypress/support/commands/perses-commands.ts
@@ -2,7 +2,7 @@ export {};
 
 import { nav } from '../../views/nav';
 import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
-import { listPersesDashboardsOUIAIDs } from '../../../src/components/data-test';
+import { listPersesDashboardsOUIAIDs } from '../../../src/shared/constants/data-test';
 
 // Display name prefixes/exact matches for test-created PersesDashboards to delete before
 // Perses tests.
diff --git a/web/cypress/support/commands/utility-commands.ts b/web/cypress/support/commands/utility-commands.ts
index 3fbef092f..eaa31b5ec 100644
--- a/web/cypress/support/commands/utility-commands.ts
+++ b/web/cypress/support/commands/utility-commands.ts
@@ -1,4 +1,4 @@
-import { Classes, DataTestIDs, LegacyTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs, LegacyTestIDs } from '../../../src/shared/constants/data-test';
 export {};
 
 declare global {
diff --git a/web/cypress/support/monitoring/01.reg_alerts.cy.ts b/web/cypress/support/monitoring/01.reg_alerts.cy.ts
index dbf2a860c..9f4b17333 100644
--- a/web/cypress/support/monitoring/01.reg_alerts.cy.ts
+++ b/web/cypress/support/monitoring/01.reg_alerts.cy.ts
@@ -16,7 +16,7 @@ import {
   SilenceComment,
   WatchdogAlert,
 } from '../../fixtures/monitoring/constants';
-import { FilterOUIAIDs } from '../../../src/components/data-test';
+import { FilterOUIAIDs } from '../../../src/shared/constants/data-test';
 
 export interface PerspectiveConfig {
   name: string;
diff --git a/web/cypress/support/monitoring/02.reg_metrics_1.cy.ts b/web/cypress/support/monitoring/02.reg_metrics_1.cy.ts
index 105335378..3cf13d3d2 100644
--- a/web/cypress/support/monitoring/02.reg_metrics_1.cy.ts
+++ b/web/cypress/support/monitoring/02.reg_metrics_1.cy.ts
@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   GraphTimespan,
   MetricsPagePredefinedQueries,
diff --git a/web/cypress/support/monitoring/02.reg_metrics_2.cy.ts b/web/cypress/support/monitoring/02.reg_metrics_2.cy.ts
index 9792638b0..522c115a1 100644
--- a/web/cypress/support/monitoring/02.reg_metrics_2.cy.ts
+++ b/web/cypress/support/monitoring/02.reg_metrics_2.cy.ts
@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   MetricGraphEmptyState,
   MetricsPagePredefinedQueries,
diff --git a/web/cypress/support/monitoring/03.reg_legacy_dashboards.cy.ts b/web/cypress/support/monitoring/03.reg_legacy_dashboards.cy.ts
index f25f9a6db..df8bc6476 100644
--- a/web/cypress/support/monitoring/03.reg_legacy_dashboards.cy.ts
+++ b/web/cypress/support/monitoring/03.reg_legacy_dashboards.cy.ts
@@ -9,7 +9,7 @@ import {
   Classes,
   LegacyDashboardPageTestIDs,
   DataTestIDs,
-} from '../../../src/components/data-test';
+} from '../../../src/shared/constants/data-test';
 import { metricsPage } from '../../views/metrics';
 import { alertingRuleDetailsPage } from '../../views/alerting-rule-details-page';
 import { alerts } from '../../fixtures/monitoring/alert';
diff --git a/web/cypress/support/monitoring/04.reg_alerts_namespace.cy.ts b/web/cypress/support/monitoring/04.reg_alerts_namespace.cy.ts
index 06a387ad7..1c6253fd1 100644
--- a/web/cypress/support/monitoring/04.reg_alerts_namespace.cy.ts
+++ b/web/cypress/support/monitoring/04.reg_alerts_namespace.cy.ts
@@ -16,7 +16,7 @@ import {
   SilenceComment,
   WatchdogAlert,
 } from '../../fixtures/monitoring/constants';
-import { FilterOUIAIDs } from '../../../src/components/data-test';
+import { FilterOUIAIDs } from '../../../src/shared/constants/data-test';
 
 export interface PerspectiveConfig {
   name: string;
diff --git a/web/cypress/support/monitoring/05.reg_metrics_namespace_1.cy.ts b/web/cypress/support/monitoring/05.reg_metrics_namespace_1.cy.ts
index 949ec029b..dc12b31bc 100644
--- a/web/cypress/support/monitoring/05.reg_metrics_namespace_1.cy.ts
+++ b/web/cypress/support/monitoring/05.reg_metrics_namespace_1.cy.ts
@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   MetricsPageUnits,
   GraphTimespan,
diff --git a/web/cypress/support/monitoring/05.reg_metrics_namespace_2.cy.ts b/web/cypress/support/monitoring/05.reg_metrics_namespace_2.cy.ts
index d9e74dcde..47b01a0d0 100644
--- a/web/cypress/support/monitoring/05.reg_metrics_namespace_2.cy.ts
+++ b/web/cypress/support/monitoring/05.reg_metrics_namespace_2.cy.ts
@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   MetricsPagePredefinedQueries,
   MetricsPageQueryInput,
diff --git a/web/cypress/support/monitoring/06.reg_legacy_dashboards_namespace.cy.ts b/web/cypress/support/monitoring/06.reg_legacy_dashboards_namespace.cy.ts
index 4f576ba49..9b9350664 100644
--- a/web/cypress/support/monitoring/06.reg_legacy_dashboards_namespace.cy.ts
+++ b/web/cypress/support/monitoring/06.reg_legacy_dashboards_namespace.cy.ts
@@ -9,7 +9,7 @@ import {
   Classes,
   LegacyDashboardPageTestIDs,
   DataTestIDs,
-} from '../../../src/components/data-test';
+} from '../../../src/shared/constants/data-test';
 import { metricsPage } from '../../views/metrics';
 import { alertingRuleDetailsPage } from '../../views/alerting-rule-details-page';
 import { alerts } from '../../fixtures/monitoring/alert';
diff --git a/web/cypress/support/perses/00.coo_bvt_perses_admin.cy.ts b/web/cypress/support/perses/00.coo_bvt_perses_admin.cy.ts
index 2675e3cc5..cdcf7c8ca 100644
--- a/web/cypress/support/perses/00.coo_bvt_perses_admin.cy.ts
+++ b/web/cypress/support/perses/00.coo_bvt_perses_admin.cy.ts
@@ -5,7 +5,7 @@ import {
   persesDashboardsEmptyDashboard,
 } from '../../fixtures/perses/constants';
 import { persesDashboardsPage } from '../../views/perses-dashboards';
-import { persesMUIDataTestIDs } from '../../../src/components/data-test';
+import { persesMUIDataTestIDs } from '../../../src/shared/constants/data-test';
 import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
 import { persesDashboardsPanelGroup } from '../../views/perses-dashboards-panelgroup';
 import { persesDashboardsPanel } from '../../views/perses-dashboards-panel';
diff --git a/web/cypress/support/perses/02.coo_edit_perses_admin.cy.ts b/web/cypress/support/perses/02.coo_edit_perses_admin.cy.ts
index 6b8343336..fb63a7bcd 100644
--- a/web/cypress/support/perses/02.coo_edit_perses_admin.cy.ts
+++ b/web/cypress/support/perses/02.coo_edit_perses_admin.cy.ts
@@ -2,7 +2,7 @@ import {
   editPersesDashboardsAddVariable,
   persesMUIDataTestIDs,
   IDs,
-} from '../../../src/components/data-test';
+} from '../../../src/shared/constants/data-test';
 import {
   persesDashboardsDashboardDropdownCOO,
   persesDashboardsDashboardDropdownPersesDev,
@@ -319,7 +319,7 @@ export function testCOOEditPerses(perspective: PerspectiveConfig) {
     },
   );
 
-  /**TODO: https://issues.redhat.com/browse/OU-1054 is targeted for COO1.5.0, 
+  /**TODO: https://issues.redhat.com/browse/OU-1054 is targeted for COO1.5.0,
    * so, commenting all Datasources related scenarios
   it(`6.${perspective.name} perspective - Edit Toolbar - Edit Datasources
    - Add and Delete Prometheus Datasource`, () => {
@@ -372,7 +372,7 @@ export function testCOOEditPerses(perspective: PerspectiveConfig) {
     // persesDashboardsPage.clickEditActionButton('Save');
   });
 
-  it(`7.${perspective.name} perspective - Edit Toolbar - Edit Datasources - 
+  it(`7.${perspective.name} perspective - Edit Toolbar - Edit Datasources -
   - Edit Prometheus Datasource`, () => {
     cy.log(`7.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
     commonPages.titleShouldHaveText('Dashboards');
@@ -410,11 +410,11 @@ export function testCOOEditPerses(perspective: PerspectiveConfig) {
 
   });
 
-  // it(`8.${perspective.name} perspective - Edit Toolbar - 
+  // it(`8.${perspective.name} perspective - Edit Toolbar -
   // Edit Datasources - Add Tempo Datasource`, () => {
   // });
 
-  it(`8.${perspective.name} perspective - Edit Toolbar - 
+  it(`8.${perspective.name} perspective - Edit Toolbar -
   - Edit Datasources - Required field validation`, () => {
     cy.log(`8.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
     commonPages.titleShouldHaveText('Dashboards');
diff --git a/web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts b/web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts
index 5da2d79bd..1f10daca1 100644
--- a/web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts
+++ b/web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts
@@ -10,7 +10,7 @@ import {
 } from '../../fixtures/perses/constants';
 import { persesDashboardsEditVariables } from '../../views/perses-dashboards-edit-variables';
 import { persesDashboardsPanelGroup } from '../../views/perses-dashboards-panelgroup';
-import { persesAriaLabels } from '../../../src/components/data-test';
+import { persesAriaLabels } from '../../../src/shared/constants/data-test';
 import { persesDashboardsPanel } from '../../views/perses-dashboards-panel';
 import { persesDashboardsAddListPanelType } from '../../fixtures/perses/constants';
 import { persesImportDashboardsPage } from '../../views/perses-dashboards-import-dashboard';
diff --git a/web/cypress/support/perses/99.coo_rbac_perses_user3.cy.ts b/web/cypress/support/perses/99.coo_rbac_perses_user3.cy.ts
index 1b80978c5..debc3334d 100644
--- a/web/cypress/support/perses/99.coo_rbac_perses_user3.cy.ts
+++ b/web/cypress/support/perses/99.coo_rbac_perses_user3.cy.ts
@@ -13,7 +13,7 @@ import { persesDashboardsPanel } from '../../views/perses-dashboards-panel';
 import { persesDashboardsAddListPanelType } from '../../fixtures/perses/constants';
 import { persesImportDashboardsPage } from '../../views/perses-dashboards-import-dashboard';
 import { nav } from '../../views/nav';
-import { persesAriaLabels } from '../../../src/components/data-test';
+import { persesAriaLabels } from '../../../src/shared/constants/data-test';
 
 export interface PerspectiveConfig {
   name: string;
diff --git a/web/cypress/views/alerting-rule-details-page.ts b/web/cypress/views/alerting-rule-details-page.ts
index 85aa2ee46..3902b4677 100644
--- a/web/cypress/views/alerting-rule-details-page.ts
+++ b/web/cypress/views/alerting-rule-details-page.ts
@@ -1,6 +1,6 @@
 import { commonPages } from './common';
 import { detailsPage } from './details-page';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 export const alertingRuleDetailsPage = {
   assertAlertingRuleDetailsPage: (title: string) => {
diff --git a/web/cypress/views/alerting-rule-list-page.ts b/web/cypress/views/alerting-rule-list-page.ts
index 1f640e65a..f7bc59565 100644
--- a/web/cypress/views/alerting-rule-list-page.ts
+++ b/web/cypress/views/alerting-rule-list-page.ts
@@ -1,4 +1,4 @@
-import { DataTestIDs, Classes, FilterOUIAIDs } from '../../src/components/data-test';
+import { DataTestIDs, Classes, FilterOUIAIDs } from '../../src/shared/constants/data-test';
 import { Source } from '../fixtures/monitoring/constants';
 import { listPage } from './list-page';
 
diff --git a/web/cypress/views/common.ts b/web/cypress/views/common.ts
index 0472673bb..045f5ec52 100644
--- a/web/cypress/views/common.ts
+++ b/web/cypress/views/common.ts
@@ -1,5 +1,5 @@
 import { detailsPage } from './details-page';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 export const commonPages = {
   projectDropdownShouldNotExist: () =>
diff --git a/web/cypress/views/details-page.ts b/web/cypress/views/details-page.ts
index 1667a980c..1bb8a48e5 100644
--- a/web/cypress/views/details-page.ts
+++ b/web/cypress/views/details-page.ts
@@ -1,5 +1,5 @@
 import { commonPages } from './common';
-import { DataTestIDs, Classes } from '../../src/components/data-test';
+import { DataTestIDs, Classes } from '../../src/shared/constants/data-test';
 
 export const detailsPage = {
   sectionHeaderShouldExist: (sectionHeading: string) => {
diff --git a/web/cypress/views/incidents-page.ts b/web/cypress/views/incidents-page.ts
index 1044de5cb..10ef9cec3 100644
--- a/web/cypress/views/incidents-page.ts
+++ b/web/cypress/views/incidents-page.ts
@@ -1,5 +1,5 @@
 import { nav } from './nav';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 // Hard timeout safety net for findIncidentWithAlert retry loops.
 // Prevents infinite loops if cy.waitUntil's timeout mechanism fails.
diff --git a/web/cypress/views/legacy-dashboards.ts b/web/cypress/views/legacy-dashboards.ts
index bc55c8839..17c1f584d 100644
--- a/web/cypress/views/legacy-dashboards.ts
+++ b/web/cypress/views/legacy-dashboards.ts
@@ -1,5 +1,9 @@
 import { commonPages } from './common';
-import { LegacyDashboardPageTestIDs, DataTestIDs, Classes } from '../../src/components/data-test';
+import {
+  LegacyDashboardPageTestIDs,
+  DataTestIDs,
+  Classes,
+} from '../../src/shared/constants/data-test';
 import {
   MonitoringPageTitles,
   LegacyDashboardsTimeRange,
diff --git a/web/cypress/views/list-page.ts b/web/cypress/views/list-page.ts
index 328d1ce90..4668b5896 100644
--- a/web/cypress/views/list-page.ts
+++ b/web/cypress/views/list-page.ts
@@ -1,4 +1,9 @@
-import { DataTestIDs, Classes, LegacyTestIDs, FilterOUIAIDs } from '../../src/components/data-test';
+import {
+  DataTestIDs,
+  Classes,
+  LegacyTestIDs,
+  FilterOUIAIDs,
+} from '../../src/shared/constants/data-test';
 
 const escapeRegExp = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
diff --git a/web/cypress/views/metrics.ts b/web/cypress/views/metrics.ts
index d21bb1d55..4253664bb 100644
--- a/web/cypress/views/metrics.ts
+++ b/web/cypress/views/metrics.ts
@@ -1,5 +1,5 @@
 import { commonPages } from './common';
-import { DataTestIDs, Classes, IDs } from '../../src/components/data-test';
+import { DataTestIDs, Classes, IDs } from '../../src/shared/constants/data-test';
 import {
   MetricsPageUnits,
   MonitoringRefreshInterval,
diff --git a/web/cypress/views/nav.ts b/web/cypress/views/nav.ts
index 096d99109..128c16c86 100644
--- a/web/cypress/views/nav.ts
+++ b/web/cypress/views/nav.ts
@@ -1,4 +1,4 @@
-import { Classes } from '../../src/components/data-test';
+import { Classes } from '../../src/shared/constants/data-test';
 export const nav = {
   sidenav: {
     clickNavLink: (path: string[]) => {
diff --git a/web/cypress/views/perses-dashboards-create-dashboard.ts b/web/cypress/views/perses-dashboards-create-dashboard.ts
index 66ffb2499..f50428b23 100644
--- a/web/cypress/views/perses-dashboards-create-dashboard.ts
+++ b/web/cypress/views/perses-dashboards-create-dashboard.ts
@@ -1,4 +1,4 @@
-import { Classes, IDs, persesAriaLabels } from '../../src/components/data-test';
+import { Classes, IDs, persesAriaLabels } from '../../src/shared/constants/data-test';
 import { persesCreateDashboard, persesDashboardsModalTitles } from '../fixtures/perses/constants';
 
 export const persesCreateDashboardsPage = {
diff --git a/web/cypress/views/perses-dashboards-edit-datasources.ts b/web/cypress/views/perses-dashboards-edit-datasources.ts
index 6adfece39..4064d6944 100644
--- a/web/cypress/views/perses-dashboards-edit-datasources.ts
+++ b/web/cypress/views/perses-dashboards-edit-datasources.ts
@@ -4,7 +4,7 @@ import {
   persesMUIDataTestIDs,
   editPersesDashboardsAddDatasource,
   IDs,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsRequiredFields,
diff --git a/web/cypress/views/perses-dashboards-edit-variables.ts b/web/cypress/views/perses-dashboards-edit-variables.ts
index 4cb7d3c4e..71a2f0162 100644
--- a/web/cypress/views/perses-dashboards-edit-variables.ts
+++ b/web/cypress/views/perses-dashboards-edit-variables.ts
@@ -4,7 +4,7 @@ import {
   persesMUIDataTestIDs,
   IDs,
   editPersesDashboardsAddVariable,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsAddListVariableSource,
diff --git a/web/cypress/views/perses-dashboards-import-dashboard.ts b/web/cypress/views/perses-dashboards-import-dashboard.ts
index 6f3929898..d2873fa65 100644
--- a/web/cypress/views/perses-dashboards-import-dashboard.ts
+++ b/web/cypress/views/perses-dashboards-import-dashboard.ts
@@ -1,4 +1,4 @@
-import { Classes, IDs, persesAriaLabels } from '../../src/components/data-test';
+import { Classes, IDs, persesAriaLabels } from '../../src/shared/constants/data-test';
 import {
   persesDashboardsImportDashboard,
   persesDashboardsModalTitles,
diff --git a/web/cypress/views/perses-dashboards-list-dashboards.ts b/web/cypress/views/perses-dashboards-list-dashboards.ts
index 58d6934ec..340068217 100644
--- a/web/cypress/views/perses-dashboards-list-dashboards.ts
+++ b/web/cypress/views/perses-dashboards-list-dashboards.ts
@@ -7,7 +7,7 @@ import {
   IDs,
   persesAriaLabels,
   LegacyTestIDs,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   listPersesDashboardsEmptyState,
   listPersesDashboardsNoDashboardsFoundState,
diff --git a/web/cypress/views/perses-dashboards-panel.ts b/web/cypress/views/perses-dashboards-panel.ts
index 298f08adf..10e1181f8 100644
--- a/web/cypress/views/perses-dashboards-panel.ts
+++ b/web/cypress/views/perses-dashboards-panel.ts
@@ -3,7 +3,7 @@ import {
   persesAriaLabels,
   IDs,
   editPersesDashboardsAddPanel,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsAddPanelAddQueryType,
diff --git a/web/cypress/views/perses-dashboards-panelgroup.ts b/web/cypress/views/perses-dashboards-panelgroup.ts
index 4705897b4..a47ca8742 100644
--- a/web/cypress/views/perses-dashboards-panelgroup.ts
+++ b/web/cypress/views/perses-dashboards-panelgroup.ts
@@ -1,5 +1,5 @@
 import { commonPages } from './common';
-import { persesAriaLabels, persesMUIDataTestIDs, IDs } from '../../src/components/data-test';
+import { persesAriaLabels, persesMUIDataTestIDs, IDs } from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsRequiredFields,
diff --git a/web/cypress/views/perses-dashboards.ts b/web/cypress/views/perses-dashboards.ts
index d7be359f0..3709fc0f8 100644
--- a/web/cypress/views/perses-dashboards.ts
+++ b/web/cypress/views/perses-dashboards.ts
@@ -9,7 +9,7 @@ import {
   IDs,
   persesDashboardDataTestIDs,
   listPersesDashboardsDataTestIDs,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import { MonitoringPageTitles } from '../fixtures/monitoring/constants';
 import {
   listPersesDashboardsPageSubtitle,
diff --git a/web/cypress/views/silence-alert-page.ts b/web/cypress/views/silence-alert-page.ts
index ab0a61c62..bdc0a9a49 100644
--- a/web/cypress/views/silence-alert-page.ts
+++ b/web/cypress/views/silence-alert-page.ts
@@ -1,4 +1,4 @@
-import { DataTestIDs, Classes } from '../../src/components/data-test';
+import { DataTestIDs, Classes } from '../../src/shared/constants/data-test';
 const silenceText =
   'Silences temporarily mute alerts based on a set of label selectors that you define. Notifications will not be sent for alerts that match all the listed values or regular expressions.';
 const alertText =
diff --git a/web/cypress/views/silence-details-page.ts b/web/cypress/views/silence-details-page.ts
index b3e1a2997..00bfd02d5 100644
--- a/web/cypress/views/silence-details-page.ts
+++ b/web/cypress/views/silence-details-page.ts
@@ -1,6 +1,6 @@
 import { commonPages } from './common';
 import { detailsPage } from './details-page';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 export const silenceDetailsPage = {
   assertSilenceDetailsPage: (title: string, section: string, labelname: string) => {
diff --git a/web/cypress/views/silences-list-page.ts b/web/cypress/views/silences-list-page.ts
index e79a37dbd..e3fe4e57b 100644
--- a/web/cypress/views/silences-list-page.ts
+++ b/web/cypress/views/silences-list-page.ts
@@ -1,5 +1,5 @@
 import { commonPages } from './common';
-import { DataTestIDs, Classes, FilterOUIAIDs } from '../../src/components/data-test';
+import { DataTestIDs, Classes, FilterOUIAIDs } from '../../src/shared/constants/data-test';
 
 export const silencesListPage = {
   shouldBeLoaded: () => {
diff --git a/web/cypress/views/troubleshooting-panel.ts b/web/cypress/views/troubleshooting-panel.ts
index b933e5d63..66f8386ae 100644
--- a/web/cypress/views/troubleshooting-panel.ts
+++ b/web/cypress/views/troubleshooting-panel.ts
@@ -1,4 +1,4 @@
-import { DataTestIDs, LegacyTestIDs } from '../../src/components/data-test';
+import { DataTestIDs, LegacyTestIDs } from '../../src/shared/constants/data-test';
 
 export const troubleshootingPanelPage = {
   openSignalCorrelation: () => {
diff --git a/web/package.json b/web/package.json
index 9a0aa4981..d0022a631 100644
--- a/web/package.json
+++ b/web/package.json
@@ -6,7 +6,6 @@
   "scripts": {
     "build": "npm run clean && NODE_ENV=production npm run ts-node node_modules/.bin/webpack",
     "build:dev": "npm run clean && npm run ts-node node_modules/.bin/webpack",
-    "build:standalone": "npm run clean && npm run ts-node node_modules/.bin/webpack --config webpack.standalone.config.ts",
     "clean": "rm -rf dist",
     "cypress:open": "cypress open",
     "cypress:open:component": "cypress open --component",
@@ -25,7 +24,6 @@
     "prepare": "cd .. && husky install web/.husky",
     "start": "npm run ts-node node_modules/.bin/webpack serve",
     "dev": "npm run ts-node node_modules/.bin/webpack serve",
-    "start:standalone": "npm run ts-node node_modules/.bin/webpack serve --config webpack.standalone.config.ts",
     "start-console": "../scripts/start-console.sh",
     "test:unit": "TZ=UTC jest --config jest.config.js --passWithNoTests",
     "test": "npm run cypress:run:ci",
@@ -174,25 +172,25 @@
     "displayName": "OpenShift console monitoring plugin",
     "description": "This plugin adds the monitoring UI to the OpenShift web console",
     "exposedModules": {
-      "DashboardListPage": "./components/dashboards/perses/dashboard-list-page",
-      "DashboardPage": "./components/dashboards/perses/dashboard-page",
-      "LegacyDashboardsPage": "./components/dashboards/legacy/legacy-dashboard-page",
-      "SilencesPage": "./components/alerting/SilencesPage",
-      "SilencesDetailsPage": "./components/alerting/SilencesDetailsPage",
-      "SilenceCreatePage": "./components/alerting/SilenceCreatePage",
-      "SilenceEditPage": "./components/alerting/SilenceEditPage",
-      "MetricsPage": "./components/MetricsPage",
-      "AlertsPage": "./components/alerting/AlertsPage",
-      "AlertingPage": "./components/alerting/AlertingPage",
-      "AlertsDetailsPage": "./components/alerting/AlertsDetailsPage",
-      "AlertRulesPage": "./components/alerting/AlertRulesPage",
-      "AlertRulesDetailsPage": "./components/alerting/AlertRulesDetailsPage",
-      "MonitoringReducer": "./store/reducers",
-      "IncidentsPage": "./components/Incidents/IncidentsPage",
-      "TargetsPage": "./components/targets-page",
-      "PrometheusRedirectPage": "./components/redirects/prometheus-redirect-page",
-      "MonitoringContext": "./contexts/MonitoringContext",
-      "ols-tool-ui": "./components/ols-tool-ui"
+      "DashboardListPage": "./features/perses-dashboards/pages/dashboard-list-page/DashboardListPage",
+      "DashboardPage": "./features/perses-dashboards/pages/dashboard-page/DashboardPage",
+      "LegacyDashboardsPage": "./features/legacy-dashboards/pages/legacy-dashboard-page",
+      "SilencesPage": "./features/alerts/pages/silences-page/SilencesPage",
+      "SilencesDetailsPage": "./features/alerts/pages/SilencesDetailsPage",
+      "SilenceCreatePage": "./features/alerts/pages/SilenceCreatePage",
+      "SilenceEditPage": "./features/alerts/pages/SilenceEditPage",
+      "MetricsPage": "./features/metrics/pages/MetricsPage",
+      "AlertsPage": "./features/alerts/pages/alerts-page/AlertsPage",
+      "AlertingPage": "./features/alerts/pages/AlertingPage",
+      "AlertsDetailsPage": "./features/alerts/pages/AlertsDetailsPage",
+      "AlertRulesPage": "./features/alerts/pages/alert-rules-page/AlertRulesPage",
+      "AlertRulesDetailsPage": "./features/alerts/pages/AlertRulesDetailsPage",
+      "MonitoringReducer": "./shared/store/reducers",
+      "IncidentsPage": "./features/incidents/pages/IncidentsPage",
+      "TargetsPage": "./features/targets/pages/targets-page",
+      "PrometheusRedirectPage": "./features/metrics/pages/PrometheusRedirectPage",
+      "MonitoringContext": "./shared/contexts/MonitoringContext",
+      "ols-tool-ui": "./features/perses-dashboards/ols-tool-ui/ShowTimeseries"
     },
     "dependencies": {
       "@console/pluginAPI": "*"
diff --git a/web/src/components/ols-tool-ui/index.ts b/web/src/components/ols-tool-ui/index.ts
deleted file mode 100644
index 27dc949d5..000000000
--- a/web/src/components/ols-tool-ui/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ShowTimeseries } from './ShowTimeseries';
diff --git a/web/src/e2e-tests-app.tsx b/web/src/e2e-tests-app.tsx
deleted file mode 100644
index 4da5e04ab..000000000
--- a/web/src/e2e-tests-app.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import '@patternfly/patternfly/patternfly.css';
-import { createRoot } from 'react-dom/client';
-import { Provider } from 'react-redux';
-import { BrowserRouter, Link, Route, Routes } from 'react-router';
-import { combineReducers, createStore } from 'redux';
-import { MpCmoAlertingPage } from './components/alerting/AlertingPage';
-import { MpCmoAlertRulesDetailsPage } from './components/alerting/AlertRulesDetailsPage';
-import { MpCmoAlertRulesPage } from './components/alerting/AlertRulesPage';
-import { MpCmoAlertsDetailsPage } from './components/alerting/AlertsDetailsPage';
-import { MpCmoAlertsPage } from './components/alerting/AlertsPage';
-import { MpCmoCreateSilencePage } from './components/alerting/SilenceCreatePage';
-import { MpCmoSilenceEditPage } from './components/alerting/SilenceEditPage';
-import { MpCmoSilencesDetailsPage } from './components/alerting/SilencesDetailsPage';
-import { MpCmoSilencesPage } from './components/alerting/SilencesPage';
-import { MpCmoLegacyDashboardsPage } from './components/dashboards/legacy/legacy-dashboard-page';
-import { MpCmoMetricsPage } from './components/MetricsPage';
-import PrometheusRedirectPage from './components/redirects/prometheus-redirect-page';
-import { MpCmoTargetsPage } from './components/targets-page';
-import i18n from './i18n';
-import ObserveReducers from './store/reducers';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type RootState = { observe: any };
-
-const baseReducers = Object.freeze({ observe: ObserveReducers });
-
-const store = createStore(combineReducers<RootState>(baseReducers), {});
-
-const App = () => (
-  <Provider store={store}>
-    <BrowserRouter>
-      <div id="page-sidebar">
-        Observe
-        <Link to="/monitoring/alerts">Alerting</Link>
-        <Link to="/monitoring/query-browser">Metrics</Link>
-        <Link to="/monitoring/dashboards">Dashboards</Link>
-        <Link to="/monitoring/targets">Targets</Link>
-      </div>
-      <Routes>
-        <Route path="silences/~new" element={<MpCmoCreateSilencePage />} />
-
-        <Route path="dashboards" element={<MpCmoLegacyDashboardsPage />} />
-        <Route path="dashboards/:dashboardName" element={<MpCmoLegacyDashboardsPage />} />
-
-        <Route path="graph" element={<PrometheusRedirectPage />} />
-        <Route path="query-browser" element={<MpCmoMetricsPage />} />
-
-        <Route path="targets" element={<MpCmoTargetsPage />} />
-        <Route path="targets/:scrapeUrl" element={<MpCmoTargetsPage />} />
-
-        <Route path="alertrules/:id" element={<MpCmoAlertRulesDetailsPage />} />
-        <Route path="alerts/:ruleID" element={<MpCmoAlertsDetailsPage />} />
-        <Route path="silences/:id" element={<MpCmoSilencesDetailsPage />} />
-        <Route path="silences/:id/edit" element={<MpCmoSilenceEditPage />} />
-
-        <Route element={<MpCmoAlertingPage />}>
-          <Route path="alerts" element={<MpCmoAlertsPage />} />
-          <Route path="alertrules" element={<MpCmoAlertRulesPage />} />
-          <Route path="silences" element={<MpCmoSilencesPage />} />
-        </Route>
-      </Routes>
-    </BrowserRouter>
-  </Provider>
-);
-
-i18n.on('initialized', () => {
-  const container = document.getElementById('app');
-  const root = createRoot(container);
-  root.render(<App />);
-});
diff --git a/web/src/e2e-tests-index.html b/web/src/e2e-tests-index.html
deleted file mode 100644
index f763ac340..000000000
--- a/web/src/e2e-tests-index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
-    <title>Monitoring Plugin</title>
-  </head>
-
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <script>
-      window.SERVER_FLAGS = {
-        alertManagerBaseURL: '/api/alertmanager',
-        basePath: '/',
-        prometheusBaseURL: '/api/prometheus',
-      };
-    </script>
-    <div id="app"></div>
-    <div></div>
-  </body>
-</html>
diff --git a/web/src/components/alerting/AlertUtils.tsx b/web/src/features/alerts/components/AlertUtils.tsx
similarity index 97%
rename from web/src/components/alerting/AlertUtils.tsx
rename to web/src/features/alerts/components/AlertUtils.tsx
index 9edf088ad..8b2176751 100644
--- a/web/src/components/alerting/AlertUtils.tsx
+++ b/web/src/features/alerts/components/AlertUtils.tsx
@@ -49,11 +49,14 @@ import type { FC, ReactNode } from 'react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router';
-import { NamespaceModel } from '../console/models';
-import { getQueryBrowserUrl, usePerspective } from '../hooks/usePerspective';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import { FormatSeriesTitle, QueryBrowser } from '../query-browser';
-import { AlertSource } from '../types';
+import { NamespaceModel } from '../../../shared/console/models';
+import { getQueryBrowserUrl, usePerspective } from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import {
+  FormatSeriesTitle,
+  QueryBrowser,
+} from '../../../shared/components/query-browser/query-browser';
+import { AlertSource } from '../../../shared/types/types';
 
 export const getAdditionalSources = <T extends Alert | Rule>(
   data: Array<T>,
diff --git a/web/src/components/alerting/SilenceForm.tsx b/web/src/features/alerts/components/SilenceForm.tsx
similarity index 96%
rename from web/src/components/alerting/SilenceForm.tsx
rename to web/src/features/alerts/components/SilenceForm.tsx
index 82c9a3849..261d8f1fe 100644
--- a/web/src/components/alerting/SilenceForm.tsx
+++ b/web/src/features/alerts/components/SilenceForm.tsx
@@ -37,19 +37,19 @@ import { useState, useEffect, useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import { useNavigate } from 'react-router';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
 import {
   formatPrometheusDuration,
   parsePrometheusDuration,
-} from '../console/console-shared/src/datetime/prometheus';
-import { ExternalLink } from '../console/utils/link';
-import { useBoolean } from '../hooks/useBoolean';
-import { getSilenceAlertUrl, usePerspective } from '../hooks/usePerspective';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import { DataTestIDs } from '../data-test';
-import { ALL_NAMESPACES_KEY, getAlertmanagerSilencesUrl } from '../utils';
-import { useAlerts } from '../../hooks/useAlerts';
-import { useMonitoring } from '../../hooks/useMonitoring';
+} from '../../../shared/console/console-shared/src/datetime/prometheus';
+import { ExternalLink } from '../../../shared/console/utils/link';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { getSilenceAlertUrl, usePerspective } from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import { DataTestIDs } from '../../../shared/constants/data-test';
+import { ALL_NAMESPACES_KEY, getAlertmanagerSilencesUrl } from '../../../shared/utils/utils';
+import { useAlerts } from '../../../shared/hooks/useAlerts';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 
 const durationOff = '-';
 
diff --git a/web/src/components/alerting/AlertDetail/SilencedByTable.tsx b/web/src/features/alerts/components/SilencedByTable.tsx
similarity index 92%
rename from web/src/components/alerting/AlertDetail/SilencedByTable.tsx
rename to web/src/features/alerts/components/SilencedByTable.tsx
index b40aac0ae..5c3ec728c 100644
--- a/web/src/components/alerting/AlertDetail/SilencedByTable.tsx
+++ b/web/src/features/alerts/components/SilencedByTable.tsx
@@ -7,8 +7,8 @@ import {
   getEditSilenceAlertUrl,
   getSilenceAlertUrl,
   usePerspective,
-} from '../../hooks/usePerspective';
-import { useMonitoringNamespace } from '../../hooks/useMonitoringNamespace';
+} from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
 import {
   DataViewTable,
   DataViewTr,
@@ -16,10 +16,10 @@ import {
 } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
 import { Flex, FlexItem, Stack, StackItem } from '@patternfly/react-core';
 import { ActionsColumn, IAction } from '@patternfly/react-table';
-import { ExpireSilenceModal, SilenceMatchersList, SilenceState } from '../SilencesUtils';
-import { useBoolean } from '../../hooks/useBoolean';
-import { SilenceResource } from '../../utils';
-import { SeverityCounts, StateTimestamp } from '../AlertUtils';
+import { ExpireSilenceModal, SilenceMatchersList, SilenceState } from '../components/SilencesUtils';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { SilenceResource } from '../../../shared/utils/utils';
+import { SeverityCounts, StateTimestamp } from '../components/AlertUtils';
 import { t_global_spacer_xs } from '@patternfly/react-tokens';
 
 export const SilencedByList: FC<{ silences: Silence[] }> = ({ silences }) => {
diff --git a/web/src/components/alerting/SilencesUtils.tsx b/web/src/features/alerts/components/SilencesUtils.tsx
similarity index 94%
rename from web/src/components/alerting/SilencesUtils.tsx
rename to web/src/features/alerts/components/SilencesUtils.tsx
index f9d3030fe..c99d5f537 100644
--- a/web/src/components/alerting/SilencesUtils.tsx
+++ b/web/src/features/alerts/components/SilencesUtils.tsx
@@ -34,15 +34,15 @@ import type { FC, Ref } from 'react';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router';
-import { useBoolean } from '../hooks/useBoolean';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
 import {
   getEditSilenceAlertUrl,
   getFetchSilenceUrl,
   usePerspective,
-} from '../hooks/usePerspective';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import { silenceMatcherEqualitySymbol, silenceState } from '../utils';
-import { DataTestIDs } from '../data-test';
+} from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import { silenceMatcherEqualitySymbol, silenceState } from '../../../shared/utils/utils';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 
 export const SilenceMatchersList = ({ silence }: { silence: Silence }) => (
   <LabelGroup numLabels={20}>
diff --git a/web/src/components/alerting/AlertRulesDetailsPage.tsx b/web/src/features/alerts/pages/AlertRulesDetailsPage.tsx
similarity index 93%
rename from web/src/components/alerting/AlertRulesDetailsPage.tsx
rename to web/src/features/alerts/pages/AlertRulesDetailsPage.tsx
index a2408a4ae..4f31794f5 100644
--- a/web/src/components/alerting/AlertRulesDetailsPage.tsx
+++ b/web/src/features/alerts/pages/AlertRulesDetailsPage.tsx
@@ -48,27 +48,27 @@ import {
   SeverityBadge,
   SeverityHelp,
   SourceHelp,
-} from '../alerting/AlertUtils';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
-import { StatusBox } from '../console/console-shared/src/components/status/StatusBox';
-import { formatPrometheusDuration } from '../console/console-shared/src/datetime/prometheus';
-import { ExternalLink } from '../console/utils/link';
+} from '../components/AlertUtils';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { StatusBox } from '../../../shared/console/console-shared/src/components/status/StatusBox';
+import { formatPrometheusDuration } from '../../../shared/console/console-shared/src/datetime/prometheus';
+import { ExternalLink } from '../../../shared/console/utils/link';
 import {
   getAlertRulesUrl,
   getAlertUrl,
   getNewSilenceAlertUrl,
   getQueryBrowserUrl,
   usePerspective,
-} from '../hooks/usePerspective';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import KebabDropdown from '../kebab-dropdown';
-import { Labels } from '../labels';
-import { ToggleGraph } from '../MetricsPage';
-import { alertDescription, RuleResource } from '../utils';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
+} from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import KebabDropdown from '../../../shared/components/KebabDropdown';
+import { Labels } from '../../../shared/components/labels';
+import { ToggleGraph } from '../../metrics/pages/MetricsPage';
+import { alertDescription, RuleResource } from '../../../shared/utils/utils';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
 
-import { DataTestIDs } from '../data-test';
-import { useAlerts } from '../../hooks/useAlerts';
+import { DataTestIDs } from '../../../shared/constants/data-test';
+import { useAlerts } from '../../../shared/hooks/useAlerts';
 
 // Renders Prometheus template text and highlights any {{ ... }} tags that it contains
 const PrometheusTemplate = ({ text }: { text: string }) => (
diff --git a/web/src/components/alerting/AlertingPage.tsx b/web/src/features/alerts/pages/AlertingPage.tsx
similarity index 69%
rename from web/src/components/alerting/AlertingPage.tsx
rename to web/src/features/alerts/pages/AlertingPage.tsx
index 40930d417..0016f442b 100644
--- a/web/src/components/alerting/AlertingPage.tsx
+++ b/web/src/features/alerts/pages/AlertingPage.tsx
@@ -7,43 +7,51 @@ import {
   NamespaceBar,
   useActivePerspective,
 } from '@openshift-console/dynamic-plugin-sdk';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { useMonitoring } from '../../hooks/useMonitoring';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 import { useLocation } from 'react-router';
-import { AlertResource, SilenceResource } from '../utils';
+import { AlertResource, SilenceResource } from '../../../shared/utils/utils';
 import { useDispatch } from 'react-redux';
-import { alertingClearSelectorData } from '../../store/actions';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
+import { alertingClearSelectorData } from '../../../shared/store/actions';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
 
 const CmoAlertsPage = lazy(() =>
-  import(/* webpackChunkName: "CmoAlertsPage" */ './AlertsPage').then((module) => ({
+  import(/* webpackChunkName: "CmoAlertsPage" */ './alerts-page/AlertsPage').then((module) => ({
     default: module.MpCmoAlertsPage,
   })),
 );
 const CooAlertsPage = lazy(() =>
-  import(/* webpackChunkName: "CooAlertsPage" */ './AlertsPage').then((module) => ({
+  import(/* webpackChunkName: "CooAlertsPage" */ './alerts-page/AlertsPage').then((module) => ({
     default: module.McpAcmAlertsPage,
   })),
 );
 const CmoSilencesPage = lazy(() =>
-  import(/* webpackChunkName: "CmoSilencesPage" */ './SilencesPage').then((module) => ({
-    default: module.MpCmoSilencesPage,
-  })),
+  import(/* webpackChunkName: "CmoSilencesPage" */ './silences-page/SilencesPage').then(
+    (module) => ({
+      default: module.MpCmoSilencesPage,
+    }),
+  ),
 );
 const CooSilencesPage = lazy(() =>
-  import(/* webpackChunkName: "CooSilencesPage" */ './SilencesPage').then((module) => ({
-    default: module.McpAcmSilencesPage,
-  })),
+  import(/* webpackChunkName: "CooSilencesPage" */ './silences-page/SilencesPage').then(
+    (module) => ({
+      default: module.McpAcmSilencesPage,
+    }),
+  ),
 );
 const CmoAlertRulesPage = lazy(() =>
-  import(/* webpackChunkName: "CmoAlertRulesPage" */ './AlertRulesPage').then((module) => ({
-    default: module.MpCmoAlertRulesPage,
-  })),
+  import(/* webpackChunkName: "CmoAlertRulesPage" */ './alert-rules-page/AlertRulesPage').then(
+    (module) => ({
+      default: module.MpCmoAlertRulesPage,
+    }),
+  ),
 );
 const CooAlertRulesPage = lazy(() =>
-  import(/* webpackChunkName: "CooAlertRulesPage" */ './AlertRulesPage').then((module) => ({
-    default: module.McpAcmAlertRulesPage,
-  })),
+  import(/* webpackChunkName: "CooAlertRulesPage" */ './alert-rules-page/AlertRulesPage').then(
+    (module) => ({
+      default: module.McpAcmAlertRulesPage,
+    }),
+  ),
 );
 
 const namespacedPages = [
diff --git a/web/src/components/alerting/AlertsDetailsPage.tsx b/web/src/features/alerts/pages/AlertsDetailsPage.tsx
similarity index 94%
rename from web/src/components/alerting/AlertsDetailsPage.tsx
rename to web/src/features/alerts/pages/AlertsDetailsPage.tsx
index 880bb1cac..bbfd24dbe 100644
--- a/web/src/components/alerting/AlertsDetailsPage.tsx
+++ b/web/src/features/alerts/pages/AlertsDetailsPage.tsx
@@ -17,17 +17,17 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
-import { ExternalLink, LinkifyExternal } from '../console/utils/link';
+import { ExternalLink, LinkifyExternal } from '../../../shared/console/utils/link';
 import {
   getAlertsUrl,
   getObserveState,
   getNewSilenceAlertUrl,
   getRuleUrl,
   usePerspective,
-} from '../hooks/usePerspective';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import { AlertResource, alertState, RuleResource } from '../utils';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
+} from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import { AlertResource, alertState, RuleResource } from '../../../shared/utils/utils';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
 
 import {
   Breadcrumb,
@@ -56,9 +56,9 @@ import {
   ToolbarGroup,
   ToolbarItem,
 } from '@patternfly/react-core';
-import { MonitoringState } from '../../store/store';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
-import { StatusBox } from '../console/console-shared/src/components/status/StatusBox';
+import { MonitoringState } from '../../../shared/store/store';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { StatusBox } from '../../../shared/console/console-shared/src/components/status/StatusBox';
 import {
   ContainerModel,
   DaemonSetModel,
@@ -68,10 +68,10 @@ import {
   NodeModel,
   PodModel,
   StatefulSetModel,
-} from '../console/models';
-import { Labels } from '../labels';
-import { ToggleGraph } from '../MetricsPage';
-import { SilencedByList } from './AlertDetail/SilencedByTable';
+} from '../../../shared/console/models';
+import { Labels } from '../../../shared/components/labels';
+import { ToggleGraph } from '../../metrics/pages/MetricsPage';
+import { SilencedByList } from '../components/SilencedByTable';
 import {
   alertSource,
   AlertState,
@@ -84,11 +84,11 @@ import {
   SeverityBadge,
   SeverityHelp,
   SourceHelp,
-} from './AlertUtils';
+} from '../components/AlertUtils';
 
-import { DataTestIDs } from '../data-test';
-import { useAlerts } from '../../hooks/useAlerts';
-import { useMonitoring } from '../../hooks/useMonitoring';
+import { DataTestIDs } from '../../../shared/constants/data-test';
+import { useAlerts } from '../../../shared/hooks/useAlerts';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 
 const AlertsDetailsPage_: FC = () => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/alerting/SilenceCreatePage.tsx b/web/src/features/alerts/pages/SilenceCreatePage.tsx
similarity index 77%
rename from web/src/components/alerting/SilenceCreatePage.tsx
rename to web/src/features/alerts/pages/SilenceCreatePage.tsx
index 46dea7a14..606edc142 100644
--- a/web/src/components/alerting/SilenceCreatePage.tsx
+++ b/web/src/features/alerts/pages/SilenceCreatePage.tsx
@@ -1,10 +1,10 @@
 import * as _ from 'lodash-es';
 import { useTranslation } from 'react-i18next';
-import { SilenceForm } from './SilenceForm';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { useMonitoring } from '../../hooks/useMonitoring';
-import { LoadingBox } from '../console/console-shared/src/components/loading/LoadingBox';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
+import { SilenceForm } from '../components/SilenceForm';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
+import { LoadingBox } from '../../../shared/console/console-shared/src/components/loading/LoadingBox';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
 import { useSearchParams } from 'react-router';
 
 const CreateSilencePage = () => {
diff --git a/web/src/components/alerting/SilenceEditPage.tsx b/web/src/features/alerts/pages/SilenceEditPage.tsx
similarity index 84%
rename from web/src/components/alerting/SilenceEditPage.tsx
rename to web/src/features/alerts/pages/SilenceEditPage.tsx
index 9352f5aab..260c58121 100644
--- a/web/src/components/alerting/SilenceEditPage.tsx
+++ b/web/src/features/alerts/pages/SilenceEditPage.tsx
@@ -3,12 +3,12 @@ import { Alert } from '@patternfly/react-core';
 import * as _ from 'lodash-es';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
-import { StatusBox } from '../console/console-shared/src/components/status/StatusBox';
-import { SilenceResource, silenceState } from '../utils';
-import { SilenceForm } from './SilenceForm';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { useAlerts } from '../../hooks/useAlerts';
-import { useMonitoring } from '../../hooks/useMonitoring';
+import { StatusBox } from '../../../shared/console/console-shared/src/components/status/StatusBox';
+import { SilenceResource, silenceState } from '../../../shared/utils/utils';
+import { SilenceForm } from '../components/SilenceForm';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { useAlerts } from '../../../shared/hooks/useAlerts';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 
 const pad = (i: number): string => (i < 10 ? `0${i}` : String(i));
 
diff --git a/web/src/components/alerting/SilencesDetailsPage.tsx b/web/src/features/alerts/pages/SilencesDetailsPage.tsx
similarity index 90%
rename from web/src/components/alerting/SilencesDetailsPage.tsx
rename to web/src/features/alerts/pages/SilencesDetailsPage.tsx
index c7f704ac0..e12093a2e 100644
--- a/web/src/components/alerting/SilencesDetailsPage.tsx
+++ b/web/src/features/alerts/pages/SilencesDetailsPage.tsx
@@ -28,20 +28,25 @@ import {
   Title,
 } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { getAlertUrl, getRuleUrl, getSilencesUrl, usePerspective } from '../hooks/usePerspective';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import KebabDropdown from '../kebab-dropdown';
-import { alertDescription, SilenceResource } from '../utils';
-import { SeverityBadge, SeverityCounts } from './AlertUtils';
-import { SilenceDropdown, SilenceMatchersList, SilenceState } from './SilencesUtils';
-import { StatusBox } from '../console/console-shared/src/components/status/StatusBox';
-import { LoadingInline } from '../console/console-shared/src/components/loading/LoadingInline';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
+import {
+  getAlertUrl,
+  getRuleUrl,
+  getSilencesUrl,
+  usePerspective,
+} from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import KebabDropdown from '../../../shared/components/KebabDropdown';
+import { alertDescription, SilenceResource } from '../../../shared/utils/utils';
+import { SeverityBadge, SeverityCounts } from '../components/AlertUtils';
+import { SilenceDropdown, SilenceMatchersList, SilenceState } from '../components/SilencesUtils';
+import { StatusBox } from '../../../shared/console/console-shared/src/components/status/StatusBox';
+import { LoadingInline } from '../../../shared/console/console-shared/src/components/loading/LoadingInline';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
 import { Table, TableVariant, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 import { useNavigate, useParams, Link } from 'react-router';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { DataTestIDs } from '../data-test';
-import { useAlerts } from '../../hooks/useAlerts';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { DataTestIDs } from '../../../shared/constants/data-test';
+import { useAlerts } from '../../../shared/hooks/useAlerts';
 
 const SilencesDetailsPage_: FC = () => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/alerting/AlertRulesPage.tsx b/web/src/features/alerts/pages/alert-rules-page/AlertRulesPage.tsx
similarity index 89%
rename from web/src/components/alerting/AlertRulesPage.tsx
rename to web/src/features/alerts/pages/alert-rules-page/AlertRulesPage.tsx
index a5501f184..d12a503cf 100644
--- a/web/src/components/alerting/AlertRulesPage.tsx
+++ b/web/src/features/alerts/pages/alert-rules-page/AlertRulesPage.tsx
@@ -12,16 +12,16 @@ import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router';
 
-import { AlertSource } from '../types';
-import { alertingRuleStateSort, RuleResource, severitySort } from '../utils';
+import { AlertSource } from '../../../../shared/types/types';
+import { alertingRuleStateSort, RuleResource, severitySort } from '../../../../shared/utils/utils';
 
 import { Flex, FlexItem, PageSection, PaginationVariant, Truncate } from '@patternfly/react-core';
 import DataView from '@patternfly/react-data-view/dist/dynamic/DataView';
 import DataViewTable, { DataViewTr } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
 import DataViewToolbar from '@patternfly/react-data-view/dist/dynamic/DataViewToolbar';
 import { useDataViewSort } from '@patternfly/react-data-view/dist/dynamic/Hooks';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { useAlerts } from '../../hooks/useAlerts';
+import { MonitoringProvider } from '../../../../shared/contexts/MonitoringContext';
+import { useAlerts } from '../../../../shared/hooks/useAlerts';
 import {
   alertingRuleSource,
   AlertStateIcon,
@@ -29,25 +29,28 @@ import {
   rowFilter,
   SeverityBadge,
   SilencesNotLoadedWarning,
-} from '../alerting/AlertUtils';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
-import { EmptyBox } from '../console/console-shared/src/components/empty-state/EmptyBox';
-import { LoadingBox } from '../console/console-shared/src/components/loading/LoadingBox';
-import { DataTestIDs } from '../data-test';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import { getRuleUrl, usePerspective } from '../hooks/usePerspective';
-import { ITEMS_PER_PAGE, TablePagination } from '../table-pagination';
+} from '../../components/AlertUtils';
+import withFallback from '../../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { EmptyBox } from '../../../../shared/console/console-shared/src/components/empty-state/EmptyBox';
+import { LoadingBox } from '../../../../shared/console/console-shared/src/components/loading/LoadingBox';
+import { DataTestIDs } from '../../../../shared/constants/data-test';
+import { useMonitoringNamespace } from '../../../../shared/hooks/useMonitoringNamespace';
+import { getRuleUrl, usePerspective } from '../../../../shared/hooks/usePerspective';
+import {
+  ITEMS_PER_PAGE,
+  TablePagination,
+} from '../../../../shared/components/table/table-pagination';
 import {
   TableFilter,
   TableFilterOption,
   TableFilterProps,
   TableFilters,
-} from '../table/TableFilters';
-import { TableToolbar } from '../table/TableToolbar';
-import { directedSort, localeCompareSort } from '../table/sort-utils';
-import { useTableColumns } from '../table/useTableColumns';
-import { useTableFilters } from '../table/useTableFilters';
-import { useTablePagination } from '../table/useTablePagination';
+} from '../../../../shared/components/table/TableFilters';
+import { TableToolbar } from '../../../../shared/components/table/TableToolbar';
+import { directedSort, localeCompareSort } from '../../../../shared/components/table/sort-utils';
+import { useTableColumns } from '../../../../shared/components/table/useTableColumns';
+import { useTableFilters } from '../../../../shared/components/table/useTableFilters';
+import { useTablePagination } from '../../../../shared/components/table/useTablePagination';
 import { filterRules } from './filter-rules';
 
 export const enum AlertRulesFilterOptions {
diff --git a/web/src/components/alerting/filter-rules.spec.ts b/web/src/features/alerts/pages/alert-rules-page/filter-rules.spec.ts
similarity index 98%
rename from web/src/components/alerting/filter-rules.spec.ts
rename to web/src/features/alerts/pages/alert-rules-page/filter-rules.spec.ts
index 242e237b6..40a87ff06 100644
--- a/web/src/components/alerting/filter-rules.spec.ts
+++ b/web/src/features/alerts/pages/alert-rules-page/filter-rules.spec.ts
@@ -2,14 +2,14 @@ jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
   ...jest.requireActual('@openshift-console/dynamic-plugin-sdk/lib/api/common-types'),
 }));
 
-jest.mock('./AlertUtils', () => ({
+jest.mock('../../components/AlertUtils', () => ({
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   alertingRuleSource: (rule: any) =>
     rule.labels?.prometheus === 'openshift-monitoring/k8s' ? 'platform' : 'user',
 }));
 
 import { AlertStates, Rule } from '@openshift-console/dynamic-plugin-sdk';
-import { AlertSource } from '../types';
+import { AlertSource } from '../../../../shared/types/types';
 import { filterRules, ruleHasAlertState } from './filter-rules';
 import { AlertRulesFilterOptions, AlertRulesFilters } from './AlertRulesPage';
 
diff --git a/web/src/components/alerting/filter-rules.ts b/web/src/features/alerts/pages/alert-rules-page/filter-rules.ts
similarity index 92%
rename from web/src/components/alerting/filter-rules.ts
rename to web/src/features/alerts/pages/alert-rules-page/filter-rules.ts
index 6cd76ee52..1b4aa7c43 100644
--- a/web/src/components/alerting/filter-rules.ts
+++ b/web/src/features/alerts/pages/alert-rules-page/filter-rules.ts
@@ -1,9 +1,9 @@
 import { AlertStates, Rule } from '@openshift-console/dynamic-plugin-sdk';
 import { isEmpty, some } from 'lodash-es';
-import { AlertSource } from '../types';
-import { fuzzyCaseInsensitive } from '../utils';
+import { AlertSource } from '../../../../shared/types/types';
+import { fuzzyCaseInsensitive } from '../../../../shared/utils/utils';
 import { AlertRulesFilterOptions, AlertRulesFilters } from './AlertRulesPage';
-import { alertingRuleSource } from './AlertUtils';
+import { alertingRuleSource } from '../../components/AlertUtils';
 
 export const filterRules = (rules: Rule[], selectedFilters: AlertRulesFilters) => {
   if (!rules) {
diff --git a/web/src/components/alerting/AlertList/AggregateAlertTableRow.tsx b/web/src/features/alerts/pages/alerts-page/AggregateAlertTableRow.tsx
similarity index 89%
rename from web/src/components/alerting/AlertList/AggregateAlertTableRow.tsx
rename to web/src/features/alerts/pages/alerts-page/AggregateAlertTableRow.tsx
index ba96c28a7..20949bc7e 100644
--- a/web/src/components/alerting/AlertList/AggregateAlertTableRow.tsx
+++ b/web/src/features/alerts/pages/alerts-page/AggregateAlertTableRow.tsx
@@ -2,17 +2,17 @@ import { Alert, ResourceIcon, TableColumn } from '@openshift-console/dynamic-plu
 import { ExpandableRowContent, Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 import { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { getRuleUrl, usePerspective } from '../../../components/hooks/usePerspective';
-import { useMonitoringNamespace } from '../../hooks/useMonitoringNamespace';
-import { AggregatedAlert } from '../AlertsAggregates';
-import { AlertState, SeverityBadge } from '../AlertUtils';
+import { getRuleUrl, usePerspective } from '../../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../../shared/hooks/useMonitoringNamespace';
+import { AggregatedAlert } from './AlertsAggregates';
+import { AlertState, SeverityBadge } from '../../components/AlertUtils';
 import AlertTableRow from './AlertTableRow';
-import { RuleResource } from '../../../components/utils';
+import { RuleResource } from '../../../../shared/utils/utils';
 import { Link } from 'react-router';
 import { filterAlerts } from './filter-alerts';
 import { Badge, Flex, FlexItem } from '@patternfly/react-core';
-import { DataTestIDs } from '../../data-test';
-import { AggregatedAlertFilters } from '../AlertsPage';
+import { DataTestIDs } from '../../../../shared/constants/data-test';
+import { AggregatedAlertFilters } from './AlertsPage';
 
 type AggregateAlertTableRowProps = {
   aggregatedAlert: AggregatedAlert;
diff --git a/web/src/components/alerting/AlertList/AlertTableRow.tsx b/web/src/features/alerts/pages/alerts-page/AlertTableRow.tsx
similarity index 89%
rename from web/src/components/alerting/AlertList/AlertTableRow.tsx
rename to web/src/features/alerts/pages/alerts-page/AlertTableRow.tsx
index ea92548cc..010b9bbd4 100644
--- a/web/src/components/alerting/AlertList/AlertTableRow.tsx
+++ b/web/src/features/alerts/pages/alerts-page/AlertTableRow.tsx
@@ -14,25 +14,25 @@ import {
   isActionWithHref,
   NamespaceGroupVersionKind,
   SeverityBadge,
-} from '../AlertUtils';
-import { AlertSource } from '../../../components/types';
+} from '../../components/AlertUtils';
+import { AlertSource } from '../../../../shared/types/types';
 import { Td, Tr } from '@patternfly/react-table';
 import { DropdownItem, Flex, FlexItem, Spinner } from '@patternfly/react-core';
-import KebabDropdown from '../../../components/kebab-dropdown';
+import KebabDropdown from '../../../../shared/components/KebabDropdown';
 import type { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, Link } from 'react-router';
-import { AlertResource, alertState } from '../../../components/utils';
+import { AlertResource, alertState } from '../../../../shared/utils/utils';
 import {
   getAlertUrl,
   getNewSilenceAlertUrl,
   getProposalsUrl,
   usePerspective,
-} from '../../../components/hooks/usePerspective';
-import { useMonitoringNamespace } from '../../hooks/useMonitoringNamespace';
-import { DataTestIDs } from '../../data-test';
-import { useProposalCheck } from '../../ai-proposals/useProposalCheck';
-import CustomIcon from '../../CustomIcon';
+} from '../../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../../shared/hooks/useMonitoringNamespace';
+import { DataTestIDs } from '../../../../shared/constants/data-test';
+import { useProposalCheck } from './ai-proposals/useProposalCheck';
+import CustomIcon from '../../../../shared/components/CustomIcon';
 
 const AlertTableRow: FC<{ alert: Alert }> = ({ alert }) => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/alerting/AlertsAggregates.ts b/web/src/features/alerts/pages/alerts-page/AlertsAggregates.ts
similarity index 100%
rename from web/src/components/alerting/AlertsAggregates.ts
rename to web/src/features/alerts/pages/alerts-page/AlertsAggregates.ts
diff --git a/web/src/components/alerting/AlertsPage.tsx b/web/src/features/alerts/pages/alerts-page/AlertsPage.tsx
similarity index 87%
rename from web/src/components/alerting/AlertsPage.tsx
rename to web/src/features/alerts/pages/alerts-page/AlertsPage.tsx
index 72877d1b0..e90b14ea1 100644
--- a/web/src/components/alerting/AlertsPage.tsx
+++ b/web/src/features/alerts/pages/alerts-page/AlertsPage.tsx
@@ -8,34 +8,37 @@ import { useDataViewSort } from '@patternfly/react-data-view/dist/dynamic/Hooks'
 import { Table, TableGridBreakpoint } from '@patternfly/react-table';
 import { useEffect, useMemo, useRef, useState, type FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { useAlerts } from '../../hooks/useAlerts';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
-import { AccessDenied } from '../console/console-shared/src/components/empty-state/AccessDenied';
-import { EmptyBox } from '../console/console-shared/src/components/empty-state/EmptyBox';
-import { LoadingBox } from '../console/console-shared/src/components/loading/LoadingBox';
-import { useDeepMemo } from '../hooks/useDeepMemo';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
-import { usePerspective } from '../hooks/usePerspective';
-import { ITEMS_PER_PAGE, TablePagination } from '../table-pagination';
+import { MonitoringProvider } from '../../../../shared/contexts/MonitoringContext';
+import { useAlerts } from '../../../../shared/hooks/useAlerts';
+import withFallback from '../../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { AccessDenied } from '../../../../shared/console/console-shared/src/components/empty-state/AccessDenied';
+import { EmptyBox } from '../../../../shared/console/console-shared/src/components/empty-state/EmptyBox';
+import { LoadingBox } from '../../../../shared/console/console-shared/src/components/loading/LoadingBox';
+import { useDeepMemo } from '../../../../shared/hooks/useDeepMemo';
+import { useMonitoringNamespace } from '../../../../shared/hooks/useMonitoringNamespace';
+import { usePerspective } from '../../../../shared/hooks/usePerspective';
+import {
+  ITEMS_PER_PAGE,
+  TablePagination,
+} from '../../../../shared/components/table/table-pagination';
 import {
   TableFilter,
   TableFilterOption,
   TableFilterProps,
   TableFilters,
-} from '../table/TableFilters';
-import { TableToolbar } from '../table/TableToolbar';
-import { directedSort, localeCompareSort } from '../table/sort-utils';
-import { useTableColumns } from '../table/useTableColumns';
-import { useTableFilters } from '../table/useTableFilters';
-import { useTablePagination } from '../table/useTablePagination';
-import { AlertSource } from '../types';
-import { ALL_NAMESPACES_KEY, severitySort } from '../utils';
-import AggregateAlertTableRow from './AlertList/AggregateAlertTableRow';
-import DownloadCSVButton from './AlertList/DownloadCSVButton';
-import { filterAlerts } from './AlertList/filter-alerts';
+} from '../../../../shared/components/table/TableFilters';
+import { TableToolbar } from '../../../../shared/components/table/TableToolbar';
+import { directedSort, localeCompareSort } from '../../../../shared/components/table/sort-utils';
+import { useTableColumns } from '../../../../shared/components/table/useTableColumns';
+import { useTableFilters } from '../../../../shared/components/table/useTableFilters';
+import { useTablePagination } from '../../../../shared/components/table/useTablePagination';
+import { AlertSource } from '../../../../shared/types/types';
+import { ALL_NAMESPACES_KEY, severitySort } from '../../../../shared/utils/utils';
+import AggregateAlertTableRow from './AggregateAlertTableRow';
+import DownloadCSVButton from './DownloadCSVButton';
+import { filterAlerts } from './filter-alerts';
 import { AggregatedAlert, getAggregateAlertsLists } from './AlertsAggregates';
-import { rowFilter, SilencesNotLoadedWarning } from './AlertUtils';
+import { rowFilter, SilencesNotLoadedWarning } from '../../components/AlertUtils';
 
 export const enum AlertFilterOptions {
   NAME = 'name',
diff --git a/web/src/components/alerting/AlertList/DownloadCSVButton.tsx b/web/src/features/alerts/pages/alerts-page/DownloadCSVButton.tsx
similarity index 91%
rename from web/src/components/alerting/AlertList/DownloadCSVButton.tsx
rename to web/src/features/alerts/pages/alerts-page/DownloadCSVButton.tsx
index d8bcda639..ec6e2b5be 100644
--- a/web/src/components/alerting/AlertList/DownloadCSVButton.tsx
+++ b/web/src/features/alerts/pages/alerts-page/DownloadCSVButton.tsx
@@ -1,9 +1,9 @@
 import { Button, ButtonVariant } from '@patternfly/react-core';
 import { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { usePerspective } from '../../hooks/usePerspective';
-import { AggregatedAlert } from '../AlertsAggregates';
-import { DataTestIDs } from '../../data-test';
+import { usePerspective } from '../../../../shared/hooks/usePerspective';
+import { AggregatedAlert } from './AlertsAggregates';
+import { DataTestIDs } from '../../../../shared/constants/data-test';
 
 type DownloadCSVButtonProps = {
   loaded: boolean;
diff --git a/web/src/components/alerting/AlertList/LabelFilter.tsx b/web/src/features/alerts/pages/alerts-page/LabelFilter.tsx
similarity index 100%
rename from web/src/components/alerting/AlertList/LabelFilter.tsx
rename to web/src/features/alerts/pages/alerts-page/LabelFilter.tsx
diff --git a/web/src/components/ai-proposals/alert-identifier.spec.ts b/web/src/features/alerts/pages/alerts-page/ai-proposals/alert-identifier.spec.ts
similarity index 100%
rename from web/src/components/ai-proposals/alert-identifier.spec.ts
rename to web/src/features/alerts/pages/alerts-page/ai-proposals/alert-identifier.spec.ts
diff --git a/web/src/components/ai-proposals/alert-identifier.ts b/web/src/features/alerts/pages/alerts-page/ai-proposals/alert-identifier.ts
similarity index 100%
rename from web/src/components/ai-proposals/alert-identifier.ts
rename to web/src/features/alerts/pages/alerts-page/ai-proposals/alert-identifier.ts
diff --git a/web/src/components/ai-proposals/constants.ts b/web/src/features/alerts/pages/alerts-page/ai-proposals/constants.ts
similarity index 100%
rename from web/src/components/ai-proposals/constants.ts
rename to web/src/features/alerts/pages/alerts-page/ai-proposals/constants.ts
diff --git a/web/src/components/ai-proposals/useProposalCheck.ts b/web/src/features/alerts/pages/alerts-page/ai-proposals/useProposalCheck.ts
similarity index 95%
rename from web/src/components/ai-proposals/useProposalCheck.ts
rename to web/src/features/alerts/pages/alerts-page/ai-proposals/useProposalCheck.ts
index cfe0e1a69..485cdbd66 100644
--- a/web/src/components/ai-proposals/useProposalCheck.ts
+++ b/web/src/features/alerts/pages/alerts-page/ai-proposals/useProposalCheck.ts
@@ -2,7 +2,7 @@ import { Alert, K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk'
 import { k8sListResourceItems } from '@openshift-console/dynamic-plugin-sdk/lib/utils/k8s';
 import { useQuery } from '@tanstack/react-query';
 import { useCallback, useMemo, useState } from 'react';
-import { ProposalModel } from '../console/models';
+import { ProposalModel } from '../../../../../shared/console/models';
 import { getAlertFingerprintPrefix, matchesProposal } from './alert-identifier';
 import {
   PROPOSAL_LABEL_FINGERPRINT,
diff --git a/web/src/components/alerting/AlertList/filter-alerts.spec.ts b/web/src/features/alerts/pages/alerts-page/filter-alerts.spec.ts
similarity index 96%
rename from web/src/components/alerting/AlertList/filter-alerts.spec.ts
rename to web/src/features/alerts/pages/alerts-page/filter-alerts.spec.ts
index c8fd0ee7a..445b23074 100644
--- a/web/src/components/alerting/AlertList/filter-alerts.spec.ts
+++ b/web/src/features/alerts/pages/alerts-page/filter-alerts.spec.ts
@@ -2,7 +2,7 @@ jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
   ...jest.requireActual('@openshift-console/dynamic-plugin-sdk/lib/api/common-types'),
 }));
 
-jest.mock('../AlertUtils', () => ({
+jest.mock('../../components/AlertUtils', () => ({
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   alertSource: (alert: any) =>
     alert.rule?.labels?.prometheus === 'openshift-monitoring/k8s' ? 'platform' : 'user',
@@ -10,9 +10,9 @@ jest.mock('../AlertUtils', () => ({
 
 import { Alert, AlertStates } from '@openshift-console/dynamic-plugin-sdk';
 import { filterAlerts } from './filter-alerts';
-import { AlertFilterOptions, AggregatedAlertFilters } from '../AlertsPage';
-import { ALL_NAMESPACES_KEY } from '../../utils';
-import { AlertSource } from '../../types';
+import { AlertFilterOptions, AggregatedAlertFilters } from './AlertsPage';
+import { ALL_NAMESPACES_KEY } from '../../../../shared/utils/utils';
+import { AlertSource } from '../../../../shared/types/types';
 
 const emptyFilters: AggregatedAlertFilters = {
   [AlertFilterOptions.NAME]: '',
diff --git a/web/src/components/alerting/AlertList/filter-alerts.ts b/web/src/features/alerts/pages/alerts-page/filter-alerts.ts
similarity index 89%
rename from web/src/components/alerting/AlertList/filter-alerts.ts
rename to web/src/features/alerts/pages/alerts-page/filter-alerts.ts
index a0945c90c..c0abe70b0 100644
--- a/web/src/components/alerting/AlertList/filter-alerts.ts
+++ b/web/src/features/alerts/pages/alerts-page/filter-alerts.ts
@@ -1,8 +1,12 @@
 import { Alert } from '@openshift-console/dynamic-plugin-sdk';
-import { alertSource } from '../AlertUtils';
-import { AlertFilterOptions, AggregatedAlertFilters } from '../AlertsPage';
-import { alertState, ALL_NAMESPACES_KEY, fuzzyCaseInsensitive } from '../../utils';
-import { Perspective } from '../../../store/actions';
+import { alertSource } from '../../components/AlertUtils';
+import { AlertFilterOptions, AggregatedAlertFilters } from './AlertsPage';
+import {
+  alertState,
+  ALL_NAMESPACES_KEY,
+  fuzzyCaseInsensitive,
+} from '../../../../shared/utils/utils';
+import { Perspective } from '../../../../shared/store/actions';
 
 export const filterAlerts = (
   alerts: Alert[],
diff --git a/web/src/components/alerting/SilencesPage.tsx b/web/src/features/alerts/pages/silences-page/SilencesPage.tsx
similarity index 92%
rename from web/src/components/alerting/SilencesPage.tsx
rename to web/src/features/alerts/pages/silences-page/SilencesPage.tsx
index a6943d709..1c53d72cc 100644
--- a/web/src/components/alerting/SilencesPage.tsx
+++ b/web/src/features/alerts/pages/silences-page/SilencesPage.tsx
@@ -32,38 +32,45 @@ import type { FC } from 'react';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useNavigate } from 'react-router';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
-import { useAlerts } from '../../hooks/useAlerts';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
-import { EmptyBox } from '../console/console-shared/src/components/empty-state/EmptyBox';
-import { LoadingBox } from '../console/console-shared/src/components/loading/LoadingBox';
-import { DataTestIDs } from '../data-test';
-import { useBoolean } from '../hooks/useBoolean';
-import { useDeepMemo } from '../hooks/useDeepMemo';
-import { useMonitoringNamespace } from '../hooks/useMonitoringNamespace';
+import { MonitoringProvider } from '../../../../shared/contexts/MonitoringContext';
+import { useAlerts } from '../../../../shared/hooks/useAlerts';
+import withFallback from '../../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { EmptyBox } from '../../../../shared/console/console-shared/src/components/empty-state/EmptyBox';
+import { LoadingBox } from '../../../../shared/console/console-shared/src/components/loading/LoadingBox';
+import { DataTestIDs } from '../../../../shared/constants/data-test';
+import { useBoolean } from '../../../../shared/hooks/useBoolean';
+import { useDeepMemo } from '../../../../shared/hooks/useDeepMemo';
+import { useMonitoringNamespace } from '../../../../shared/hooks/useMonitoringNamespace';
 import {
   getEditSilenceAlertUrl,
   getFetchSilenceUrl,
   getNewSilenceUrl,
   getSilenceAlertUrl,
   usePerspective,
-} from '../hooks/usePerspective';
-import { directedSort, localeCompareSort } from '../table/sort-utils';
-import { useTableColumns } from '../table/useTableColumns';
-import { ITEMS_PER_PAGE, TablePagination } from '../table-pagination';
+} from '../../../../shared/hooks/usePerspective';
+import { directedSort, localeCompareSort } from '../../../../shared/components/table/sort-utils';
+import { useTableColumns } from '../../../../shared/components/table/useTableColumns';
+import {
+  ITEMS_PER_PAGE,
+  TablePagination,
+} from '../../../../shared/components/table/table-pagination';
 import {
   TableFilter,
   TableFilterOption,
   TableFilterProps,
   TableFilters,
-} from '../table/TableFilters';
-import { TableToolbar } from '../table/TableToolbar';
-import { useTableFilters } from '../table/useTableFilters';
-import { useTablePagination } from '../table/useTablePagination';
-import { severitySort, SilenceResource, silenceState } from '../utils';
-import { rowFilter, SeverityCounts, StateTimestamp } from './AlertUtils';
+} from '../../../../shared/components/table/TableFilters';
+import { TableToolbar } from '../../../../shared/components/table/TableToolbar';
+import { useTableFilters } from '../../../../shared/components/table/useTableFilters';
+import { useTablePagination } from '../../../../shared/components/table/useTablePagination';
+import { severitySort, SilenceResource, silenceState } from '../../../../shared/utils/utils';
+import { rowFilter, SeverityCounts, StateTimestamp } from '../../components/AlertUtils';
 import { filterSilences } from './filter-silences';
-import { ExpireSilenceModal, SilenceMatchersList, SilenceState } from './SilencesUtils';
+import {
+  ExpireSilenceModal,
+  SilenceMatchersList,
+  SilenceState,
+} from '../../components/SilencesUtils';
 
 export const enum SilenceFilterOptions {
   NAME = 'name',
diff --git a/web/src/components/alerting/filter-silences.spec.ts b/web/src/features/alerts/pages/silences-page/filter-silences.spec.ts
similarity index 98%
rename from web/src/components/alerting/filter-silences.spec.ts
rename to web/src/features/alerts/pages/silences-page/filter-silences.spec.ts
index eadd721a1..e8d77eb1e 100644
--- a/web/src/components/alerting/filter-silences.spec.ts
+++ b/web/src/features/alerts/pages/silences-page/filter-silences.spec.ts
@@ -5,7 +5,7 @@ jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
 import { Silence, SilenceStates } from '@openshift-console/dynamic-plugin-sdk';
 import { filterSilences } from './filter-silences';
 import { SilenceFilterOptions, SilenceFilters } from './SilencesPage';
-import { ALL_NAMESPACES_KEY } from '../utils';
+import { ALL_NAMESPACES_KEY } from '../../../../shared/utils/utils';
 
 const emptyFilters: SilenceFilters = {
   [SilenceFilterOptions.NAME]: '',
diff --git a/web/src/components/alerting/filter-silences.ts b/web/src/features/alerts/pages/silences-page/filter-silences.ts
similarity index 90%
rename from web/src/components/alerting/filter-silences.ts
rename to web/src/features/alerts/pages/silences-page/filter-silences.ts
index 36dfc5ef9..a7c1a3b15 100644
--- a/web/src/components/alerting/filter-silences.ts
+++ b/web/src/features/alerts/pages/silences-page/filter-silences.ts
@@ -1,6 +1,10 @@
 import { Silence } from '@openshift-console/dynamic-plugin-sdk';
-import { ALL_NAMESPACES_KEY, fuzzyCaseInsensitive, silenceState } from '../utils';
-import { Perspective } from '../../store/actions';
+import {
+  ALL_NAMESPACES_KEY,
+  fuzzyCaseInsensitive,
+  silenceState,
+} from '../../../../shared/utils/utils';
+import { Perspective } from '../../../../shared/store/actions';
 import { SilenceFilterOptions, SilenceFilters } from './SilencesPage';
 
 export const filterSilences = (
diff --git a/web/src/components/Incidents/incidents-styles.css b/web/src/features/incidents/assets/incidents-styles.css
similarity index 100%
rename from web/src/components/Incidents/incidents-styles.css
rename to web/src/features/incidents/assets/incidents-styles.css
diff --git a/web/src/components/Incidents/AlertsChart/AlertsChart.tsx b/web/src/features/incidents/components/AlertsChart.tsx
similarity index 95%
rename from web/src/components/Incidents/AlertsChart/AlertsChart.tsx
rename to web/src/features/incidents/components/AlertsChart.tsx
index 5751b32b9..eb7237855 100644
--- a/web/src/components/Incidents/AlertsChart/AlertsChart.tsx
+++ b/web/src/features/incidents/components/AlertsChart.tsx
@@ -26,21 +26,21 @@ import {
   t_global_color_status_warning_default,
 } from '@patternfly/react-tokens';
 import { useDispatch, useSelector } from 'react-redux';
-import { IncidentsTooltip } from '../IncidentsTooltip';
+import { IncidentsTooltip } from './IncidentsTooltip';
 import {
   createAlertsChartBars,
   generateDateArray,
   generateAlertsDateArray,
   getCurrentTime,
   roundDateToInterval,
-} from '../utils';
-import { dateTimeFormatter, timeFormatter } from '../../console/utils/datetime';
+} from '../utils/utils';
+import { dateTimeFormatter, timeFormatter } from '../../../shared/console/utils/datetime';
 import { useTranslation } from 'react-i18next';
-import { AlertsChartBar } from '../model';
-import { setAlertsAreLoading } from '../../../store/actions';
-import { MonitoringState } from '../../../store/store';
+import { AlertsChartBar } from '../types/model';
+import { setAlertsAreLoading } from '../../../shared/store/actions';
+import { MonitoringState } from '../../../shared/store/store';
 import { isEmpty } from 'lodash-es';
-import { DataTestIDs } from '../../data-test';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 
 const AlertsChart = ({ theme }: { theme: 'light' | 'dark' }) => {
   const dispatch = useDispatch();
diff --git a/web/src/components/Incidents/IncidentAlertStateIcon.tsx b/web/src/features/incidents/components/IncidentAlertStateIcon.tsx
similarity index 97%
rename from web/src/components/Incidents/IncidentAlertStateIcon.tsx
rename to web/src/features/incidents/components/IncidentAlertStateIcon.tsx
index 37f37354c..8fd03811e 100644
--- a/web/src/components/Incidents/IncidentAlertStateIcon.tsx
+++ b/web/src/features/incidents/components/IncidentAlertStateIcon.tsx
@@ -2,7 +2,7 @@ import { FC } from 'react';
 import { Tooltip } from '@patternfly/react-core';
 import { BellIcon, CheckIcon, BellSlashIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
-import { GroupedAlert, IncidentsDetailsAlert } from './model';
+import { GroupedAlert, IncidentsDetailsAlert } from '../types/model';
 
 interface IncidentAlertStateIconProps {
   alertDetails: IncidentsDetailsAlert;
diff --git a/web/src/components/Incidents/IncidentsChart/IncidentsChart.tsx b/web/src/features/incidents/components/IncidentsChart.tsx
similarity index 97%
rename from web/src/components/Incidents/IncidentsChart/IncidentsChart.tsx
rename to web/src/features/incidents/components/IncidentsChart.tsx
index 2d7e456b8..327c29881 100644
--- a/web/src/components/Incidents/IncidentsChart/IncidentsChart.tsx
+++ b/web/src/features/incidents/components/IncidentsChart.tsx
@@ -26,18 +26,17 @@ import {
   t_global_color_status_info_default,
   t_global_color_status_warning_default,
 } from '@patternfly/react-tokens';
-import '../incidents-styles.css';
-import { IncidentsTooltip } from '../IncidentsTooltip';
-import { Incident } from '../model';
+import { IncidentsTooltip } from './IncidentsTooltip';
+import { Incident } from '../types/model';
 import {
   calculateIncidentsChartDomain,
   createIncidentsChartBars,
   generateDateArray,
   roundDateToInterval,
-} from '../utils';
-import { dateTimeFormatter, timeFormatter } from '../../console/utils/datetime';
+} from '../utils/utils';
+import { dateTimeFormatter, timeFormatter } from '../../../shared/console/utils/datetime';
 import { useTranslation } from 'react-i18next';
-import { DataTestIDs } from '../../data-test';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 
 /**
  * Processes component list: moves "Others" to end and limits display to 3 components
diff --git a/web/src/components/Incidents/IncidentsDetailsRowTable.tsx b/web/src/features/incidents/components/IncidentsDetailsRowTable.tsx
similarity index 90%
rename from web/src/components/Incidents/IncidentsDetailsRowTable.tsx
rename to web/src/features/incidents/components/IncidentsDetailsRowTable.tsx
index 3bf2e8128..f05e1753c 100644
--- a/web/src/components/Incidents/IncidentsDetailsRowTable.tsx
+++ b/web/src/features/incidents/components/IncidentsDetailsRowTable.tsx
@@ -2,15 +2,14 @@ import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { ResourceIcon, Timestamp, useActiveNamespace } from '@openshift-console/dynamic-plugin-sdk';
 import { Bullseye, Spinner } from '@patternfly/react-core';
 import { Link } from 'react-router';
-import { ALL_NAMESPACES_KEY, RuleResource } from '../utils';
+import { ALL_NAMESPACES_KEY, RuleResource } from '../../../shared/utils/utils';
 import { useTranslation } from 'react-i18next';
-import { getRuleUrl, usePerspective } from '../hooks/usePerspective';
-import './incidents-styles.css';
-import { SeverityBadge } from '../alerting/AlertUtils';
-import { Alert, IncidentsDetailsAlert } from './model';
+import { getRuleUrl, usePerspective } from '../../../shared/hooks/usePerspective';
+import { SeverityBadge } from '../../alerts/components/AlertUtils';
+import { Alert, IncidentsDetailsAlert } from '../types/model';
 import { IncidentAlertStateIcon } from './IncidentAlertStateIcon';
 import { useMemo } from 'react';
-import { DataTestIDs } from '../data-test';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 
 interface IncidentsDetailsRowTableProps {
   alerts: Alert[];
diff --git a/web/src/components/Incidents/IncidentsTable.tsx b/web/src/features/incidents/components/IncidentsTable.tsx
similarity index 97%
rename from web/src/components/Incidents/IncidentsTable.tsx
rename to web/src/features/incidents/components/IncidentsTable.tsx
index 81842f4ab..679963be2 100644
--- a/web/src/components/Incidents/IncidentsTable.tsx
+++ b/web/src/features/incidents/components/IncidentsTable.tsx
@@ -13,13 +13,13 @@ import { isEmpty } from 'lodash-es';
 import { useState, useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { MonitoringState } from '../../store/store';
-import { SeverityBadge } from '../alerting/AlertUtils';
+import { MonitoringState } from '../../../shared/store/store';
+import { SeverityBadge } from '../../alerts/components/AlertUtils';
 import IncidentsDetailsRowTable from './IncidentsDetailsRowTable';
 import { GroupedAlertStateIcon } from './IncidentAlertStateIcon';
 
-import { GroupedAlert } from './model';
-import { DataTestIDs } from '../data-test';
+import { GroupedAlert } from '../types/model';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 
 export const IncidentsTable = () => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/Incidents/IncidentsTooltip.tsx b/web/src/features/incidents/components/IncidentsTooltip.tsx
similarity index 96%
rename from web/src/components/Incidents/IncidentsTooltip.tsx
rename to web/src/features/incidents/components/IncidentsTooltip.tsx
index f74aebb71..5ca9e2628 100644
--- a/web/src/components/Incidents/IncidentsTooltip.tsx
+++ b/web/src/features/incidents/components/IncidentsTooltip.tsx
@@ -1,5 +1,4 @@
 import { VictoryPortal } from 'victory';
-import './incidents-styles.css';
 
 const TOOLTIP_MAX_HEIGHT = 300;
 const TOOLTIP_MAX_WIDTH = 650;
diff --git a/web/src/components/Incidents/ToolbarItemFilter.tsx b/web/src/features/incidents/components/ToolbarItemFilter.tsx
similarity index 96%
rename from web/src/components/Incidents/ToolbarItemFilter.tsx
rename to web/src/features/incidents/components/ToolbarItemFilter.tsx
index 416c6e02c..0966fd8c9 100644
--- a/web/src/components/Incidents/ToolbarItemFilter.tsx
+++ b/web/src/features/incidents/components/ToolbarItemFilter.tsx
@@ -8,10 +8,10 @@ import {
   MenuToggle,
   Badge,
 } from '@patternfly/react-core';
-import { getFilterKey } from './utils';
-import { IncidentFiltersCombined } from './model';
-import { setAlertsAreLoading } from '../../store/actions';
-import { DataTestIDs } from '../data-test';
+import { getFilterKey } from '../utils/utils';
+import { IncidentFiltersCombined } from '../types/model';
+import { setAlertsAreLoading } from '../../../shared/store/actions';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 import { useTranslation } from 'react-i18next';
 
 interface IncidentFilterToolbarItemProps {
diff --git a/web/src/components/Incidents/IncidentsPage.tsx b/web/src/features/incidents/pages/IncidentsPage.tsx
similarity index 94%
rename from web/src/components/Incidents/IncidentsPage.tsx
rename to web/src/features/incidents/pages/IncidentsPage.tsx
index 027c47406..e67da576b 100644
--- a/web/src/components/Incidents/IncidentsPage.tsx
+++ b/web/src/features/incidents/pages/IncidentsPage.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { useMemo, useState, useEffect, useCallback, MouseEvent } from 'react';
-import { useSafeFetch } from '../console/utils/safe-fetch-hook';
-import { createAlertsQuery, fetchDataForIncidentsAndAlerts } from './api';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
+import { createAlertsQuery, fetchDataForIncidentsAndAlerts } from '../utils/api';
 import { useTranslation } from 'react-i18next';
 import {
   Bullseye,
@@ -23,13 +23,14 @@ import {
   Alert,
   AlertActionCloseButton,
 } from '@patternfly/react-core';
-import { AccessDenied } from '../console/console-shared/src/components/empty-state/AccessDenied';
-import { IncidentsTable } from './IncidentsTable';
+import { AccessDenied } from '../../../shared/console/console-shared/src/components/empty-state/AccessDenied';
+import { IncidentsTable } from '../components/IncidentsTable';
+import '../assets/incidents-styles.css';
 import {
   getIncidentsTimeRanges,
   convertToIncidents,
   processIncidentsForAlerts,
-} from './processIncidents';
+} from '../utils/processIncidents';
 import {
   filterIncident,
   getCurrentTime,
@@ -39,8 +40,8 @@ import {
   onIncidentFiltersSelect,
   parseUrlParams,
   updateBrowserUrl,
-} from './utils';
-import { groupAlertsForTable, convertToAlerts } from './processAlerts';
+} from '../utils/utils';
+import { groupAlertsForTable, convertToAlerts } from '../utils/processAlerts';
 import { CompressArrowsAltIcon, CompressIcon, FilterIcon } from '@patternfly/react-icons';
 import { useDispatch, useSelector } from 'react-redux';
 import {
@@ -52,24 +53,24 @@ import {
   setIncidents,
   setIncidentsActiveFilters,
   setIncidentsLastRefreshTime,
-} from '../../store/actions';
+} from '../../../shared/store/actions';
 import { useLocation } from 'react-router';
-import { changeDaysFilter } from './utils';
-import { parsePrometheusDuration } from '../console/console-shared/src/datetime/prometheus';
-import withFallback from '../console/console-shared/error/fallbacks/withFallback';
-import IncidentsChart from './IncidentsChart/IncidentsChart';
-import AlertsChart from './AlertsChart/AlertsChart';
-import { usePatternFlyTheme } from '../hooks/usePatternflyTheme';
-import { MonitoringState } from '../../store/store';
-import { Incident, IncidentsPageFiltersExpandedState } from './model';
-import { useAlerts } from '../../hooks/useAlerts';
+import { changeDaysFilter } from '../utils/utils';
+import { parsePrometheusDuration } from '../../../shared/console/console-shared/src/datetime/prometheus';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
+import IncidentsChart from '../components/IncidentsChart';
+import AlertsChart from '../components/AlertsChart';
+import { usePatternFlyTheme } from '../../../shared/hooks/usePatternflyTheme';
+import { MonitoringState } from '../../../shared/store/store';
+import { Incident, IncidentsPageFiltersExpandedState } from '../types/model';
+import { useAlerts } from '../../../shared/hooks/useAlerts';
 import IncidentFilterToolbarItem, {
   useSeverityOptions,
   useStateOptions,
-} from './ToolbarItemFilter';
-import { MonitoringProvider } from '../../contexts/MonitoringContext';
+} from '../components/ToolbarItemFilter';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
 import { isEmpty } from 'lodash-es';
-import { DataTestIDs } from '../data-test';
+import { DataTestIDs } from '../../../shared/constants/data-test';
 import { DocumentTitle } from '@openshift-console/dynamic-plugin-sdk';
 
 const IncidentsPage = () => {
diff --git a/web/src/components/Incidents/model.ts b/web/src/features/incidents/types/model.ts
similarity index 100%
rename from web/src/components/Incidents/model.ts
rename to web/src/features/incidents/types/model.ts
diff --git a/web/src/components/Incidents/api.spec.ts b/web/src/features/incidents/utils/api.spec.ts
similarity index 97%
rename from web/src/components/Incidents/api.spec.ts
rename to web/src/features/incidents/utils/api.spec.ts
index ad3daf6c9..29142f228 100644
--- a/web/src/components/Incidents/api.spec.ts
+++ b/web/src/features/incidents/utils/api.spec.ts
@@ -1,6 +1,6 @@
 import { createAlertsQuery, fetchDataForIncidentsAndAlerts } from './api';
 import { PrometheusResponse, consoleFetchJSON } from '@openshift-console/dynamic-plugin-sdk';
-import { buildPrometheusUrl } from '../utils';
+import { buildPrometheusUrl } from '../../../shared/utils/utils';
 
 // Mock the SDK
 jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
@@ -11,7 +11,7 @@ jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
 }));
 
 // Mock the global utils to avoid window access side effects
-jest.mock('../utils', () => ({
+jest.mock('../../../shared/utils/utils', () => ({
   getPrometheusBasePath: jest.fn(),
   buildPrometheusUrl: jest.fn(),
 }));
diff --git a/web/src/components/Incidents/api.ts b/web/src/features/incidents/utils/api.ts
similarity index 98%
rename from web/src/components/Incidents/api.ts
rename to web/src/features/incidents/utils/api.ts
index 59dafa135..95e110745 100644
--- a/web/src/components/Incidents/api.ts
+++ b/web/src/features/incidents/utils/api.ts
@@ -5,7 +5,7 @@ import {
   PrometheusEndpoint,
   PrometheusResponse,
 } from '@openshift-console/dynamic-plugin-sdk';
-import { getPrometheusBasePath, buildPrometheusUrl } from '../utils';
+import { getPrometheusBasePath, buildPrometheusUrl } from '../../../shared/utils/utils';
 import { PROMETHEUS_QUERY_INTERVAL_SECONDS } from './utils';
 
 // Disable client-side timeout (-1) to let the backend control query timeouts
diff --git a/web/src/components/Incidents/processAlerts.spec.ts b/web/src/features/incidents/utils/processAlerts.spec.ts
similarity index 99%
rename from web/src/components/Incidents/processAlerts.spec.ts
rename to web/src/features/incidents/utils/processAlerts.spec.ts
index 011e8aaba..153b9901e 100644
--- a/web/src/components/Incidents/processAlerts.spec.ts
+++ b/web/src/features/incidents/utils/processAlerts.spec.ts
@@ -1,6 +1,6 @@
 import { PrometheusResult } from '@openshift-console/dynamic-plugin-sdk';
 import { convertToAlerts, deduplicateAlerts } from './processAlerts';
-import { Incident } from './model';
+import { Incident } from '../types/model';
 import { getCurrentTime } from './utils';
 
 describe('convertToAlerts', () => {
diff --git a/web/src/components/Incidents/processAlerts.ts b/web/src/features/incidents/utils/processAlerts.ts
similarity index 99%
rename from web/src/components/Incidents/processAlerts.ts
rename to web/src/features/incidents/utils/processAlerts.ts
index acb8aca41..701d8ea95 100644
--- a/web/src/components/Incidents/processAlerts.ts
+++ b/web/src/features/incidents/utils/processAlerts.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 
 import { PrometheusResult, PrometheusRule } from '@openshift-console/dynamic-plugin-sdk';
-import { Alert, GroupedAlert, Incident, Severity } from './model';
+import { Alert, GroupedAlert, Incident, Severity } from '../types/model';
 import {
   insertPaddingPointsForChart,
   isResolved,
diff --git a/web/src/components/Incidents/processIncidents.spec.ts b/web/src/features/incidents/utils/processIncidents.spec.ts
similarity index 100%
rename from web/src/components/Incidents/processIncidents.spec.ts
rename to web/src/features/incidents/utils/processIncidents.spec.ts
diff --git a/web/src/components/Incidents/processIncidents.ts b/web/src/features/incidents/utils/processIncidents.ts
similarity index 99%
rename from web/src/components/Incidents/processIncidents.ts
rename to web/src/features/incidents/utils/processIncidents.ts
index dc46ccfc3..2e2d578e8 100644
--- a/web/src/components/Incidents/processIncidents.ts
+++ b/web/src/features/incidents/utils/processIncidents.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 
 import { PrometheusLabels, PrometheusResult } from '@openshift-console/dynamic-plugin-sdk';
-import { Incident, Metric, ProcessedIncident } from './model';
+import { Incident, Metric, ProcessedIncident } from '../types/model';
 import { insertPaddingPointsForChart, isResolved, sortByEarliestTimestamp } from './utils';
 
 /**
diff --git a/web/src/components/Incidents/utils.spec.ts b/web/src/features/incidents/utils/utils.spec.ts
similarity index 100%
rename from web/src/components/Incidents/utils.spec.ts
rename to web/src/features/incidents/utils/utils.spec.ts
diff --git a/web/src/components/Incidents/utils.ts b/web/src/features/incidents/utils/utils.ts
similarity index 99%
rename from web/src/components/Incidents/utils.ts
rename to web/src/features/incidents/utils/utils.ts
index e9db4df5a..83dd02038 100644
--- a/web/src/components/Incidents/utils.ts
+++ b/web/src/features/incidents/utils/utils.ts
@@ -5,7 +5,7 @@ import {
 } from '@patternfly/react-tokens';
 import { PrometheusResult } from '@openshift-console/dynamic-plugin-sdk';
 import { Dispatch } from 'redux';
-import { setIncidentsActiveFilters } from '../../store/actions';
+import { setIncidentsActiveFilters } from '../../../shared/store/actions';
 import {
   Alert,
   AlertsChartBar,
@@ -16,7 +16,7 @@ import {
   IncidentsDetailsAlert,
   SpanDates,
   Timestamps,
-} from './model';
+} from '../types/model';
 import { TFunction } from 'i18next';
 
 /**
diff --git a/web/src/components/dashboards/legacy/custom-time-range-modal.tsx b/web/src/features/legacy-dashboards/components/custom-time-range-modal.tsx
similarity index 97%
rename from web/src/components/dashboards/legacy/custom-time-range-modal.tsx
rename to web/src/features/legacy-dashboards/components/custom-time-range-modal.tsx
index 7712d6559..5bc122d21 100644
--- a/web/src/components/dashboards/legacy/custom-time-range-modal.tsx
+++ b/web/src/features/legacy-dashboards/components/custom-time-range-modal.tsx
@@ -17,9 +17,9 @@ import type { FC, MouseEventHandler } from 'react';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { QueryParams } from '../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 import { NumberParam, useQueryParam } from 'use-query-params';
-import { TimeRangeParam } from './utils';
+import { TimeRangeParam } from '../utils/utils';
 
 const zeroPad = (number: number) => (number < 10 ? `0${number}` : number);
 
diff --git a/web/src/components/dashboards/legacy/dashboard-skeleton-legacy.tsx b/web/src/features/legacy-dashboards/components/dashboard-skeleton-legacy.tsx
similarity index 93%
rename from web/src/components/dashboards/legacy/dashboard-skeleton-legacy.tsx
rename to web/src/features/legacy-dashboards/components/dashboard-skeleton-legacy.tsx
index d3bb86bdd..ffab5f82f 100644
--- a/web/src/components/dashboards/legacy/dashboard-skeleton-legacy.tsx
+++ b/web/src/features/legacy-dashboards/components/dashboard-skeleton-legacy.tsx
@@ -4,8 +4,8 @@ import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { Divider, PageSection, Split, SplitItem, Stack, StackItem } from '@patternfly/react-core';
-import { CombinedDashboardMetadata } from '../perses/hooks/useDashboardsData';
-import { DashboardDropdown } from '../shared/dashboard-dropdown';
+import { CombinedDashboardMetadata } from '../../perses-dashboards/hooks/useDashboardsData';
+import { DashboardDropdown } from '../../../shared/components/dashboard-dropdown';
 import { PollIntervalDropdown, TimespanDropdown } from './time-dropdowns';
 import { LegacyDashboardsAllVariableDropdowns } from './legacy-variable-dropdowns';
 import { DocumentTitle, ListPageHeader } from '@openshift-console/dynamic-plugin-sdk';
diff --git a/web/src/components/dashboards/legacy/error.tsx b/web/src/features/legacy-dashboards/components/error.tsx
similarity index 100%
rename from web/src/components/dashboards/legacy/error.tsx
rename to web/src/features/legacy-dashboards/components/error.tsx
diff --git a/web/src/components/dashboards/legacy/legacy-dashboard.tsx b/web/src/features/legacy-dashboards/components/legacy-dashboard.tsx
similarity index 92%
rename from web/src/components/dashboards/legacy/legacy-dashboard.tsx
rename to web/src/features/legacy-dashboards/components/legacy-dashboard.tsx
index 4be22e725..f61120b38 100644
--- a/web/src/components/dashboards/legacy/legacy-dashboard.tsx
+++ b/web/src/features/legacy-dashboards/components/legacy-dashboard.tsx
@@ -23,35 +23,35 @@ import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router';
 
-import { Perspective } from '../../../store/actions';
-import BarChart from '../legacy/bar-chart';
-import Graph from '../legacy/graph';
-import SingleStat from '../legacy/single-stat';
-import Table from '../legacy/table';
-import { useBoolean } from '../../hooks/useBoolean';
-import { useIsVisible } from '../../hooks/useIsVisible';
+import { Perspective } from '../../../shared/store/actions';
+import BarChart from './panels/bar-chart';
+import Graph from './panels/graph';
+import SingleStat from './panels/single-stat';
+import Table from './panels/table';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { useIsVisible } from '../../../shared/hooks/useIsVisible';
 import {
   getMutlipleQueryBrowserUrl,
   getObserveState,
   usePerspective,
-} from '../../hooks/usePerspective';
-import { useMonitoringNamespace } from '../../hooks/useMonitoringNamespace';
-import KebabDropdown from '../../kebab-dropdown';
-import { MonitoringState } from '../../../store/store';
+} from '../../../shared/hooks/usePerspective';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
+import KebabDropdown from '../../../shared/components/KebabDropdown';
+import { MonitoringState } from '../../../shared/store/store';
 import { evaluateVariableTemplate, Variable } from './legacy-variable-dropdowns';
-import { Panel, Row } from './types';
-import { QueryParams } from '../../query-params';
+import { Panel, Row } from '../types/types';
+import { QueryParams } from '../../../shared/constants/query-params';
 import { CustomDataSource } from '@openshift-console/dynamic-plugin-sdk-internal/lib/extensions/dashboard-data-source';
 import {
   DataSource,
   isDataSource,
 } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
 import { t_global_font_size_heading_h2 } from '@patternfly/react-tokens';
-import { GraphUnits } from '../../../components/metrics/units';
-import { LegacyDashboardPageTestIDs } from '../../../components/data-test';
-import { useMonitoring } from '../../../hooks/useMonitoring';
+import { GraphUnits } from '../../metrics/utils/units';
+import { LegacyDashboardPageTestIDs } from '../../../shared/constants/data-test';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 import { useQueryParam } from 'use-query-params';
-import { RefreshIntervalParam, TimeRangeParam } from './utils';
+import { RefreshIntervalParam, TimeRangeParam } from '../utils/utils';
 
 const QueryBrowserLink = ({
   queries,
diff --git a/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx b/web/src/features/legacy-dashboards/components/legacy-variable-dropdowns.tsx
similarity index 91%
rename from web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx
rename to web/src/features/legacy-dashboards/components/legacy-variable-dropdowns.tsx
index a26b61469..22b6b276e 100644
--- a/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx
+++ b/web/src/features/legacy-dashboards/components/legacy-variable-dropdowns.tsx
@@ -23,31 +23,34 @@ import { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { useSafeFetch } from '../../console/utils/safe-fetch-hook';
-import { SingleTypeaheadDropdown } from '../../console/utils/single-typeahead-dropdown';
-import { buildPrometheusUrl, getPrometheusBasePath } from '../../utils';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
+import { SingleTypeaheadDropdown } from '../../../shared/console/utils/single-typeahead-dropdown';
+import { buildPrometheusUrl, getPrometheusBasePath } from '../../../shared/utils/utils';
 
 import {
   DataSource,
   isDataSource,
 } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
 import { StringParam, useQueryParam } from 'use-query-params';
-import { useMonitoring } from '../../../hooks/useMonitoring';
-import { dashboardsPatchVariable, dashboardsVariableOptionsLoaded } from '../../../store/actions';
-import { MonitoringState } from '../../../store/store';
-import { useDeepMemo } from '../../hooks/useDeepMemo';
-import { getObserveState, usePerspective } from '../../hooks/usePerspective';
-import { QueryParams } from '../../query-params';
-import { getTimeRanges, isTimeoutError, QUERY_CHUNK_SIZE } from '../../utils';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
+import {
+  dashboardsPatchVariable,
+  dashboardsVariableOptionsLoaded,
+} from '../../../shared/store/actions';
+import { MonitoringState } from '../../../shared/store/store';
+import { useDeepMemo } from '../../../shared/hooks/useDeepMemo';
+import { getObserveState, usePerspective } from '../../../shared/hooks/usePerspective';
+import { QueryParams } from '../../../shared/constants/query-params';
+import { getTimeRanges, isTimeoutError, QUERY_CHUNK_SIZE } from '../../../shared/utils/utils';
 import {
   DEFAULT_GRAPH_SAMPLES,
   MONITORING_DASHBOARDS_VARIABLE_ALL_OPTION_KEY,
   TimeRangeParam,
-} from './utils';
-import type { Variable } from './variable-utils';
-import { evaluateVariableTemplate, isIntervalVariable } from './variable-utils';
-export { evaluateVariableTemplate } from './variable-utils';
-export type { Variable } from './variable-utils';
+} from '../utils/utils';
+import type { Variable } from '../utils/variable-utils';
+import { evaluateVariableTemplate, isIntervalVariable } from '../utils/variable-utils';
+export { evaluateVariableTemplate } from '../utils/variable-utils';
+export type { Variable } from '../utils/variable-utils';
 
 const LegacyDashboardsVariableOption = ({ value, isSelected, ...rest }: SelectOptionProps) =>
   isIntervalVariable(String(value)) ? (
diff --git a/web/src/components/dashboards/legacy/bar-chart.tsx b/web/src/features/legacy-dashboards/components/panels/bar-chart.tsx
similarity index 89%
rename from web/src/components/dashboards/legacy/bar-chart.tsx
rename to web/src/features/legacy-dashboards/components/panels/bar-chart.tsx
index 9dae8b041..b516d3f9f 100644
--- a/web/src/components/dashboards/legacy/bar-chart.tsx
+++ b/web/src/features/legacy-dashboards/components/panels/bar-chart.tsx
@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 
-import { Bar } from '../../console/graphs/bar';
+import { Bar } from '../../../../shared/console/graphs/bar';
 import { CustomDataSource } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
 
 const BarChart: FC<BarChartProps> = ({ customDataSource, pollInterval, query }) => (
diff --git a/web/src/components/dashboards/legacy/graph.tsx b/web/src/features/legacy-dashboards/components/panels/graph.tsx
similarity index 83%
rename from web/src/components/dashboards/legacy/graph.tsx
rename to web/src/features/legacy-dashboards/components/panels/graph.tsx
index 2892eec8c..2d06cf8b2 100644
--- a/web/src/components/dashboards/legacy/graph.tsx
+++ b/web/src/features/legacy-dashboards/components/panels/graph.tsx
@@ -2,11 +2,14 @@ import type { FC } from 'react';
 import { useCallback } from 'react';
 import { NumberParam, useQueryParam } from 'use-query-params';
 
-import { FormatSeriesTitle, QueryBrowser } from '../../query-browser';
-import { DEFAULT_GRAPH_SAMPLES, TimeRangeParam } from './utils';
+import {
+  FormatSeriesTitle,
+  QueryBrowser,
+} from '../../../../shared/components/query-browser/query-browser';
+import { DEFAULT_GRAPH_SAMPLES, TimeRangeParam } from '../../utils/utils';
 import { CustomDataSource } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
-import { GraphUnits } from '../../../components/metrics/units';
-import { QueryParams } from '../../query-params';
+import { GraphUnits } from '../../../metrics/utils/units';
+import { QueryParams } from '../../../../shared/constants/query-params';
 
 type Props = {
   customDataSource?: CustomDataSource;
diff --git a/web/src/components/dashboards/legacy/single-stat.tsx b/web/src/features/legacy-dashboards/components/panels/single-stat.tsx
similarity index 90%
rename from web/src/components/dashboards/legacy/single-stat.tsx
rename to web/src/features/legacy-dashboards/components/panels/single-stat.tsx
index 758993678..5f9b85521 100644
--- a/web/src/components/dashboards/legacy/single-stat.tsx
+++ b/web/src/features/legacy-dashboards/components/panels/single-stat.tsx
@@ -4,15 +4,15 @@ import { useState, useCallback } from 'react';
 import { PrometheusEndpoint, PrometheusResponse } from '@openshift-console/dynamic-plugin-sdk';
 import { Bullseye, Title } from '@patternfly/react-core';
 
-import ErrorAlert from './error';
-import { getPrometheusBasePath, buildPrometheusUrl } from '../../utils';
-import { usePoll } from '../../console/utils/poll-hook';
-import { useSafeFetch } from '../../console/utils/safe-fetch-hook';
+import ErrorAlert from '../error';
+import { getPrometheusBasePath, buildPrometheusUrl } from '../../../../shared/utils/utils';
+import { usePoll } from '../../../../shared/console/utils/poll-hook';
+import { useSafeFetch } from '../../../../shared/console/utils/safe-fetch-hook';
 
-import { formatNumber } from '../../format';
-import { Panel } from './types';
+import { formatNumber } from '../../../../shared/components/format';
+import { Panel } from '../../types/types';
 import { useTranslation } from 'react-i18next';
-import { LoadingInline } from '../../console/console-shared/src/components/loading/LoadingInline';
+import { LoadingInline } from '../../../../shared/console/console-shared/src/components/loading/LoadingInline';
 import { CustomDataSource } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
 import {
   t_chart_color_blue_100,
@@ -46,8 +46,8 @@ import {
   t_chart_color_yellow_400,
   t_chart_color_yellow_500,
 } from '@patternfly/react-tokens';
-import { PatternflyToken } from '../../types';
-import { useMonitoring } from '../../../hooks/useMonitoring';
+import { PatternflyToken } from '../../../../shared/types/types';
+import { useMonitoring } from '../../../../shared/hooks/useMonitoring';
 
 const colorMap: Record<string, PatternflyToken> = {
   'super-light-blue': t_chart_color_blue_100,
diff --git a/web/src/components/dashboards/legacy/table.tsx b/web/src/features/legacy-dashboards/components/panels/table.tsx
similarity index 92%
rename from web/src/components/dashboards/legacy/table.tsx
rename to web/src/features/legacy-dashboards/components/panels/table.tsx
index 4a63a9c4d..f16ed60a5 100644
--- a/web/src/components/dashboards/legacy/table.tsx
+++ b/web/src/features/legacy-dashboards/components/panels/table.tsx
@@ -16,17 +16,20 @@ import type { FC } from 'react';
 import { useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import ErrorAlert from './error';
-import { getPrometheusBasePath, buildPrometheusUrl } from '../../utils';
-import { usePoll } from '../../console/utils/poll-hook';
-import { useSafeFetch } from '../../console/utils/safe-fetch-hook';
+import ErrorAlert from '../error';
+import { getPrometheusBasePath, buildPrometheusUrl } from '../../../../shared/utils/utils';
+import { usePoll } from '../../../../shared/console/utils/poll-hook';
+import { useSafeFetch } from '../../../../shared/console/utils/safe-fetch-hook';
 
-import { formatNumber } from '../../format';
-import { ITEMS_PER_PAGE, TablePagination } from '../../table-pagination';
-import { ColumnStyle, Panel } from './types';
+import { formatNumber } from '../../../../shared/components/format';
+import {
+  ITEMS_PER_PAGE,
+  TablePagination,
+} from '../../../../shared/components/table/table-pagination';
+import { ColumnStyle, Panel } from '../../types/types';
 import { CustomDataSource } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
-import { GraphEmpty } from '../../console/graphs/graph-empty';
-import { useMonitoring } from '../../../hooks/useMonitoring';
+import { GraphEmpty } from '../../../../shared/console/graphs/graph-empty';
+import { useMonitoring } from '../../../../shared/hooks/useMonitoring';
 
 type AugmentedColumnStyle = ColumnStyle & {
   className?: string;
diff --git a/web/src/components/dashboards/legacy/time-dropdowns.tsx b/web/src/features/legacy-dashboards/components/time-dropdowns.tsx
similarity index 90%
rename from web/src/components/dashboards/legacy/time-dropdowns.tsx
rename to web/src/features/legacy-dashboards/components/time-dropdowns.tsx
index 70d2cc46c..4dda3f85d 100644
--- a/web/src/components/dashboards/legacy/time-dropdowns.tsx
+++ b/web/src/features/legacy-dashboards/components/time-dropdowns.tsx
@@ -7,13 +7,13 @@ import { NumberParam, useQueryParam } from 'use-query-params';
 import {
   formatPrometheusDuration,
   parsePrometheusDuration,
-} from '../../console/console-shared/src/datetime/prometheus';
-import { DropDownPollInterval } from '../../dropdown-poll-interval';
-import { useBoolean } from '../../hooks/useBoolean';
-import { QueryParams } from '../../query-params';
+} from '../../../shared/console/console-shared/src/datetime/prometheus';
+import { DropDownPollInterval } from '../../../shared/components/DropdownPollInterval';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { QueryParams } from '../../../shared/constants/query-params';
 import CustomTimeRangeModal from './custom-time-range-modal';
-import { LegacyDashboardPageTestIDs } from '../../data-test';
-import { RefreshIntervalParam, TimeRangeParam } from './utils';
+import { LegacyDashboardPageTestIDs } from '../../../shared/constants/data-test';
+import { RefreshIntervalParam, TimeRangeParam } from '../utils/utils';
 
 const CUSTOM_TIME_RANGE_KEY = 'CUSTOM_TIME_RANGE_KEY';
 const DEFAULT_TIMERANGE = '30m';
diff --git a/web/src/components/dashboards/legacy/useLegacyDashboards.ts b/web/src/features/legacy-dashboards/hooks/useLegacyDashboards.ts
similarity index 93%
rename from web/src/components/dashboards/legacy/useLegacyDashboards.ts
rename to web/src/features/legacy-dashboards/hooks/useLegacyDashboards.ts
index 1590be24c..f3bdfacad 100644
--- a/web/src/components/dashboards/legacy/useLegacyDashboards.ts
+++ b/web/src/features/legacy-dashboards/hooks/useLegacyDashboards.ts
@@ -3,15 +3,15 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useNavigate, useSearchParams } from 'react-router';
-import { dashboardsPatchAllVariables } from '../../../store/actions';
-import { useSafeFetch } from '../../console/utils/safe-fetch-hook';
-import { useBoolean } from '../../hooks/useBoolean';
-import { getLegacyDashboardsUrl, usePerspective } from '../../hooks/usePerspective';
-import { QueryParams } from '../../query-params';
-import { ALL_NAMESPACES_KEY } from '../../utils';
-import { CombinedDashboardMetadata } from '../perses/hooks/useDashboardsData';
-import { Board } from './types';
-import { MONITORING_DASHBOARDS_VARIABLE_ALL_OPTION_KEY } from './utils';
+import { dashboardsPatchAllVariables } from '../../../shared/store/actions';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { getLegacyDashboardsUrl, usePerspective } from '../../../shared/hooks/usePerspective';
+import { QueryParams } from '../../../shared/constants/query-params';
+import { ALL_NAMESPACES_KEY } from '../../../shared/utils/utils';
+import { CombinedDashboardMetadata } from '../../perses-dashboards/hooks/useDashboardsData';
+import { Board } from '../types/types';
+import { MONITORING_DASHBOARDS_VARIABLE_ALL_OPTION_KEY } from '../utils/utils';
 import { useLegacyDashboardsProject } from './useLegacyDashboardsProject';
 
 export const useLegacyDashboards = (urlBoard: string) => {
diff --git a/web/src/components/dashboards/legacy/useLegacyDashboardsProject.ts b/web/src/features/legacy-dashboards/hooks/useLegacyDashboardsProject.ts
similarity index 82%
rename from web/src/components/dashboards/legacy/useLegacyDashboardsProject.ts
rename to web/src/features/legacy-dashboards/hooks/useLegacyDashboardsProject.ts
index 7ec3c49b6..3b3fe972e 100644
--- a/web/src/components/dashboards/legacy/useLegacyDashboardsProject.ts
+++ b/web/src/features/legacy-dashboards/hooks/useLegacyDashboardsProject.ts
@@ -1,13 +1,13 @@
 import { useActiveNamespace } from '@openshift-console/dynamic-plugin-sdk';
 import { useEffect } from 'react';
-import { QueryParams } from '../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { useDispatch, useSelector } from 'react-redux';
-import { MonitoringState } from '../../../store/store';
-import { getObserveState, usePerspective } from '../../hooks/usePerspective';
-import { useMonitoring } from '../../../hooks/useMonitoring';
+import { MonitoringState } from '../../../shared/store/store';
+import { getObserveState, usePerspective } from '../../../shared/hooks/usePerspective';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 import { useParams } from 'react-router';
-import { dashboardsPatchVariable } from '../../../store/actions';
+import { dashboardsPatchVariable } from '../../../shared/store/actions';
 
 export const useLegacyDashboardsProject = (dashboardName?: string) => {
   const { perspective } = usePerspective();
diff --git a/web/src/components/dashboards/legacy/legacy-dashboard-page.tsx b/web/src/features/legacy-dashboards/pages/legacy-dashboard-page.tsx
similarity index 77%
rename from web/src/components/dashboards/legacy/legacy-dashboard-page.tsx
rename to web/src/features/legacy-dashboards/pages/legacy-dashboard-page.tsx
index fd9b03c28..1161def94 100644
--- a/web/src/components/dashboards/legacy/legacy-dashboard-page.tsx
+++ b/web/src/features/legacy-dashboards/pages/legacy-dashboard-page.tsx
@@ -2,17 +2,17 @@ import { NamespaceBar, Overview } from '@openshift-console/dynamic-plugin-sdk';
 import type { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
-import { LoadingInline } from '../../../components/console/console-shared/src/components/loading/LoadingInline';
-import withFallback from '../../console/console-shared/error/fallbacks/withFallback';
-import { usePerspective } from '../../hooks/usePerspective';
-import { LegacyDashboard } from '../legacy/legacy-dashboard';
-import ErrorAlert from './error';
-import { DashboardSkeletonLegacy } from './dashboard-skeleton-legacy';
-import { useLegacyDashboards } from './useLegacyDashboards';
-import { MonitoringProvider } from '../../../contexts/MonitoringContext';
-import { useMonitoring } from '../../../hooks/useMonitoring';
+import { LoadingInline } from '../../../shared/console/console-shared/src/components/loading/LoadingInline';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { usePerspective } from '../../../shared/hooks/usePerspective';
+import { LegacyDashboard } from '../components/legacy-dashboard';
+import ErrorAlert from '../components/error';
+import { DashboardSkeletonLegacy } from '../components/dashboard-skeleton-legacy';
+import { useLegacyDashboards } from '../hooks/useLegacyDashboards';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 import { StringParam, useQueryParam } from 'use-query-params';
-import { QueryParams } from '../../../components/query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 
 type LegacyDashboardsPageProps = {
   urlBoard: string;
diff --git a/web/src/components/dashboards/legacy/types.ts b/web/src/features/legacy-dashboards/types/types.ts
similarity index 100%
rename from web/src/components/dashboards/legacy/types.ts
rename to web/src/features/legacy-dashboards/types/types.ts
diff --git a/web/src/components/dashboards/legacy/utils.ts b/web/src/features/legacy-dashboards/utils/utils.ts
similarity index 100%
rename from web/src/components/dashboards/legacy/utils.ts
rename to web/src/features/legacy-dashboards/utils/utils.ts
diff --git a/web/src/components/dashboards/legacy/variable-utils.spec.ts b/web/src/features/legacy-dashboards/utils/variable-utils.spec.ts
similarity index 100%
rename from web/src/components/dashboards/legacy/variable-utils.spec.ts
rename to web/src/features/legacy-dashboards/utils/variable-utils.spec.ts
diff --git a/web/src/components/dashboards/legacy/variable-utils.ts b/web/src/features/legacy-dashboards/utils/variable-utils.ts
similarity index 97%
rename from web/src/components/dashboards/legacy/variable-utils.ts
rename to web/src/features/legacy-dashboards/utils/variable-utils.ts
index ccf0203c6..2491857ba 100644
--- a/web/src/components/dashboards/legacy/variable-utils.ts
+++ b/web/src/features/legacy-dashboards/utils/variable-utils.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash-es';
 import { DEFAULT_GRAPH_SAMPLES, MONITORING_DASHBOARDS_VARIABLE_ALL_OPTION_KEY } from './utils';
-import { ALL_NAMESPACES_KEY } from '../../utils';
+import { ALL_NAMESPACES_KEY } from '../../../shared/utils/utils';
 
 const intervalVariableRegExps = ['__interval', '__rate_interval', '__auto_interval_[a-z]+'];
 
diff --git a/web/src/components/metrics/promql-expression-input.tsx b/web/src/features/metrics/components/promql-expression-input.tsx
similarity index 98%
rename from web/src/components/metrics/promql-expression-input.tsx
rename to web/src/features/metrics/components/promql-expression-input.tsx
index 55ebe2a6e..6434023b6 100644
--- a/web/src/components/metrics/promql-expression-input.tsx
+++ b/web/src/features/metrics/components/promql-expression-input.tsx
@@ -49,7 +49,7 @@ import type { FC } from 'react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useSafeFetch } from '../console/utils/safe-fetch-hook';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
 
 import {
   t_global_color_brand_default,
@@ -67,9 +67,9 @@ import {
   t_global_text_color_regular,
   t_global_text_color_subtle,
 } from '@patternfly/react-tokens';
-import { useMonitoring } from '../../hooks/useMonitoring';
-import { usePatternFlyTheme } from '../hooks/usePatternflyTheme';
-import { getPrometheusBasePath, PROMETHEUS_BASE_PATH } from '../utils';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
+import { usePatternFlyTheme } from '../../../shared/hooks/usePatternflyTheme';
+import { getPrometheusBasePath, PROMETHEUS_BASE_PATH } from '../../../shared/utils/utils';
 
 const box_shadow = `
     var(--pf-t--global--box-shadow--X--md--default)
diff --git a/web/src/components/MetricsPage.tsx b/web/src/features/metrics/pages/MetricsPage.tsx
similarity index 95%
rename from web/src/components/MetricsPage.tsx
rename to web/src/features/metrics/pages/MetricsPage.tsx
index a672a6d3b..beed484af 100644
--- a/web/src/components/MetricsPage.tsx
+++ b/web/src/features/metrics/pages/MetricsPage.tsx
@@ -80,44 +80,48 @@ import {
   queryBrowserToggleSeries,
   showGraphs,
   toggleGraphs,
-} from '../store/actions';
+} from '../../../shared/store/actions';
 
-import { getPrometheusBasePath, buildPrometheusUrl } from './utils';
-import { AsyncComponent } from './console/utils/async';
-import { usePoll } from './console/utils/poll-hook';
-import { useSafeFetch } from './console/utils/safe-fetch-hook';
+import { getPrometheusBasePath, buildPrometheusUrl } from '../../../shared/utils/utils';
+import { AsyncComponent } from '../../../shared/console/utils/async';
+import { usePoll } from '../../../shared/console/utils/poll-hook';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
 
 import {
   CustomDataSource,
   DataSource,
   isDataSource,
 } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
-import { MonitoringState } from '../store/store';
-import { DropDownPollInterval } from './dropdown-poll-interval';
-import { useBoolean } from './hooks/useBoolean';
-import { getObserveState } from './hooks/usePerspective';
-import KebabDropdown from './kebab-dropdown';
-import { colors, Error, QueryBrowser } from './query-browser';
-import { QueryParams } from './query-params';
-import { TablePagination } from './table-pagination';
-import { PrometheusAPIError } from './types';
-import { TypeaheadSelect } from './TypeaheadSelect';
-import { LoadingInline } from './console/console-shared/src/components/loading/LoadingInline';
-import withFallback from './console/console-shared/error/fallbacks/withFallback';
+import { MonitoringState } from '../../../shared/store/store';
+import { DropDownPollInterval } from '../../../shared/components/DropdownPollInterval';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { getObserveState } from '../../../shared/hooks/usePerspective';
+import KebabDropdown from '../../../shared/components/KebabDropdown';
+import {
+  colors,
+  Error,
+  QueryBrowser,
+} from '../../../shared/components/query-browser/query-browser';
+import { QueryParams } from '../../../shared/constants/query-params';
+import { TablePagination } from '../../../shared/components/table/table-pagination';
+import { PrometheusAPIError } from '../../../shared/types/types';
+import { TypeaheadSelect } from '../../../shared/components/TypeaheadSelect';
+import { LoadingInline } from '../../../shared/console/console-shared/src/components/loading/LoadingInline';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
 import {
   t_global_spacer_md,
   t_global_spacer_sm,
   t_global_font_family_mono,
 } from '@patternfly/react-tokens';
 import { StringParam, useQueryParam } from 'use-query-params';
-import { GraphUnits, isGraphUnit } from './metrics/units';
+import { GraphUnits, isGraphUnit } from '../utils/units';
 import { SimpleSelect, SimpleSelectOption } from '@patternfly/react-templates';
-import { valueFormatter } from './console/console-shared/src/components/query-browser/QueryBrowserTooltip';
-import { ALL_NAMESPACES_KEY } from './utils';
-import { MonitoringProvider } from '../contexts/MonitoringContext';
-import { DataTestIDs } from './data-test';
-import { useMonitoring } from '../hooks/useMonitoring';
-import { useMonitoringNamespace } from './hooks/useMonitoringNamespace';
+import { valueFormatter } from '../../../shared/console/console-shared/src/components/query-browser/QueryBrowserTooltip';
+import { ALL_NAMESPACES_KEY } from '../../../shared/utils/utils';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { DataTestIDs } from '../../../shared/constants/data-test';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
+import { useMonitoringNamespace } from '../../../shared/hooks/useMonitoringNamespace';
 import { useSearchParams } from 'react-router';
 
 // Stores information about the currently focused query input
@@ -943,7 +947,9 @@ export const QueryTable: FC<QueryTableProps> = ({ index, namespace, customDataso
 
 const PromQLExpressionInput = (props) => (
   <AsyncComponent
-    loader={() => import('./metrics/promql-expression-input').then((c) => c.PromQLExpressionInput)}
+    loader={() =>
+      import('../components/promql-expression-input').then((c) => c.PromQLExpressionInput)
+    }
     {...props}
   />
 );
diff --git a/web/src/components/redirects/prometheus-redirect-page.tsx b/web/src/features/metrics/pages/PrometheusRedirectPage.tsx
similarity index 91%
rename from web/src/components/redirects/prometheus-redirect-page.tsx
rename to web/src/features/metrics/pages/PrometheusRedirectPage.tsx
index 00c5ec5bc..75eabab0f 100644
--- a/web/src/components/redirects/prometheus-redirect-page.tsx
+++ b/web/src/features/metrics/pages/PrometheusRedirectPage.tsx
@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 import { Navigate, useSearchParams } from 'react-router';
-import { usePerspective } from '../hooks/usePerspective';
+import { usePerspective } from '../../../shared/hooks/usePerspective';
 
 // Handles links that have the Prometheus UI's URL format (expected for links in alerts sent by
 // Alertmanager). The Prometheus UI specifies the PromQL query with the GET param `g0.expr`, so we
diff --git a/web/src/components/metrics/units.ts b/web/src/features/metrics/utils/units.ts
similarity index 100%
rename from web/src/components/metrics/units.ts
rename to web/src/features/metrics/utils/units.ts
diff --git a/web/src/components/dashboards/perses/PersesWrapper.tsx b/web/src/features/perses-dashboards/components/PersesWrapper.tsx
similarity index 97%
rename from web/src/components/dashboards/perses/PersesWrapper.tsx
rename to web/src/features/perses-dashboards/components/PersesWrapper.tsx
index b51ac13c2..68a505519 100644
--- a/web/src/components/dashboards/perses/PersesWrapper.tsx
+++ b/web/src/features/perses-dashboards/components/PersesWrapper.tsx
@@ -1,4 +1,4 @@
-import '../../../perses-config';
+import '../utils/perses-config';
 import { ThemeOptions, ThemeProvider } from '@mui/material';
 import { ChartThemeColor, getThemeColors } from '@patternfly/react-charts/victory';
 import {
@@ -34,10 +34,10 @@ import {
   ValidationProvider,
 } from '@perses-dev/plugin-system';
 import { ReactNode, useMemo } from 'react';
-import { usePatternFlyTheme } from '../../hooks/usePatternflyTheme';
-import { OcpDatasourceApi } from './datasource-api';
-import { PERSES_PROXY_BASE_PATH, useFetchPersesDashboard } from './perses-client';
-import { CachedDatasourceAPI } from './perses/datasource-cache-api';
+import { usePatternFlyTheme } from '../../../shared/hooks/usePatternflyTheme';
+import { OcpDatasourceApi } from '../utils/datasource-api';
+import { PERSES_PROXY_BASE_PATH, useFetchPersesDashboard } from '../utils/perses-client';
+import { CachedDatasourceAPI } from '../utils/perses/datasource-cache-api';
 import {
   chart_color_blue_100,
   chart_color_blue_300,
@@ -48,10 +48,10 @@ import {
   t_global_background_color_100,
   t_global_background_color_400,
 } from '@patternfly/react-tokens';
-import { QueryParams } from '../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { useTranslation } from 'react-i18next';
-import { LoadingBox } from '../../../components/console/console-shared/src/components/loading/LoadingBox';
+import { LoadingBox } from '../../../shared/console/console-shared/src/components/loading/LoadingBox';
 import { remotePluginLoader } from '@perses-dev/plugin-system';
 import { Link, useNavigate } from 'react-router';
 
diff --git a/web/src/components/dashboards/perses/ToastProvider.tsx b/web/src/features/perses-dashboards/components/ToastProvider.tsx
similarity index 100%
rename from web/src/components/dashboards/perses/ToastProvider.tsx
rename to web/src/features/perses-dashboards/components/ToastProvider.tsx
diff --git a/web/src/components/dashboards/perses/dashboard-action-modals.tsx b/web/src/features/perses-dashboards/components/dashboard-action-modals.tsx
similarity index 98%
rename from web/src/components/dashboards/perses/dashboard-action-modals.tsx
rename to web/src/features/perses-dashboards/components/dashboard-action-modals.tsx
index d8962a6f1..72b5f6794 100644
--- a/web/src/components/dashboards/perses/dashboard-action-modals.tsx
+++ b/web/src/features/perses-dashboards/components/dashboard-action-modals.tsx
@@ -26,25 +26,25 @@ import {
   useCreateDashboardMutation,
   useDeleteDashboardMutation,
   useCreateProjectMutation,
-} from './dashboard-api';
+} from '../utils/dashboard-api';
 import {
   renameDashboardDialogValidationSchema,
   RenameDashboardValidationType,
   createDashboardDialogValidationSchema,
   CreateDashboardValidationType,
   useDashboardValidationSchema,
-} from './dashboard-action-validations';
+} from '../utils/dashboard-action-validations';
 
 import { Controller, FormProvider, SubmitHandler, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { DashboardResource, getResourceExtendedDisplayName } from '@perses-dev/core';
 import { useToast } from './ToastProvider';
-import { generateMetadataName } from './dashboard-utils';
-import { useEditableProjects } from './hooks/useEditableProjects';
-import { usePerses } from './hooks/usePerses';
+import { generateMetadataName } from '../utils/dashboard-utils';
+import { useEditableProjects } from '../hooks/useEditableProjects';
+import { usePerses } from '../hooks/usePerses';
 import { t_global_spacer_200, t_global_font_weight_200 } from '@patternfly/react-tokens';
 import { useNavigate } from 'react-router';
-import { usePerspective, getDashboardUrl } from '../../hooks/usePerspective';
+import { usePerspective, getDashboardUrl } from '../../../shared/hooks/usePerspective';
 
 export const formGroupStyle = {
   fontWeight: t_global_font_weight_200.value,
diff --git a/web/src/components/dashboards/perses/dashboard-actions-menu.tsx b/web/src/features/perses-dashboards/components/dashboard-actions-menu.tsx
similarity index 95%
rename from web/src/components/dashboards/perses/dashboard-actions-menu.tsx
rename to web/src/features/perses-dashboards/components/dashboard-actions-menu.tsx
index 1ecb0fba1..a811dd0ff 100644
--- a/web/src/components/dashboards/perses/dashboard-actions-menu.tsx
+++ b/web/src/features/perses-dashboards/components/dashboard-actions-menu.tsx
@@ -9,10 +9,10 @@ import {
   Tooltip,
 } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { useEditableProjects } from './hooks/useEditableProjects';
+import { useEditableProjects } from '../hooks/useEditableProjects';
 import { DashboardCreateDialog } from './dashboard-create-dialog';
 import { DashboardImportDialog } from './dashboard-import-dialog';
-import { persesDashboardDataTestIDs } from '../../data-test';
+import { persesDashboardDataTestIDs } from '../../../shared/constants/data-test';
 
 export const DashboardActionsMenu: FC = () => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/dashboards/perses/dashboard-create-dialog.tsx b/web/src/features/perses-dashboards/components/dashboard-create-dialog.tsx
similarity index 97%
rename from web/src/components/dashboards/perses/dashboard-create-dialog.tsx
rename to web/src/features/perses-dashboards/components/dashboard-create-dialog.tsx
index 7b24df8b0..e77f8fd16 100644
--- a/web/src/components/dashboards/perses/dashboard-create-dialog.tsx
+++ b/web/src/features/perses-dashboards/components/dashboard-create-dialog.tsx
@@ -19,14 +19,14 @@ import {
 import { useTranslation } from 'react-i18next';
 
 import { DashboardResource } from '@perses-dev/core';
-import { useCreateDashboardMutation } from './dashboard-api';
-import { createNewDashboard } from './dashboard-utils';
+import { useCreateDashboardMutation } from '../utils/dashboard-api';
+import { createNewDashboard } from '../utils/dashboard-utils';
 import { useToast } from './ToastProvider';
 import {
   createDashboardDialogValidationSchema,
   CreateDashboardValidationType,
   useDashboardValidationSchema,
-} from './dashboard-action-validations';
+} from '../utils/dashboard-action-validations';
 import { Controller, FormProvider, SubmitHandler, useForm } from 'react-hook-form';
 import {
   PermissionStateWrapper,
diff --git a/web/src/components/dashboards/perses/dashboard-dialog-helpers.tsx b/web/src/features/perses-dashboards/components/dashboard-dialog-helpers.tsx
similarity index 95%
rename from web/src/components/dashboards/perses/dashboard-dialog-helpers.tsx
rename to web/src/features/perses-dashboards/components/dashboard-dialog-helpers.tsx
index 77239339c..e50742926 100644
--- a/web/src/components/dashboards/perses/dashboard-dialog-helpers.tsx
+++ b/web/src/features/perses-dashboards/components/dashboard-dialog-helpers.tsx
@@ -12,11 +12,11 @@ import { FC, ReactNode, useMemo } from 'react';
 import { Control, Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router';
-import { getDashboardUrl, usePerspective } from '../../hooks/usePerspective';
+import { getDashboardUrl, usePerspective } from '../../../shared/hooks/usePerspective';
 import { formGroupStyle, LabelSpacer } from './dashboard-action-modals';
-import { useCreateProjectMutation } from './dashboard-api';
-import { useEditableProjects } from './hooks/useEditableProjects';
-import { usePerses } from './hooks/usePerses';
+import { useCreateProjectMutation } from '../utils/dashboard-api';
+import { useEditableProjects } from '../hooks/useEditableProjects';
+import { usePerses } from '../hooks/usePerses';
 import { useToast } from './ToastProvider';
 
 export const useDashboardProjects = () => {
diff --git a/web/src/components/dashboards/perses/dashboard-header.tsx b/web/src/features/perses-dashboards/components/dashboard-header.tsx
similarity index 91%
rename from web/src/components/dashboards/perses/dashboard-header.tsx
rename to web/src/features/perses-dashboards/components/dashboard-header.tsx
index cd9faf895..7820386d1 100644
--- a/web/src/components/dashboards/perses/dashboard-header.tsx
+++ b/web/src/features/perses-dashboards/components/dashboard-header.tsx
@@ -5,11 +5,11 @@ import { useTranslation } from 'react-i18next';
 import { Divider, Stack, StackItem } from '@patternfly/react-core';
 
 import { DocumentTitle, ListPageHeader } from '@openshift-console/dynamic-plugin-sdk';
-import { CombinedDashboardMetadata } from './hooks/useDashboardsData';
+import { CombinedDashboardMetadata } from '../hooks/useDashboardsData';
 
 import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
 import { useNavigate } from 'react-router';
-import { getDashboardsListUrl, usePerspective } from '../../hooks/usePerspective';
+import { getDashboardsListUrl, usePerspective } from '../../../shared/hooks/usePerspective';
 
 import {
   chart_color_blue_100,
@@ -17,10 +17,10 @@ import {
   t_global_spacer_md,
   t_global_spacer_xl,
 } from '@patternfly/react-tokens';
-import { listPersesDashboardsDataTestIDs } from '../../data-test';
-import { usePatternFlyTheme } from '../../hooks/usePatternflyTheme';
+import { listPersesDashboardsDataTestIDs } from '../../../shared/constants/data-test';
+import { usePatternFlyTheme } from '../../../shared/hooks/usePatternflyTheme';
 import { DashboardActionsMenu } from './dashboard-actions-menu';
-import { PagePadding } from './dashboard-page-padding';
+import { PagePadding } from '../pages/dashboard-page/dashboard-page-padding';
 
 const DASHBOARD_VIEW_PATH = 'v2/dashboards/view';
 
diff --git a/web/src/components/dashboards/perses/dashboard-import-dialog.tsx b/web/src/features/perses-dashboards/components/dashboard-import-dialog.tsx
similarity index 98%
rename from web/src/components/dashboards/perses/dashboard-import-dialog.tsx
rename to web/src/features/perses-dashboards/components/dashboard-import-dialog.tsx
index 72a425ae0..746c6a83d 100644
--- a/web/src/components/dashboards/perses/dashboard-import-dialog.tsx
+++ b/web/src/features/perses-dashboards/components/dashboard-import-dialog.tsx
@@ -30,13 +30,13 @@ import {
 } from './dashboard-dialog-helpers';
 
 import { DashboardResource } from '@perses-dev/core';
-import { usePatternFlyTheme } from '../../hooks/usePatternflyTheme';
+import { usePatternFlyTheme } from '../../../shared/hooks/usePatternflyTheme';
 import {
   importDashboardDialogValidationSchema,
   ImportDashboardValidationType,
-} from './dashboard-action-validations';
-import { useCreateDashboardMutation } from './dashboard-api';
-import { useMigrateDashboard } from './migrate-api';
+} from '../utils/dashboard-action-validations';
+import { useCreateDashboardMutation } from '../utils/dashboard-api';
+import { useMigrateDashboard } from '../utils/migrate-api';
 import { useToast } from './ToastProvider';
 
 const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
diff --git a/web/src/components/dashboards/perses/emptystates/DashboardEmptyState.tsx b/web/src/features/perses-dashboards/components/emptystates/DashboardEmptyState.tsx
similarity index 92%
rename from web/src/components/dashboards/perses/emptystates/DashboardEmptyState.tsx
rename to web/src/features/perses-dashboards/components/emptystates/DashboardEmptyState.tsx
index a2aeae4b8..e0efc6509 100644
--- a/web/src/components/dashboards/perses/emptystates/DashboardEmptyState.tsx
+++ b/web/src/features/perses-dashboards/components/emptystates/DashboardEmptyState.tsx
@@ -3,7 +3,7 @@ import { Title, EmptyState, EmptyStateBody, Bullseye } from '@patternfly/react-c
 import { ListIcon } from '@patternfly/react-icons';
 
 import { useTranslation } from 'react-i18next';
-import { ExternalLink } from '../../../console/utils/link';
+import { ExternalLink } from '../../../../shared/console/utils/link';
 
 export function DashboardEmptyState(): ReactElement {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/dashboards/perses/emptystates/ProjectEmptyState.tsx b/web/src/features/perses-dashboards/components/emptystates/ProjectEmptyState.tsx
similarity index 91%
rename from web/src/components/dashboards/perses/emptystates/ProjectEmptyState.tsx
rename to web/src/features/perses-dashboards/components/emptystates/ProjectEmptyState.tsx
index c6e9c85d4..f10515dd9 100644
--- a/web/src/components/dashboards/perses/emptystates/ProjectEmptyState.tsx
+++ b/web/src/features/perses-dashboards/components/emptystates/ProjectEmptyState.tsx
@@ -3,7 +3,7 @@ import { Title, EmptyState, EmptyStateBody, Bullseye } from '@patternfly/react-c
 import { ListIcon } from '@patternfly/react-icons';
 
 import { useTranslation } from 'react-i18next';
-import { ExternalLink } from '../../../console/utils/link';
+import { ExternalLink } from '../../../../shared/console/utils/link';
 
 export function ProjectEmptyState(): ReactElement {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/dashboards/perses/project/ProjectBar.tsx b/web/src/features/perses-dashboards/components/project/ProjectBar.tsx
similarity index 84%
rename from web/src/components/dashboards/perses/project/ProjectBar.tsx
rename to web/src/features/perses-dashboards/components/project/ProjectBar.tsx
index 48d3d4d28..5a6de7efe 100644
--- a/web/src/components/dashboards/perses/project/ProjectBar.tsx
+++ b/web/src/features/perses-dashboards/components/project/ProjectBar.tsx
@@ -1,9 +1,9 @@
 import type { FC } from 'react';
 import { KEYBOARD_SHORTCUTS } from './utils';
 import ProjectDropdown from './ProjectDropdown';
-import { getDashboardsListUrl, usePerspective } from '../../../hooks/usePerspective';
+import { getDashboardsListUrl, usePerspective } from '../../../../shared/hooks/usePerspective';
 import { useNavigate } from 'react-router';
-import { QueryParams } from '../../../query-params';
+import { QueryParams } from '../../../../shared/constants/query-params';
 
 export type ProjectBarProps = {
   activeProject: string | null;
diff --git a/web/src/components/dashboards/perses/project/ProjectDropdown.tsx b/web/src/features/perses-dashboards/components/project/ProjectDropdown.tsx
similarity index 98%
rename from web/src/components/dashboards/perses/project/ProjectDropdown.tsx
rename to web/src/features/perses-dashboards/components/project/ProjectDropdown.tsx
index 9ecc3294e..cf290e577 100644
--- a/web/src/components/dashboards/perses/project/ProjectDropdown.tsx
+++ b/web/src/features/perses-dashboards/components/project/ProjectDropdown.tsx
@@ -20,7 +20,7 @@ import fuzzysearch from 'fuzzysearch';
 import { useTranslation } from 'react-i18next';
 import ProjectMenuToggle from './ProjectMenuToggle';
 import { alphanumericCompare } from './utils';
-import { useEditableProjects } from '../hooks/useEditableProjects';
+import { useEditableProjects } from '../../hooks/useEditableProjects';
 import {
   ChangeEvent,
   FC,
@@ -32,7 +32,7 @@ import {
   useRef,
   useState,
 } from 'react';
-import { ALL_NAMESPACES_KEY } from '../../../utils';
+import { ALL_NAMESPACES_KEY } from '../../../../shared/utils/utils';
 
 export const NoResults: FC<{
   onClear: (event: ReactMouseEvent<HTMLButtonElement, MouseEvent>) => void;
diff --git a/web/src/components/dashboards/perses/project/ProjectMenuToggle.tsx b/web/src/features/perses-dashboards/components/project/ProjectMenuToggle.tsx
similarity index 100%
rename from web/src/components/dashboards/perses/project/ProjectMenuToggle.tsx
rename to web/src/features/perses-dashboards/components/project/ProjectMenuToggle.tsx
diff --git a/web/src/components/dashboards/perses/project/useActiveProject.tsx b/web/src/features/perses-dashboards/components/project/useActiveProject.tsx
similarity index 86%
rename from web/src/components/dashboards/perses/project/useActiveProject.tsx
rename to web/src/features/perses-dashboards/components/project/useActiveProject.tsx
index c74443dc0..9c726ee9d 100644
--- a/web/src/components/dashboards/perses/project/useActiveProject.tsx
+++ b/web/src/features/perses-dashboards/components/project/useActiveProject.tsx
@@ -4,10 +4,10 @@ import {
   useK8sWatchResource,
 } from '@openshift-console/dynamic-plugin-sdk';
 import { useEffect } from 'react';
-import { ProjectModel } from '../../../console/models';
-import { QueryParams } from '../../../query-params';
+import { ProjectModel } from '../../../../shared/console/models';
+import { QueryParams } from '../../../../shared/constants/query-params';
 import { StringParam, useQueryParam } from 'use-query-params';
-import { ALL_NAMESPACES_KEY } from '../../../utils';
+import { ALL_NAMESPACES_KEY } from '../../../../shared/utils/utils';
 
 export const useActiveProject = () => {
   const [activeNamespace, setActiveNamespace] = useActiveNamespace();
diff --git a/web/src/components/dashboards/perses/project/utils.ts b/web/src/features/perses-dashboards/components/project/utils.ts
similarity index 100%
rename from web/src/components/dashboards/perses/project/utils.ts
rename to web/src/features/perses-dashboards/components/project/utils.ts
diff --git a/web/src/components/dashboards/perses/hooks/useDashboardsData.ts b/web/src/features/perses-dashboards/hooks/useDashboardsData.ts
similarity index 93%
rename from web/src/components/dashboards/perses/hooks/useDashboardsData.ts
rename to web/src/features/perses-dashboards/hooks/useDashboardsData.ts
index 16e54ab5c..306e2a9f5 100644
--- a/web/src/components/dashboards/perses/hooks/useDashboardsData.ts
+++ b/web/src/features/perses-dashboards/hooks/useDashboardsData.ts
@@ -3,13 +3,13 @@ import { useMemo, useCallback, useRef } from 'react';
 
 import { DashboardResource } from '@perses-dev/core';
 import { StringParam, useQueryParam } from 'use-query-params';
-import { useBoolean } from '../../../hooks/useBoolean';
-import { getDashboardUrl, usePerspective } from '../../../hooks/usePerspective';
-import { QueryParams } from '../../../query-params';
-import { useActiveProject } from '../project/useActiveProject';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { getDashboardUrl, usePerspective } from '../../../shared/hooks/usePerspective';
+import { QueryParams } from '../../../shared/constants/query-params';
+import { useActiveProject } from '../components/project/useActiveProject';
 import { usePerses } from './usePerses';
 import { useNavigate, useSearchParams } from 'react-router';
-import { ALL_NAMESPACES_KEY } from '../../../utils';
+import { ALL_NAMESPACES_KEY } from '../../../shared/utils/utils';
 
 // This hook syncs with mutliple external API's, redux, and URL state. Its a lot, but needs to all
 // be in a single location
diff --git a/web/src/components/dashboards/perses/hooks/useEditableProjects.ts b/web/src/features/perses-dashboards/hooks/useEditableProjects.ts
similarity index 99%
rename from web/src/components/dashboards/perses/hooks/useEditableProjects.ts
rename to web/src/features/perses-dashboards/hooks/useEditableProjects.ts
index c86d49733..a49fd4af5 100644
--- a/web/src/components/dashboards/perses/hooks/useEditableProjects.ts
+++ b/web/src/features/perses-dashboards/hooks/useEditableProjects.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { PersesUserPermissions, useFetchPersesPermissions } from '../perses-client';
+import { PersesUserPermissions, useFetchPersesPermissions } from '../utils/perses-client';
 import { useOcpProjects } from './useOcpProjects';
 import { K8sResourceKind } from '@openshift-console/dynamic-plugin-sdk';
 
diff --git a/web/src/components/dashboards/perses/hooks/useOcpProjects.ts b/web/src/features/perses-dashboards/hooks/useOcpProjects.ts
similarity index 90%
rename from web/src/components/dashboards/perses/hooks/useOcpProjects.ts
rename to web/src/features/perses-dashboards/hooks/useOcpProjects.ts
index 1038eae4c..3567bd349 100644
--- a/web/src/components/dashboards/perses/hooks/useOcpProjects.ts
+++ b/web/src/features/perses-dashboards/hooks/useOcpProjects.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { K8sResourceKind, useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
-import { ProjectModel } from '../../../console/models';
+import { ProjectModel } from '../../../shared/console/models';
 
 export const useOcpProjects = () => {
   const [ocpProjects, ocpProjectsLoaded] = useK8sWatchResource<K8sResourceKind[]>({
diff --git a/web/src/components/dashboards/perses/hooks/usePerses.ts b/web/src/features/perses-dashboards/hooks/usePerses.ts
similarity index 95%
rename from web/src/components/dashboards/perses/hooks/usePerses.ts
rename to web/src/features/perses-dashboards/hooks/usePerses.ts
index 10e6cacf3..d8ef936d2 100644
--- a/web/src/components/dashboards/perses/hooks/usePerses.ts
+++ b/web/src/features/perses-dashboards/hooks/usePerses.ts
@@ -2,10 +2,10 @@ import {
   fetchPersesProjects,
   fetchPersesDashboardsMetadata,
   fetchPersesDashboardsByProject,
-} from '../perses-client';
+} from '../utils/perses-client';
 import { useQuery } from '@tanstack/react-query';
 import { NumberParam, useQueryParam } from 'use-query-params';
-import { QueryParams } from '../../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 import { useTranslation } from 'react-i18next';
 
 export const usePerses = (project?: string | number) => {
diff --git a/web/src/components/dashboards/perses/hooks/usePersesRefreshInterval.ts b/web/src/features/perses-dashboards/hooks/usePersesRefreshInterval.ts
similarity index 84%
rename from web/src/components/dashboards/perses/hooks/usePersesRefreshInterval.ts
rename to web/src/features/perses-dashboards/hooks/usePersesRefreshInterval.ts
index 8de0006b0..7253edab9 100644
--- a/web/src/components/dashboards/perses/hooks/usePersesRefreshInterval.ts
+++ b/web/src/features/perses-dashboards/hooks/usePersesRefreshInterval.ts
@@ -1,6 +1,6 @@
 import { DurationString } from '@perses-dev/core';
 import { NumberParam, useQueryParam } from 'use-query-params';
-import { QueryParams } from '../../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 
 export const usePersesRefreshInterval = (): DurationString | undefined => {
   const [refreshInterval] = useQueryParam(QueryParams.RefreshInterval, NumberParam);
diff --git a/web/src/components/dashboards/perses/hooks/usePersesTimeRange.ts b/web/src/features/perses-dashboards/hooks/usePersesTimeRange.ts
similarity index 90%
rename from web/src/components/dashboards/perses/hooks/usePersesTimeRange.ts
rename to web/src/features/perses-dashboards/hooks/usePersesTimeRange.ts
index cdcba4322..ff1a4d64b 100644
--- a/web/src/components/dashboards/perses/hooks/usePersesTimeRange.ts
+++ b/web/src/features/perses-dashboards/hooks/usePersesTimeRange.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_DASHBOARD_DURATION, DurationString, TimeRangeValue } from '@perses-dev/core';
 import { NumberParam, useQueryParam } from 'use-query-params';
-import { QueryParams } from '../../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 
 export const usePersesTimeRange = (): TimeRangeValue => {
   const [timeRange] = useQueryParam(QueryParams.TimeRange, NumberParam);
diff --git a/web/src/components/ols-tool-ui/ShowTimeseries.tsx b/web/src/features/perses-dashboards/ols-tool-ui/ShowTimeseries.tsx
similarity index 100%
rename from web/src/components/ols-tool-ui/ShowTimeseries.tsx
rename to web/src/features/perses-dashboards/ols-tool-ui/ShowTimeseries.tsx
diff --git a/web/src/components/ols-tool-ui/helpers/AddToDashboardButton.tsx b/web/src/features/perses-dashboards/ols-tool-ui/helpers/AddToDashboardButton.tsx
similarity index 94%
rename from web/src/components/ols-tool-ui/helpers/AddToDashboardButton.tsx
rename to web/src/features/perses-dashboards/ols-tool-ui/helpers/AddToDashboardButton.tsx
index a0120a3a0..ab69632b5 100644
--- a/web/src/components/ols-tool-ui/helpers/AddToDashboardButton.tsx
+++ b/web/src/features/perses-dashboards/ols-tool-ui/helpers/AddToDashboardButton.tsx
@@ -9,8 +9,8 @@ import { StyledComponent } from '@emotion/styled';
 import type { PanelDefinition } from '@perses-dev/core';
 import { InfoTooltip } from '@perses-dev/components';
 
-import { dashboardsAddPersesPanelExternally } from '../../../store/actions';
-import type { RootState } from '../../../store/store';
+import { dashboardsAddPersesPanelExternally } from '../../../../shared/store/actions';
+import type { RootState } from '../../../../shared/store/store';
 
 export const HeaderIconButton: StyledComponent<IconButtonProps & { theme?: Theme }> = styled(
   IconButton,
diff --git a/web/src/components/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx b/web/src/features/perses-dashboards/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx
similarity index 93%
rename from web/src/components/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx
rename to web/src/features/perses-dashboards/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx
index 4e3278f5e..e55efc8a8 100644
--- a/web/src/components/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx
+++ b/web/src/features/perses-dashboards/ols-tool-ui/helpers/OlsToolUIPersesWrapper.tsx
@@ -5,10 +5,7 @@ import { TimeRangeProviderBasic } from '@perses-dev/plugin-system';
 import { TimeZoneProvider } from '@perses-dev/components';
 import type { DurationString, TimeRangeValue } from '@perses-dev/core';
 
-import {
-  PersesWrapper,
-  PersesPrometheusDatasourceWrapper,
-} from '../../dashboards/perses/PersesWrapper';
+import { PersesWrapper, PersesPrometheusDatasourceWrapper } from '../../components/PersesWrapper';
 
 const queryClient = new QueryClient({
   defaultOptions: {
diff --git a/web/src/components/ols-tool-ui/helpers/useTimeRange.ts b/web/src/features/perses-dashboards/ols-tool-ui/helpers/useTimeRange.ts
similarity index 100%
rename from web/src/components/ols-tool-ui/helpers/useTimeRange.ts
rename to web/src/features/perses-dashboards/ols-tool-ui/helpers/useTimeRange.ts
diff --git a/web/src/components/dashboards/perses/dashboard-list-page.tsx b/web/src/features/perses-dashboards/pages/dashboard-list-page/DashboardListPage.tsx
similarity index 82%
rename from web/src/components/dashboards/perses/dashboard-list-page.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-list-page/DashboardListPage.tsx
index 4e06f2508..82bc510ef 100644
--- a/web/src/components/dashboards/perses/dashboard-list-page.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-list-page/DashboardListPage.tsx
@@ -2,8 +2,8 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { type FC } from 'react';
 import { QueryParamProvider } from 'use-query-params';
 import { DashboardList } from './dashboard-list';
-import { ToastProvider } from './ToastProvider';
-import { ReactRouter7Adapter } from '../../../react-router-7-adapter';
+import { ToastProvider } from '../../components/ToastProvider';
+import { ReactRouter7Adapter } from '../../../../shared/utils/react-router-7-adapter';
 
 const queryClient = new QueryClient({
   defaultOptions: {
diff --git a/web/src/components/dashboards/perses/dashboard-list-frame.tsx b/web/src/features/perses-dashboards/pages/dashboard-list-page/dashboard-list-frame.tsx
similarity index 78%
rename from web/src/components/dashboards/perses/dashboard-list-frame.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-list-page/dashboard-list-frame.tsx
index 04988d147..9f3e1ae04 100644
--- a/web/src/components/dashboards/perses/dashboard-list-frame.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-list-page/dashboard-list-frame.tsx
@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
-import { DashboardListHeader } from './dashboard-header';
-import { CombinedDashboardMetadata } from './hooks/useDashboardsData';
-import { ProjectBar } from './project/ProjectBar';
+import { DashboardListHeader } from '../../components/dashboard-header';
+import { CombinedDashboardMetadata } from '../../hooks/useDashboardsData';
+import { ProjectBar } from '../../components/project/ProjectBar';
 
 interface DashboardListFrameProps {
   activeProject: string | null;
diff --git a/web/src/components/dashboards/perses/dashboard-list.tsx b/web/src/features/perses-dashboards/pages/dashboard-list-page/dashboard-list.tsx
similarity index 95%
rename from web/src/components/dashboards/perses/dashboard-list.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-list-page/dashboard-list.tsx
index af2459c5a..b7ae1d75c 100644
--- a/web/src/components/dashboards/perses/dashboard-list.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-list-page/dashboard-list.tsx
@@ -1,6 +1,6 @@
 import { memo, ReactNode, useCallback, useMemo, useState, type FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useDashboardsData } from './hooks/useDashboardsData';
+import { useDashboardsData } from '../../hooks/useDashboardsData';
 
 import {
   Button,
@@ -27,20 +27,23 @@ import {
 import { ActionsColumn, ThProps } from '@patternfly/react-table';
 import { Link, useSearchParams } from 'react-router';
 
-import { getDashboardUrl, usePerspective } from '../../hooks/usePerspective';
+import { getDashboardUrl, usePerspective } from '../../../../shared/hooks/usePerspective';
 import { Timestamp } from '@openshift-console/dynamic-plugin-sdk';
-import { listPersesDashboardsDataTestIDs } from '../../../components/data-test';
+import { listPersesDashboardsDataTestIDs } from '../../../../shared/constants/data-test';
 import { DashboardListFrame } from './dashboard-list-frame';
-import { usePersesEditPermissions } from './dashboard-toolbar';
+import { usePersesEditPermissions } from '../dashboard-page/dashboard-toolbar';
 import { DashboardResource } from '@perses-dev/core';
 import {
   DeleteActionModal,
   DuplicateActionModal,
   RenameActionModal,
-} from './dashboard-action-modals';
-import { useEditableProjects } from './hooks/useEditableProjects';
-import { ALL_NAMESPACES_KEY } from '../../utils';
-import { ITEMS_PER_PAGE, TablePagination } from '../../../components/table-pagination';
+} from '../../components/dashboard-action-modals';
+import { useEditableProjects } from '../../hooks/useEditableProjects';
+import { ALL_NAMESPACES_KEY } from '../../../../shared/utils/utils';
+import {
+  ITEMS_PER_PAGE,
+  TablePagination,
+} from '../../../../shared/components/table/table-pagination';
 
 const DashboardActionsCell = memo(
   ({
diff --git a/web/src/components/dashboards/perses/dashboard-page.tsx b/web/src/features/perses-dashboards/pages/dashboard-page/DashboardPage.tsx
similarity index 88%
rename from web/src/components/dashboards/perses/dashboard-page.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-page/DashboardPage.tsx
index 930968806..8c90c06fb 100644
--- a/web/src/components/dashboards/perses/dashboard-page.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-page/DashboardPage.tsx
@@ -3,13 +3,13 @@ import { useEffect, type FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSearchParams } from 'react-router';
 import { QueryParamProvider } from 'use-query-params';
-import { LoadingInline } from '../../console/console-shared/src/components/loading/LoadingInline';
+import { LoadingInline } from '../../../../shared/console/console-shared/src/components/loading/LoadingInline';
 import { OCPDashboardApp } from './dashboard-app';
 import { DashboardFrame } from './dashboard-frame';
-import { ProjectEmptyState } from './emptystates/ProjectEmptyState';
-import { useDashboardsData } from './hooks/useDashboardsData';
-import { ToastProvider } from './ToastProvider';
-import { ReactRouter7Adapter } from '../../../react-router-7-adapter';
+import { ProjectEmptyState } from '../../components/emptystates/ProjectEmptyState';
+import { useDashboardsData } from '../../hooks/useDashboardsData';
+import { ToastProvider } from '../../components/ToastProvider';
+import { ReactRouter7Adapter } from '../../../../shared/utils/react-router-7-adapter';
 import './dashboard-page.css';
 
 const queryClient = new QueryClient({
diff --git a/web/src/components/dashboards/perses/dashboard-app.tsx b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-app.tsx
similarity index 96%
rename from web/src/components/dashboards/perses/dashboard-app.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-page/dashboard-app.tsx
index c3d44a977..37870ec7c 100644
--- a/web/src/components/dashboards/perses/dashboard-app.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-app.tsx
@@ -25,11 +25,11 @@ import {
   useEditMode,
 } from '@perses-dev/dashboards';
 import { OCPDashboardToolbar } from './dashboard-toolbar';
-import { useUpdateDashboardMutation } from './dashboard-api';
+import { useUpdateDashboardMutation } from '../../utils/dashboard-api';
 import { useTranslation } from 'react-i18next';
-import { useToast } from './ToastProvider';
+import { useToast } from '../../components/ToastProvider';
 import { useSearchParams } from 'react-router';
-import { ExternalPanelAddition } from './ExternalPanelAddition';
+import { ExternalPanelAddition } from './external-panel-addition';
 
 export interface DashboardAppProps {
   dashboardResource: DashboardResource | EphemeralDashboardResource;
diff --git a/web/src/components/dashboards/perses/dashboard-frame.tsx b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-frame.tsx
similarity index 73%
rename from web/src/components/dashboards/perses/dashboard-frame.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-page/dashboard-frame.tsx
index 0d73b8bb7..690a6f7aa 100644
--- a/web/src/components/dashboards/perses/dashboard-frame.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-frame.tsx
@@ -1,10 +1,10 @@
 import { FC, ReactNode } from 'react';
-import { DashboardEmptyState } from './emptystates/DashboardEmptyState';
-import { DashboardHeader } from './dashboard-header';
-import { CombinedDashboardMetadata } from './hooks/useDashboardsData';
-import { ProjectBar } from './project/ProjectBar';
-import { PersesWrapper } from './PersesWrapper';
-import { ToastProvider } from './ToastProvider';
+import { DashboardEmptyState } from '../../components/emptystates/DashboardEmptyState';
+import { DashboardHeader } from '../../components/dashboard-header';
+import { CombinedDashboardMetadata } from '../../hooks/useDashboardsData';
+import { ProjectBar } from '../../components/project/ProjectBar';
+import { PersesWrapper } from '../../components/PersesWrapper';
+import { ToastProvider } from '../../components/ToastProvider';
 import { PagePadding } from './dashboard-page-padding';
 
 interface DashboardFrameProps {
diff --git a/web/src/components/dashboards/perses/dashboard-page-padding.tsx b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-page-padding.tsx
similarity index 100%
rename from web/src/components/dashboards/perses/dashboard-page-padding.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-page/dashboard-page-padding.tsx
diff --git a/web/src/components/dashboards/perses/dashboard-page.css b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-page.css
similarity index 100%
rename from web/src/components/dashboards/perses/dashboard-page.css
rename to web/src/features/perses-dashboards/pages/dashboard-page/dashboard-page.css
diff --git a/web/src/components/dashboards/perses/dashboard-toolbar.tsx b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-toolbar.tsx
similarity index 96%
rename from web/src/components/dashboards/perses/dashboard-toolbar.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-page/dashboard-toolbar.tsx
index 2791c6e66..d84505ebc 100644
--- a/web/src/components/dashboards/perses/dashboard-toolbar.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-page/dashboard-toolbar.tsx
@@ -21,10 +21,10 @@ import { StackItem } from '@patternfly/react-core';
 import * as _ from 'lodash-es';
 import PencilIcon from 'mdi-material-ui/PencilOutline';
 import { useTranslation } from 'react-i18next';
-import { DashboardDropdown } from '../shared/dashboard-dropdown';
-import { useDashboardsData } from './hooks/useDashboardsData';
+import { DashboardDropdown } from '../../../../shared/components/dashboard-dropdown';
+import { useDashboardsData } from '../../hooks/useDashboardsData';
 
-import { persesDashboardDataTestIDs } from '../../data-test';
+import { persesDashboardDataTestIDs } from '../../../../shared/constants/data-test';
 
 export interface DashboardToolbarProps {
   dashboardName: string;
diff --git a/web/src/components/dashboards/perses/ExternalPanelAddition.tsx b/web/src/features/perses-dashboards/pages/dashboard-page/external-panel-addition.tsx
similarity index 95%
rename from web/src/components/dashboards/perses/ExternalPanelAddition.tsx
rename to web/src/features/perses-dashboards/pages/dashboard-page/external-panel-addition.tsx
index 476c1860e..9ca98492d 100644
--- a/web/src/components/dashboards/perses/ExternalPanelAddition.tsx
+++ b/web/src/features/perses-dashboards/pages/dashboard-page/external-panel-addition.tsx
@@ -1,8 +1,11 @@
 import { ReactElement, useEffect, useState, useCallback, useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useDashboardActions, useDashboardStore } from '@perses-dev/dashboards';
-import { dashboardsOpened, dashboardsPersesPanelExternallyAdded } from '../../../store/actions';
-import type { RootState } from '../../../store/store';
+import {
+  dashboardsOpened,
+  dashboardsPersesPanelExternallyAdded,
+} from '../../../../shared/store/actions';
+import type { RootState } from '../../../../shared/store/store';
 
 interface ExternalPanelAdditionProps {
   isEditMode: boolean;
diff --git a/web/src/components/dashboards/perses/dashboard-action-validations.ts b/web/src/features/perses-dashboards/utils/dashboard-action-validations.ts
similarity index 100%
rename from web/src/components/dashboards/perses/dashboard-action-validations.ts
rename to web/src/features/perses-dashboards/utils/dashboard-action-validations.ts
diff --git a/web/src/components/dashboards/perses/dashboard-api.ts b/web/src/features/perses-dashboards/utils/dashboard-api.ts
similarity index 100%
rename from web/src/components/dashboards/perses/dashboard-api.ts
rename to web/src/features/perses-dashboards/utils/dashboard-api.ts
diff --git a/web/src/components/dashboards/perses/dashboard-utils.ts b/web/src/features/perses-dashboards/utils/dashboard-utils.ts
similarity index 100%
rename from web/src/components/dashboards/perses/dashboard-utils.ts
rename to web/src/features/perses-dashboards/utils/dashboard-utils.ts
diff --git a/web/src/components/dashboards/perses/datasource-api.ts b/web/src/features/perses-dashboards/utils/datasource-api.ts
similarity index 100%
rename from web/src/components/dashboards/perses/datasource-api.ts
rename to web/src/features/perses-dashboards/utils/datasource-api.ts
diff --git a/web/src/components/dashboards/perses/migrate-api.ts b/web/src/features/perses-dashboards/utils/migrate-api.ts
similarity index 100%
rename from web/src/components/dashboards/perses/migrate-api.ts
rename to web/src/features/perses-dashboards/utils/migrate-api.ts
diff --git a/web/src/components/dashboards/perses/perses-client.ts b/web/src/features/perses-dashboards/utils/perses-client.ts
similarity index 97%
rename from web/src/components/dashboards/perses/perses-client.ts
rename to web/src/features/perses-dashboards/utils/perses-client.ts
index e6d532477..a2437ef1f 100644
--- a/web/src/components/dashboards/perses/perses-client.ts
+++ b/web/src/features/perses-dashboards/utils/perses-client.ts
@@ -2,7 +2,7 @@ import { consoleFetchJSON } from '@openshift-console/dynamic-plugin-sdk';
 import { DashboardResource, ProjectResource } from '@perses-dev/core';
 import { useQuery } from '@tanstack/react-query';
 import { NumberParam, useQueryParam } from 'use-query-params';
-import { QueryParams } from '../../query-params';
+import { QueryParams } from '../../../shared/constants/query-params';
 
 export const PERSES_PROXY_BASE_PATH = '/api/proxy/plugin/monitoring-console-plugin/perses';
 
diff --git a/web/src/perses-config.ts b/web/src/features/perses-dashboards/utils/perses-config.ts
similarity index 100%
rename from web/src/perses-config.ts
rename to web/src/features/perses-dashboards/utils/perses-config.ts
diff --git a/web/src/components/dashboards/perses/perses/README.md b/web/src/features/perses-dashboards/utils/perses/README.md
similarity index 100%
rename from web/src/components/dashboards/perses/perses/README.md
rename to web/src/features/perses-dashboards/utils/perses/README.md
diff --git a/web/src/components/dashboards/perses/perses/datasource-cache-api.ts b/web/src/features/perses-dashboards/utils/perses/datasource-cache-api.ts
similarity index 100%
rename from web/src/components/dashboards/perses/perses/datasource-cache-api.ts
rename to web/src/features/perses-dashboards/utils/perses/datasource-cache-api.ts
diff --git a/web/src/components/dashboards/perses/perses/datasource-client.ts b/web/src/features/perses-dashboards/utils/perses/datasource-client.ts
similarity index 100%
rename from web/src/components/dashboards/perses/perses/datasource-client.ts
rename to web/src/features/perses-dashboards/utils/perses/datasource-client.ts
diff --git a/web/src/components/dashboards/perses/perses/global-datasource-client.ts b/web/src/features/perses-dashboards/utils/perses/global-datasource-client.ts
similarity index 100%
rename from web/src/components/dashboards/perses/perses/global-datasource-client.ts
rename to web/src/features/perses-dashboards/utils/perses/global-datasource-client.ts
diff --git a/web/src/components/dashboards/perses/perses/url-builder.ts b/web/src/features/perses-dashboards/utils/perses/url-builder.ts
similarity index 100%
rename from web/src/components/dashboards/perses/perses/url-builder.ts
rename to web/src/features/perses-dashboards/utils/perses/url-builder.ts
diff --git a/web/src/components/targets-page.tsx b/web/src/features/targets/pages/targets-page.tsx
similarity index 93%
rename from web/src/components/targets-page.tsx
rename to web/src/features/targets/pages/targets-page.tsx
index d3ea28822..73694f367 100644
--- a/web/src/components/targets-page.tsx
+++ b/web/src/features/targets/pages/targets-page.tsx
@@ -39,39 +39,39 @@ import type { FC } from 'react';
 import { createContext, memo, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useParams } from 'react-router';
-import { MonitoringProvider } from '../contexts/MonitoringContext';
-import { rowFilter } from './alerting/AlertUtils';
-import { EmptyBox } from './console/console-shared/src/components/empty-state/EmptyBox';
-import { LoadingBox } from './console/console-shared/src/components/loading/LoadingBox';
-import { LoadingInline } from './console/console-shared/src/components/loading/LoadingInline';
-import { StatusBox } from './console/console-shared/src/components/status/StatusBox';
+import { MonitoringProvider } from '../../../shared/contexts/MonitoringContext';
+import { rowFilter } from '../../alerts/components/AlertUtils';
+import { EmptyBox } from '../../../shared/console/console-shared/src/components/empty-state/EmptyBox';
+import { LoadingBox } from '../../../shared/console/console-shared/src/components/loading/LoadingBox';
+import { LoadingInline } from '../../../shared/console/console-shared/src/components/loading/LoadingInline';
+import { StatusBox } from '../../../shared/console/console-shared/src/components/status/StatusBox';
 import {
   NamespaceModel,
   PodModel,
   PodMonitorModel,
   ServiceModel,
   ServiceMonitorModel,
-} from './console/models';
-import { LabelSelector } from './console/module/k8s/label-selector';
-import { usePoll } from './console/utils/poll-hook';
-import { useSafeFetch } from './console/utils/safe-fetch-hook';
-import { filterTargets } from './filter-targets';
-import { directedSort, localeCompareSort } from './table/sort-utils';
-import { useTableColumns } from './table/useTableColumns';
-import { useBoolean } from './hooks/useBoolean';
-import { Labels } from './labels';
-import { ITEMS_PER_PAGE, TablePagination } from './table-pagination';
+} from '../../../shared/console/models';
+import { LabelSelector } from '../../../shared/console/module/k8s/label-selector';
+import { usePoll } from '../../../shared/console/utils/poll-hook';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
+import { filterTargets } from '../utils/filter-targets';
+import { directedSort, localeCompareSort } from '../../../shared/components/table/sort-utils';
+import { useTableColumns } from '../../../shared/components/table/useTableColumns';
+import { useBoolean } from '../../../shared/hooks/useBoolean';
+import { Labels } from '../../../shared/components/labels';
+import { ITEMS_PER_PAGE, TablePagination } from '../../../shared/components/table/table-pagination';
 import {
   TableFilter,
   TableFilterOption,
   TableFilterProps,
   TableFilters,
-} from './table/TableFilters';
-import { TableToolbar } from './table/TableToolbar';
-import { useTableFilters } from './table/useTableFilters';
-import { useTablePagination } from './table/useTablePagination';
-import { AlertSource, PrometheusAPIError, Target } from './types';
-import { PROMETHEUS_BASE_PATH } from './utils';
+} from '../../../shared/components/table/TableFilters';
+import { TableToolbar } from '../../../shared/components/table/TableToolbar';
+import { useTableFilters } from '../../../shared/components/table/useTableFilters';
+import { useTablePagination } from '../../../shared/components/table/useTablePagination';
+import { AlertSource, PrometheusAPIError, Target } from '../../../shared/types/types';
+import { PROMETHEUS_BASE_PATH } from '../../../shared/utils/utils';
 
 export const enum TargetsFilterOptions {
   NAME = 'name',
diff --git a/web/src/components/filter-targets.spec.ts b/web/src/features/targets/utils/filter-targets.spec.ts
similarity index 97%
rename from web/src/components/filter-targets.spec.ts
rename to web/src/features/targets/utils/filter-targets.spec.ts
index 0bbc1eca0..2432b3b90 100644
--- a/web/src/components/filter-targets.spec.ts
+++ b/web/src/features/targets/utils/filter-targets.spec.ts
@@ -3,8 +3,8 @@ jest.mock('@openshift-console/dynamic-plugin-sdk', () => ({
 }));
 
 import { filterTargets } from './filter-targets';
-import { TargetsFilterOptions, TargetsFilters } from './targets-page';
-import { Target } from './types';
+import { TargetsFilterOptions, TargetsFilters } from '../pages/targets-page';
+import { Target } from '../../../shared/types/types';
 
 const emptyFilters: TargetsFilters = {
   [TargetsFilterOptions.NAME]: '',
diff --git a/web/src/components/filter-targets.ts b/web/src/features/targets/utils/filter-targets.ts
similarity index 90%
rename from web/src/components/filter-targets.ts
rename to web/src/features/targets/utils/filter-targets.ts
index 164e24bcb..8f2710f6f 100644
--- a/web/src/components/filter-targets.ts
+++ b/web/src/features/targets/utils/filter-targets.ts
@@ -1,6 +1,6 @@
-import { TargetsFilterOptions, TargetsFilters } from './targets-page';
-import { Target } from './types';
-import { fuzzyCaseInsensitive, targetSource } from './utils';
+import { TargetsFilterOptions, TargetsFilters } from '../pages/targets-page';
+import { Target } from '../../../shared/types/types';
+import { fuzzyCaseInsensitive, targetSource } from '../../../shared/utils/utils';
 
 export const filterTargets = (targets: Target[], selectedFilters: TargetsFilters) => {
   if (!targets) {
diff --git a/web/src/components/codicon.ttf b/web/src/shared/assets/codicon.ttf
similarity index 100%
rename from web/src/components/codicon.ttf
rename to web/src/shared/assets/codicon.ttf
diff --git a/web/src/components/CustomIcon.tsx b/web/src/shared/components/CustomIcon.tsx
similarity index 100%
rename from web/src/components/CustomIcon.tsx
rename to web/src/shared/components/CustomIcon.tsx
diff --git a/web/src/components/dropdown-poll-interval.tsx b/web/src/shared/components/DropdownPollInterval.tsx
similarity index 93%
rename from web/src/components/dropdown-poll-interval.tsx
rename to web/src/shared/components/DropdownPollInterval.tsx
index fb467705f..0b5f47bb1 100644
--- a/web/src/components/dropdown-poll-interval.tsx
+++ b/web/src/shared/components/DropdownPollInterval.tsx
@@ -4,9 +4,9 @@ import { useTranslation } from 'react-i18next';
 import {
   formatPrometheusDuration,
   parsePrometheusDuration,
-} from './console/console-shared/src/datetime/prometheus';
+} from '../console/console-shared/src/datetime/prometheus';
 import { SimpleSelect, SimpleSelectOption } from '@patternfly/react-templates';
-import { LegacyDashboardPageTestIDs } from './data-test';
+import { LegacyDashboardPageTestIDs } from '../constants/data-test';
 
 type DropDownPollIntervalProps = {
   setInterval: (v: number) => void;
diff --git a/web/src/components/kebab-dropdown.tsx b/web/src/shared/components/KebabDropdown.tsx
similarity index 91%
rename from web/src/components/kebab-dropdown.tsx
rename to web/src/shared/components/KebabDropdown.tsx
index 6212e6fbb..4a53e2af7 100644
--- a/web/src/components/kebab-dropdown.tsx
+++ b/web/src/shared/components/KebabDropdown.tsx
@@ -2,8 +2,8 @@ import type { FC, MouseEventHandler, ReactNode, Ref } from 'react';
 import { Dropdown, DropdownList, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 import { EllipsisVIcon } from '@patternfly/react-icons';
 
-import { useBoolean } from './hooks/useBoolean';
-import { DataTestIDs } from './data-test';
+import { useBoolean } from '../hooks/useBoolean';
+import { DataTestIDs } from '../constants/data-test';
 
 const KebabDropdown: FC<{
   dropdownItems: ReactNode;
diff --git a/web/src/components/TypeaheadSelect.tsx b/web/src/shared/components/TypeaheadSelect.tsx
similarity index 99%
rename from web/src/components/TypeaheadSelect.tsx
rename to web/src/shared/components/TypeaheadSelect.tsx
index 2bae86a11..10cc1b084 100644
--- a/web/src/components/TypeaheadSelect.tsx
+++ b/web/src/shared/components/TypeaheadSelect.tsx
@@ -12,7 +12,7 @@ import {
   SelectProps,
 } from '@patternfly/react-core';
 import { TimesIcon } from '@patternfly/react-icons';
-import { DataTestIDs } from './data-test';
+import { DataTestIDs } from '../constants/data-test';
 import { useState, useRef, useEffect, FormEvent, KeyboardEvent, Ref, FC } from 'react';
 
 const NO_RESULTS = 'no results';
diff --git a/web/src/components/dashboards/shared/dashboard-dropdown.tsx b/web/src/shared/components/dashboard-dropdown.tsx
similarity index 93%
rename from web/src/components/dashboards/shared/dashboard-dropdown.tsx
rename to web/src/shared/components/dashboard-dropdown.tsx
index aa79373fa..bac58f162 100644
--- a/web/src/components/dashboards/shared/dashboard-dropdown.tsx
+++ b/web/src/shared/components/dashboard-dropdown.tsx
@@ -13,8 +13,8 @@ import type { FC } from 'react';
 import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { SingleTypeaheadDropdown } from '../../console/utils/single-typeahead-dropdown';
-import { CombinedDashboardMetadata } from '../perses/hooks/useDashboardsData';
+import { SingleTypeaheadDropdown } from '../console/utils/single-typeahead-dropdown';
+import { CombinedDashboardMetadata } from '../../features/perses-dashboards/hooks/useDashboardsData';
 
 type TagColor = 'red' | 'purple' | 'blue' | 'green' | 'teal' | 'orange';
 const tagColors: TagColor[] = ['red', 'purple', 'blue', 'green', 'teal', 'orange'];
diff --git a/web/src/components/format.spec.ts b/web/src/shared/components/format.spec.ts
similarity index 100%
rename from web/src/components/format.spec.ts
rename to web/src/shared/components/format.spec.ts
diff --git a/web/src/components/format.tsx b/web/src/shared/components/format.tsx
similarity index 97%
rename from web/src/components/format.tsx
rename to web/src/shared/components/format.tsx
index 4042a4039..0ce5a6c40 100644
--- a/web/src/components/format.tsx
+++ b/web/src/shared/components/format.tsx
@@ -8,7 +8,7 @@ import {
   humanizeNumber,
   humanizePacketsPerSec,
   humanizeSeconds,
-} from './console/utils/units';
+} from '../console/utils/units';
 
 export const formatNumber = (s: string, decimals = 2, format = 'short'): string => {
   const value = Number(s);
diff --git a/web/src/components/labels.tsx b/web/src/shared/components/labels.tsx
similarity index 100%
rename from web/src/components/labels.tsx
rename to web/src/shared/components/labels.tsx
diff --git a/web/src/components/query-browser-theme.ts b/web/src/shared/components/query-browser/query-browser-theme.ts
similarity index 100%
rename from web/src/components/query-browser-theme.ts
rename to web/src/shared/components/query-browser/query-browser-theme.ts
diff --git a/web/src/components/query-browser.scss b/web/src/shared/components/query-browser/query-browser.scss
similarity index 100%
rename from web/src/components/query-browser.scss
rename to web/src/shared/components/query-browser/query-browser.scss
diff --git a/web/src/components/query-browser.tsx b/web/src/shared/components/query-browser/query-browser.tsx
similarity index 96%
rename from web/src/components/query-browser.tsx
rename to web/src/shared/components/query-browser/query-browser.tsx
index f87ba4093..5b251544d 100644
--- a/web/src/components/query-browser.tsx
+++ b/web/src/shared/components/query-browser/query-browser.tsx
@@ -53,23 +53,23 @@ import {
   queryBrowserDeleteAllSeries,
   queryBrowserPatchQuery,
   queryBrowserSetTimespan,
-} from '../store/actions';
+} from '../../../shared/store/actions';
 
-import { GraphEmpty } from './console/graphs/graph-empty';
-import { getPrometheusBasePath, buildPrometheusUrl } from './utils';
+import { GraphEmpty } from '../../../shared/console/graphs/graph-empty';
+import { getPrometheusBasePath, buildPrometheusUrl } from '../../../shared/utils/utils';
 import {
   dateFormatterNoYear,
   timeFormatter,
   timeFormatterWithSeconds,
-} from './console/utils/datetime';
-import { usePoll } from './console/utils/poll-hook';
-import { useRefWidth } from './console/utils/ref-width-hook';
-import { useSafeFetch } from './console/utils/safe-fetch-hook';
+} from '../../../shared/console/utils/datetime';
+import { usePoll } from '../../../shared/console/utils/poll-hook';
+import { useRefWidth } from '../../../shared/console/utils/ref-width-hook';
+import { useSafeFetch } from '../../../shared/console/utils/safe-fetch-hook';
 
-import { useBoolean } from './hooks/useBoolean';
+import { useBoolean } from '../../hooks/useBoolean';
 import { queryBrowserTheme } from './query-browser-theme';
-import { PrometheusAPIError, TimeRange } from './types';
-import { getTimeRanges } from './utils';
+import { PrometheusAPIError, TimeRange } from '../../../shared/types/types';
+import { getTimeRanges } from '../../../shared/utils/utils';
 
 import { CustomDataSource } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-data-source';
 import {
@@ -77,22 +77,22 @@ import {
   chart_axis_tick_Size,
   t_chart_global_fill_color_200,
 } from '@patternfly/react-tokens';
-import { MonitoringState } from '../store/store';
-import withFallback from './console/console-shared/error/fallbacks/withFallback';
-import { LoadingInline } from './console/console-shared/src/components/loading/LoadingInline';
+import { MonitoringState } from '../../../shared/store/store';
+import withFallback from '../../../shared/console/console-shared/error/fallbacks/withFallback';
+import { LoadingInline } from '../../../shared/console/console-shared/src/components/loading/LoadingInline';
 import {
   QueryBrowserTooltip,
   valueFormatter,
-} from './console/console-shared/src/components/query-browser/QueryBrowserTooltip';
+} from '../../../shared/console/console-shared/src/components/query-browser/QueryBrowserTooltip';
 import {
   formatPrometheusDuration,
   parsePrometheusDuration,
-} from './console/console-shared/src/datetime/prometheus';
-import { getObserveState } from './hooks/usePerspective';
+} from '../../../shared/console/console-shared/src/datetime/prometheus';
+import { getObserveState } from '../../hooks/usePerspective';
 import './query-browser.scss';
-import { GraphUnits } from './metrics/units';
-import { DataTestIDs } from './data-test';
-import { useMonitoring } from '../hooks/useMonitoring';
+import { GraphUnits } from '../../../features/metrics/utils/units';
+import { DataTestIDs } from '../../constants/data-test';
+import { useMonitoring } from '../../../shared/hooks/useMonitoring';
 
 const spans = ['5m', '15m', '30m', '1h', '2h', '6h', '12h', '1d', '2d', '1w', '2w'];
 export const colors = queryBrowserTheme.line.colorScale;
diff --git a/web/src/components/table/TableCheckboxFilter.tsx b/web/src/shared/components/table/TableCheckboxFilter.tsx
similarity index 100%
rename from web/src/components/table/TableCheckboxFilter.tsx
rename to web/src/shared/components/table/TableCheckboxFilter.tsx
diff --git a/web/src/components/table/TableFilters.tsx b/web/src/shared/components/table/TableFilters.tsx
similarity index 100%
rename from web/src/components/table/TableFilters.tsx
rename to web/src/shared/components/table/TableFilters.tsx
diff --git a/web/src/components/table/TableLabelFilter.tsx b/web/src/shared/components/table/TableLabelFilter.tsx
similarity index 95%
rename from web/src/components/table/TableLabelFilter.tsx
rename to web/src/shared/components/table/TableLabelFilter.tsx
index 13d44dbbb..b622f75a8 100644
--- a/web/src/components/table/TableLabelFilter.tsx
+++ b/web/src/shared/components/table/TableLabelFilter.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import * as _ from 'lodash';
-import AutocompleteInput from '../console/public/components/autocomplete';
+import AutocompleteInput from '../../console/public/components/autocomplete';
 import { ToolbarFilter, ToolbarLabel } from '@patternfly/react-core';
 
 export type DataViewLabelFilterProps<TData> = {
diff --git a/web/src/components/table/TableTextFilter.tsx b/web/src/shared/components/table/TableTextFilter.tsx
similarity index 100%
rename from web/src/components/table/TableTextFilter.tsx
rename to web/src/shared/components/table/TableTextFilter.tsx
diff --git a/web/src/components/table/TableToolbar.tsx b/web/src/shared/components/table/TableToolbar.tsx
similarity index 100%
rename from web/src/components/table/TableToolbar.tsx
rename to web/src/shared/components/table/TableToolbar.tsx
diff --git a/web/src/components/table/sort-utils.spec.ts b/web/src/shared/components/table/sort-utils.spec.ts
similarity index 100%
rename from web/src/components/table/sort-utils.spec.ts
rename to web/src/shared/components/table/sort-utils.spec.ts
diff --git a/web/src/components/table/sort-utils.ts b/web/src/shared/components/table/sort-utils.ts
similarity index 100%
rename from web/src/components/table/sort-utils.ts
rename to web/src/shared/components/table/sort-utils.ts
diff --git a/web/src/components/table-pagination.tsx b/web/src/shared/components/table/table-pagination.tsx
similarity index 100%
rename from web/src/components/table-pagination.tsx
rename to web/src/shared/components/table/table-pagination.tsx
diff --git a/web/src/components/table/useTableColumns.ts b/web/src/shared/components/table/useTableColumns.ts
similarity index 100%
rename from web/src/components/table/useTableColumns.ts
rename to web/src/shared/components/table/useTableColumns.ts
diff --git a/web/src/components/table/useTableFilters.ts b/web/src/shared/components/table/useTableFilters.ts
similarity index 100%
rename from web/src/components/table/useTableFilters.ts
rename to web/src/shared/components/table/useTableFilters.ts
diff --git a/web/src/components/table/useTablePagination.ts b/web/src/shared/components/table/useTablePagination.ts
similarity index 100%
rename from web/src/components/table/useTablePagination.ts
rename to web/src/shared/components/table/useTablePagination.ts
diff --git a/web/src/components/console/@types/console/react.d.ts b/web/src/shared/console/@types/console/react.d.ts
similarity index 100%
rename from web/src/components/console/@types/console/react.d.ts
rename to web/src/shared/console/@types/console/react.d.ts
diff --git a/web/src/components/console/README.md b/web/src/shared/console/README.md
similarity index 100%
rename from web/src/components/console/README.md
rename to web/src/shared/console/README.md
diff --git a/web/src/components/console/console-shared/constants/common.ts b/web/src/shared/console/console-shared/constants/common.ts
similarity index 100%
rename from web/src/components/console/console-shared/constants/common.ts
rename to web/src/shared/console/console-shared/constants/common.ts
diff --git a/web/src/components/console/console-shared/error/error-boundary.tsx b/web/src/shared/console/console-shared/error/error-boundary.tsx
similarity index 100%
rename from web/src/components/console/console-shared/error/error-boundary.tsx
rename to web/src/shared/console/console-shared/error/error-boundary.tsx
diff --git a/web/src/components/console/console-shared/error/fallbacks/withFallback.tsx b/web/src/shared/console/console-shared/error/fallbacks/withFallback.tsx
similarity index 100%
rename from web/src/components/console/console-shared/error/fallbacks/withFallback.tsx
rename to web/src/shared/console/console-shared/error/fallbacks/withFallback.tsx
diff --git a/web/src/components/console/console-shared/hooks/useDocumentListener.ts b/web/src/shared/console/console-shared/hooks/useDocumentListener.ts
similarity index 100%
rename from web/src/components/console/console-shared/hooks/useDocumentListener.ts
rename to web/src/shared/console/console-shared/hooks/useDocumentListener.ts
diff --git a/web/src/components/console/console-shared/src/components/empty-state/AccessDenied.tsx b/web/src/shared/console/console-shared/src/components/empty-state/AccessDenied.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/empty-state/AccessDenied.tsx
rename to web/src/shared/console/console-shared/src/components/empty-state/AccessDenied.tsx
diff --git a/web/src/components/console/console-shared/src/components/empty-state/ConsoleEmptyState.tsx b/web/src/shared/console/console-shared/src/components/empty-state/ConsoleEmptyState.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/empty-state/ConsoleEmptyState.tsx
rename to web/src/shared/console/console-shared/src/components/empty-state/ConsoleEmptyState.tsx
diff --git a/web/src/components/console/console-shared/src/components/empty-state/EmptyBox.tsx b/web/src/shared/console/console-shared/src/components/empty-state/EmptyBox.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/empty-state/EmptyBox.tsx
rename to web/src/shared/console/console-shared/src/components/empty-state/EmptyBox.tsx
diff --git a/web/src/components/console/console-shared/src/components/loading/LoadError.tsx b/web/src/shared/console/console-shared/src/components/loading/LoadError.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/loading/LoadError.tsx
rename to web/src/shared/console/console-shared/src/components/loading/LoadError.tsx
diff --git a/web/src/components/console/console-shared/src/components/loading/Loading.tsx b/web/src/shared/console/console-shared/src/components/loading/Loading.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/loading/Loading.tsx
rename to web/src/shared/console/console-shared/src/components/loading/Loading.tsx
diff --git a/web/src/components/console/console-shared/src/components/loading/LoadingBox.tsx b/web/src/shared/console/console-shared/src/components/loading/LoadingBox.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/loading/LoadingBox.tsx
rename to web/src/shared/console/console-shared/src/components/loading/LoadingBox.tsx
diff --git a/web/src/components/console/console-shared/src/components/loading/LoadingInline.tsx b/web/src/shared/console/console-shared/src/components/loading/LoadingInline.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/loading/LoadingInline.tsx
rename to web/src/shared/console/console-shared/src/components/loading/LoadingInline.tsx
diff --git a/web/src/components/console/console-shared/src/components/query-browser/QueryBrowserTooltip.tsx b/web/src/shared/console/console-shared/src/components/query-browser/QueryBrowserTooltip.tsx
similarity index 98%
rename from web/src/components/console/console-shared/src/components/query-browser/QueryBrowserTooltip.tsx
rename to web/src/shared/console/console-shared/src/components/query-browser/QueryBrowserTooltip.tsx
index 85374e1ab..94c05fd1f 100644
--- a/web/src/components/console/console-shared/src/components/query-browser/QueryBrowserTooltip.tsx
+++ b/web/src/shared/console/console-shared/src/components/query-browser/QueryBrowserTooltip.tsx
@@ -5,7 +5,7 @@ import { VictoryPortal } from 'victory';
 import classNames from 'classnames';
 import { PrometheusLabels } from '@openshift-console/dynamic-plugin-sdk';
 import withFallback from '../../../error/fallbacks/withFallback';
-import { formatNumber } from '../../../../../format';
+import { formatNumber } from '../../../../../components/format';
 import { humanizeNumberSI } from '../../../../utils/units';
 import { dateTimeFormatterWithSeconds } from '../../../../utils/datetime';
 
diff --git a/web/src/components/console/console-shared/src/components/status/StatusBox.tsx b/web/src/shared/console/console-shared/src/components/status/StatusBox.tsx
similarity index 100%
rename from web/src/components/console/console-shared/src/components/status/StatusBox.tsx
rename to web/src/shared/console/console-shared/src/components/status/StatusBox.tsx
diff --git a/web/src/components/console/console-shared/src/datetime/prometheus.ts b/web/src/shared/console/console-shared/src/datetime/prometheus.ts
similarity index 100%
rename from web/src/components/console/console-shared/src/datetime/prometheus.ts
rename to web/src/shared/console/console-shared/src/datetime/prometheus.ts
diff --git a/web/src/components/console/graphs/bar.tsx b/web/src/shared/console/graphs/bar.tsx
similarity index 100%
rename from web/src/components/console/graphs/bar.tsx
rename to web/src/shared/console/graphs/bar.tsx
diff --git a/web/src/components/console/graphs/graph-empty.tsx b/web/src/shared/console/graphs/graph-empty.tsx
similarity index 92%
rename from web/src/components/console/graphs/graph-empty.tsx
rename to web/src/shared/console/graphs/graph-empty.tsx
index b12b86398..da82f0b2c 100644
--- a/web/src/components/console/graphs/graph-empty.tsx
+++ b/web/src/shared/console/graphs/graph-empty.tsx
@@ -1,7 +1,7 @@
 import { EmptyState, EmptyStateVariant, Spinner } from '@patternfly/react-core';
 import type { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { DataTestIDs } from '../../../components/data-test';
+import { DataTestIDs } from '../../constants/data-test';
 
 export const GraphEmpty: FC<GraphEmptyProps> = ({ minHeight = 180, loading = false }) => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
diff --git a/web/src/components/console/graphs/helpers.ts b/web/src/shared/console/graphs/helpers.ts
similarity index 100%
rename from web/src/components/console/graphs/helpers.ts
rename to web/src/shared/console/graphs/helpers.ts
diff --git a/web/src/components/console/graphs/promethues-graph.tsx b/web/src/shared/console/graphs/promethues-graph.tsx
similarity index 97%
rename from web/src/components/console/graphs/promethues-graph.tsx
rename to web/src/shared/console/graphs/promethues-graph.tsx
index 4b2956a34..0d3a04b67 100644
--- a/web/src/components/console/graphs/promethues-graph.tsx
+++ b/web/src/shared/console/graphs/promethues-graph.tsx
@@ -8,7 +8,7 @@ import { Title } from '@patternfly/react-core';
 
 import { getMutlipleQueryBrowserUrl, usePerspective } from '../../hooks/usePerspective';
 import { useMonitoringNamespace } from '../../hooks/useMonitoringNamespace';
-import { RootState } from '../../../store/store';
+import { RootState } from '../../store/store';
 
 const getActiveNamespace = ({ UI }: RootState): string => UI.get('activeNamespace');
 
diff --git a/web/src/components/console/imgs/restricted-sign.svg b/web/src/shared/console/imgs/restricted-sign.svg
similarity index 100%
rename from web/src/components/console/imgs/restricted-sign.svg
rename to web/src/shared/console/imgs/restricted-sign.svg
diff --git a/web/src/components/console/models/index.ts b/web/src/shared/console/models/index.ts
similarity index 100%
rename from web/src/components/console/models/index.ts
rename to web/src/shared/console/models/index.ts
diff --git a/web/src/components/console/module/k8s/label-selector.js b/web/src/shared/console/module/k8s/label-selector.js
similarity index 100%
rename from web/src/components/console/module/k8s/label-selector.js
rename to web/src/shared/console/module/k8s/label-selector.js
diff --git a/web/src/components/console/public/components/autocomplete.tsx b/web/src/shared/console/public/components/autocomplete.tsx
similarity index 98%
rename from web/src/components/console/public/components/autocomplete.tsx
rename to web/src/shared/console/public/components/autocomplete.tsx
index 0b39ab5c7..a55cb549d 100644
--- a/web/src/components/console/public/components/autocomplete.tsx
+++ b/web/src/shared/console/public/components/autocomplete.tsx
@@ -10,7 +10,7 @@ import {
   requirementToString,
   toRequirements,
 } from '@openshift-console/dynamic-plugin-sdk/lib/utils/k8s';
-import { fuzzyCaseInsensitive } from '../../../utils';
+import { fuzzyCaseInsensitive } from '../../../utils/utils';
 
 const mapLabelsToStrings = (labels: { [key: string]: string }): string[] => {
   const requirements = toRequirements(labels);
diff --git a/web/src/components/console/public/components/factory/text-filter.tsx b/web/src/shared/console/public/components/factory/text-filter.tsx
similarity index 100%
rename from web/src/components/console/public/components/factory/text-filter.tsx
rename to web/src/shared/console/public/components/factory/text-filter.tsx
diff --git a/web/src/components/console/utils/async.tsx b/web/src/shared/console/utils/async.tsx
similarity index 100%
rename from web/src/components/console/utils/async.tsx
rename to web/src/shared/console/utils/async.tsx
diff --git a/web/src/components/console/utils/datetime.ts b/web/src/shared/console/utils/datetime.ts
similarity index 100%
rename from web/src/components/console/utils/datetime.ts
rename to web/src/shared/console/utils/datetime.ts
diff --git a/web/src/components/console/utils/getLastLanguage.ts b/web/src/shared/console/utils/getLastLanguage.ts
similarity index 100%
rename from web/src/components/console/utils/getLastLanguage.ts
rename to web/src/shared/console/utils/getLastLanguage.ts
diff --git a/web/src/components/console/utils/link.tsx b/web/src/shared/console/utils/link.tsx
similarity index 100%
rename from web/src/components/console/utils/link.tsx
rename to web/src/shared/console/utils/link.tsx
diff --git a/web/src/components/console/utils/poll-hook.ts b/web/src/shared/console/utils/poll-hook.ts
similarity index 100%
rename from web/src/components/console/utils/poll-hook.ts
rename to web/src/shared/console/utils/poll-hook.ts
diff --git a/web/src/components/console/utils/ref-width-hook.ts b/web/src/shared/console/utils/ref-width-hook.ts
similarity index 100%
rename from web/src/components/console/utils/ref-width-hook.ts
rename to web/src/shared/console/utils/ref-width-hook.ts
diff --git a/web/src/components/console/utils/safe-fetch-hook.ts b/web/src/shared/console/utils/safe-fetch-hook.ts
similarity index 100%
rename from web/src/components/console/utils/safe-fetch-hook.ts
rename to web/src/shared/console/utils/safe-fetch-hook.ts
diff --git a/web/src/components/console/utils/single-typeahead-dropdown.tsx b/web/src/shared/console/utils/single-typeahead-dropdown.tsx
similarity index 100%
rename from web/src/components/console/utils/single-typeahead-dropdown.tsx
rename to web/src/shared/console/utils/single-typeahead-dropdown.tsx
diff --git a/web/src/components/console/utils/units.ts b/web/src/shared/console/utils/units.ts
similarity index 100%
rename from web/src/components/console/utils/units.ts
rename to web/src/shared/console/utils/units.ts
diff --git a/web/src/components/data-test.ts b/web/src/shared/constants/data-test.ts
similarity index 100%
rename from web/src/components/data-test.ts
rename to web/src/shared/constants/data-test.ts
diff --git a/web/src/components/query-params.ts b/web/src/shared/constants/query-params.ts
similarity index 100%
rename from web/src/components/query-params.ts
rename to web/src/shared/constants/query-params.ts
diff --git a/web/src/contexts/MonitoringContext.tsx b/web/src/shared/contexts/MonitoringContext.tsx
similarity index 95%
rename from web/src/contexts/MonitoringContext.tsx
rename to web/src/shared/contexts/MonitoringContext.tsx
index 0caeee626..6725f9ba6 100644
--- a/web/src/contexts/MonitoringContext.tsx
+++ b/web/src/shared/contexts/MonitoringContext.tsx
@@ -1,8 +1,8 @@
 import { createContext, FC, PropsWithChildren, useMemo } from 'react';
-import { MonitoringPlugins, Prometheus } from '../components/utils';
+import { MonitoringPlugins, Prometheus } from '../utils/utils';
 import { QueryParamProvider } from 'use-query-params';
 import { useAccessReview } from '@openshift-console/dynamic-plugin-sdk';
-import { ReactRouter7Adapter } from '../react-router-7-adapter';
+import { ReactRouter7Adapter } from '../utils/react-router-7-adapter';
 
 type MonitoringContextType = {
   /** Dictates which plugin this code is being run in */
diff --git a/web/src/hooks/useAlerts.ts b/web/src/shared/hooks/useAlerts.ts
similarity index 94%
rename from web/src/hooks/useAlerts.ts
rename to web/src/shared/hooks/useAlerts.ts
index e3e5668e0..28247f70b 100644
--- a/web/src/hooks/useAlerts.ts
+++ b/web/src/shared/hooks/useAlerts.ts
@@ -16,18 +16,18 @@ import {
   getPrometheusBasePath,
   Prometheus,
   silenceCluster,
-} from '../components/utils';
-import { usePoll } from '../components/console/utils/poll-hook';
+} from '../utils/utils';
+import { usePoll } from '../console/utils/poll-hook';
 import { useMonitoring } from './useMonitoring';
 import {
   alertingRuleSource,
   alertSource,
   getAdditionalSources,
-} from '../components/alerting/AlertUtils';
+} from '../../features/alerts/components/AlertUtils';
 import { MonitoringState } from '../store/store';
 import { AppDispatch } from '../store/actions';
-import { getObserveState } from '../components/hooks/usePerspective';
-import { useMonitoringNamespace } from '../components/hooks/useMonitoringNamespace';
+import { getObserveState } from './usePerspective';
+import { useMonitoringNamespace } from './useMonitoringNamespace';
 
 const POLLING_INTERVAL_MS = 15 * 1000; // 15 seconds
 
diff --git a/web/src/components/hooks/useBoolean.ts b/web/src/shared/hooks/useBoolean.ts
similarity index 100%
rename from web/src/components/hooks/useBoolean.ts
rename to web/src/shared/hooks/useBoolean.ts
diff --git a/web/src/components/hooks/useDeepMemo.ts b/web/src/shared/hooks/useDeepMemo.ts
similarity index 100%
rename from web/src/components/hooks/useDeepMemo.ts
rename to web/src/shared/hooks/useDeepMemo.ts
diff --git a/web/src/components/hooks/useFeatures.ts b/web/src/shared/hooks/useFeatures.ts
similarity index 100%
rename from web/src/components/hooks/useFeatures.ts
rename to web/src/shared/hooks/useFeatures.ts
diff --git a/web/src/components/hooks/useIsVisible.ts b/web/src/shared/hooks/useIsVisible.ts
similarity index 100%
rename from web/src/components/hooks/useIsVisible.ts
rename to web/src/shared/hooks/useIsVisible.ts
diff --git a/web/src/hooks/useMonitoring.ts b/web/src/shared/hooks/useMonitoring.ts
similarity index 100%
rename from web/src/hooks/useMonitoring.ts
rename to web/src/shared/hooks/useMonitoring.ts
diff --git a/web/src/components/hooks/useMonitoringNamespace.ts b/web/src/shared/hooks/useMonitoringNamespace.ts
similarity index 100%
rename from web/src/components/hooks/useMonitoringNamespace.ts
rename to web/src/shared/hooks/useMonitoringNamespace.ts
diff --git a/web/src/components/hooks/usePatternflyTheme.ts b/web/src/shared/hooks/usePatternflyTheme.ts
similarity index 100%
rename from web/src/components/hooks/usePatternflyTheme.ts
rename to web/src/shared/hooks/usePatternflyTheme.ts
diff --git a/web/src/components/hooks/usePerspective.tsx b/web/src/shared/hooks/usePerspective.tsx
similarity index 96%
rename from web/src/components/hooks/usePerspective.tsx
rename to web/src/shared/hooks/usePerspective.tsx
index b9a109d2a..00263b28b 100644
--- a/web/src/components/hooks/usePerspective.tsx
+++ b/web/src/shared/hooks/usePerspective.tsx
@@ -1,6 +1,6 @@
 import { PrometheusAlert, Rule, useActivePerspective } from '@openshift-console/dynamic-plugin-sdk';
-import { Perspective } from '../../store/actions';
-import { AlertSource } from '../types';
+import { Perspective } from '../store/actions';
+import { AlertSource } from '../types/types';
 import * as _ from 'lodash-es';
 import {
   ALERTMANAGER_BASE_PATH,
@@ -11,10 +11,10 @@ import {
   MonitoringPlugins,
   RuleResource,
   SilenceResource,
-} from '../utils';
-import { GraphUnits } from '../metrics/units';
-import { QueryParams } from '../query-params';
-import { MonitoringState } from '../../store/store';
+} from '../utils/utils';
+import { GraphUnits } from '../../features/metrics/utils/units';
+import { QueryParams } from '../constants/query-params';
+import { MonitoringState } from '../store/store';
 
 export type UrlRoot = 'monitoring' | 'dev-monitoring' | 'multicloud/monitoring' | 'virt-monitoring';
 
diff --git a/web/src/store/actions.ts b/web/src/shared/store/actions.ts
similarity index 100%
rename from web/src/store/actions.ts
rename to web/src/shared/store/actions.ts
diff --git a/web/src/components/fetch-alerts.tsx b/web/src/shared/store/fetch-alerts.tsx
similarity index 100%
rename from web/src/components/fetch-alerts.tsx
rename to web/src/shared/store/fetch-alerts.tsx
diff --git a/web/src/store/reducers.ts b/web/src/shared/store/reducers.ts
similarity index 99%
rename from web/src/store/reducers.ts
rename to web/src/shared/store/reducers.ts
index c1b2e1bb5..ed3d2663d 100644
--- a/web/src/store/reducers.ts
+++ b/web/src/shared/store/reducers.ts
@@ -2,7 +2,7 @@ import * as _ from 'lodash-es';
 
 import { ActionType, ObserveAction } from './actions';
 
-import { MONITORING_DASHBOARDS_VARIABLE_ALL_OPTION_KEY } from '../components/dashboards/legacy/utils';
+import { MONITORING_DASHBOARDS_VARIABLE_ALL_OPTION_KEY } from '../../features/legacy-dashboards/utils/utils';
 import {
   defaultObserveState,
   newAlertsInfo,
@@ -11,7 +11,7 @@ import {
   QueryStructure,
 } from './store';
 import { produce } from 'immer';
-import { applySilences } from '../components/alerting/AlertUtils';
+import { applySilences } from '../../features/alerts/components/AlertUtils';
 
 const monitoringReducer = produce((draft: ObserveState, action: ObserveAction): ObserveState => {
   if (!draft) {
diff --git a/web/src/store/store.ts b/web/src/shared/store/store.ts
similarity index 93%
rename from web/src/store/store.ts
rename to web/src/shared/store/store.ts
index a75563db3..5f65638bf 100644
--- a/web/src/store/store.ts
+++ b/web/src/shared/store/store.ts
@@ -1,15 +1,15 @@
 import * as _ from 'lodash-es';
 
 import type { PanelDefinition } from '@perses-dev/core';
-import { MONITORING_DASHBOARDS_DEFAULT_TIMESPAN } from '../components/dashboards/legacy/utils';
+import { MONITORING_DASHBOARDS_DEFAULT_TIMESPAN } from '../../features/legacy-dashboards/utils/utils';
 import { Alert, PrometheusLabels, Rule } from '@openshift-console/dynamic-plugin-sdk';
-import { Silences } from '../components/types';
+import { Silences } from '../types/types';
 import {
   DaysFilters,
   IncidentSeverityFilters,
   IncidentStateFilters,
-} from '../components/Incidents/model';
-import { Variable } from '../components/dashboards/legacy/legacy-variable-dropdowns';
+} from '../../features/incidents/types/model';
+import { Variable } from '../../features/legacy-dashboards/components/legacy-variable-dropdowns';
 
 export type RootState = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/web/src/store/thunks.ts b/web/src/shared/store/thunks.ts
similarity index 96%
rename from web/src/store/thunks.ts
rename to web/src/shared/store/thunks.ts
index 709803dc1..5e6673dec 100644
--- a/web/src/store/thunks.ts
+++ b/web/src/shared/store/thunks.ts
@@ -10,8 +10,8 @@ import {
   alertingSetErrored,
   ObserveAction,
 } from './actions';
-import { getAlertsAndRules, getSilenceName, Prometheus } from '../components/utils';
-import { fetchAlerts } from '../components/fetch-alerts';
+import { getAlertsAndRules, getSilenceName, Prometheus } from '../utils/utils';
+import { fetchAlerts } from './fetch-alerts';
 
 import type { RootState } from './store';
 
diff --git a/web/src/components/types.ts b/web/src/shared/types/types.ts
similarity index 100%
rename from web/src/components/types.ts
rename to web/src/shared/types/types.ts
diff --git a/web/src/react-router-7-adapter.ts b/web/src/shared/utils/react-router-7-adapter.ts
similarity index 100%
rename from web/src/react-router-7-adapter.ts
rename to web/src/shared/utils/react-router-7-adapter.ts
diff --git a/web/src/components/utils.spec.ts b/web/src/shared/utils/utils.spec.ts
similarity index 100%
rename from web/src/components/utils.spec.ts
rename to web/src/shared/utils/utils.spec.ts
diff --git a/web/src/components/utils.ts b/web/src/shared/utils/utils.ts
similarity index 98%
rename from web/src/components/utils.ts
rename to web/src/shared/utils/utils.ts
index f9955d286..9d7c3522f 100644
--- a/web/src/components/utils.ts
+++ b/web/src/shared/utils/utils.ts
@@ -15,9 +15,9 @@ import fuzzy from 'fuzzysearch';
 import * as _ from 'lodash-es';
 import { murmur3 } from 'murmurhash-js';
 
-import { QueryParams } from './query-params';
-import { AlertSource, MonitoringResource, Target, TimeRange } from './types';
-import { AggregatedAlert } from './alerting/AlertsAggregates';
+import { QueryParams } from '../constants/query-params';
+import { AlertSource, MonitoringResource, Target, TimeRange } from '../types/types';
+import { AggregatedAlert } from '../../features/alerts/pages/alerts-page/AlertsAggregates';
 
 export const QUERY_CHUNK_SIZE = 24 * 60 * 60 * 1000;
 
diff --git a/web/webpack.standalone.config.ts b/web/webpack.standalone.config.ts
deleted file mode 100644
index 2b61b435a..000000000
--- a/web/webpack.standalone.config.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/* eslint-env node */
-
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import webpack from 'webpack';
-import { Configuration as WebpackConfiguration } from 'webpack';
-import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
-import * as path from 'path';
-
-interface Configuration extends WebpackConfiguration {
-  devServer?: WebpackDevServerConfiguration;
-}
-
-const config: Configuration = {
-  mode: 'development',
-  entry: './e2e-tests-app.tsx',
-  context: path.resolve(__dirname, 'src'),
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: '[name]-bundle.js',
-    chunkFilename: '[name]-chunk.js',
-    publicPath: '/',
-  },
-  resolve: {
-    extensions: ['.ts', '.tsx', '.js', '.jsx'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(jsx?|tsx?)$/,
-        exclude: /node_modules/,
-        use: [
-          {
-            loader: 'esbuild-loader',
-            options: {
-              target: 'es2021',
-              tsconfig: path.resolve(__dirname, 'tsconfig.json'),
-            },
-          },
-        ],
-      },
-      {
-        test: /\.scss$/,
-        exclude: /node_modules\/(?!(@patternfly|@openshift-console)\/).*/,
-        use: [
-          { loader: 'style-loader' },
-          {
-            loader: 'css-loader',
-            options: {
-              sourceMap: true,
-            },
-          },
-          {
-            loader: 'sass-loader',
-            options: {
-              sourceMap: true,
-              sassOptions: {
-                outputStyle: 'compressed',
-              },
-            },
-          },
-        ],
-      },
-      {
-        test: /\.css$/,
-        use: ['style-loader', 'css-loader'],
-      },
-      {
-        test: /\.(png|jpg|jpeg|gif|svg|woff2?|ttf|eot|otf)(\?.*$|$)/,
-        type: 'asset/resource',
-        generator: {
-          filename: 'assets/[name].[ext]',
-        },
-      },
-      {
-        test: /\.m?js/,
-        resolve: {
-          fullySpecified: false,
-        },
-      },
-    ],
-  },
-  devServer: {
-    static: './dist',
-    historyApiFallback: {
-      index: '/index.html',
-    },
-    port: 9003,
-    // Allow bridge running in a container to connect to the plugin dev server.
-    allowedHosts: 'all',
-    headers: {
-      'Access-Control-Allow-Origin': '*',
-      'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
-      'Access-Control-Allow-Headers': 'X-Requested-With, Content-Type, Authorization',
-    },
-    devMiddleware: {
-      writeToDisk: true,
-    },
-  },
-  plugins: [
-    new webpack.NormalModuleReplacementPlugin(/dynamic-plugin-sdk/, (resource) => {
-      if (!resource.contextInfo.issuer.includes('cypress/dummy')) {
-        resource.request = path.resolve(__dirname, 'cypress/dummy');
-      }
-    }),
-    new webpack.NormalModuleReplacementPlugin(/@console\//, (resource) => {
-      resource.request = path.resolve(__dirname, 'cypress/dummy-sdk-internal');
-    }),
-    new HtmlWebpackPlugin({
-      template: path.join(__dirname, 'src', 'e2e-tests-index.html'),
-    }),
-    new CopyWebpackPlugin({
-      patterns: [{ from: path.resolve(__dirname, 'locales'), to: 'locales' }],
-    }),
-  ],
-  devtool: 'source-map',
-  optimization: {
-    chunkIds: 'named',
-    minimize: false,
-  },
-};
-
-export default config;