diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/AppAnalyticsTab/AppAnalyticsTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/AppAnalyticsTab/AppAnalyticsTab.component.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/AppAnalyticsTab/AppAnalyticsTab.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/AppAnalyticsTab/AppAnalyticsTab.component.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/CustomStatistic.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/CustomStatistic.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/CustomStatistic.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/CustomStatistic.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DailyActiveUsersChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DailyActiveUsersChart.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DailyActiveUsersChart.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DailyActiveUsersChart.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataAssetsTab/DataAssetsTab.component.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataAssetsTab/DataAssetsTab.component.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightProgressBar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightProgressBar.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightProgressBar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightProgressBar.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightSummary.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightSummary.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightSummary.tsx
similarity index 98%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightSummary.tsx
index aa7131f906e..5c86f658d0e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightSummary.tsx
@@ -16,7 +16,6 @@ import { AxiosError } from 'axios';
 import React, { FC, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
-import { SummaryCard } from '../../components/common/SummaryCard/SummaryCard.component';
 import {
   ENTITIES_CHARTS,
   WEB_CHARTS,
@@ -41,6 +40,7 @@ import {
 import { getEntityName } from '../../utils/EntityUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
 import UserPopOverCard from '../common/PopOverCard/UserPopOverCard';
+import { SummaryCard } from '../common/SummaryCard/SummaryCard.component';
 import './data-insight-detail.less';
 
 interface Props {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DescriptionInsight.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DescriptionInsight.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DescriptionInsight.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DescriptionInsight.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EmptyGraphPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EmptyGraphPlaceholder.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EmptyGraphPlaceholder.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EmptyGraphPlaceholder.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EntitySummaryProgressBar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.component.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EntitySummaryProgressBar.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.component.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EntitySummaryProgressBar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EntitySummaryProgressBar.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPIChart.tsx
similarity index 99%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPIChart.tsx
index 3f925119e43..78f35d04db9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPIChart.tsx
@@ -29,7 +29,6 @@ import {
   XAxis,
   YAxis,
 } from 'recharts';
-import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import {
   DEFAULT_CHART_OPACITY,
   GRAPH_BACKGROUND_COLOR,
@@ -60,6 +59,7 @@ import {
   renderLegend,
 } from '../../utils/DataInsightUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
+import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import PageHeader from '../PageHeader/PageHeader.component';
 import './data-insight-detail.less';
 import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPILatestResultsV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPILatestResultsV1.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPILatestResultsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPILatestResultsV1.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/OwnerInsight.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/OwnerInsight.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/OwnerInsight.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/OwnerInsight.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/PageViewsByEntitiesChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/PageViewsByEntitiesChart.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/PageViewsByEntitiesChart.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/PageViewsByEntitiesChart.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TierInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TierInsight.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TierInsight.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TierInsight.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TopActiveUsers.tsx
similarity index 98%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TopActiveUsers.tsx
index c696ba6587b..a4c040624f9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TopActiveUsers.tsx
@@ -17,7 +17,6 @@ import { AxiosError } from 'axios';
 import React, { FC, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import Table from '../../components/common/Table/Table';
 import { getUserPath } from '../../constants/constants';
 import { DataReportIndex } from '../../generated/dataInsight/dataInsightChart';
 import { DataInsightChartType } from '../../generated/dataInsight/dataInsightChartResult';
@@ -30,6 +29,7 @@ import {
 } from '../../utils/date-time/DateTimeUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
 import ProfilePicture from '../common/ProfilePicture/ProfilePicture';
+import Table from '../common/Table/Table';
 import PageHeader from '../PageHeader/PageHeader.component';
 import './data-insight-detail.less';
 import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TopViewEntities.tsx
similarity index 98%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TopViewEntities.tsx
index f88924d4bb1..e4fb0ee7259 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TopViewEntities.tsx
@@ -18,7 +18,6 @@ import { isUndefined } from 'lodash';
 import React, { FC, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import Table from '../../components/common/Table/Table';
 import { DataReportIndex } from '../../generated/dataInsight/dataInsightChart';
 import { DataInsightChartType } from '../../generated/dataInsight/dataInsightChartResult';
 import { MostViewedEntities } from '../../generated/dataInsight/type/mostViewedEntities';
@@ -27,6 +26,7 @@ import { getAggregateChartData } from '../../rest/DataInsightAPI';
 import { getDecodedFqn } from '../../utils/StringsUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
 import ProfilePicture from '../common/ProfilePicture/ProfilePicture';
+import Table from '../common/Table/Table';
 import PageHeader from '../PageHeader/PageHeader.component';
 import './data-insight-detail.less';
 import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TotalEntityInsight.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsight.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TotalEntityInsight.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TotalEntityInsightSummary.component.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TotalEntityInsightSummary.component.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TotalEntityInsightSummary.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/TotalEntityInsightSummary.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/data-insight-detail.less b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/data-insight-detail.less
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/data-insight-detail.less
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/data-insight-detail.less
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/kpi-latest-results.less b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/kpi-latest-results.less
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/kpi-latest-results.less
rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsight/kpi-latest-results.less
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx
index 9318ee6a361..e34bc1aa659 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx
@@ -54,8 +54,8 @@ import SuccessScreen from '../../common/SuccessScreen/SuccessScreen';
 import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component';
 import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface';
 import { TableProfilerTab } from '../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface';
-import SingleColumnProfile from '../../Database/TableProfiler/SingleColumnProfile';
-import TableProfilerChart from '../../Database/TableProfiler/TableProfilerChart/TableProfilerChart';
+import SingleColumnProfile from '../../Database/Profiler/TableProfiler/SingleColumnProfile';
+import TableProfilerChart from '../../Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart';
 import IngestionStepper from '../../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component';
 import { AddDataQualityTestProps } from './AddDataQualityTest.interface';
 import RightPanel from './components/RightPanel';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx
index e0df340491d..b89d0f50dbd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx
@@ -33,8 +33,8 @@ import {
   TestCaseParameterDefinition,
   TestDataType,
 } from '../../../../generated/tests/testDefinition';
+import '../../../Database/Profiler/TableProfiler/table-profiler.less';
 import SchemaEditor from '../../../Database/SchemaEditor/SchemaEditor';
-import '../../../Database/TableProfiler/table-profiler.less';
 import { ParameterFormProps } from '../AddDataQualityTest.interface';
 
 const ParameterForm: React.FC<ParameterFormProps> = ({ definition, table }) => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
similarity index 78%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
index c71d7e2f913..457c19dcfbc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
@@ -24,32 +24,32 @@ import React, {
 } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useParams } from 'react-router-dom';
-import { getTableTabPath, ROUTES } from '../../../constants/constants';
-import { PROGRESS_BAR_COLOR } from '../../../constants/TestSuite.constant';
-import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider';
-import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum';
-import { EntityTabs } from '../../../enums/entity.enum';
-import { TestSummary } from '../../../generated/entity/data/table';
-import { EntityReference } from '../../../generated/entity/type';
-import { TestSuite } from '../../../generated/tests/testCase';
-import { usePaging } from '../../../hooks/paging/usePaging';
-import { DataQualityPageTabs } from '../../../pages/DataQuality/DataQualityPage.interface';
+import { getTableTabPath, ROUTES } from '../../../../constants/constants';
+import { PROGRESS_BAR_COLOR } from '../../../../constants/TestSuite.constant';
+import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider';
+import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum';
+import { EntityTabs } from '../../../../enums/entity.enum';
+import { TestSummary } from '../../../../generated/entity/data/table';
+import { EntityReference } from '../../../../generated/entity/type';
+import { TestSuite } from '../../../../generated/tests/testCase';
+import { usePaging } from '../../../../hooks/paging/usePaging';
+import { DataQualityPageTabs } from '../../../../pages/DataQuality/DataQualityPage.interface';
 import {
   getListTestSuites,
   ListTestSuitePrams,
   TestSuiteType,
-} from '../../../rest/testAPI';
-import { getEntityName } from '../../../utils/EntityUtils';
-import { getTestSuitePath } from '../../../utils/RouterUtils';
-import { showErrorToast } from '../../../utils/ToastUtils';
-import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
-import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder';
-import NextPrevious from '../../common/NextPrevious/NextPrevious';
-import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface';
-import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component';
-import Table from '../../common/Table/Table';
-import { TableProfilerTab } from '../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface';
-import ProfilerProgressWidget from '../../Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget';
+} from '../../../../rest/testAPI';
+import { getEntityName } from '../../../../utils/EntityUtils';
+import { getTestSuitePath } from '../../../../utils/RouterUtils';
+import { showErrorToast } from '../../../../utils/ToastUtils';
+import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder';
+import NextPrevious from '../../../common/NextPrevious/NextPrevious';
+import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface';
+import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component';
+import Table from '../../../common/Table/Table';
+import { TableProfilerTab } from '../../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface';
+import ProfilerProgressWidget from '../../../Database/Profiler/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget';
 
 export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => {
   const { t } = useTranslation();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx
similarity index 90%
rename from openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx
index 897043944b8..4a2d6271ef0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx
@@ -13,8 +13,8 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { DataQualityPageTabs } from '../../../pages/DataQuality/DataQualityPage.interface';
-import { getListTestSuites } from '../../../rest/testAPI';
+import { DataQualityPageTabs } from '../../../../pages/DataQuality/DataQualityPage.interface';
+import { getListTestSuites } from '../../../../rest/testAPI';
 import { TestSuites } from './TestSuites.component';
 
 const testSuitePermission = {
@@ -30,16 +30,16 @@ const mockUseParam = { tab: DataQualityPageTabs.TABLES } as {
   tab?: DataQualityPageTabs;
 };
 
-jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({
+jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({
   usePermissionProvider: jest.fn().mockImplementation(() => ({
     permissions: {
       testSuite: testSuitePermission,
     },
   })),
 }));
-jest.mock('../../../rest/testAPI', () => {
+jest.mock('../../../../rest/testAPI', () => {
   return {
-    ...jest.requireActual('../../../rest/testAPI'),
+    ...jest.requireActual('../../../../rest/testAPI'),
     getListTestSuites: jest
       .fn()
       .mockImplementation(() =>
@@ -53,10 +53,10 @@ jest.mock('react-router-dom', () => {
     useParams: jest.fn().mockImplementation(() => mockUseParam),
   };
 });
-jest.mock('../../common/NextPrevious/NextPrevious', () => {
+jest.mock('../../../common/NextPrevious/NextPrevious', () => {
   return jest.fn().mockImplementation(() => <div>NextPrevious.component</div>);
 });
-jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => {
+jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => {
   return jest
     .fn()
     .mockImplementation(({ type }) => (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnPickerMenu.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnPickerMenu.tsx
similarity index 91%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnPickerMenu.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnPickerMenu.tsx
index 454a2bf92ba..1a0b7f0fd85 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnPickerMenu.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnPickerMenu.tsx
@@ -14,9 +14,9 @@ import { Button, Dropdown, Space, Typography } from 'antd';
 import { find, map } from 'lodash';
 import { MenuInfo } from 'rc-menu/lib/interface';
 import React, { FC, useMemo, useState } from 'react';
-import { ReactComponent as DropdownIcon } from '../../../assets/svg/drop-down.svg';
-import { Column } from '../../../generated/entity/data/container';
-import { getEntityName } from '../../../utils/EntityUtils';
+import { ReactComponent as DropdownIcon } from '../../../../assets/svg/drop-down.svg';
+import { Column } from '../../../../generated/entity/data/container';
+import { getEntityName } from '../../../../utils/EntityUtils';
 
 interface ColumnPickerMenuProps {
   activeColumnFqn: string;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx
similarity index 87%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx
index 746ea85c9c9..e11ccee29ce 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx
@@ -21,16 +21,16 @@ import {
 } from '@testing-library/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { MOCK_TABLE } from '../../../../mocks/TableData.mock';
+import { MOCK_TABLE } from '../../../../../mocks/TableData.mock';
 import ColumnProfileTable from './ColumnProfileTable';
 
-jest.mock('../../../common/Table/Table', () =>
+jest.mock('../../../../common/Table/Table', () =>
   jest.fn().mockImplementation(() => <div>Table</div>)
 );
-jest.mock('../../../PageHeader/PageHeader.component', () =>
+jest.mock('../../../../PageHeader/PageHeader.component', () =>
   jest.fn().mockImplementation(() => <div>PageHeader</div>)
 );
-jest.mock('../../../common/DatePickerMenu/DatePickerMenu.component', () =>
+jest.mock('../../../../common/DatePickerMenu/DatePickerMenu.component', () =>
   jest.fn().mockImplementation(() => <div>DatePickerMenu</div>)
 );
 jest.mock('../ColumnPickerMenu', () =>
@@ -39,14 +39,14 @@ jest.mock('../ColumnPickerMenu', () =>
 jest.mock('../ColumnSummary', () =>
   jest.fn().mockImplementation(() => <div>ColumnSummary</div>)
 );
-jest.mock('../../../common/SummaryCard/SummaryCard.component', () => ({
+jest.mock('../../../../common/SummaryCard/SummaryCard.component', () => ({
   SummaryCard: jest.fn().mockImplementation(() => <div>SummaryCard</div>),
 }));
 
-jest.mock('../../../../utils/CommonUtils', () => ({
+jest.mock('../../../../../utils/CommonUtils', () => ({
   formatNumberWithComma: jest.fn(),
 }));
-jest.mock('../../../common/SearchBarComponent/SearchBar.component', () => {
+jest.mock('../../../../common/SearchBarComponent/SearchBar.component', () => {
   return jest
     .fn()
     .mockImplementation(({ searchValue, onSearch }) => (
@@ -64,7 +64,7 @@ jest.mock('../ProfilerProgressWidget/ProfilerProgressWidget', () => {
     </span>
   ));
 });
-jest.mock('../../../common/TestIndicator/TestIndicator', () => {
+jest.mock('../../../../common/TestIndicator/TestIndicator', () => {
   return jest.fn().mockImplementation(({ value, type }) => (
     <span data-testid="test-indicator">
       {value} <span>{type}</span>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx
similarity index 88%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx
index 71f6d8d87b1..c5ec4900aa8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx
@@ -30,37 +30,46 @@ import Qs from 'qs';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useHistory, useLocation } from 'react-router-dom';
-import { ReactComponent as DropDownIcon } from '../../../../assets/svg/drop-down.svg';
-import { ReactComponent as SettingIcon } from '../../../../assets/svg/ic-settings-primery.svg';
-import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants';
-import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant';
+import { ReactComponent as DropDownIcon } from '../../../../../assets/svg/drop-down.svg';
+import { ReactComponent as SettingIcon } from '../../../../../assets/svg/ic-settings-primery.svg';
+import { NO_DATA_PLACEHOLDER } from '../../../../../constants/constants';
+import { PAGE_HEADERS } from '../../../../../constants/PageHeaders.constant';
 import {
   DEFAULT_TEST_VALUE,
   INITIAL_TEST_RESULT_SUMMARY,
-} from '../../../../constants/profiler.constant';
-import { ProfilerDashboardType } from '../../../../enums/table.enum';
-import { Column, ColumnProfile } from '../../../../generated/entity/data/table';
-import { TestCase, TestCaseStatus } from '../../../../generated/tests/testCase';
-import { useFqn } from '../../../../hooks/useFqn';
-import { formatNumberWithComma } from '../../../../utils/CommonUtils';
-import { updateTestResults } from '../../../../utils/DataQualityAndProfilerUtils';
-import { getEntityName, searchInColumns } from '../../../../utils/EntityUtils';
+} from '../../../../../constants/profiler.constant';
+import { ProfilerDashboardType } from '../../../../../enums/table.enum';
+import {
+  Column,
+  ColumnProfile,
+} from '../../../../../generated/entity/data/table';
+import {
+  TestCase,
+  TestCaseStatus,
+} from '../../../../../generated/tests/testCase';
+import { useFqn } from '../../../../../hooks/useFqn';
+import { formatNumberWithComma } from '../../../../../utils/CommonUtils';
+import { updateTestResults } from '../../../../../utils/DataQualityAndProfilerUtils';
+import {
+  getEntityName,
+  searchInColumns,
+} from '../../../../../utils/EntityUtils';
 import {
   getAddCustomMetricPath,
   getAddDataQualityTableTestPath,
-} from '../../../../utils/RouterUtils';
-import { getEncodedFqn } from '../../../../utils/StringsUtils';
-import { getTableExpandableConfig } from '../../../../utils/TableUtils';
-import DatePickerMenu from '../../../common/DatePickerMenu/DatePickerMenu.component';
-import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder';
-import Searchbar from '../../../common/SearchBarComponent/SearchBar.component';
-import { SummaryCard } from '../../../common/SummaryCard/SummaryCard.component';
-import { SummaryCardProps } from '../../../common/SummaryCard/SummaryCard.interface';
-import Table from '../../../common/Table/Table';
-import TabsLabel from '../../../common/TabsLabel/TabsLabel.component';
-import TestIndicator from '../../../common/TestIndicator/TestIndicator';
-import PageHeader from '../../../PageHeader/PageHeader.component';
-import { TableProfilerTab } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface';
+} from '../../../../../utils/RouterUtils';
+import { getEncodedFqn } from '../../../../../utils/StringsUtils';
+import { getTableExpandableConfig } from '../../../../../utils/TableUtils';
+import DatePickerMenu from '../../../../common/DatePickerMenu/DatePickerMenu.component';
+import FilterTablePlaceHolder from '../../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder';
+import Searchbar from '../../../../common/SearchBarComponent/SearchBar.component';
+import { SummaryCard } from '../../../../common/SummaryCard/SummaryCard.component';
+import { SummaryCardProps } from '../../../../common/SummaryCard/SummaryCard.interface';
+import Table from '../../../../common/Table/Table';
+import TabsLabel from '../../../../common/TabsLabel/TabsLabel.component';
+import TestIndicator from '../../../../common/TestIndicator/TestIndicator';
+import PageHeader from '../../../../PageHeader/PageHeader.component';
+import { TableProfilerTab } from '../../ProfilerDashboard/profilerDashboard.interface';
 import ColumnPickerMenu from '../ColumnPickerMenu';
 import ColumnSummary from '../ColumnSummary';
 import NoProfilerBanner from '../NoProfilerBanner/NoProfilerBanner.component';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnSummary.tsx
similarity index 83%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnSummary.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnSummary.tsx
index 4b5183e010c..1b7758190ae 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnSummary.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ColumnSummary.tsx
@@ -13,10 +13,10 @@
 import { Space, Typography } from 'antd';
 import { isEmpty } from 'lodash';
 import React, { FC } from 'react';
-import { Column } from '../../../generated/entity/data/container';
-import { getEntityName } from '../../../utils/EntityUtils';
-import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer';
-import TagsViewer from '../../Tag/TagsViewer/TagsViewer';
+import { Column } from '../../../../generated/entity/data/container';
+import { getEntityName } from '../../../../utils/EntityUtils';
+import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer';
+import TagsViewer from '../../../Tag/TagsViewer/TagsViewer';
 
 interface ColumnSummaryProps {
   column: Column;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx
similarity index 89%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx
index 5a2b42c6180..6636b1b6b76 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx
@@ -34,27 +34,30 @@ import {
   XAxis,
   YAxis,
 } from 'recharts';
-import { ReactComponent as IconDropdown } from '../../../../assets/svg/menu.svg';
-import { GRAPH_BACKGROUND_COLOR } from '../../../../constants/constants';
-import { TOTAL_ENTITY_CHART_COLOR } from '../../../../constants/DataInsight.constants';
-import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant';
-import { EntityType } from '../../../../enums/entity.enum';
-import { CustomMetric } from '../../../../generated/entity/data/table';
+import { ReactComponent as IconDropdown } from '../../../../../assets/svg/menu.svg';
+import { GRAPH_BACKGROUND_COLOR } from '../../../../../constants/constants';
+import { TOTAL_ENTITY_CHART_COLOR } from '../../../../../constants/DataInsight.constants';
+import { PAGE_HEADERS } from '../../../../../constants/PageHeaders.constant';
+import { EntityType } from '../../../../../enums/entity.enum';
+import { CustomMetric } from '../../../../../generated/entity/data/table';
 import {
   deleteCustomMetric,
   putCustomMetric,
-} from '../../../../rest/customMetricAPI';
+} from '../../../../../rest/customMetricAPI';
 import {
   axisTickFormatter,
   tooltipFormatter,
-} from '../../../../utils/ChartUtils';
-import { getRandomHexColor } from '../../../../utils/DataInsightUtils';
-import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils';
-import DeleteWidgetModal from '../../../common/DeleteWidget/DeleteWidgetModal';
-import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
-import CustomMetricForm from '../../../DataQuality/CustomMetricForm/CustomMetricForm.component';
-import PageHeader from '../../../PageHeader/PageHeader.component';
-import ProfilerLatestValue from '../../Profiler/ProfilerLatestValue/ProfilerLatestValue';
+} from '../../../../../utils/ChartUtils';
+import { getRandomHexColor } from '../../../../../utils/DataInsightUtils';
+import {
+  showErrorToast,
+  showSuccessToast,
+} from '../../../../../utils/ToastUtils';
+import DeleteWidgetModal from '../../../../common/DeleteWidget/DeleteWidgetModal';
+import ErrorPlaceHolder from '../../../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import CustomMetricForm from '../../../../DataQuality/CustomMetricForm/CustomMetricForm.component';
+import PageHeader from '../../../../PageHeader/PageHeader.component';
+import ProfilerLatestValue from '../../ProfilerLatestValue/ProfilerLatestValue';
 import { useTableProfiler } from '../TableProfilerProvider';
 import './custom-metric-graphs.style.less';
 import {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts
similarity index 83%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts
index 996784c7a57..7cd63c0a849 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts
@@ -10,8 +10,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { CustomMetric } from '../../../../generated/tests/customMetric';
-import { MetricChartType } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface';
+import { CustomMetric } from '../../../../../generated/tests/customMetric';
+import { MetricChartType } from '../../ProfilerDashboard/profilerDashboard.interface';
 
 export interface CustomMetricGraphsProps {
   customMetricsGraphData?: Record<string, MetricChartType['data']>;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx
similarity index 95%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx
index 9aa40e44948..d379db61c3a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx
@@ -60,18 +60,18 @@ const mockProps = {
 };
 
 jest.mock(
-  '../../../DataQuality/CustomMetricForm/CustomMetricForm.component',
+  '../../../../DataQuality/CustomMetricForm/CustomMetricForm.component',
   () => {
     return jest.fn().mockImplementation(() => <div>CustomMetricForm</div>);
   }
 );
-jest.mock('../../Profiler/ProfilerLatestValue/ProfilerLatestValue', () => {
+jest.mock('../../../Profiler/ProfilerLatestValue/ProfilerLatestValue', () => {
   return jest.fn().mockImplementation(() => <div>ProfilerLatestValue</div>);
 });
-jest.mock('../../../common/DeleteWidget/DeleteWidgetModal', () => {
+jest.mock('../../../../common/DeleteWidget/DeleteWidgetModal', () => {
   return jest.fn().mockImplementation(() => <div>DeleteWidgetModal</div>);
 });
-jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => {
+jest.mock('../../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => {
   return jest.fn().mockImplementation(() => <div>ErrorPlaceHolder</div>);
 });
 jest.mock('../TableProfilerProvider', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx
similarity index 93%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx
index 0d787bfe034..063f3d2dbe4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx
@@ -13,7 +13,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import { ReactComponent as NoDataIcon } from '../../../../assets/svg/no-data-icon.svg';
+import { ReactComponent as NoDataIcon } from '../../../../../assets/svg/no-data-icon.svg';
 
 const NoProfilerBanner = () => {
   const { t } = useTranslation();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/NoProfilerBanner/NoProfilerBanner.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/NoProfilerBanner/NoProfilerBanner.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.test.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.test.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.tsx
similarity index 100%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.tsx
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx
similarity index 96%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx
index 9f210693092..787ed892303 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx
@@ -20,12 +20,12 @@ import {
   screen,
 } from '@testing-library/react';
 import React from 'react';
-import { MOCK_TABLE } from '../../../../mocks/TableData.mock';
-import { getTableProfilerConfig } from '../../../../rest/tableAPI';
+import { MOCK_TABLE } from '../../../../../mocks/TableData.mock';
+import { getTableProfilerConfig } from '../../../../../rest/tableAPI';
 import { ProfilerSettingsModalProps } from '../TableProfiler.interface';
 import ProfilerSettingsModal from './ProfilerSettingsModal';
 
-jest.mock('../../../../rest/tableAPI', () => ({
+jest.mock('../../../../../rest/tableAPI', () => ({
   getTableProfilerConfig: jest
     .fn()
     .mockImplementation(() => Promise.resolve(MOCK_TABLE)),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx
similarity index 97%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx
index 62e216e05be..fcb84ad8363 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx
@@ -40,7 +40,7 @@ import React, {
   useState,
 } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.svg';
+import { ReactComponent as IconDelete } from '../../../../../assets/svg/ic-delete.svg';
 import {
   DEFAULT_INCLUDE_PROFILE,
   INTERVAL_TYPE_OPTIONS,
@@ -50,21 +50,24 @@ import {
   PROFILE_SAMPLE_OPTIONS,
   SUPPORTED_COLUMN_DATA_TYPE_FOR_INTERVAL,
   TIME_BASED_PARTITION,
-} from '../../../../constants/profiler.constant';
-import { CSMode } from '../../../../enums/codemirror.enum';
-import { PartitionIntervalType } from '../../../../generated/api/data/createTable';
+} from '../../../../../constants/profiler.constant';
+import { CSMode } from '../../../../../enums/codemirror.enum';
+import { PartitionIntervalType } from '../../../../../generated/api/data/createTable';
 import {
   ProfileSampleType,
   TableProfilerConfig,
-} from '../../../../generated/entity/data/table';
+} from '../../../../../generated/entity/data/table';
 import {
   getTableProfilerConfig,
   putTableProfileConfig,
-} from '../../../../rest/tableAPI';
-import { reducerWithoutAction } from '../../../../utils/CommonUtils';
-import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils';
-import SliderWithInput from '../../../common/SliderWithInput/SliderWithInput';
-import SchemaEditor from '../../SchemaEditor/SchemaEditor';
+} from '../../../../../rest/tableAPI';
+import { reducerWithoutAction } from '../../../../../utils/CommonUtils';
+import {
+  showErrorToast,
+  showSuccessToast,
+} from '../../../../../utils/ToastUtils';
+import SliderWithInput from '../../../../common/SliderWithInput/SliderWithInput';
+import SchemaEditor from '../../../SchemaEditor/SchemaEditor';
 import '../table-profiler.less';
 import {
   ProfilerForm,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
similarity index 82%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.component.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
index e5df09dc3e8..9bf06e9d623 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
@@ -17,32 +17,32 @@ import { isUndefined } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
-import { getTableTabPath } from '../../../../constants/constants';
-import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant';
+import { getTableTabPath } from '../../../../../constants/constants';
+import { PAGE_HEADERS } from '../../../../../constants/PageHeaders.constant';
 import {
   TEST_CASE_STATUS_OPTION,
   TEST_CASE_TYPE_OPTION,
-} from '../../../../constants/profiler.constant';
-import { INITIAL_TEST_SUMMARY } from '../../../../constants/TestSuite.constant';
-import { EntityTabs, TabSpecificField } from '../../../../enums/entity.enum';
-import { ProfilerDashboardType } from '../../../../enums/table.enum';
-import { Table } from '../../../../generated/entity/data/table';
-import { TestCase } from '../../../../generated/tests/testCase';
-import { EntityType as TestType } from '../../../../generated/tests/testDefinition';
-import { useFqn } from '../../../../hooks/useFqn';
-import { getTableDetailsByFQN } from '../../../../rest/tableAPI';
+} from '../../../../../constants/profiler.constant';
+import { INITIAL_TEST_SUMMARY } from '../../../../../constants/TestSuite.constant';
+import { EntityTabs, TabSpecificField } from '../../../../../enums/entity.enum';
+import { ProfilerDashboardType } from '../../../../../enums/table.enum';
+import { Table } from '../../../../../generated/entity/data/table';
+import { TestCase } from '../../../../../generated/tests/testCase';
+import { EntityType as TestType } from '../../../../../generated/tests/testDefinition';
+import { useFqn } from '../../../../../hooks/useFqn';
+import { getTableDetailsByFQN } from '../../../../../rest/tableAPI';
 import {
   getBreadcrumbForTable,
   getEntityName,
-} from '../../../../utils/EntityUtils';
-import { getAddDataQualityTableTestPath } from '../../../../utils/RouterUtils';
-import { showErrorToast } from '../../../../utils/ToastUtils';
-import TabsLabel from '../../../common/TabsLabel/TabsLabel.component';
-import { SummaryPanel } from '../../../DataQuality/SummaryPannel/SummaryPanel.component';
-import TestSuitePipelineTab from '../../../DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component';
-import PageHeader from '../../../PageHeader/PageHeader.component';
-import DataQualityTab from '../../Profiler/DataQualityTab/DataQualityTab';
-import { TableProfilerTab } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface';
+} from '../../../../../utils/EntityUtils';
+import { getAddDataQualityTableTestPath } from '../../../../../utils/RouterUtils';
+import { showErrorToast } from '../../../../../utils/ToastUtils';
+import TabsLabel from '../../../../common/TabsLabel/TabsLabel.component';
+import { SummaryPanel } from '../../../../DataQuality/SummaryPannel/SummaryPanel.component';
+import TestSuitePipelineTab from '../../../../DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component';
+import PageHeader from '../../../../PageHeader/PageHeader.component';
+import DataQualityTab from '../../DataQualityTab/DataQualityTab';
+import { TableProfilerTab } from '../../ProfilerDashboard/profilerDashboard.interface';
 import { useTableProfiler } from '../TableProfilerProvider';
 
 export const QualityTab = () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.test.tsx
similarity index 92%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.test.tsx
index efe0e227e2e..ae8a5755a4a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.test.tsx
@@ -12,7 +12,7 @@
  */
 import { act, render, screen } from '@testing-library/react';
 import React from 'react';
-import { MOCK_TABLE } from '../../../../mocks/TableData.mock';
+import { MOCK_TABLE } from '../../../../../mocks/TableData.mock';
 import { useTableProfiler } from '../TableProfilerProvider';
 import { QualityTab } from './QualityTab.component';
 
@@ -43,15 +43,18 @@ jest.mock('../TableProfilerProvider', () => ({
   })),
 }));
 
-jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({
-  usePermissionProvider: jest.fn().mockImplementation(() => ({
-    permissions: {
-      testCase: testCasePermission,
-    },
-  })),
-}));
+jest.mock(
+  '../../../../../context/PermissionProvider/PermissionProvider',
+  () => ({
+    usePermissionProvider: jest.fn().mockImplementation(() => ({
+      permissions: {
+        testCase: testCasePermission,
+      },
+    })),
+  })
+);
 
-jest.mock('../../../../hooks/useFqn', () => ({
+jest.mock('../../../../../hooks/useFqn', () => ({
   useFqn: jest.fn().mockImplementation(() => ({ fqn: 'testFqn' })),
 }));
 
@@ -62,7 +65,7 @@ jest.mock('react-router-dom', () => ({
   Link: jest.fn().mockImplementation(() => <div>Link</div>),
 }));
 
-jest.mock('../../../../rest/tableAPI', () => ({
+jest.mock('../../../../../rest/tableAPI', () => ({
   getTableDetailsByFQN: jest
     .fn()
     .mockImplementation(() => Promise.resolve(mockTable)),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/SingleColumnProfile.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/SingleColumnProfile.tsx
similarity index 90%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/SingleColumnProfile.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/SingleColumnProfile.tsx
index c3c787dcb2b..09c9ce7c635 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/SingleColumnProfile.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/SingleColumnProfile.tsx
@@ -19,20 +19,19 @@ import { useTranslation } from 'react-i18next';
 import {
   DEFAULT_RANGE_DATA,
   INITIAL_COLUMN_METRICS_VALUE,
-} from '../../../constants/profiler.constant';
-import { ColumnProfile } from '../../../generated/entity/data/container';
-import { Table } from '../../../generated/entity/data/table';
-import { getColumnProfilerList } from '../../../rest/tableAPI';
-import DataDistributionHistogram from '../../Visualisations/Chart/DataDistributionHistogram.component';
-import ProfilerDetailsCard from '../Profiler/ProfilerDetailsCard/ProfilerDetailsCard';
-
+} from '../../../../constants/profiler.constant';
+import { ColumnProfile } from '../../../../generated/entity/data/container';
+import { Table } from '../../../../generated/entity/data/table';
+import { getColumnProfilerList } from '../../../../rest/tableAPI';
 import {
   calculateColumnProfilerMetrics,
   calculateCustomMetrics,
   getColumnCustomMetric,
-} from '../../../utils/TableProfilerUtils';
-import { ColumnMetricsInterface } from '../../../utils/TableProfilerUtils.interface';
-import { showErrorToast } from '../../../utils/ToastUtils';
+} from '../../../../utils/TableProfilerUtils';
+import { ColumnMetricsInterface } from '../../../../utils/TableProfilerUtils.interface';
+import { showErrorToast } from '../../../../utils/ToastUtils';
+import DataDistributionHistogram from '../../../Visualisations/Chart/DataDistributionHistogram.component';
+import ProfilerDetailsCard from '../ProfilerDetailsCard/ProfilerDetailsCard';
 import CustomMetricGraphs from './CustomMetricGraphs/CustomMetricGraphs.component';
 import { useTableProfiler } from './TableProfilerProvider';
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.interface.ts
similarity index 90%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.interface.ts
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.interface.ts
index e11b8addc68..e21cb97ba33 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.interface.ts
@@ -13,8 +13,8 @@
 
 import { DateRangeObject } from 'Models';
 import { ReactNode } from 'react';
-import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface';
-import { SystemProfile } from '../../../generated/api/data/createTableProfile';
+import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface';
+import { SystemProfile } from '../../../../generated/api/data/createTableProfile';
 import {
   Column,
   ColumnProfilerConfig,
@@ -23,9 +23,9 @@ import {
   Table,
   TableProfile,
   TableProfilerConfig,
-} from '../../../generated/entity/data/table';
-import { TestCase } from '../../../generated/tests/testCase';
-import { ListTestCaseParams } from '../../../rest/testAPI';
+} from '../../../../generated/entity/data/table';
+import { TestCase } from '../../../../generated/tests/testCase';
+import { ListTestCaseParams } from '../../../../rest/testAPI';
 
 export interface TableProfilerProps {
   isTableDeleted?: boolean;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.test.tsx
similarity index 92%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.test.tsx
index 2eb0a903f1b..30875b6731b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.test.tsx
@@ -15,8 +15,8 @@
 import { cleanup, render, screen } from '@testing-library/react';
 import React from 'react';
 // internal imports
-import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface';
-import { TEST_CASE } from '../../../mocks/TableData.mock';
+import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface';
+import { TEST_CASE } from '../../../../mocks/TableData.mock';
 import TableProfilerV1 from './TableProfiler';
 import { TableProfilerProps } from './TableProfiler.interface';
 
@@ -45,12 +45,12 @@ jest.mock('./ColumnProfileTable/ColumnProfileTable', () => {
   });
 });
 
-jest.mock('../../../rest/testAPI', () => ({
+jest.mock('../../../../rest/testAPI', () => ({
   getListTestCase: jest
     .fn()
     .mockImplementation(() => Promise.resolve(TEST_CASE)),
 }));
-jest.mock('../../../rest/tableAPI', () => ({
+jest.mock('../../../../rest/tableAPI', () => ({
   getTableDetailsByFQN: jest.fn().mockImplementation(() => Promise.resolve()),
 }));
 jest.mock('./QualityTab/QualityTab.component', () => ({
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.tsx
similarity index 90%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.tsx
index 70e7f1ece15..6a08030d239 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfiler.tsx
@@ -16,11 +16,11 @@ import Qs from 'qs';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useLocation } from 'react-router-dom';
-import { ReactComponent as ColumnProfileIcon } from '../../../assets/svg/column-profile.svg';
-import { ReactComponent as DataQualityIcon } from '../../../assets/svg/data-quality.svg';
-import { ReactComponent as TableProfileIcon } from '../../../assets/svg/table-profile.svg';
-import { useTourProvider } from '../../../context/TourProvider/TourProvider';
-import { TableProfilerTab } from '../Profiler/ProfilerDashboard/profilerDashboard.interface';
+import { ReactComponent as ColumnProfileIcon } from '../../../../assets/svg/column-profile.svg';
+import { ReactComponent as DataQualityIcon } from '../../../../assets/svg/data-quality.svg';
+import { ReactComponent as TableProfileIcon } from '../../../../assets/svg/table-profile.svg';
+import { useTourProvider } from '../../../../context/TourProvider/TourProvider';
+import { TableProfilerTab } from '../ProfilerDashboard/profilerDashboard.interface';
 import ColumnProfileTable from './ColumnProfileTable/ColumnProfileTable';
 import { QualityTab } from './QualityTab/QualityTab.component';
 import { TableProfilerProps } from './TableProfiler.interface';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx
similarity index 87%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx
index 02b654f212d..43a58c4dee2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx
@@ -13,11 +13,11 @@
 
 import { act, render, screen } from '@testing-library/react';
 import React from 'react';
-import { DEFAULT_RANGE_DATA } from '../../../../constants/profiler.constant';
+import { DEFAULT_RANGE_DATA } from '../../../../../constants/profiler.constant';
 import {
   getSystemProfileList,
   getTableProfilesList,
-} from '../../../../rest/tableAPI';
+} from '../../../../../rest/tableAPI';
 import TableProfilerChart from './TableProfilerChart';
 
 const mockFQN = 'testFQN';
@@ -26,29 +26,29 @@ jest.mock('react-router-dom', () => ({
   useParams: jest.fn().mockImplementation(() => ({ fqn: mockFQN })),
   useHistory: jest.fn(),
 }));
-jest.mock('../../../../rest/tableAPI');
-jest.mock('../../Profiler/ProfilerLatestValue/ProfilerLatestValue', () => {
+jest.mock('../../../../../rest/tableAPI');
+jest.mock('../../ProfilerLatestValue/ProfilerLatestValue', () => {
   return jest.fn().mockImplementation(() => <div>ProfilerLatestValue</div>);
 });
-jest.mock('../../Profiler/ProfilerDetailsCard/ProfilerDetailsCard', () => {
+jest.mock('../../ProfilerDetailsCard/ProfilerDetailsCard', () => {
   return jest.fn().mockImplementation(() => <div>ProfilerDetailsCard</div>);
 });
-jest.mock('../../../Visualisations/Chart/CustomBarChart', () => {
+jest.mock('../../../../Visualisations/Chart/CustomBarChart', () => {
   return jest.fn().mockImplementation(() => <div>CustomBarChart</div>);
 });
-jest.mock('../../../Visualisations/Chart/OperationDateBarChart', () => {
+jest.mock('../../../../Visualisations/Chart/OperationDateBarChart', () => {
   return jest.fn().mockImplementation(() => <div>OperationDateBarChart</div>);
 });
-jest.mock('../../../PageHeader/PageHeader.component', () => {
+jest.mock('../../../../PageHeader/PageHeader.component', () => {
   return jest.fn().mockImplementation(() => <div>PageHeader</div>);
 });
-jest.mock('../../../common/DatePickerMenu/DatePickerMenu.component', () => {
+jest.mock('../../../../common/DatePickerMenu/DatePickerMenu.component', () => {
   return jest.fn().mockImplementation(() => <div>DatePickerMenu</div>);
 });
 jest.mock('../NoProfilerBanner/NoProfilerBanner.component', () => {
   return jest.fn().mockImplementation(() => <div>NoProfilerBanner</div>);
 });
-jest.mock('../../../common/SummaryCard/SummaryCard.component', () => {
+jest.mock('../../../../common/SummaryCard/SummaryCard.component', () => {
   return {
     SummaryCard: jest.fn().mockImplementation(() => <div>SummaryCard</div>),
   };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart.tsx
similarity index 87%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart.tsx
index 7cd3c8f7636..79e8fd7cea9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart.tsx
@@ -29,39 +29,39 @@ import { DateRangeObject } from 'Models';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
-import { ReactComponent as SettingIcon } from '../../../../assets/svg/ic-settings-primery.svg';
-import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant';
+import { ReactComponent as SettingIcon } from '../../../../../assets/svg/ic-settings-primery.svg';
+import { PAGE_HEADERS } from '../../../../../constants/PageHeaders.constant';
 import {
   DEFAULT_RANGE_DATA,
   INITIAL_OPERATION_METRIC_VALUE,
   INITIAL_ROW_METRIC_VALUE,
-} from '../../../../constants/profiler.constant';
-import { ProfilerDashboardType } from '../../../../enums/table.enum';
-import { TableProfile } from '../../../../generated/entity/data/table';
-import { useFqn } from '../../../../hooks/useFqn';
+} from '../../../../../constants/profiler.constant';
+import { ProfilerDashboardType } from '../../../../../enums/table.enum';
+import { TableProfile } from '../../../../../generated/entity/data/table';
+import { useFqn } from '../../../../../hooks/useFqn';
 import {
   getSystemProfileList,
   getTableProfilesList,
-} from '../../../../rest/tableAPI';
+} from '../../../../../rest/tableAPI';
 import {
   getAddCustomMetricPath,
   getAddDataQualityTableTestPath,
-} from '../../../../utils/RouterUtils';
+} from '../../../../../utils/RouterUtils';
 import {
   calculateCustomMetrics,
   calculateRowCountMetrics,
   calculateSystemMetrics,
-} from '../../../../utils/TableProfilerUtils';
-import { showErrorToast } from '../../../../utils/ToastUtils';
-import DatePickerMenu from '../../../common/DatePickerMenu/DatePickerMenu.component';
-import { SummaryCard } from '../../../common/SummaryCard/SummaryCard.component';
-import TabsLabel from '../../../common/TabsLabel/TabsLabel.component';
-import PageHeader from '../../../PageHeader/PageHeader.component';
-import CustomBarChart from '../../../Visualisations/Chart/CustomBarChart';
-import OperationDateBarChart from '../../../Visualisations/Chart/OperationDateBarChart';
-import { MetricChartType } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface';
-import ProfilerDetailsCard from '../../Profiler/ProfilerDetailsCard/ProfilerDetailsCard';
-import ProfilerLatestValue from '../../Profiler/ProfilerLatestValue/ProfilerLatestValue';
+} from '../../../../../utils/TableProfilerUtils';
+import { showErrorToast } from '../../../../../utils/ToastUtils';
+import DatePickerMenu from '../../../../common/DatePickerMenu/DatePickerMenu.component';
+import { SummaryCard } from '../../../../common/SummaryCard/SummaryCard.component';
+import TabsLabel from '../../../../common/TabsLabel/TabsLabel.component';
+import PageHeader from '../../../../PageHeader/PageHeader.component';
+import CustomBarChart from '../../../../Visualisations/Chart/CustomBarChart';
+import OperationDateBarChart from '../../../../Visualisations/Chart/OperationDateBarChart';
+import { MetricChartType } from '../../ProfilerDashboard/profilerDashboard.interface';
+import ProfilerDetailsCard from '../../ProfilerDetailsCard/ProfilerDetailsCard';
+import ProfilerLatestValue from '../../ProfilerLatestValue/ProfilerLatestValue';
 import CustomMetricGraphs from '../CustomMetricGraphs/CustomMetricGraphs.component';
 import NoProfilerBanner from '../NoProfilerBanner/NoProfilerBanner.component';
 import { TableProfilerChartProps } from '../TableProfiler.interface';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerProvider.tsx
similarity index 90%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerProvider.tsx
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerProvider.tsx
index bf5b6d77bf2..94680cd4779 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerProvider.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/TableProfilerProvider.tsx
@@ -25,23 +25,23 @@ import React, {
 } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
-import { API_RES_MAX_SIZE } from '../../../constants/constants';
-import { mockDatasetData } from '../../../constants/mockTourData.constants';
-import { DEFAULT_RANGE_DATA } from '../../../constants/profiler.constant';
-import { useTourProvider } from '../../../context/TourProvider/TourProvider';
-import { Table } from '../../../generated/entity/data/table';
-import { ProfileSampleType } from '../../../generated/metadataIngestion/databaseServiceProfilerPipeline';
-import { TestCase } from '../../../generated/tests/testCase';
-import { useFqn } from '../../../hooks/useFqn';
+import { API_RES_MAX_SIZE } from '../../../../constants/constants';
+import { mockDatasetData } from '../../../../constants/mockTourData.constants';
+import { DEFAULT_RANGE_DATA } from '../../../../constants/profiler.constant';
+import { useTourProvider } from '../../../../context/TourProvider/TourProvider';
+import { Table } from '../../../../generated/entity/data/table';
+import { ProfileSampleType } from '../../../../generated/metadataIngestion/databaseServiceProfilerPipeline';
+import { TestCase } from '../../../../generated/tests/testCase';
+import { useFqn } from '../../../../hooks/useFqn';
 import {
   getLatestTableProfileByFqn,
   getTableDetailsByFQN,
-} from '../../../rest/tableAPI';
-import { getListTestCase, ListTestCaseParams } from '../../../rest/testAPI';
-import { bytesToSize } from '../../../utils/StringsUtils';
-import { generateEntityLink } from '../../../utils/TableUtils';
-import { showErrorToast } from '../../../utils/ToastUtils';
-import { TableProfilerTab } from '../Profiler/ProfilerDashboard/profilerDashboard.interface';
+} from '../../../../rest/tableAPI';
+import { getListTestCase, ListTestCaseParams } from '../../../../rest/testAPI';
+import { bytesToSize } from '../../../../utils/StringsUtils';
+import { generateEntityLink } from '../../../../utils/TableUtils';
+import { showErrorToast } from '../../../../utils/ToastUtils';
+import { TableProfilerTab } from '../ProfilerDashboard/profilerDashboard.interface';
 import ProfilerSettingsModal from './ProfilerSettingsModal/ProfilerSettingsModal';
 import {
   OverallTableSummaryType,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/table-profiler.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less
similarity index 97%
rename from openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/table-profiler.less
rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less
index 55ec0c749df..11e35621977 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/table-profiler.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-@import url('../../../styles/variables.less');
+@import url('../../../../styles/variables.less');
 
 @succesColor: #28a745;
 @failedColor: #cb2431;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx
index 80dc707a1f1..23cfd0518f3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx
@@ -49,7 +49,7 @@ import {
   getEpochMillisForPastDays,
 } from '../../../../utils/date-time/DateTimeUtils';
 import { showErrorToast } from '../../../../utils/ToastUtils';
-import KPILatestResultsV1 from '../../../DataInsightDetail/KPILatestResultsV1';
+import KPILatestResultsV1 from '../../../DataInsight/KPILatestResultsV1';
 import './kpi-widget.less';
 import { KPIWidgetProps } from './KPIWidget.interface';
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx
index f42866fb19e..3abf5220620 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx
@@ -49,8 +49,8 @@ import {
   getEpochMillisForPastDays,
 } from '../../../../utils/date-time/DateTimeUtils';
 import { showErrorToast } from '../../../../utils/ToastUtils';
-import { EmptyGraphPlaceholder } from '../../../DataInsightDetail/EmptyGraphPlaceholder';
-import TotalEntityInsightSummary from '../../../DataInsightDetail/TotalEntityInsightSummary.component';
+import { EmptyGraphPlaceholder } from '../../../DataInsight/EmptyGraphPlaceholder';
+import TotalEntityInsightSummary from '../../../DataInsight/TotalEntityInsightSummary.component';
 import './total-data-assets-widget.less';
 import { TotalDataAssetsWidgetProps } from './TotalDataAssetsWidget.interface';
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx
index 00a657c4c1b..a84dee67b9e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx
@@ -14,7 +14,7 @@
 import { cleanup, render, screen } from '@testing-library/react';
 import React from 'react';
 import { TestCaseStatus } from '../../../generated/tests/testCase';
-import { TestIndicatorProps } from '../../Database/TableProfiler/TableProfiler.interface';
+import { TestIndicatorProps } from '../../Database/Profiler/TableProfiler/TableProfiler.interface';
 import TestIndicator from './TestIndicator';
 
 const mockProps: TestIndicatorProps = {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx
index f176342aa17..49c7ec4e7e8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx
@@ -14,7 +14,7 @@
 import { Space } from 'antd';
 import classNames from 'classnames';
 import React from 'react';
-import { TestIndicatorProps } from '../../Database/TableProfiler/TableProfiler.interface';
+import { TestIndicatorProps } from '../../Database/Profiler/TableProfiler/TableProfiler.interface';
 import './test-indicator.less';
 
 const TestIndicator: React.FC<TestIndicatorProps> = ({ value, type }) => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx
index daec59c30eb..9dd3b61b9de 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx
@@ -30,11 +30,14 @@ jest.mock(
     return jest.fn().mockImplementation(() => <div>CustomMetricForm</div>);
   }
 );
-jest.mock('../../components/Database/TableProfiler/SingleColumnProfile', () => {
-  return jest.fn().mockImplementation(() => <div>SingleColumnProfile</div>);
-});
 jest.mock(
-  '../../components/Database/TableProfiler/TableProfilerChart/TableProfilerChart',
+  '../../components/Database/Profiler/TableProfiler/SingleColumnProfile',
+  () => {
+    return jest.fn().mockImplementation(() => <div>SingleColumnProfile</div>);
+  }
+);
+jest.mock(
+  '../../components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart',
   () => {
     return jest.fn().mockImplementation(() => <div>TableProfilerChart</div>);
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx
index 49228908f6a..1d94f220d53 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx
@@ -21,8 +21,8 @@ import ResizablePanels from '../../components/common/ResizablePanels/ResizablePa
 import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component';
 import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface';
 import { TableProfilerTab } from '../../components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface';
-import SingleColumnProfile from '../../components/Database/TableProfiler/SingleColumnProfile';
-import TableProfilerChart from '../../components/Database/TableProfiler/TableProfilerChart/TableProfilerChart';
+import SingleColumnProfile from '../../components/Database/Profiler/TableProfiler/SingleColumnProfile';
+import TableProfilerChart from '../../components/Database/Profiler/TableProfiler/TableProfilerChart/TableProfilerChart';
 import RightPanel from '../../components/DataQuality/AddDataQualityTest/components/RightPanel';
 import CustomMetricForm from '../../components/DataQuality/CustomMetricForm/CustomMetricForm.component';
 import { getTableTabPath } from '../../constants/constants';
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts
index c3499740a06..12c5496b640 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts
@@ -13,8 +13,8 @@
 import { ReactComponent as AppAnalyticsIcon } from '../../assets/svg/app-analytics.svg';
 import { ReactComponent as DataAssetsIcon } from '../../assets/svg/data-asset.svg';
 import { ReactComponent as KPIIcon } from '../../assets/svg/kpi.svg';
-import AppAnalyticsTab from '../../components/DataInsightDetail/AppAnalyticsTab/AppAnalyticsTab.component';
-import DataAssetsTab from '../../components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component';
+import AppAnalyticsTab from '../../components/DataInsight/AppAnalyticsTab/AppAnalyticsTab.component';
+import DataAssetsTab from '../../components/DataInsight/DataAssetsTab/DataAssetsTab.component';
 import { DataInsightTabs } from '../../interface/data-insight.interface';
 import { getDataInsightPathWithFqn } from '../../utils/DataInsightUtils';
 import i18n from '../../utils/i18next/LocalUtil';
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx
index b2a34aecf9e..9e919f95402 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx
@@ -15,8 +15,8 @@ import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useParams } from 'react-router-dom';
 import DatePickerMenu from '../../../components/common/DatePickerMenu/DatePickerMenu.component';
-import DataInsightSummary from '../../../components/DataInsightDetail/DataInsightSummary';
-import KPIChart from '../../../components/DataInsightDetail/KPIChart';
+import DataInsightSummary from '../../../components/DataInsight/DataInsightSummary';
+import KPIChart from '../../../components/DataInsight/KPIChart';
 import SearchDropdown from '../../../components/SearchDropdown/SearchDropdown';
 import { ROUTES } from '../../../constants/constants';
 import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider';
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx
index b23466c7969..0e6371c33ff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx
@@ -25,11 +25,11 @@ jest.mock('react-router-dom', () => ({
   useParams: jest.fn(() => ({ tab: 'tab' })),
 }));
 
-jest.mock('../../../components/DataInsightDetail/DataInsightSummary', () =>
+jest.mock('../../../components/DataInsight/DataInsightSummary', () =>
   jest.fn(() => <div>DataInsightSummary</div>)
 );
 
-jest.mock('../../../components/DataInsightDetail/KPIChart', () =>
+jest.mock('../../../components/DataInsight/KPIChart', () =>
   jest.fn(() => <div>KPIChart</div>)
 );
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx
index 13b14352123..4e4fce17346 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx
@@ -48,7 +48,7 @@ jest.mock('./DataInsightHeader/DataInsightHeader.component', () =>
   jest.fn().mockReturnValue(<div>DataInsightHeader.component</div>)
 );
 jest.mock(
-  '../../components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component',
+  '../../components/DataInsight/DataAssetsTab/DataAssetsTab.component',
   () => jest.fn().mockReturnValue(<div>DataAssetsTab.component</div>)
 );
 const mockComponent = () => <div>dataAssetsComponent</div>;
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx
index 530cc2e0535..3a3cd23a3cb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx
@@ -27,7 +27,7 @@ import NextPrevious from '../../components/common/NextPrevious/NextPrevious';
 import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface';
 import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer';
 import Table from '../../components/common/Table/Table';
-import { EmptyGraphPlaceholder } from '../../components/DataInsightDetail/EmptyGraphPlaceholder';
+import { EmptyGraphPlaceholder } from '../../components/DataInsight/EmptyGraphPlaceholder';
 import {
   getKpiPath,
   INITIAL_PAGING_VALUE,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx
index d4286693647..a1d61537b93 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx
@@ -29,7 +29,7 @@ jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => {
   return jest.fn().mockImplementation(({ children }) => <div>{children}</div>);
 });
 jest.mock(
-  '../../components/DataQuality/TestSuites/TestSuites.component',
+  '../../components/DataQuality/TestSuite/TestSuiteList/TestSuites.component',
   () => {
     return {
       TestSuites: jest
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx
index 36099cd917d..e9b914b6eb5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx
@@ -19,7 +19,7 @@ import { useHistory, useParams } from 'react-router-dom';
 import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component';
 import { SummaryPanel } from '../../components/DataQuality/SummaryPannel/SummaryPanel.component';
 import { TestCases } from '../../components/DataQuality/TestCases/TestCases.component';
-import { TestSuites } from '../../components/DataQuality/TestSuites/TestSuites.component';
+import { TestSuites } from '../../components/DataQuality/TestSuite/TestSuiteList/TestSuites.component';
 import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
 import { INITIAL_TEST_SUMMARY } from '../../constants/TestSuite.constant';
 import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider';
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx
index badcae8a65c..8c844528daf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx
@@ -113,9 +113,12 @@ jest.mock('../../components/Database/SchemaTab/SchemaTab.component', () => {
   return jest.fn().mockImplementation(() => <p>testSchemaTab</p>);
 });
 
-jest.mock('../../components/Database/TableProfiler/TableProfiler', () => {
-  return jest.fn().mockImplementation(() => <p>testTableProfiler</p>);
-});
+jest.mock(
+  '../../components/Database/Profiler/TableProfiler/TableProfiler',
+  () => {
+    return jest.fn().mockImplementation(() => <p>testTableProfiler</p>);
+  }
+);
 
 jest.mock('../../components/Database/TableQueries/TableQueries', () => {
   return jest.fn().mockImplementation(() => <p>testTableQueries</p>);
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
index a2e735cd51d..69aaba6c7bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
@@ -31,9 +31,9 @@ import Loader from '../../components/common/Loader/Loader';
 import QueryViewer from '../../components/common/QueryViewer/QueryViewer.component';
 import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component';
 import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component';
+import TableProfiler from '../../components/Database/Profiler/TableProfiler/TableProfiler';
 import SampleDataTableComponent from '../../components/Database/SampleDataTable/SampleDataTable.component';
 import SchemaTab from '../../components/Database/SchemaTab/SchemaTab.component';
-import TableProfiler from '../../components/Database/TableProfiler/TableProfiler';
 import TableQueries from '../../components/Database/TableQueries/TableQueries';
 import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface';
 import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel';
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts
index 7eef973b17c..7c4117a4167 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { TableTestsType } from '../components/Database/TableProfiler/TableProfiler.interface';
+import { TableTestsType } from '../components/Database/Profiler/TableProfiler/TableProfiler.interface';
 import { TestCaseStatus } from '../generated/tests/testCase';
 
 export const updateTestResults = (