diff --git a/public/app/features/trails/ActionTabs/LogsScene.tsx b/public/app/features/trails/ActionTabs/LogsScene.tsx
index d223cca2222..a2d7b39af49 100644
--- a/public/app/features/trails/ActionTabs/LogsScene.tsx
+++ b/public/app/features/trails/ActionTabs/LogsScene.tsx
@@ -15,7 +15,7 @@ import {
 } from '@grafana/scenes';
 import { Stack } from '@grafana/ui';
 
-import { SelectMetricAction } from '../SelectMetricAction';
+import { SelectMetricAction } from '../MetricSelect/SelectMetricAction';
 import { LOGS_METRIC, VAR_LOGS_DATASOURCE, VAR_LOGS_DATASOURCE_EXPR } from '../shared';
 
 interface LogsSceneState extends SceneObjectState {
diff --git a/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx b/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx
index 42c00db75f9..384f5ad7528 100644
--- a/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx
+++ b/public/app/features/trails/ActionTabs/RelatedMetricsScene.tsx
@@ -1,4 +1,4 @@
-import { MetricSelectScene } from '../MetricSelectScene';
+import { MetricSelectScene } from '../MetricSelect/MetricSelectScene';
 
 export function buildRelatedMetricsScene() {
   return new MetricSelectScene({});
diff --git a/public/app/features/trails/DataTrail.test.tsx b/public/app/features/trails/DataTrail.test.tsx
index e8617751909..04dbcf2a047 100644
--- a/public/app/features/trails/DataTrail.test.tsx
+++ b/public/app/features/trails/DataTrail.test.tsx
@@ -7,7 +7,7 @@ import { activateFullSceneTree } from '../dashboard-scene/utils/test-utils';
 
 import { DataTrail } from './DataTrail';
 import { MetricScene } from './MetricScene';
-import { MetricSelectScene } from './MetricSelectScene';
+import { MetricSelectScene } from './MetricSelect/MetricSelectScene';
 import { MetricSelectedEvent, VAR_FILTERS } from './shared';
 
 describe('DataTrail', () => {
diff --git a/public/app/features/trails/DataTrail.tsx b/public/app/features/trails/DataTrail.tsx
index 8375c23e3ba..fda4703db5a 100644
--- a/public/app/features/trails/DataTrail.tsx
+++ b/public/app/features/trails/DataTrail.tsx
@@ -29,7 +29,7 @@ import { useStyles2 } from '@grafana/ui';
 import { DataTrailSettings } from './DataTrailSettings';
 import { DataTrailHistory } from './DataTrailsHistory';
 import { MetricScene } from './MetricScene';
-import { MetricSelectScene } from './MetricSelectScene';
+import { MetricSelectScene } from './MetricSelect/MetricSelectScene';
 import { MetricsHeader } from './MetricsHeader';
 import { getTrailStore } from './TrailStore/TrailStore';
 import { MetricDatasourceHelper } from './helpers/MetricDatasourceHelper';
diff --git a/public/app/features/trails/MetricSelectScene.tsx b/public/app/features/trails/MetricSelect/MetricSelectScene.tsx
similarity index 97%
rename from public/app/features/trails/MetricSelectScene.tsx
rename to public/app/features/trails/MetricSelect/MetricSelectScene.tsx
index 8fafd0fb107..2c3f7001d4e 100644
--- a/public/app/features/trails/MetricSelectScene.tsx
+++ b/public/app/features/trails/MetricSelect/MetricSelectScene.tsx
@@ -22,13 +22,10 @@ import {
 import { VariableHide } from '@grafana/schema';
 import { Input, InlineSwitch, Field, Alert, Icon, useStyles2 } from '@grafana/ui';
 
-import { getPreviewPanelFor } from './AutomaticMetricQueries/previewPanel';
-import { MetricScene } from './MetricScene';
-import { SelectMetricAction } from './SelectMetricAction';
-import { StatusWrapper } from './StatusWrapper';
-import { getMetricDescription } from './helpers/MetricDatasourceHelper';
-import { reportExploreMetrics } from './interactions';
-import { sortRelatedMetrics } from './relatedMetrics';
+import { MetricScene } from '../MetricScene';
+import { StatusWrapper } from '../StatusWrapper';
+import { getMetricDescription } from '../helpers/MetricDatasourceHelper';
+import { reportExploreMetrics } from '../interactions';
 import {
   getVariablesWithMetricConstant,
   MetricSelectedEvent,
@@ -36,8 +33,12 @@ import {
   VAR_DATASOURCE,
   VAR_FILTERS_EXPR,
   VAR_METRIC_NAMES,
-} from './shared';
-import { getFilters, getTrailFor } from './utils';
+} from '../shared';
+import { getFilters, getTrailFor } from '../utils';
+
+import { SelectMetricAction } from './SelectMetricAction';
+import { getPreviewPanelFor } from './previewPanel';
+import { sortRelatedMetrics } from './relatedMetrics';
 
 interface MetricPanel {
   name: string;
diff --git a/public/app/features/trails/SelectMetricAction.tsx b/public/app/features/trails/MetricSelect/SelectMetricAction.tsx
similarity index 93%
rename from public/app/features/trails/SelectMetricAction.tsx
rename to public/app/features/trails/MetricSelect/SelectMetricAction.tsx
index 134c651482a..3ee10805115 100644
--- a/public/app/features/trails/SelectMetricAction.tsx
+++ b/public/app/features/trails/MetricSelect/SelectMetricAction.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { SceneObjectState, SceneObjectBase, SceneComponentProps } from '@grafana/scenes';
 import { Button } from '@grafana/ui';
 
-import { MetricSelectedEvent } from './shared';
+import { MetricSelectedEvent } from '../shared';
 
 export interface SelectMetricActionState extends SceneObjectState {
   title: string;
diff --git a/public/app/features/trails/hideEmptyPreviews.ts b/public/app/features/trails/MetricSelect/hideEmptyPreviews.ts
similarity index 100%
rename from public/app/features/trails/hideEmptyPreviews.ts
rename to public/app/features/trails/MetricSelect/hideEmptyPreviews.ts
diff --git a/public/app/features/trails/AutomaticMetricQueries/previewPanel.test.ts b/public/app/features/trails/MetricSelect/previewPanel.test.ts
similarity index 100%
rename from public/app/features/trails/AutomaticMetricQueries/previewPanel.test.ts
rename to public/app/features/trails/MetricSelect/previewPanel.test.ts
diff --git a/public/app/features/trails/AutomaticMetricQueries/previewPanel.ts b/public/app/features/trails/MetricSelect/previewPanel.ts
similarity index 88%
rename from public/app/features/trails/AutomaticMetricQueries/previewPanel.ts
rename to public/app/features/trails/MetricSelect/previewPanel.ts
index e6561ba26aa..2300a8eb88d 100644
--- a/public/app/features/trails/AutomaticMetricQueries/previewPanel.ts
+++ b/public/app/features/trails/MetricSelect/previewPanel.ts
@@ -1,12 +1,12 @@
 import { PromQuery } from '@grafana/prometheus';
 import { SceneCSSGridItem, SceneQueryRunner, SceneVariableSet } from '@grafana/scenes';
 
-import { SelectMetricAction } from '../SelectMetricAction';
-import { hideEmptyPreviews } from '../hideEmptyPreviews';
+import { getAutoQueriesForMetric } from '../AutomaticMetricQueries/AutoQueryEngine';
 import { getVariablesWithMetricConstant, trailDS } from '../shared';
 import { getColorByIndex } from '../utils';
 
-import { getAutoQueriesForMetric } from './AutoQueryEngine';
+import { SelectMetricAction } from './SelectMetricAction';
+import { hideEmptyPreviews } from './hideEmptyPreviews';
 
 export function getPreviewPanelFor(metric: string, index: number, currentFilterCount: number, description?: string) {
   const autoQuery = getAutoQueriesForMetric(metric);
diff --git a/public/app/features/trails/relatedMetrics.ts b/public/app/features/trails/MetricSelect/relatedMetrics.ts
similarity index 100%
rename from public/app/features/trails/relatedMetrics.ts
rename to public/app/features/trails/MetricSelect/relatedMetrics.ts