Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Move data studio to feature tier (#75846)

Romeo Van Snick922fcf102ec3
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
index 74d7075605f..8fd89bc61fd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { useListCollectionsTreeQuery } from "metabase/api";
import { ListEmptyState } from "metabase/common/components/ListEmptyState";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useHasTokenFeature } from "metabase/common/hooks";
import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { LibraryUpsellPage } from "metabase/data-studio/upsells/pages";
import {
Card,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
index fbf0643b047..dab822c5e13 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.tsx
@@ -3,7 +3,7 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { trackMetricCreateStarted } from "metabase/data-studio/analytics";
+import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
import { setOpenModalWithProps } from "metabase/redux/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
index b9a46c4fb76..dd17aad164b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CreateLibraryModal/CreateLibraryModal.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { trackDataStudioLibraryCreated } from "metabase/data-studio/analytics";
+import { trackDataStudioLibraryCreated } from "metabase/common/data-studio/analytics";
import {
Form,
FormErrorMessage,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
index 32b4adde7de..1f99acac4c3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/LibraryEmptyState/LibraryEmptyState.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
import { t } from "ttag";
import { getErrorMessage } from "metabase/api/utils";
-import { trackDataStudioLibraryCreated } from "metabase/data-studio/analytics";
+import { trackDataStudioLibraryCreated } from "metabase/common/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
Button,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
index d53906150f2..082a70b4371 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
@@ -4,7 +4,7 @@ import { jt, t } from "ttag";
import { useGetTableSelectionInfoQuery } from "metabase/api";
import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { trackDataStudioTablePublished } from "metabase/data-studio/analytics";
+import { trackDataStudioTablePublished } from "metabase/common/data-studio/analytics";
import {
Form,
FormErrorMessage,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
index e3769f04738..303fd99d69a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/UnpublishTablesModal/UnpublishTablesModal.tsx
@@ -3,7 +3,7 @@ import { jt, t } from "ttag";
import { useGetTableSelectionInfoQuery } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { trackDataStudioTableUnpublished } from "metabase/data-studio/analytics";
+import { trackDataStudioTableUnpublished } from "metabase/common/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import type { UnpublishTablesModalProps } from "metabase/plugins";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
index d34d6bbc7cf..65219cd05f7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
@@ -1,6 +1,6 @@
import { Link } from "metabase/common/components/Link";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
import * as Urls from "metabase/urls";
import type { Card } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
index a5962ae6df1..09eba56af55 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -2,7 +2,7 @@ import type { Location } from "history";
import { Link, type Route } from "react-router";
import { t } from "ttag";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import { NewMetricPage } from "metabase/metrics/pages/NewMetricPage";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
index 463e65882f9..f90943acdf1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
@@ -5,16 +5,16 @@ import { t } from "ttag";
import { useUpdateSnippetMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { isRootCollection } from "metabase/common/collections/utils";
-import { useToast } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import {
PaneHeader,
PaneHeaderInput,
type PaneHeaderProps,
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
+import { useToast } from "metabase/common/hooks";
import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
index f656945b99c..e98e6ca0489 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { useUpdateSnippetMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
index 92c416b5c99..5943ce79882 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
@@ -15,9 +15,9 @@ import { EntityCreationInfo } from "metabase/common/components/EntityCreationInf
import { NotFound } from "metabase/common/components/ErrorPages";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";
import { useToast } from "metabase/common/hooks";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { Alert, Card, Center, Flex, Stack } from "metabase/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
index 2300c5caa23..1c5e9acc3df 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
@@ -11,14 +11,14 @@ import { EditableText } from "metabase/common/components/EditableText";
import { Unauthorized } from "metabase/common/components/ErrorPages";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { Link } from "metabase/common/components/Link";
-import { useToast } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import {
PaneHeader,
PaneHeaderActions,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { useToast } from "metabase/common/hooks";
import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
import { Card, Flex, Stack } from "metabase/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
index 7848786933c..69e4ad6f2f1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import { skipToken, useGetSnippetQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
index 66d15dc740c..4f85461ae82 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
@@ -1,10 +1,10 @@
import { Link } from "metabase/common/components/Link/Link";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import {
PaneHeader,
type PaneHeaderProps,
-} from "metabase/data-studio/common/components/PaneHeader";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
import * as Urls from "metabase/urls";
import type { Table } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
index 92e7cea9d09..ce3de88cf6b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableNameInput/TableNameInput.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { useUpdateTableMutation } from "metabase/api";
-import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
+import { PaneHeaderInput } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
import type { Table } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
index 9d241de05ce..2a47b0458a1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getLocation } from "metabase/selectors/routing";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
index cc35e886c3f..9191b0b605f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
index 56d12d51428..8f01e10d815 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer/PageContainer";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import {
FieldEmptyState,
FieldSection,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
index ca7940a3372..f96032a2e6e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
-import { trackMeasureCreateStarted } from "metabase/data-studio/analytics";
+import { trackMeasureCreateStarted } from "metabase/common/data-studio/analytics";
+import { getUserCanWriteMeasures } from "metabase/common/data-studio/selectors";
import {
EntityList,
EntityListItem,
} from "metabase/data-studio/common/components/EntityList";
-import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/redux";
import { Flex } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
index c4216c5a3f6..c1042b0b5a2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
@@ -1,6 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
index 952b133286f..2c727252e94 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
+import { OverviewVisualization } from "metabase/common/data-studio/components/OverviewVisualization";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Flex, Stack } from "metabase/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
index ac647c1beb0..ac40b50dca7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
@@ -1,6 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
index 39f48482cb3..399429c4829 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
-import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";
+import { trackSegmentCreateStarted } from "metabase/common/data-studio/analytics";
+import { getUserCanWriteSegments } from "metabase/common/data-studio/selectors";
import {
EntityList,
EntityListItem,
} from "metabase/data-studio/common/components/EntityList";
-import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
import { useSelector } from "metabase/redux";
import { Flex } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
index 136ee4288fa..137fb0bd901 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
@@ -1,6 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx
index 0fac3ec42ee..38c0d8df775 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx
@@ -3,7 +3,7 @@ import cx from "classnames";
import { useLayoutEffect, useState } from "react";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { trackDependencyDiagnosticsEntitySelected } from "metabase/data-studio/analytics";
+import { trackDependencyDiagnosticsEntitySelected } from "metabase/common/data-studio/analytics";
import { Center, Flex, Stack } from "metabase/ui";
import type * as Urls from "metabase/urls";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx
index e5d0a7c8dcb..a79935749e0 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx
@@ -1,12 +1,12 @@
import { memo } from "react";
import { t } from "ttag";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import {
PaneHeader,
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import * as Urls from "metabase/urls";
export const DiagnosticsHeader = memo(function DiagnosticsHeader() {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
index f0e3cb740d0..de5a44f3a01 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
-import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
+import { trackDependencyEntitySelected } from "metabase/common/data-studio/analytics";
import { Badge, Group, Loader, Stack, Title } from "metabase/ui";
import { useListBrokenGraphNodesQuery } from "metabase-enterprise/api";
import type { DependencyNode } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
index dc19c51cf3b..2f09e6564b4 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { trackDependencyEntitySelected } from "metabase/common/data-studio/analytics";
import CS from "metabase/css/core/index.css";
-import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { DependencyNode } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
index 285d5d3dbf8..a3c2eddd3eb 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
@@ -2,7 +2,7 @@ import { useDisclosure } from "@mantine/hooks";
import { useState } from "react";
import { push } from "react-router-redux";
-import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
+import { trackDependencyEntitySelected } from "metabase/common/data-studio/analytics";
import { useDispatch } from "metabase/redux";
import { Card } from "metabase/ui";
import type {
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx
index 2d1f028eab6..214d5a89448 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx
@@ -1,8 +1,8 @@
import { Link } from "react-router";
import { t } from "ttag";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { Box, Text, Title } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
index 1327650bf36..bccffab2f20 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
@@ -3,7 +3,7 @@ import { match } from "ts-pattern";
import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { TransformDisconnectedDatabaseBanner } from "metabase/transforms/components/TransformDisconnectedDatabaseBanner";
import { TransformHeader } from "metabase/transforms/components/TransformHeader";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
index 07569bd8e06..729195dbd69 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import {
PaneHeader,
PanelHeaderTitle,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import { Button, Group } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
index f095defaf9a..b60e464fbbd 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useSelector } from "metabase/redux";
import { Alert, Box, Card, Stack } from "metabase/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
index 7b2c38a2459..95f9e87a196 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/TransformInspectorUpsellPage.tsx
@@ -1,6 +1,6 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useSelector } from "metabase/redux/hooks";
import { getIsHosted } from "metabase/selectors/settings";
import { getStoreUsers } from "metabase/selectors/store-users";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
index cfc6be22ab5..45c3866a39c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
@@ -5,8 +5,8 @@ import { jt, t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";
import { LineDecorator } from "metabase/common/components/upsells/components/LineDecorator";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks/useMetadataToasts";
import { useSelector } from "metabase/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx
index c421823f855..c58225ffb32 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/CurrentWorkspacePage.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { useListDatabasesQuery } from "metabase/api";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { Stack, Title } from "metabase/ui";
import {
useGetCurrentWorkspaceQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx
index e4d82224949..2b3a7fff983 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/DeleteSection/DeleteSection.tsx
@@ -1,7 +1,7 @@
import { jt, t } from "ttag";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
import { Button, Code, Group, Text } from "metabase/ui";
import { useDeleteCurrentWorkspaceMutation } from "metabase-enterprise/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.tsx
index c0f3009e4af..f2179f39b0f 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/CurrentWorkspacePage/TableRemappingSection/TableRemappingSection.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { Box, FixedSizeIcon, Group, Text } from "metabase/ui";
import type { Database, TableRemapping } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
index 6b8dd4291db..8afb7eff734 100644
--- a/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { useListDatabasesQuery } from "metabase/api";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { Stack } from "metabase/ui";
import { useListWorkspacesQuery } from "metabase-enterprise/api";
import type { Database, Workspace } from "metabase-types/api";
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index 725d8f36cd1..97c1de22779 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -62,7 +62,6 @@ const elements = [
pattern: "enterprise/frontend/src/custom-viz/**",
}),
createElement({ type: "shared", name: "data-grid" }),
- createElement({ type: "shared", name: "data-studio" }),
createElement({ type: "shared", name: "databases" }),
createElement({ type: "shared", name: "detail-view" }),
createElement({
@@ -154,6 +153,7 @@ const elements = [
// feature
createElement({ type: "feature", name: "admin" }),
createElement({ type: "feature", name: "dashboard" }),
+ createElement({ type: "feature", name: "data-studio" }),
createElement({ type: "feature", name: "documents" }),
createElement({
type: "feature",
diff --git a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx
index 49d38bdcdca..56e5b6a73eb 100644
--- a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx
@@ -2,7 +2,7 @@ import { useEffect } from "react";
import { useGetSegmentQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { useDispatch, useSelector } from "metabase/redux";
import type { State } from "metabase/redux/store";
import { getUser } from "metabase/selectors/user";
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx
index b2958e05679..7b02cf6785b 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx
@@ -10,9 +10,9 @@ import {
} from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { trackSegmentCreated } from "metabase/common/data-studio/analytics";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";
-import { trackSegmentCreated } from "metabase/data-studio/analytics";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch } from "metabase/redux";
import type {
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx
index 45dc42e2806..c989f8beba4 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx
@@ -9,9 +9,9 @@ import { useListSegmentsQuery } from "metabase/api";
import { useSetArchive } from "metabase/archive/hooks";
import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { trackSegmentCreateStarted } from "metabase/common/data-studio/analytics";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getShallowTables } from "metabase/selectors/metadata";
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index f7190df03e0..b6ff62ed3dc 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -7,9 +7,9 @@ import { skipToken } from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink, Link } from "metabase/common/components/Link";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
+import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
import { useDocsUrl } from "metabase/common/hooks";
import { useFetchMetrics } from "metabase/common/hooks/use-fetch-metrics";
-import { trackMetricCreateStarted } from "metabase/data-studio/analytics";
import { PLUGIN_CONTENT_VERIFICATION, PLUGIN_LIBRARY } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
index 9a24b872c45..98f7798983c 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
@@ -7,7 +7,7 @@ import {
isRootTrashCollection,
} from "metabase/common/collections/utils";
import { NewItemMenu } from "metabase/common/components/NewItemMenu";
-import { canAccessDataStudio } from "metabase/data-studio/selectors";
+import { canAccessDataStudio } from "metabase/common/data-studio/selectors";
import { PLUGIN_LIBRARY } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { Box, Button, Icon, Stack, Text, useMantineTheme } from "metabase/ui";
diff --git a/frontend/src/metabase/common/collections/utils.ts b/frontend/src/metabase/common/collections/utils.ts
index 0f8af898286..b74d7c054dd 100644
--- a/frontend/src/metabase/common/collections/utils.ts
+++ b/frontend/src/metabase/common/collections/utils.ts
@@ -3,7 +3,7 @@ import { t } from "ttag";
import {
canPlaceEntityInCollection as canPlaceEntityInCollectionImpl,
canPlaceEntityInCollectionOrDescendants as canPlaceEntityInCollectionOrDescendantsImpl,
-} from "metabase/data-studio/utils";
+} from "metabase/common/data-studio/collection-utils";
import { PLUGIN_COLLECTIONS, PLUGIN_LIBRARY } from "metabase/plugins";
import type { State } from "metabase/redux/store";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
diff --git a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
index 9a69dbcdbbd..b9acffea248 100644
--- a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { useGetMostRecentlyViewedDashboardQuery } from "metabase/api";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utils";
+import { canPlaceEntityInCollectionOrDescendants } from "metabase/common/data-studio/collection-utils";
import { useSelector } from "metabase/redux";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx
index 2c6de85abd6..44aa2a2ca3e 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewDashboardDialog/NewDashboardDialog.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { useCreateDashboardMutation } from "metabase/api";
import { FormFooter } from "metabase/common/components/FormFooter";
-import { canPlaceEntityInCollection } from "metabase/data-studio/utils";
+import { canPlaceEntityInCollection } from "metabase/common/data-studio/collection-utils";
import {
Form,
FormErrorMessage,
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/util.ts b/frontend/src/metabase/common/components/SaveQuestionForm/util.ts
index 0aee65ac6ab..16ce538c5f6 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/util.ts
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/util.ts
@@ -5,7 +5,7 @@ import {
canonicalCollectionId,
canonicalCollectionIdOrEntityId,
} from "metabase/common/collections/utils";
-import { trackMetricCreated } from "metabase/data-studio/analytics";
+import { trackMetricCreated } from "metabase/common/data-studio/analytics";
import { isNullOrUndefined } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import type { CardType } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/analytics.ts b/frontend/src/metabase/common/data-studio/analytics.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/analytics.ts
rename to frontend/src/metabase/common/data-studio/analytics.ts
diff --git a/frontend/src/metabase/data-studio/utils.ts b/frontend/src/metabase/common/data-studio/collection-utils.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/utils.ts
rename to frontend/src/metabase/common/data-studio/collection-utils.ts
diff --git a/frontend/src/metabase/data-studio/utils.unit.spec.ts b/frontend/src/metabase/common/data-studio/collection-utils.unit.spec.ts
similarity index 96%
rename from frontend/src/metabase/data-studio/utils.unit.spec.ts
rename to frontend/src/metabase/common/data-studio/collection-utils.unit.spec.ts
index 9b9e9e0dc35..7e32dbd1a17 100644
--- a/frontend/src/metabase/data-studio/utils.unit.spec.ts
+++ b/frontend/src/metabase/common/data-studio/collection-utils.unit.spec.ts
@@ -2,7 +2,7 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
-import { canPlaceEntityInCollection } from "./utils";
+import { canPlaceEntityInCollection } from "./collection-utils";
describe("canPlaceEntityInCollection", () => {
beforeEach(() => {
diff --git a/frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css b/frontend/src/metabase/common/data-studio/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
rename to frontend/src/metabase/common/data-studio/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
diff --git a/frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx b/frontend/src/metabase/common/data-studio/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
rename to frontend/src/metabase/common/data-studio/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/index.ts b/frontend/src/metabase/common/data-studio/components/DataStudioBreadcrumbs/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/DataStudioBreadcrumbs/index.ts
rename to frontend/src/metabase/common/data-studio/components/DataStudioBreadcrumbs/index.ts
diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css b/frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css
rename to frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.module.css
diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
rename to frontend/src/metabase/common/data-studio/components/OverviewVisualization/OverviewVisualization.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts b/frontend/src/metabase/common/data-studio/components/OverviewVisualization/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts
rename to frontend/src/metabase/common/data-studio/components/OverviewVisualization/index.ts
diff --git a/frontend/src/metabase/data-studio/common/components/PageContainer/PageContainer.tsx b/frontend/src/metabase/common/data-studio/components/PageContainer/PageContainer.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/PageContainer/PageContainer.tsx
rename to frontend/src/metabase/common/data-studio/components/PageContainer/PageContainer.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/PageContainer/index.ts b/frontend/src/metabase/common/data-studio/components/PageContainer/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/PageContainer/index.ts
rename to frontend/src/metabase/common/data-studio/components/PageContainer/index.ts
diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.module.css b/frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.module.css
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.module.css
rename to frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.module.css
diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
rename to frontend/src/metabase/common/data-studio/components/PaneHeader/PaneHeader.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/index.ts b/frontend/src/metabase/common/data-studio/components/PaneHeader/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/PaneHeader/index.ts
rename to frontend/src/metabase/common/data-studio/components/PaneHeader/index.ts
diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/types.ts b/frontend/src/metabase/common/data-studio/components/PaneHeader/types.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/PaneHeader/types.ts
rename to frontend/src/metabase/common/data-studio/components/PaneHeader/types.ts
diff --git a/frontend/src/metabase/data-studio/common/components/TitleSection/TitleSection.tsx b/frontend/src/metabase/common/data-studio/components/TitleSection/TitleSection.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/TitleSection/TitleSection.tsx
rename to frontend/src/metabase/common/data-studio/components/TitleSection/TitleSection.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/TitleSection/TitleSection.unit.spec.tsx b/frontend/src/metabase/common/data-studio/components/TitleSection/TitleSection.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/TitleSection/TitleSection.unit.spec.tsx
rename to frontend/src/metabase/common/data-studio/components/TitleSection/TitleSection.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/common/components/TitleSection/index.ts b/frontend/src/metabase/common/data-studio/components/TitleSection/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/components/TitleSection/index.ts
rename to frontend/src/metabase/common/data-studio/components/TitleSection/index.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/index.ts b/frontend/src/metabase/common/data-studio/hooks/use-card-query-data/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-card-query-data/index.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-card-query-data/index.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/use-card-query-data.ts b/frontend/src/metabase/common/data-studio/hooks/use-card-query-data/use-card-query-data.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-card-query-data/use-card-query-data.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-card-query-data/use-card-query-data.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts b/frontend/src/metabase/common/data-studio/hooks/use-collection-path/useCollectionPath.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-collection-path/useCollectionPath.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/index.ts b/frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/index.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/index.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts b/frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-load-card-with-metadata/use-load-card-with-metadata.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/index.ts b/frontend/src/metabase/common/data-studio/hooks/use-load-table-with-metadata/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/index.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-load-table-with-metadata/index.ts
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts b/frontend/src/metabase/common/data-studio/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
rename to frontend/src/metabase/common/data-studio/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
diff --git a/frontend/src/metabase/data-studio/selectors.ts b/frontend/src/metabase/common/data-studio/selectors.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/selectors.ts
rename to frontend/src/metabase/common/data-studio/selectors.ts
diff --git a/frontend/src/metabase/data-studio/selectors.unit.spec.ts b/frontend/src/metabase/common/data-studio/selectors.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/selectors.unit.spec.ts
rename to frontend/src/metabase/common/data-studio/selectors.unit.spec.ts
diff --git a/frontend/src/metabase/data-studio/common/utils/get-result-metadata.ts b/frontend/src/metabase/common/data-studio/utils/get-result-metadata.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/common/utils/get-result-metadata.ts
rename to frontend/src/metabase/common/data-studio/utils/get-result-metadata.ts
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
index a5de52e8ae8..7fc2e23e41a 100644
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
@@ -2,12 +2,11 @@ import { skipToken } from "@reduxjs/toolkit/query";
import { Link } from "react-router";
import { useListDatabaseSchemasQuery } from "metabase/api";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import { Ellipsified } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Table } from "metabase-types/api";
-import { DataStudioBreadcrumbs } from "../DataStudioBreadcrumbs";
-
type DataModelBreadcrumbsProps = {
table: Table;
entityName: string | undefined;
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
index 2b9482f22ba..da9af8fa28c 100644
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
@@ -1,11 +1,10 @@
import { Link } from "react-router";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
import * as Urls from "metabase/urls";
import type { Table } from "metabase-types/api";
-import { useCollectionPath } from "../../hooks/use-collection-path/useCollectionPath";
-import { DataStudioBreadcrumbs } from "../DataStudioBreadcrumbs";
-
type PublishedTableBreadcrumbsProps = {
table: Table;
entityName: string | undefined;
diff --git a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
index 9991064c275..cccb3cdc734 100644
--- a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getLocation } from "metabase/selectors/routing";
diff --git a/frontend/src/metabase/data-studio/common/utils/index.ts b/frontend/src/metabase/data-studio/common/utils/index.ts
index 8de8835868a..ce25c80a5e5 100644
--- a/frontend/src/metabase/data-studio/common/utils/index.ts
+++ b/frontend/src/metabase/data-studio/common/utils/index.ts
@@ -9,7 +9,7 @@ import type {
export { createEmptyStateItem } from "./create-empty-space-item";
export { getDatasetQueryPreviewUrl } from "./get-dataset-query-preview-url";
-export { getResultMetadata } from "./get-result-metadata";
+export { getResultMetadata } from "metabase/common/data-studio/utils/get-result-metadata";
// TODO Alex P 12/05/2025 Fix the endpoint to return sensible data
export const hasLibraryCollection = (
diff --git a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
index 899134dd31d..3b466c07c6f 100644
--- a/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/DiscardTableFieldValuesButton/DiscardTableFieldValuesButton.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { useDiscardTablesFieldValuesMutation } from "metabase/api";
+import { trackDataStudioTableFieldValuesDiscardStarted } from "metabase/common/data-studio/analytics";
import { useTemporaryState } from "metabase/common/hooks";
-import { trackDataStudioTableFieldValuesDiscardStarted } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
index a64ddb4e342..bcea3fd4ab8 100644
--- a/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/RescanTableFieldsButton/RescanTableFieldsButton.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { useRescanTablesFieldValuesMutation } from "metabase/api";
+import { trackDataStudioTableFieldsRescanStarted } from "metabase/common/data-studio/analytics";
import { useTemporaryState } from "metabase/common/hooks";
-import { trackDataStudioTableFieldsRescanStarted } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
index d855d4d6b52..51b1e3394cd 100644
--- a/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/SyncTableSchemaButton/SyncTableSchemaButton.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { useSyncTablesSchemasMutation } from "metabase/api";
+import { trackDataStudioTableSchemaSyncStarted } from "metabase/common/data-studio/analytics";
import { useTemporaryState } from "metabase/common/hooks";
-import { trackDataStudioTableSchemaSyncStarted } from "metabase/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button } from "metabase/ui";
import type { DatabaseId, SchemaId, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
index 650aa193b47..b9662e3d74f 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/FilterPopover.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import {
trackDataStudioTablePickerFiltersApplied,
trackDataStudioTablePickerFiltersCleared,
-} from "metabase/data-studio/analytics";
+} from "metabase/common/data-studio/analytics";
import {
DataSourceInput,
LayerInput,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
index 05b87062b88..6571b1a2ef7 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/SearchNew.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import { useListDatabasesQuery } from "metabase/api";
import { useListTablesQuery } from "metabase/api/table";
-import { trackDataStudioTablePickerSearchPerformed } from "metabase/data-studio/analytics";
+import { trackDataStudioTablePickerSearchPerformed } from "metabase/common/data-studio/analytics";
import { parseRouteParams } from "metabase/metadata/pages/shared/utils";
import { Box, Flex, Loader, Text } from "metabase/ui";
import type { Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
index 9fcf62cd9d3..e55c072c7e4 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -8,7 +8,7 @@ import {
} from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
+import { trackDependencyEntitySelected } from "metabase/common/data-studio/analytics";
import {
FieldOrderPicker,
NameDescriptionInput,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
index 1ae50cea857..1b70a58aa2c 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { trackMeasureCreateStarted } from "metabase/data-studio/analytics";
-import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
+import { trackMeasureCreateStarted } from "metabase/common/data-studio/analytics";
+import { getUserCanWriteMeasures } from "metabase/common/data-studio/selectors";
import { useSelector } from "metabase/redux";
import { Button, Group, Icon, Stack } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
index a2a243103aa..01937400449 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";
-import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
+import { trackSegmentCreateStarted } from "metabase/common/data-studio/analytics";
+import { getUserCanWriteSegments } from "metabase/common/data-studio/selectors";
import { useSelector } from "metabase/redux";
import { Button, Group, Icon, Stack } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
index afc40df62d3..75f997258c3 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.tsx
@@ -11,7 +11,7 @@ import {
trackDataStudioTableFieldValuesDiscardStarted,
trackDataStudioTableFieldsRescanStarted,
trackDataStudioTableSchemaSyncStarted,
-} from "metabase/data-studio/analytics";
+} from "metabase/common/data-studio/analytics";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REPLACEMENT } from "metabase/plugins";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
index 9ecbcbca853..3e35cf7bfa6 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
@@ -6,7 +6,7 @@ import { useEditTablesMutation } from "metabase/api";
import {
trackDataStudioBulkAttributeUpdated,
trackDataStudioBulkSyncSettingsClicked,
-} from "metabase/data-studio/analytics";
+} from "metabase/common/data-studio/analytics";
import {
DataSourceInput,
EntityTypeInput,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
index 7ca78810dde..f6c9cf3d2a6 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
@@ -2,7 +2,7 @@ import { Link } from "react-router";
import { P, match } from "ts-pattern";
import { t } from "ttag";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
import { Box } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
index 4a9d26ef64f..1541d8646ee 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -9,10 +9,10 @@ import {
} from "metabase/api";
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { hasLibraryCollection } from "metabase/data-studio/common/utils";
import { isCypressActive } from "metabase/env";
import {
diff --git a/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
index 73d53d85a75..3aeee2c02f6 100644
--- a/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
+++ b/frontend/src/metabase/data-studio/glossary/pages/GlossaryPage/GlossaryPage.tsx
@@ -11,10 +11,10 @@ import {
trackDataStudioGlossaryTermCreated,
trackDataStudioGlossaryTermDeleted,
trackDataStudioGlossaryTermUpdated,
-} from "metabase/data-studio/analytics";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/analytics";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { usePageTitle } from "metabase/hooks/use-page-title";
import { Box, Card } from "metabase/ui";
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
index ee212e3cc79..d17756b1cd3 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
@@ -2,11 +2,11 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { useUpdateMeasureMutation } from "metabase/api";
-import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Stack } from "metabase/ui";
import type { Measure } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx b/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
index 5591d387290..bf073ad797d 100644
--- a/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { EditableText } from "metabase/common/components/EditableText";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { MeasureMoreMenu } from "../MeasureMoreMenu";
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
index f3772cf514d..3781752c9b4 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
@@ -7,12 +7,12 @@ import {
useGetMeasureQuery,
useUpdateMeasureMutation,
} from "metabase/api";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch } from "metabase/redux";
import * as Urls from "metabase/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
-import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
import type { MeasureTabUrls } from "../types";
type DataModelMeasurePageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
index b5e3f729ad9..4c1c8a08da9 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
@@ -7,11 +7,11 @@ import {
useGetMeasureQuery,
useUpdateMeasureMutation,
} from "metabase/api";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { useToast } from "metabase/common/hooks/use-toast";
import { useDispatch } from "metabase/redux";
import * as Urls from "metabase/urls";
-import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
import type { MeasureTabUrls } from "../types";
type PublishedTableMeasurePageParams = {
diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
index 46aec6c26fe..f4d10895571 100644
--- a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
index 55038b1a4cd..4e1192dedba 100644
--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card } from "metabase/ui";
diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
index 5b62dc93107..b960efef34b 100644
--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
@@ -5,8 +5,8 @@ import { t } from "ttag";
import { useUpdateMeasureMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { getUserCanWriteMeasures } from "metabase/common/data-studio/selectors";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
index 30bdf823042..0bfa8fa3428 100644
--- a/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { Stack } from "metabase/ui";
import type { Measure } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
index 7e3412f0909..8ae4ba9d27f 100644
--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
@@ -6,8 +6,8 @@ import { t } from "ttag";
import { useCreateMeasureMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { trackMeasureCreated } from "metabase/data-studio/analytics";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { trackMeasureCreated } from "metabase/common/data-studio/analytics";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch, useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
index aa9fd09c2e5..0779ec8487e 100644
--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx b/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
index ea9293a5f21..2c751d1d605 100644
--- a/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/NewSegmentHeader/NewSegmentHeader.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import { SegmentMoreMenu } from "../SegmentMoreMenu";
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
index 9d66f7d78f4..f815e8e26b8 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx
@@ -2,12 +2,12 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { useUpdateSegmentMutation } from "metabase/api";
-import { modelIconMap } from "metabase/common/utils/icon";
-import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { modelIconMap } from "metabase/common/utils/icon";
+import { EntityDetailTabs } from "metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";
import type { SegmentTabUrls } from "metabase/data-studio/segments/types";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Stack } from "metabase/ui";
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
index 5e1c2f195ec..832e4124448 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
@@ -7,12 +7,12 @@ import {
useGetSegmentQuery,
useUpdateSegmentMutation,
} from "metabase/api";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch } from "metabase/redux";
import * as Urls from "metabase/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
-import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
import type { SegmentTabUrls } from "../types";
type DataModelSegmentPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
index 30de22a722f..95db3cd7f4b 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
@@ -7,11 +7,11 @@ import {
useGetSegmentQuery,
useUpdateSegmentMutation,
} from "metabase/api";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { useToast } from "metabase/common/hooks/use-toast";
import { useDispatch } from "metabase/redux";
import * as Urls from "metabase/urls";
-import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
import type { SegmentTabUrls } from "../types";
type PublishedTableSegmentPageParams = {
diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
index 80c0f4afdea..2f7b80ef781 100644
--- a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
index 27d25844849..bcf087ef8d1 100644
--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
@@ -6,8 +6,8 @@ import { t } from "ttag";
import { useCreateSegmentMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { trackSegmentCreated } from "metabase/data-studio/analytics";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { trackSegmentCreated } from "metabase/common/data-studio/analytics";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch, useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
index 060bdf2a88d..f6963d18b57 100644
--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
+import { useLoadTableWithMetadata } from "metabase/common/data-studio/hooks/use-load-table-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
index 8724eabc6ab..ac36176329e 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card } from "metabase/ui";
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
index a2ee9051f77..5c3cfd1a118 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { useUpdateSegmentMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { getUserCanWriteSegments } from "metabase/common/data-studio/selectors";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
-import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
index 15ceb79246e..f741d4a3622 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { Stack } from "metabase/ui";
import type { Segment } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx
index a0b2cf1d5d3..4b4a88db62a 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/BaseUpsellPage.tsx
@@ -3,8 +3,8 @@ import { LineDecorator } from "metabase/common/components/upsells/components/Lin
import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";
import { UpsellCardContent } from "metabase/common/components/upsells/components/UpsellCardContent";
import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/constants";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { Stack } from "metabase/ui";
import S from "./BaseUpsellPage.module.css";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
index e085dd0f0df..42d2ba61374 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
@@ -5,8 +5,8 @@ import { LineDecorator } from "metabase/common/components/upsells/components/Lin
import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";
import { UpsellCardContent } from "metabase/common/components/upsells/components/UpsellCardContent";
import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/constants";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Stack } from "metabase/ui";
diff --git a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
index 3356b9dbd0f..d7841790478 100644
--- a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
+++ b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
@@ -1,8 +1,8 @@
import cx from "classnames";
import { Link } from "metabase/common/components/Link";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
import CS from "metabase/css/core/index.css";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
import { Breadcrumbs, Icon } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
index d57f1be5e2a..9c3aec7378b 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
@@ -1,10 +1,10 @@
import type { ReactNode } from "react";
-import type { MetricUrls } from "metabase/common/metrics/types";
import {
PaneHeader,
PanelHeaderTitle,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { Flex, Group } from "metabase/ui";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
index 62ce5a9582f..b46cce5c60b 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { useUpdateCardMutation } from "metabase/api";
-import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
+import { PaneHeaderInput } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
index 29f23975c48..09db7b1c34b 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
@@ -2,11 +2,11 @@ import { useMemo } from "react";
import { t } from "ttag";
import { useGetMetricQuery } from "metabase/api/metric";
-import type { MetricUrls } from "metabase/common/metrics/types";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { isNumericMetric } from "metabase/metrics/utils/validation";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
index 11592511149..f175e0902b2 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
@@ -9,8 +9,8 @@ import {
useListNotificationsQuery,
} from "metabase/api";
import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/AddToDashSelectDashModal";
+import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/common/data-studio/selectors";
import type { MetricUrls } from "metabase/common/metrics/types";
-import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/data-studio/selectors";
import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";
import {
PLUGIN_AUDIT,
diff --git a/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx
index ca75f7d6866..9116050bf4c 100644
--- a/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx
+++ b/frontend/src/metabase/metrics/components/MetricPageCard/MetricPageCard.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
import { skipToken, useGetCardQueryQuery } from "metabase/api";
import { Unauthorized } from "metabase/common/components/ErrorPages";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
+import { useLoadCardWithMetadata } from "metabase/common/data-studio/hooks/use-load-card-with-metadata";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
import { is403Error } from "metabase/utils/errors";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx
index b1a3ceb9f52..f085a988e9a 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
-import { MetricCardVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
-import { useCardQueryData } from "metabase/data-studio/common/hooks/use-card-query-data";
+import { MetricCardVisualization } from "metabase/common/data-studio/components/OverviewVisualization";
+import { useCardQueryData } from "metabase/common/data-studio/hooks/use-card-query-data";
import { Box, Stack } from "metabase/ui";
import {
TrendInfo,
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
index 6e91bd02751..46f88f3b44b 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
@@ -1,6 +1,6 @@
+import { MetricCardVisualization } from "metabase/common/data-studio/components/OverviewVisualization";
+import { useCardQueryData } from "metabase/common/data-studio/hooks/use-card-query-data";
import type { MetricUrls } from "metabase/common/metrics/types";
-import { MetricCardVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
-import { useCardQueryData } from "metabase/data-studio/common/hooks/use-card-query-data";
import { isNumericMetric } from "metabase/metrics/utils/validation";
import { Box, Flex, Stack } from "metabase/ui";
import { isDate, isNumeric } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
index 8ec0c3c2436..965026fd4e0 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
@@ -1,5 +1,5 @@
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import type { MetricPageProps } from "metabase/common/metrics/types";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { MetricPageCard } from "../../components/MetricPageCard";
import { MetricPageShell } from "../../components/MetricPageShell";
diff --git a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
index 05a618427e4..1413397e42e 100644
--- a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import type { MetricPageProps } from "metabase/common/metrics/types";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card } from "metabase/ui";
diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
index b5a9485d4c0..5d3b895e81e 100644
--- a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
@@ -1,5 +1,5 @@
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import type { MetricPageProps } from "metabase/common/metrics/types";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { Box, Card } from "metabase/ui";
import { MetricActivityTimeline } from "../../components/MetricActivityTimeline";
diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
index bd4a73ee165..2ef974c889a 100644
--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -3,11 +3,11 @@ import { replace } from "react-router-redux";
import { useGetMetricQuery } from "metabase/api/metric";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import type {
MetricPageProps,
MetricUrls,
} from "metabase/common/metrics/types";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useDispatch } from "metabase/redux";
import { Center } from "metabase/ui";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
index 6f76957fe9b..330749f5b0d 100644
--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
@@ -5,13 +5,13 @@ import { t } from "ttag";
import { useUpdateCardMutation } from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";
+import { getResultMetadata } from "metabase/common/data-studio/utils/get-result-metadata";
import type {
MetricPageProps,
MetricUrls,
} from "metabase/common/metrics/types";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
-import { getResultMetadata } from "metabase/data-studio/common/utils";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
index a53016b2783..22f4407c55d 100644
--- a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
@@ -4,7 +4,7 @@ import * as Yup from "yup";
import { useCreateCardMutation } from "metabase/api";
import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";
-import { trackMetricCreated } from "metabase/data-studio/analytics";
+import { trackMetricCreated } from "metabase/common/data-studio/analytics";
import {
Form,
FormErrorMessage,
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
index 250c039addf..d8e69b6bc55 100644
--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -8,14 +8,14 @@ import { t } from "ttag";
import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import type { MetricUrls } from "metabase/common/metrics/types";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import {
PaneHeader,
PaneHeaderActions,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
-import { getResultMetadata } from "metabase/data-studio/common/utils";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { getResultMetadata } from "metabase/common/data-studio/utils/get-result-metadata";
+import type { MetricUrls } from "metabase/common/metrics/types";
import { MetricQueryEditor } from "metabase/metrics/components/MetricQueryEditor";
import { NAME_MAX_LENGTH } from "metabase/metrics/constants";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
index 4af176b700f..c1964e28139 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
@@ -5,9 +5,9 @@ import { ErrorDiagnosticModalWrapper } from "metabase/common/components/ErrorPag
import { trackErrorDiagnosticModalOpened } from "metabase/common/components/ErrorPages/analytics";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { trackDataStudioOpened } from "metabase/common/data-studio/analytics";
+import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/common/data-studio/selectors";
import { userInitials } from "metabase/common/utils/user";
-import { trackDataStudioOpened } from "metabase/data-studio/analytics";
-import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/data-studio/selectors";
import { useDispatch, useSelector } from "metabase/redux";
import { openDiagnostics } from "metabase/redux/app";
import { logout } from "metabase/redux/auth";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
index 0c6cd6c5397..cf97d69f017 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
@@ -16,7 +16,7 @@ import { Tree } from "metabase/common/components/tree";
import { useSetting, useUserSetting } from "metabase/common/hooks";
import { useIsAtHomepageDashboard } from "metabase/common/hooks/use-is-at-homepage-dashboard";
import { useShowOtherUsersCollections } from "metabase/common/hooks/use-show-other-users-collections";
-import { NavbarLibrarySection } from "metabase/data-studio/nav/components/NavbarLibrarySection";
+import { NavbarLibrarySection } from "metabase/nav/containers/MainNavbar/NavbarLibrarySection";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TENANTS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import {
diff --git a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx
rename to frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/NavbarLibrarySection.tsx
diff --git a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/index.ts b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/index.ts
similarity index 100%
rename from frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/index.ts
rename to frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/index.ts
diff --git a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/enterprise.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/enterprise.unit.spec.tsx
rename to frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/enterprise.unit.spec.tsx
diff --git a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx
similarity index 100%
rename from frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/tests/setup.tsx
rename to frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx
diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
index 897e79ebd83..571d7ec5ab9 100644
--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
@@ -7,9 +7,9 @@ import { t } from "ttag";
import { skipToken, useSearchQuery } from "metabase/api";
import { useInitialCollectionId } from "metabase/common/collections/hooks";
+import { trackMetricCreateStarted } from "metabase/common/data-studio/analytics";
+import { canAccessDataStudio } from "metabase/common/data-studio/selectors";
import { useDatabaseListQuery } from "metabase/common/hooks";
-import { trackMetricCreateStarted } from "metabase/data-studio/analytics";
-import { canAccessDataStudio } from "metabase/data-studio/selectors";
import { useDispatch, useSelector } from "metabase/redux";
import { openDiagnostics } from "metabase/redux/app";
import type { ModalName } from "metabase/redux/store/modal";
diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsx
index 7adb5b7fbc2..7f11a6151ea 100644
--- a/frontend/src/metabase/route-guards.tsx
+++ b/frontend/src/metabase/route-guards.tsx
@@ -1,7 +1,7 @@
import { routerActions } from "react-router-redux";
import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
-import { canAccessDataStudio } from "metabase/data-studio/selectors";
+import { canAccessDataStudio } from "metabase/common/data-studio/selectors";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { metabaseReduxContext } from "metabase/redux";
import type { State } from "metabase/redux/store";
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
index 259f5044dc0..010b13baa87 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
@@ -1,8 +1,8 @@
import { useFormikContext } from "formik";
import { t } from "ttag";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { useDocsUrl } from "metabase/common/hooks";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
import { FormSelect } from "metabase/forms";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
index 03e4e05a536..e70f55da490 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
@@ -2,13 +2,13 @@ import type { ReactNode } from "react";
import { Link } from "react-router";
import { t } from "ttag";
-import { useSetting } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import {
PaneHeader,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
+import { useSetting } from "metabase/common/hooks";
import { Group, Stack } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
index 8733b13c56b..c3c2262e22c 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
@@ -2,8 +2,8 @@ import { c, t } from "ttag";
import { useRunTransformJobMutation } from "metabase/api";
import { Schedule } from "metabase/common/components/Schedule";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { useSetting } from "metabase/common/hooks";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Divider, Group, Tooltip } from "metabase/ui";
import { getScheduleExplanation } from "metabase/utils/cron";
diff --git a/frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.tsx
index c9e07141d16..7b5d1e0498e 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/TagSection/TagSection.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { Box } from "metabase/ui";
import type { TransformTagId } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
index 0820b5ddacf..39576284a06 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
@@ -6,8 +6,8 @@ import { t } from "ttag";
import { useListTransformJobTransformsQuery } from "metabase/api";
import { ListEmptyState } from "metabase/common/components/ListEmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import CS from "metabase/css/core/index.css";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
import { useDispatch } from "metabase/redux";
import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/transforms/components/JobTabs/JobTabs.tsx b/frontend/src/metabase/transforms/components/JobTabs/JobTabs.tsx
index c4277c722d1..a1051841f36 100644
--- a/frontend/src/metabase/transforms/components/JobTabs/JobTabs.tsx
+++ b/frontend/src/metabase/transforms/components/JobTabs/JobTabs.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import * as Urls from "metabase/urls";
import type { TransformJobId } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
index 433f7caa3bb..777f0ca14da 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
+import { useCollectionPath } from "metabase/common/data-studio/hooks/use-collection-path/useCollectionPath";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import type { StackProps } from "metabase/ui";
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx
index c7ddbae6bc3..c605aea23e5 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformNameInput.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { useUpdateTransformMutation } from "metabase/api";
-import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
+import { PaneHeaderInput } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { NAME_MAX_LENGTH } from "metabase/transforms/constants";
import type { Transform } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
index 0e5b8326f99..a50df3c31c2 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import {
type PaneHeaderTab,
PaneHeaderTabs,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import {
PLUGIN_DEPENDENCIES,
PLUGIN_TRANSFORMS_PYTHON,
diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx
index 3689bf91664..a0fb5775e00 100644
--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx
+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
import { useUpdateSettingMutation } from "metabase/api";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useSetting } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { useSelector } from "metabase/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Center, Text } from "metabase/ui";
diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
index a4cf62b1a43..ea64bcce865 100644
--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
@@ -7,10 +7,10 @@ import { DateTime } from "metabase/common/components/DateTime";
import { ForwardRefLink } from "metabase/common/components/Link";
import { ListEmptyState } from "metabase/common/components/ListEmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useSetting } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { useDispatch, useSelector } from "metabase/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";
diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx
index 5c38c4265a9..266d80300e3 100644
--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunListPage.tsx
@@ -13,11 +13,11 @@ import {
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PaginationControls } from "metabase/common/components/PaginationControls";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
import {
PaneHeader,
PanelHeaderTitle,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import { usePageTitle } from "metabase/hooks/use-page-title";
import { useDispatch } from "metabase/redux";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
index 884a18dc0d6..517fd14d032 100644
--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
@@ -9,7 +9,7 @@ import {
useLazyGetTransformJobQuery,
} from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
+import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { useDispatch } from "metabase/redux";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
index 5f3ea40a609..8b44ab95899 100644
--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
@@ -9,13 +9,13 @@ import { skipToken, useGetCardQuery } from "metabase/api";
import { NotFound } from "metabase/common/components/ErrorPages";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import {
PaneHeader,
PaneHeaderActions,
PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
+} from "metabase/common/data-studio/components/PaneHeader";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { useDispatch, useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx b/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx
index d47b2392c21..26dcf8a115e 100644
--- a/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx
+++ b/frontend/src/metabase/transforms/pages/NoWritableDatabasesEmptyState/NoWritableDatabasesEmptyState.tsx
@@ -1,9 +1,9 @@
import { Link } from "react-router";
import { t } from "ttag";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useSelector } from "metabase/redux";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import { Button, Center, Icon, Stack, Text, Title } from "metabase/ui";
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
index 531561f8a97..d1449445ef3 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
@@ -11,9 +11,9 @@ import {
useListTransformsQuery,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useSetting } from "metabase/common/hooks";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { usePageTitle } from "metabase/hooks/use-page-title";
import { useDispatch } from "metabase/redux";
import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
index b585b63ad58..305ae665bc7 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { trackDependencyEntitySelected } from "metabase/common/data-studio/analytics";
import CS from "metabase/css/core/index.css";
-import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
index e4ecc788b48..0f56bab9a7e 100644
--- a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import { skipToken, useGetTransformQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Card, Center } from "metabase/ui";
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
index aeac5a3cf8a..954c4ee7579 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
@@ -20,11 +20,11 @@ import { DateTime } from "metabase/common/components/DateTime";
import { ListEmptyState } from "metabase/common/components/ListEmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
+import { DataStudioBreadcrumbs } from "metabase/common/data-studio/components/DataStudioBreadcrumbs";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
+import { PaneHeader } from "metabase/common/data-studio/components/PaneHeader";
import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { PLUGIN_REPLACEMENT, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { LockedTransformsBanner } from "metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner";
diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
index 3a475c79bab..eb86f584573 100644
--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
+import { PaneHeaderActions } from "metabase/common/data-studio/components/PaneHeader";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
index 179f07b87b1..93e19f7ecee 100644
--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
@@ -15,7 +15,7 @@ import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { EmptyState } from "metabase/common/components/EmptyState/EmptyState";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
index 09960f4ba5d..e1e9c6a32f2 100644
--- a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
@@ -9,7 +9,7 @@ import {
useUpdateTransformMutation,
} from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
index 9cc284177fc..7f94ca2ccc9 100644
--- a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
@@ -1,5 +1,5 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";
import { Center } from "metabase/ui";
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
index cf6764b0092..1739d79756c 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
@@ -1,5 +1,5 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { PageContainer } from "metabase/common/data-studio/components/PageContainer";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
index e3357bda234..434e13085e3 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
@@ -8,8 +8,8 @@ import {
useUpdateTransformMutation,
} from "metabase/api";
import { Link } from "metabase/common/components/Link";
+import { TitleSection } from "metabase/common/data-studio/components/TitleSection";
import CS from "metabase/css/core/index.css";
-import { TitleSection } from "metabase/data-studio/common/components/TitleSection";
import { UserInput } from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";