chore(ui): improve file and folder names (#13784)

* chore(ui): improve file and folder names

* chore: fix test

* fix: build

* Fix paging (#13821)

* chore(ui): pagesize support for all the pagination

* revamp pagination

* complete pagination update

* fix import

* fix pagination

* fix tests

* fix path

* fix import

* fix import error

---------

Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>

openmetadata-ui/src/main/resources/ui/src/App.test.tsx

@@ -14,14 +14,14 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 import App from './App';
-import { AuthContext } from './components/authentication/auth-provider/AuthProvider';
-import { IAuthContext } from './components/authentication/auth-provider/AuthProvider.interface';
+import { AuthContext } from './components/Auth/AuthProviders/AuthProvider';
+import { IAuthContext } from './components/Auth/AuthProviders/AuthProvider.interface';
 
-jest.mock('./components/router/AppRouter', () => {
+jest.mock('./components/AppRouter/AppRouter', () => {
   return jest.fn().mockReturnValue(<p>AppRouter</p>);
 });
 
-jest.mock('./components/authentication/auth-provider/AuthProvider', () => {
+jest.mock('./components/Auth/AuthProviders/AuthProvider', () => {
   return {
     AuthProvider: jest
       .fn()

openmetadata-ui/src/main/resources/ui/src/App.tsx

@@ -18,16 +18,16 @@ import { Router } from 'react-router-dom';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.min.css';
 import ApplicationConfigProvider from './components/ApplicationConfigProvider/ApplicationConfigProvider';
-import { AuthProvider } from './components/authentication/auth-provider/AuthProvider';
+import AppRouter from './components/AppRouter/AppRouter';
+import { AuthProvider } from './components/Auth/AuthProviders/AuthProvider';
 import DomainProvider from './components/Domain/DomainProvider/DomainProvider';
 import { EntityExportModalProvider } from './components/Entity/EntityExportModalProvider/EntityExportModalProvider.component';
 import ErrorBoundary from './components/ErrorBoundary/ErrorBoundary';
 import GlobalSearchProvider from './components/GlobalSearchProvider/GlobalSearchProvider';
 import PermissionProvider from './components/PermissionProvider/PermissionProvider';
-import AppRouter from './components/router/AppRouter';
 import TourProvider from './components/TourProvider/TourProvider';
-import WebSocketProvider from './components/web-scoket/web-scoket.provider';
 import WebAnalyticsProvider from './components/WebAnalytics/WebAnalyticsProvider';
+import WebSocketProvider from './components/WebSocketProvider/WebSocketProvider';
 import { TOAST_OPTIONS } from './constants/Toasts.constants';
 import { history } from './utils/HistoryUtils';
 import i18n from './utils/i18next/LocalUtil';

openmetadata-ui/src/main/resources/ui/src/AppState.ts

@@ -14,7 +14,7 @@
 import { isEmpty, isNil, isUndefined } from 'lodash';
 import { action, makeAutoObservable } from 'mobx';
 import { ClientAuth, NewUser } from 'Models';
-import { EntityUnion } from './components/Explore/explore.interface';
+import { EntityUnion } from './components/Explore/ExplorePage.interface';
 import { ResourcePermission } from './generated/entity/policies/accessControl/resourcePermission';
 import {
   EntityReference as UserTeams,

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx

@@ -25,7 +25,7 @@ import {
   getEntityFQN,
   getEntityType,
 } from '../../../utils/FeedUtils';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
 import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard';
 import ProfilePicture from '../../common/ProfilePicture/ProfilePicture';
 import EditAnnouncementModal from '../../Modals/AnnouncementModal/EditAnnouncementModal';

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx

@@ -32,7 +32,7 @@ jest.mock('../../../../utils/FeedUtils', () => ({
   },
 }));
 
-jest.mock('../../../common/rich-text-editor/RichTextEditorPreviewer', () => {
+jest.mock('../../../common/RichTextEditor/RichTextEditorPreviewer', () => {
   return jest.fn().mockReturnValue(<p>RichText Preview</p>);
 });
 

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx

@@ -21,7 +21,7 @@ import {
   getFrontEndFormat,
   MarkdownToHTMLConverter,
 } from '../../../../utils/FeedUtils';
-import RichTextEditorPreviewer from '../../../common/rich-text-editor/RichTextEditorPreviewer';
+import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer';
 import Reactions from '../../../Reactions/Reactions';
 import ActivityFeedEditor from '../../ActivityFeedEditor/ActivityFeedEditor';
 import { FeedBodyProp } from '../ActivityFeedCard.interface';

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx

@@ -16,7 +16,7 @@ import { isUndefined } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import ActivityFeedEditor from '../../../../components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor';
-import RichTextEditorPreviewer from '../../../../components/common/rich-text-editor/RichTextEditorPreviewer';
+import RichTextEditorPreviewer from '../../../../components/common/RichTextEditor/RichTextEditorPreviewer';
 import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils';
 import {
   getFrontEndFormat,

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx

@@ -43,7 +43,7 @@ const mockUserData: User = {
   isAdmin: true,
 };
 
-jest.mock('../../authentication/auth-provider/AuthProvider', () => ({
+jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({
   useAuthContext: jest.fn(() => ({
     currentUser: mockUserData,
   })),

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx

@@ -23,7 +23,7 @@ import { REACTION_LIST } from '../../../constants/reactions.constant';
 import { ReactionOperation } from '../../../enums/reactions.enum';
 import { Post } from '../../../generated/entity/feed/thread';
 import { ReactionType } from '../../../generated/type/reaction';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
 import Reaction from '../../Reactions/Reaction';
 import { ConfirmState } from './ActivityFeedCard.interface';
 

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx

@@ -16,7 +16,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as ActivityFeedIcon } from '../../../assets/svg/activity-feed.svg';
 import { ReactComponent as TaskIcon } from '../../../assets/svg/ic-task.svg';
-import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import Loader from '../../../components/Loader/Loader';
 import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum';
 import { Thread } from '../../../generated/entity/feed/thread';

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx

@@ -45,7 +45,7 @@ import {
 import { getEntityFeedLink } from '../../../utils/EntityUtils';
 import { getUpdatedThread } from '../../../utils/FeedUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
 import ActivityFeedDrawer from '../ActivityFeedDrawer/ActivityFeedDrawer';
 import { ActivityFeedProviderContextType } from './ActivityFeedProviderContext.interface';
 

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx

@@ -47,10 +47,10 @@ import {
   ENTITY_LINK_SEPARATOR,
   getEntityFeedLink,
 } from '../../../utils/EntityUtils';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
 import Loader from '../../Loader/Loader';
 import { TaskTab } from '../../Task/TaskTab/TaskTab.component';
-import '../../Widgets/FeedsWidget/FeedsWidget.less';
+import '../../Widgets/FeedsWidget/feeds-widget.less';
 import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor';
 import ActivityFeedListV1 from '../ActivityFeedList/ActivityFeedListV1.component';
 import FeedPanelBodyV1 from '../ActivityFeedPanel/FeedPanelBodyV1';

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx

@@ -31,8 +31,8 @@ import { Paging } from '../../../generated/type/paging';
 import { useElementInView } from '../../../hooks/useElementInView';
 import { getAllFeeds } from '../../../rest/feedsAPI';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
-import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
+import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import Loader from '../../Loader/Loader';
 import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal';
 import { ConfirmState } from '../ActivityFeedCard/ActivityFeedCard.interface';

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx

@@ -29,7 +29,7 @@ import {
   Thread,
   ThreadType,
 } from '../../../generated/entity/feed/thread';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
 import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider';
 import './activity-feed-actions.less';
 

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx

@@ -15,7 +15,7 @@ import { Typography } from 'antd';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as AnnouncementIcon } from '../../../assets/svg/announcements-v1.svg';
-import './Badge.less';
+import './task-badge.less';
 
 const AnnouncementBadge = () => {
   const { t } = useTranslation();

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx

@@ -19,7 +19,7 @@ import { useTranslation } from 'react-i18next';
 import { ReactComponent as IconTaskClose } from '../../../assets/svg/complete.svg';
 import { ReactComponent as IconTaskOpen } from '../../../assets/svg/in-progress.svg';
 import { ThreadTaskStatus } from '../../../generated/entity/feed/thread';
-import './Badge.less';
+import './task-badge.less';
 
 const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => {
   const { t } = useTranslation();

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx

@@ -46,10 +46,10 @@ import { createExecutableTestSuite, createTestCase } from '../../rest/testAPI';
 import { getEntityBreadcrumbs, getEntityName } from '../../utils/EntityUtils';
 import { getEncodedFqn } from '../../utils/StringsUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
-import SuccessScreen from '../common/success-screen/SuccessScreen';
-import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component';
-import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
+import SuccessScreen from '../common/SuccessScreen/SuccessScreen';
+import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component';
+import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface';
 import IngestionStepper from '../IngestionStepper/IngestionStepper.component';
 import { AddDataQualityTestProps } from './AddDataQualityTest.interface';
 import RightPanel from './components/RightPanel';

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx

@@ -26,7 +26,7 @@ const mockProps: EditTestCaseModalProps = {
   onUpdate: jest.fn(),
 };
 
-jest.mock('../common/rich-text-editor/RichTextEditor', () => {
+jest.mock('../common/RichTextEditor/RichTextEditor', () => {
   return forwardRef(
     jest.fn().mockImplementation(() => <div>RichTextEditor.component</div>)
   );

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx

@@ -35,8 +35,8 @@ import { getTestDefinitionById, updateTestCaseById } from '../../rest/testAPI';
 import { getNameFromFQN } from '../../utils/CommonUtils';
 import { getEntityFqnFromEntityLink } from '../../utils/TableUtils';
 import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils';
-import RichTextEditor from '../common/rich-text-editor/RichTextEditor';
-import { EditorContentRef } from '../common/rich-text-editor/RichTextEditor.interface';
+import RichTextEditor from '../common/RichTextEditor/RichTextEditor';
+import { EditorContentRef } from '../common/RichTextEditor/RichTextEditor.interface';
 import Loader from '../Loader/Loader';
 import { EditTestCaseModalProps } from './AddDataQualityTest.interface';
 import ParameterForm from './components/ParameterForm';

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx

@@ -42,7 +42,7 @@ import {
 } from '../../utils/CommonUtils';
 import { getIngestionName } from '../../utils/ServiceUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
-import SuccessScreen from '../common/success-screen/SuccessScreen';
+import SuccessScreen from '../common/SuccessScreen/SuccessScreen';
 import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal';
 import { TestSuiteIngestionProps } from './AddDataQualityTest.interface';
 import TestSuiteScheduler from './components/TestSuiteScheduler';

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx

@@ -22,7 +22,7 @@ import {
 } from '../../../mocks/TestSuite.mock';
 import ParameterForm from './ParameterForm';
 
-jest.mock('../../../components/schema-editor/SchemaEditor', () => {
+jest.mock('../../../components/SchemaEditor/SchemaEditor', () => {
   return jest.fn().mockReturnValue(<div>SchemaEditor</div>);
 });
 

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx

@@ -17,7 +17,6 @@ import 'codemirror/addon/fold/foldgutter.css';
 import { isUndefined } from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import SchemaEditor from '../../../components/schema-editor/SchemaEditor';
 import { SUPPORTED_PARTITION_TYPE_FOR_DATE_TIME } from '../../../constants/profiler.constant';
 import { CSMode } from '../../../enums/codemirror.enum';
 import {
@@ -25,7 +24,8 @@ import {
   TestDataType,
 } from '../../../generated/tests/testDefinition';
 import SVGIcons, { Icons } from '../../../utils/SvgUtils';
-import '../../TableProfiler/tableProfiler.less';
+import SchemaEditor from '../../SchemaEditor/SchemaEditor';
+import '../../TableProfiler/table-profiler.less';
 import { ParameterFormProps } from '../AddDataQualityTest.interface';
 
 const ParameterForm: React.FC<ParameterFormProps> = ({ definition, table }) => {

openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx

@@ -39,8 +39,8 @@ import { getEntityName } from '../../../utils/EntityUtils';
 import { getDecodedFqn } from '../../../utils/StringsUtils';
 import { generateEntityLink } from '../../../utils/TableUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import RichTextEditor from '../../common/rich-text-editor/RichTextEditor';
-import { EditorContentRef } from '../../common/rich-text-editor/RichTextEditor.interface';
+import RichTextEditor from '../../common/RichTextEditor/RichTextEditor';
+import { EditorContentRef } from '../../common/RichTextEditor/RichTextEditor.interface';
 import { TestCaseFormProps } from '../AddDataQualityTest.interface';
 import ParameterForm from './ParameterForm';
 

openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx

@@ -29,8 +29,8 @@ import { IngestionPipeline } from '../../generated/entity/services/ingestionPipe
 import { IngestionWorkflowData } from '../../interface/service.interface';
 import { getIngestionFrequency } from '../../utils/CommonUtils';
 import { getIngestionName } from '../../utils/ServiceUtils';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
-import SuccessScreen from '../common/success-screen/SuccessScreen';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
+import SuccessScreen from '../common/SuccessScreen/SuccessScreen';
 import IngestionStepper from '../IngestionStepper/IngestionStepper.component';
 import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal';
 import {

openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx

@@ -41,10 +41,10 @@ import {
 import { getEncodedFqn } from '../../utils/StringsUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
 import AddIngestion from '../AddIngestion/AddIngestion.component';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
 import ServiceDocPanel from '../common/ServiceDocPanel/ServiceDocPanel';
-import SuccessScreen from '../common/success-screen/SuccessScreen';
-import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component';
+import SuccessScreen from '../common/SuccessScreen/SuccessScreen';
+import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component';
 import IngestionStepper from '../IngestionStepper/IngestionStepper.component';
 import ConnectionConfigForm from '../ServiceConfig/ConnectionConfigForm';
 import { AddServiceProps, ServiceConfig } from './AddService.interface';

openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts

@@ -14,7 +14,7 @@
 import { ServiceCategory } from '../../enums/service.enum';
 import { CreateIngestionPipeline } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline';
 import { DataObj } from '../../interface/service.interface';
-import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface';
+import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface';
 
 export interface AddServiceProps {
   serviceCategory: ServiceCategory;

openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx

@@ -24,7 +24,7 @@ jest.mock('../AddIngestion/AddIngestion.component', () => () => (
   <>AddIngestion</>
 ));
 
-jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => () => (
+jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => () => (
   <>TitleBreadcrumb.component</>
 ));
 

openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx

@@ -30,7 +30,7 @@ import { PipelineServiceType } from '../../../generated/entity/services/pipeline
 import { errorMsg, getServiceLogo } from '../../../utils/CommonUtils';
 import ServiceUtilClassBase from '../../../utils/ServiceUtilClassBase';
 import SVGIcons, { Icons } from '../../../utils/SvgUtils';
-import Searchbar from '../../common/searchbar/Searchbar';
+import Searchbar from '../../common/SearchBarComponent/SearchBar.component';
 import './select-service-type.less';
 import { SelectServiceTypeProps } from './Steps.interface';
 

openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx

@@ -15,7 +15,6 @@ import VirtualList from 'rc-virtual-list';
 import React, { UIEventHandler, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import Searchbar from '../../components/common/searchbar/Searchbar';
 import Loader from '../../components/Loader/Loader';
 import { getTableTabPath, PAGE_SIZE } from '../../constants/constants';
 import { SearchIndex } from '../../enums/search.enum';
@@ -29,6 +28,7 @@ import { getNameFromFQN } from '../../utils/CommonUtils';
 import { getEntityName } from '../../utils/EntityUtils';
 import { replacePlus } from '../../utils/StringsUtils';
 import { getEntityFqnFromEntityLink } from '../../utils/TableUtils';
+import Searchbar from '../common/SearchBarComponent/SearchBar.component';
 import { AddTestCaseModalProps } from './AddTestCaseList.interface';
 
 // Todo: need to help from backend guys for ES query

openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx

@@ -20,10 +20,6 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg';
 import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg';
-import TitleBreadcrumb from '../../../components/common/title-breadcrumb/title-breadcrumb.component';
-import { TitleBreadcrumbProps } from '../../../components/common/title-breadcrumb/title-breadcrumb.interface';
-import PageHeader from '../../../components/header/PageHeader.component';
-import { HeaderProps } from '../../../components/header/PageHeader.interface';
 import {
   Effect,
   EventSubscription,
@@ -37,6 +33,10 @@ import {
   getFunctionDisplayName,
 } from '../../../utils/Alerts/AlertsUtil';
 import { getHostNameFromURL } from '../../../utils/CommonUtils';
+import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component';
+import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface';
+import PageHeader from '../../PageHeader/PageHeader.component';
+import { HeaderProps } from '../../PageHeader/PageHeader.interface';
 
 interface AlertDetailsComponentProps {
   alerts: EventSubscription;

openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.test.tsx

@@ -27,7 +27,7 @@ jest.mock('../../hooks/authHooks', () => ({
   },
 }));
 
-jest.mock('../authentication/auth-provider/AuthProvider', () => {
+jest.mock('../Auth/AuthProviders/AuthProvider', () => {
   return {
     useAuthContext: jest.fn(() => ({
       isAuthDisabled: false,
@@ -39,7 +39,7 @@ jest.mock('../authentication/auth-provider/AuthProvider', () => {
   };
 });
 
-jest.mock('../nav-bar/NavBar', () => {
+jest.mock('../NavBar/NavBar', () => {
   return jest.fn().mockReturnValue(<p>NavBar</p>);
 });
 

openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx

@@ -49,8 +49,8 @@ import {
 import { addToRecentSearched } from '../../utils/CommonUtils';
 import SVGIcons, { Icons } from '../../utils/SvgUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
-import NavBar from '../nav-bar/NavBar';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
+import NavBar from '../NavBar/NavBar';
 import './app-bar.style.less';
 
 const Appbar: React.FC = (): JSX.Element => {

openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx

@@ -32,7 +32,7 @@ jest.mock('../../AppState', () => ({
   },
 }));
 
-jest.mock('../authentication/auth-provider/AuthProvider', () => {
+jest.mock('../Auth/AuthProviders/AuthProvider', () => {
   return {
     useAuthContext: jest.fn(() => ({
       isAuthDisabled: false,
@@ -68,7 +68,7 @@ jest.mock('../../pages/SignUp/SignUpPage', () =>
   jest.fn().mockReturnValue(<p>SignUpPage</p>)
 );
 
-jest.mock('../../components/router/AuthenticatedAppRouter', () =>
+jest.mock('../../components/AppRouter/AuthenticatedAppRouter', () =>
   jest.fn().mockReturnValue(<p>AuthenticatedAppRouter</p>)
 );
 

openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx

@@ -18,8 +18,8 @@ import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import AppState from '../../AppState';
 import Appbar from '../../components/AppBar/Appbar';
+import AuthenticatedAppRouter from '../../components/AppRouter/AuthenticatedAppRouter';
 import LeftSidebar from '../../components/MyData/LeftSidebar/LeftSidebar.component';
-import AuthenticatedAppRouter from '../../components/router/AuthenticatedAppRouter';
 import { ROUTES } from '../../constants/constants';
 import SignUpPage from '../../pages/SignUp/SignUpPage';
 import './app-container.less';

openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx

@@ -13,7 +13,7 @@
 
 import React from 'react';
 import { Redirect, Route, RouteProps } from 'react-router-dom';
-import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { ROUTES } from '../../constants/constants';
 import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum';
 import { useAuth } from '../../hooks/authHooks';

openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx

@@ -21,27 +21,25 @@ import { AuthProvider } from '../../generated/settings/settings';
 import SamlCallback from '../../pages/SamlCallback';
 import AccountActivationConfirmation from '../../pages/SignUp/account-activation-confirmation.component';
 import { isProtectedRoute } from '../../utils/AuthProvider.util';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
 import Loader from '../Loader/Loader';
 import withSuspenseFallback from './withSuspenseFallback';
 
 const SigninPage = withSuspenseFallback(
-  React.lazy(() => import('../../pages/login'))
+  React.lazy(() => import('../../pages/LoginPage'))
 );
 const PageNotFound = withSuspenseFallback(
-  React.lazy(() => import('../../pages/page-not-found/PageNotFound'))
+  React.lazy(() => import('../../pages/PageNotFound/PageNotFound'))
 );
 
 const ForgotPassword = withSuspenseFallback(
   React.lazy(
-    () => import('../../pages/forgot-password/forgot-password.component')
+    () => import('../../pages/ForgotPassword/forgot-password.component')
   )
 );
 
 const ResetPassword = withSuspenseFallback(
-  React.lazy(
-    () => import('../../pages/reset-password/reset-password.component')
-  )
+  React.lazy(() => import('../../pages/ResetPassword/ResetPassword.component'))
 );
 
 const BasicSignupPage = withSuspenseFallback(

openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx

@@ -77,7 +77,7 @@ const ServicePage = withSuspenseFallback(
 );
 
 const SwaggerPage = withSuspenseFallback(
-  React.lazy(() => import('../../pages/swagger'))
+  React.lazy(() => import('../../pages/SwaggerPage'))
 );
 const TagsPage = withSuspenseFallback(
   React.lazy(() => import('../../pages/TagsPage/TagsPage'))
@@ -94,7 +94,7 @@ const TopicDetailsPage = withSuspenseFallback(
   )
 );
 const TourPageComponent = withSuspenseFallback(
-  React.lazy(() => import('../../pages/tour-page/TourPage.component'))
+  React.lazy(() => import('../../pages/TourPage/TourPage.component'))
 );
 const UserPage = withSuspenseFallback(
   React.lazy(() => import('../../pages/UserPage/UserPage.component'))
@@ -211,7 +211,7 @@ const DatabaseSchemaVersionPage = withSuspenseFallback(
   )
 );
 const ExplorePageV1 = withSuspenseFallback(
-  React.lazy(() => import('../../pages/explore/ExplorePageV1.component'))
+  React.lazy(() => import('../../pages/ExplorePage/ExplorePageV1.component'))
 );
 
 const GlossaryPage = withSuspenseFallback(
@@ -333,7 +333,7 @@ const AddQueryPage = withSuspenseFallback(
 );
 
 const PageNotFound = withSuspenseFallback(
-  React.lazy(() => import('../../pages/page-not-found/PageNotFound'))
+  React.lazy(() => import('../../pages/PageNotFound/PageNotFound'))
 );
 
 const EditLoginConfiguration = withSuspenseFallback(

openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx

@@ -37,7 +37,9 @@ const AddAlertPage = withSuspenseFallback(
 );
 
 const ImportTeamsPage = withSuspenseFallback(
-  React.lazy(() => import('../../pages/teams/ImportTeamsPage/ImportTeamsPage'))
+  React.lazy(
+    () => import('../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage')
+  )
 );
 const AddDataInsightReportAlert = withSuspenseFallback(
   React.lazy(
@@ -69,11 +71,11 @@ const AlertsPage = withSuspenseFallback(
 );
 
 const TeamsPage = withSuspenseFallback(
-  React.lazy(() => import('../../pages/teams/TeamsPage'))
+  React.lazy(() => import('../../pages/TeamsPage/TeamsPage'))
 );
 
 const ServicesPage = withSuspenseFallback(
-  React.lazy(() => import('../../pages/services/ServicesPage'))
+  React.lazy(() => import('../../pages/ServicesPage/ServicesPage'))
 );
 const BotsPageV1 = withSuspenseFallback(
   React.lazy(() => import('../../pages/BotsPageV1/BotsPageV1.component'))

openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx

@@ -16,10 +16,10 @@ import { Button } from 'antd';
 import { observer } from 'mobx-react';
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { useTourProvider } from '../../components/TourProvider/TourProvider';
 import { PRIMERY_COLOR } from '../../constants/constants';
 import { CurrentTourPageType } from '../../enums/tour.enum';
 import TourEndModal from '../Modals/TourEndModal/TourEndModal';
+import { useTourProvider } from '../TourProvider/TourProvider';
 import './tour.style.less';
 
 const Tour = ({ steps }: { steps: TourSteps[] }) => {

openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx

@@ -40,8 +40,8 @@ import { ReactComponent as IconExternalLink } from '../../../assets/svg/external
 import { ReactComponent as DeleteIcon } from '../../../assets/svg/ic-delete.svg';
 import { ReactComponent as IconRestore } from '../../../assets/svg/ic-restore.svg';
 import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg';
-import PageLayoutV1 from '../../../components/containers/PageLayoutV1';
 import Loader from '../../../components/Loader/Loader';
+import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1';
 import TabsLabel from '../../../components/TabsLabel/TabsLabel.component';
 import { DE_ACTIVE_COLOR } from '../../../constants/constants';
 import {

openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx

@@ -29,7 +29,7 @@ import { useTranslation } from 'react-i18next';
 import { Transi18next } from '../../../utils/CommonUtils';
 import { getRelativeTime } from '../../../utils/date-time/DateTimeUtils';
 import { getEntityName } from '../../../utils/EntityUtils';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
 import BrandImage from '../../common/BrandImage/BrandImage';
 import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard';
 import ProfilePicture from '../../common/ProfilePicture/ProfilePicture';

openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx

@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { LazyLog } from 'react-lazylog';
 import { ReactComponent as IconSuccessBadge } from '../../../assets/svg/success-badge.svg';
 import { formatDateTimeWithTimezone } from '../../../utils/date-time/DateTimeUtils';
-import CopyToClipboardButton from '../../buttons/CopyToClipboardButton/CopyToClipboardButton';
+import CopyToClipboardButton from '../../CopyToClipboardButton/CopyToClipboardButton';
 import { AppLogsViewerProps, JobStats } from './AppLogsViewer.interface';
 
 const AppLogsViewer = ({ data }: AppLogsViewerProps) => {

openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx

@@ -45,9 +45,9 @@ import {
 } from '../../../utils/date-time/DateTimeUtils';
 import { getLogsViewerPath } from '../../../utils/RouterUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder';
-import NextPrevious from '../../common/next-previous/NextPrevious';
-import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface';
+import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import NextPrevious from '../../common/NextPrevious/NextPrevious';
+import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface';
 import StatusBadge from '../../common/StatusBadge/StatusBadge.component';
 import { StatusType } from '../../common/StatusBadge/StatusBadge.interface';
 import Table from '../../common/Table/Table';
@@ -77,6 +77,7 @@ const AppRunsHistory = forwardRef(
       handlePagingChange,
       handlePageChange,
       handlePageSizeChange,
+      showPagination: paginationVisible,
     } = usePaging();
 
     const history = useHistory();
@@ -255,7 +256,7 @@ const AppRunsHistory = forwardRef(
     }: PagingHandlerParams) => {
       handlePageChange(currentPage);
       fetchAppHistory({
-        offset: currentPage * pageSize,
+        offset: (currentPage - 1) * pageSize,
       } as Paging);
     };
 
@@ -267,10 +268,10 @@ const AppRunsHistory = forwardRef(
 
     useEffect(() => {
       fetchAppHistory();
-    }, [fqn]);
+    }, [fqn, pageSize]);
 
     return (
-      <Row>
+      <Row gutter={[16, 16]}>
         <Col span={24}>
           <Table
             bordered
@@ -292,18 +293,16 @@ const AppRunsHistory = forwardRef(
             size="small"
           />
         </Col>
-        <Col span={20}>
-          {paging.total > pageSize && showPagination && (
-            <div className="p-y-md">
-              <NextPrevious
-                isNumberBased
-                currentPage={currentPage}
-                pageSize={pageSize}
-                paging={paging}
-                pagingHandler={handleAppHistoryPageChange}
-                onShowSizeChange={handlePageSizeChange}
-              />
-            </div>
+        <Col span={24}>
+          {showPagination && paginationVisible && (
+            <NextPrevious
+              isNumberBased
+              currentPage={currentPage}
+              pageSize={pageSize}
+              paging={paging}
+              pagingHandler={handleAppHistoryPageChange}
+              onShowSizeChange={handlePageSizeChange}
+            />
           )}
         </Col>
       </Row>

openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts

@@ -24,6 +24,6 @@ export interface AppRunsHistoryRef {
 
 export interface AppRunsHistoryProps {
   maxRecords?: number;
-  showPagination?: boolean;
   appData?: App;
+  showPagination?: boolean;
 }

openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx

@@ -16,7 +16,7 @@ import classNames from 'classnames';
 import { kebabCase } from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer';
+import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer';
 import AppLogo from '../AppLogo/AppLogo.component';
 import { ApplicationCardProps } from './ApplicationCard.interface';
 

openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx

@@ -18,9 +18,9 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useParams } from 'react-router-dom';
 import { ReactComponent as CheckMarkIcon } from '../../../assets/svg/ic-cloud-checkmark.svg';
-import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer';
-import PageLayoutV1 from '../../../components/containers/PageLayoutV1';
+import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer';
 import Loader from '../../../components/Loader/Loader';
+import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1';
 import { ROUTES } from '../../../constants/constants';
 import { AppMarketPlaceDefinition } from '../../../generated/entity/applications/marketplace/appMarketPlaceDefinition';
 import { Include } from '../../../generated/type/include';

openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx

@@ -41,12 +41,12 @@ import {
 } from '../../../utils/Assets/AssetsUtils';
 import { getEntityReferenceFromEntity } from '../../../utils/EntityUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder';
-import Searchbar from '../../common/searchbar/Searchbar';
-import TableDataCardV2 from '../../common/table-data-card-v2/TableDataCardV2';
+import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import Searchbar from '../../common/SearchBarComponent/SearchBar.component';
+import TableDataCardV2 from '../../common/TableDataCardV2/TableDataCardV2';
 import { AssetsOfEntity } from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface';
 import Loader from '../../Loader/Loader';
-import { SearchedDataProps } from '../../searched-data/SearchedData.interface';
+import { SearchedDataProps } from '../../SearchedData/SearchedData.interface';
 import './asset-selection-model.style.less';
 import { AssetSelectionModalProps } from './AssetSelectionModal.interface';
 

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.test.tsx

@@ -16,7 +16,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import Auth0Authenticator from './Auth0Authenticator';
 
-jest.mock('../auth-provider/AuthProvider', () => {
+jest.mock('../AuthProviders/AuthProvider', () => {
   return {
     useAuthContext: jest.fn(() => ({
       authConfig: {},

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.tsx

@@ -21,8 +21,8 @@ import React, {
 import { useTranslation } from 'react-i18next';
 import { AuthProvider } from '../../../generated/settings/settings';
 import localState from '../../../utils/LocalStorageUtils';
-import { useAuthContext } from '../auth-provider/AuthProvider';
-import { AuthenticatorRef } from '../auth-provider/AuthProvider.interface';
+import { useAuthContext } from '../AuthProviders/AuthProvider';
+import { AuthenticatorRef } from '../AuthProviders/AuthProvider.interface';
 
 interface Props {
   children: ReactNode;

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/BasicAuthAuthenticator.tsx

@@ -24,8 +24,8 @@ import {
   getAccessTokenOnExpiry,
 } from '../../../rest/auth-API';
 import localState from '../../../utils/LocalStorageUtils';
-import { useAuthContext } from '../auth-provider/AuthProvider';
-import { useBasicAuth } from '../auth-provider/basic-auth.provider';
+import { useAuthContext } from '../AuthProviders/AuthProvider';
+import { useBasicAuth } from '../AuthProviders/BasicAuthProvider';
 
 interface BasicAuthenticatorInterface {
   children: ReactNode;

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.test.tsx

@@ -16,7 +16,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import MsalAuthenticator from './MsalAuthenticator';
 
-jest.mock('../auth-provider/AuthProvider', () => {
+jest.mock('../AuthProviders/AuthProvider', () => {
   return {
     useAuthContext: jest.fn(() => ({
       authConfig: {},

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.tsx

@@ -31,7 +31,7 @@ import localState from '../../../utils/LocalStorageUtils';
 import {
   AuthenticatorRef,
   OidcUser,
-} from '../auth-provider/AuthProvider.interface';
+} from '../AuthProviders/AuthProvider.interface';
 
 interface Props {
   children: ReactNode;

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx

@@ -25,16 +25,16 @@ import { Callback, makeAuthenticator, makeUserManager } from 'react-oidc';
 import { Redirect, Route, Switch, useHistory } from 'react-router-dom';
 import AppState from '../../../AppState';
 import { ROUTES } from '../../../constants/constants';
-import SigninPage from '../../../pages/login/index';
-import PageNotFound from '../../../pages/page-not-found/PageNotFound';
+import SigninPage from '../../../pages/LoginPage/index';
+import PageNotFound from '../../../pages/PageNotFound/PageNotFound';
 import localState from '../../../utils/LocalStorageUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
 import Loader from '../../Loader/Loader';
-import { useAuthContext } from '../auth-provider/AuthProvider';
+import { useAuthContext } from '../AuthProviders/AuthProvider';
 import {
   AuthenticatorRef,
   OidcUser,
-} from '../auth-provider/AuthProvider.interface';
+} from '../AuthProviders/AuthProvider.interface';
 
 interface Props {
   childComponentType: ComponentType;

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OktaAuthenticator.tsx

@@ -21,8 +21,8 @@ import React, {
 import { useHistory } from 'react-router-dom';
 import { ROUTES } from '../../../constants/constants';
 import localState from '../../../utils/LocalStorageUtils';
-import { useAuthContext } from '../auth-provider/AuthProvider';
-import { AuthenticatorRef } from '../auth-provider/AuthProvider.interface';
+import { useAuthContext } from '../AuthProviders/AuthProvider';
+import { AuthenticatorRef } from '../AuthProviders/AuthProvider.interface';
 
 interface Props {
   children: ReactNode;

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/SamlAuthenticator.tsx

@@ -33,8 +33,8 @@ import { oidcTokenKey } from '../../../constants/constants';
 import { SamlSSOClientConfig } from '../../../generated/configuration/authenticationConfiguration';
 import { postSamlLogout } from '../../../rest/miscAPI';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import { useAuthContext } from '../auth-provider/AuthProvider';
-import { AuthenticatorRef } from '../auth-provider/AuthProvider.interface';
+import { useAuthContext } from '../AuthProviders/AuthProvider';
+import { AuthenticatorRef } from '../AuthProviders/AuthProvider.interface';
 
 interface Props {
   children: ReactNode;

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.test.tsx

@@ -50,7 +50,7 @@ jest.mock('@auth0/auth0-react', () => ({
   useAuth0: jest.fn(),
 }));
 
-jest.mock('../../../authentication/auth-provider/AuthProvider', () => {
+jest.mock('../../../Auth/AuthProviders/AuthProvider', () => {
   return {
     useAuthContext: jest.fn(() => ({
       authConfig: {},

openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.tsx

@@ -15,8 +15,8 @@ import { useAuth0 } from '@auth0/auth0-react';
 import { t } from 'i18next';
 import React, { VFC } from 'react';
 import localState from '../../../../utils/LocalStorageUtils';
-import { useAuthContext } from '../../auth-provider/AuthProvider';
-import { OidcUser } from '../../auth-provider/AuthProvider.interface';
+import { useAuthContext } from '../../AuthProviders/AuthProvider';
+import { OidcUser } from '../../AuthProviders/AuthProvider.interface';
 
 const Auth0Callback: VFC = () => {
   const { isAuthenticated, user, getIdTokenClaims, error } = useAuth0();

openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx

@@ -72,21 +72,21 @@ import {
 } from '../../../utils/UserDataUtils';
 import { resetWebAnalyticSession } from '../../../utils/WebAnalyticsUtils';
 import Loader from '../../Loader/Loader';
-import Auth0Authenticator from '../authenticators/Auth0Authenticator';
-import BasicAuthAuthenticator from '../authenticators/basic-auth.authenticator';
-import MsalAuthenticator from '../authenticators/MsalAuthenticator';
-import OidcAuthenticator from '../authenticators/OidcAuthenticator';
-import OktaAuthenticator from '../authenticators/OktaAuthenticator';
-import SamlAuthenticator from '../authenticators/SamlAuthenticator';
-import Auth0Callback from '../callbacks/Auth0Callback/Auth0Callback';
+import Auth0Authenticator from '../AppAuthenticators/Auth0Authenticator';
+import BasicAuthAuthenticator from '../AppAuthenticators/BasicAuthAuthenticator';
+import MsalAuthenticator from '../AppAuthenticators/MsalAuthenticator';
+import OidcAuthenticator from '../AppAuthenticators/OidcAuthenticator';
+import OktaAuthenticator from '../AppAuthenticators/OktaAuthenticator';
+import SamlAuthenticator from '../AppAuthenticators/SamlAuthenticator';
+import Auth0Callback from '../AppCallbacks/Auth0Callback/Auth0Callback';
 import {
   AuthenticationConfigurationWithScope,
   AuthenticatorRef,
   IAuthContext,
   OidcUser,
 } from './AuthProvider.interface';
-import BasicAuthProvider from './basic-auth.provider';
-import OktaAuthProvider from './okta-auth-provider';
+import BasicAuthProvider from './BasicAuthProvider';
+import OktaAuthProvider from './OktaAuthProvider';
 interface AuthProviderProps {
   childComponentType: ComponentType;
   children: ReactNode;

openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts

@@ -20,7 +20,7 @@ import { getSuggestions, searchData } from '../../../../rest/miscAPI';
 import { getEntityBreadcrumbs } from '../../../../utils/EntityUtils';
 import { buildMentionLink } from '../../../../utils/FeedUtils';
 import { getEncodedFqn } from '../../../../utils/StringsUtils';
-import { SearchedDataProps } from '../../../searched-data/SearchedData.interface';
+import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface';
 import { ExtensionRef } from '../../BlockEditor.interface';
 import HashList from './HashList';
 

openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx

@@ -17,8 +17,8 @@ import React, { FC } from 'react';
 import { AuthenticationMechanism } from '../../generated/entity/teams/user';
 import { getTokenExpiry } from '../../utils/BotsUtils';
 import SVGIcons from '../../utils/SvgUtils';
-import CopyToClipboardButton from '../buttons/CopyToClipboardButton/CopyToClipboardButton';
-import './AuthMechanism.less';
+import CopyToClipboardButton from '../CopyToClipboardButton/CopyToClipboardButton';
+import './auth-mechanism.less';
 
 interface Props {
   authenticationMechanism: AuthenticationMechanism;

openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx

@@ -18,7 +18,7 @@ import { toLower } from 'lodash';
 import React, { FC, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg';
-import PageLayoutV1 from '../../components/containers/PageLayoutV1';
+import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
 import { TERM_ADMIN } from '../../constants/constants';
 import {
   GlobalSettingOptions,
@@ -38,15 +38,15 @@ import {
 import { getEntityName } from '../../utils/EntityUtils';
 import { getSettingPath } from '../../utils/RouterUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
-import Description from '../common/description/Description';
+import Description from '../common/EntityDescription/Description';
 import InheritedRolesCard from '../common/InheritedRolesCard/InheritedRolesCard.component';
 import RolesCard from '../common/RolesCard/RolesCard.component';
-import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component';
+import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component';
 import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal';
 import AuthMechanism from './AuthMechanism';
 import AuthMechanismForm from './AuthMechanismForm';
+import './bot-details.less';
 import { BotsDetailProps } from './BotDetails.interfaces';
-import './BotDetails.style.less';
 
 import { ReactComponent as IconBotProfile } from '../../assets/svg/bot-profile.svg';
 

openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx

@@ -110,7 +110,7 @@ jest.mock('../../rest/userAPI', () => {
   };
 });
 
-jest.mock('../common/description/Description', () => {
+jest.mock('../common/EntityDescription/Description', () => {
   return jest.fn().mockReturnValue(<p>Description Component</p>);
 });
 
@@ -122,7 +122,7 @@ jest.mock('./AuthMechanismForm', () =>
     )
 );
 
-jest.mock('../containers/PageLayoutV1', () =>
+jest.mock('../PageLayoutV1/PageLayoutV1', () =>
   jest
     .fn()
     .mockImplementation(({ children, leftPanel, rightPanel, header }) => (

openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx

@@ -18,8 +18,7 @@ import { isEmpty, lowerCase } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import FilterTablePlaceHolder from '../../components/common/error-with-placeholder/FilterTablePlaceHolder';
-import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface';
+import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder';
 import Table from '../../components/common/Table/Table';
 import { getBotsPath } from '../../constants/constants';
 import { BOTS_DOCS } from '../../constants/docs.constants';
@@ -32,16 +31,16 @@ import { Paging } from '../../generated/type/paging';
 import { useAuth } from '../../hooks/authHooks';
 import { usePaging } from '../../hooks/paging/usePaging';
 import { getBots } from '../../rest/botsAPI';
-import { showPagination } from '../../utils/CommonUtils';
 import { getEntityName } from '../../utils/EntityUtils';
 import SVGIcons, { Icons } from '../../utils/SvgUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
 import DeleteWidgetModal from '../common/DeleteWidget/DeleteWidgetModal';
-import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder';
-import NextPrevious from '../common/next-previous/NextPrevious';
-import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer';
-import Searchbar from '../common/searchbar/Searchbar';
-import PageHeader from '../header/PageHeader.component';
+import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import NextPrevious from '../common/NextPrevious/NextPrevious';
+import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface';
+import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer';
+import Searchbar from '../common/SearchBarComponent/SearchBar.component';
+import PageHeader from '../PageHeader/PageHeader.component';
 import { BotListV1Props } from './BotListV1.interfaces';
 
 const BotListV1 = ({
@@ -62,6 +61,7 @@ const BotListV1 = ({
     handlePagingChange,
     handlePageChange,
     handlePageSizeChange,
+    showPagination,
   } = usePaging();
 
   const [handleErrorPlaceholder, setHandleErrorPlaceholder] = useState(false);
@@ -288,7 +288,7 @@ const BotListV1 = ({
         />
       </Col>
       <Col span={24}>
-        {showPagination(paging) && (
+        {showPagination && (
           <NextPrevious
             currentPage={currentPage}
             pageSize={pageSize}

openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.tsx

@@ -30,7 +30,7 @@ import {
   tooltipFormatter,
   updateActiveChartFilter,
 } from '../../utils/ChartUtils';
-import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { CustomBarChartProps } from './Chart.interface';
 
 const CustomBarChart = ({

openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.component.tsx

@@ -25,7 +25,7 @@ import {
   XAxis,
   YAxis,
 } from 'recharts';
-import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants';
 import { DEFAULT_HISTOGRAM_DATA } from '../../constants/profiler.constant';
 import { HistogramClass } from '../../generated/entity/data/table';

openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.test.tsx

@@ -97,7 +97,7 @@ const COLUMN_PROFILER = {
 };
 
 jest.mock(
-  '../../components/common/error-with-placeholder/ErrorPlaceHolder',
+  '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder',
   () => {
     return jest.fn().mockReturnValue(<div>ErrorPlaceHolder</div>);
   }

openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx

@@ -28,7 +28,7 @@ import {
 import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants';
 import { updateActiveChartFilter } from '../../utils/ChartUtils';
 import { formatNumberWithComma } from '../../utils/CommonUtils';
-import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { CustomBarChartProps } from './Chart.interface';
 
 const OperationDateBarChart = ({

openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx

@@ -14,21 +14,19 @@ import Icon from '@ant-design/icons/lib/components/Icon';
 import { Button, Col, Row, Space, Switch, Tooltip, Typography } from 'antd';
 import ButtonGroup from 'antd/lib/button/button-group';
 import { ColumnsType } from 'antd/lib/table';
+import { AxiosError } from 'axios';
 import classNames from 'classnames';
 import { capitalize, isUndefined, toString } from 'lodash';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useParams } from 'react-router-dom';
 import { ReactComponent as IconTag } from '../../assets/svg/classification.svg';
 import { ReactComponent as LockIcon } from '../../assets/svg/closed-lock.svg';
 import { ReactComponent as VersionIcon } from '../../assets/svg/ic-version.svg';
 import AppBadge from '../../components/common/Badge/Badge.component';
-import Description from '../../components/common/description/Description';
-import ManageButton from '../../components/common/entityPageInfo/ManageButton/ManageButton';
-import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder';
-import NextPrevious from '../../components/common/next-previous/NextPrevious';
-import { NextPreviousProps } from '../../components/common/next-previous/NextPrevious.interface';
-import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer';
+import Description from '../../components/common/EntityDescription/Description';
+import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer';
 import Table from '../../components/common/Table/Table';
 import EntityHeaderTitle from '../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component';
 import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider';
@@ -36,7 +34,7 @@ import {
   OperationPermission,
   ResourceEntity,
 } from '../../components/PermissionProvider/PermissionProvider.interface';
-import { DE_ACTIVE_COLOR, PAGE_SIZE } from '../../constants/constants';
+import { DE_ACTIVE_COLOR } from '../../constants/constants';
 import { EntityField } from '../../constants/Feeds.constants';
 import { EntityType } from '../../enums/entity.enum';
 import { ProviderType } from '../../generated/api/classification/createClassification';
@@ -47,7 +45,9 @@ import {
 import { Tag } from '../../generated/entity/classification/tag';
 import { Operation } from '../../generated/entity/policies/policy';
 import { Paging } from '../../generated/type/paging';
+import { usePaging } from '../../hooks/paging/usePaging';
 import { DeleteTagsType } from '../../pages/TagsPage/TagsPage.interface';
+import { getTags } from '../../rest/tagAPI';
 import {
   getClassificationExtraDropdownContent,
   getTagsTableColumn,
@@ -61,19 +61,19 @@ import {
   getClassificationDetailsPath,
   getClassificationVersionsPath,
 } from '../../utils/RouterUtils';
+import { getErrorText } from '../../utils/StringsUtils';
+import { showErrorToast } from '../../utils/ToastUtils';
+import ManageButton from '../common/EntityPageInfos/ManageButton/ManageButton';
+import NextPrevious from '../common/NextPrevious/NextPrevious';
+import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface';
 
 export interface ClassificationDetailsProps {
-  paging: Paging;
-  isTagsLoading: boolean;
-  currentPage: number;
   classificationPermissions: OperationPermission;
   isVersionView?: boolean;
   currentClassification?: Classification;
   deleteTags?: DeleteTagsType;
-  tags?: Tag[];
   isEditClassification?: boolean;
   disableEditButton?: boolean;
-  handlePageChange: NextPreviousProps['pagingHandler'];
   handleAfterDeleteAction?: () => void;
   handleEditTagClick?: (selectedTag: Tag) => void;
   handleActionDeleteTag?: (record: Tag) => void;
@@ -89,19 +89,14 @@ function ClassificationDetails({
   currentClassification,
   handleAfterDeleteAction,
   isEditClassification,
-  isTagsLoading,
   classificationPermissions,
   handleUpdateClassification,
   handleEditTagClick,
   deleteTags,
-  tags,
   handleActionDeleteTag,
   handleAddNewTagClick,
   handleEditDescriptionClick,
   handleCancelEditDescription,
-  paging,
-  currentPage,
-  handlePageChange,
   disableEditButton,
   isVersionView = false,
 }: ClassificationDetailsProps) {
@@ -109,6 +104,61 @@ function ClassificationDetails({
   const { t } = useTranslation();
   const { fqn: tagCategoryName } = useParams<{ fqn: string }>();
   const history = useHistory();
+  const [tags, setTags] = useState<Tag[]>([]);
+  const [isTagsLoading, setIsTagsLoading] = useState(false);
+
+  const {
+    currentPage,
+    paging,
+    pageSize,
+    handlePageChange,
+    handlePageSizeChange,
+    handlePagingChange,
+    showPagination,
+  } = usePaging();
+
+  const fetchClassificationChildren = async (
+    currentClassificationName: string,
+    paging?: Partial<Paging>
+  ) => {
+    setIsTagsLoading(true);
+    setTags([]);
+    try {
+      const { data, paging: tagPaging } = await getTags({
+        arrQueryFields: ['usageCount'],
+        parent: currentClassificationName,
+        after: paging?.after,
+        before: paging?.before,
+        limit: pageSize,
+      });
+      setTags(data);
+      handlePagingChange(tagPaging);
+    } catch (error) {
+      const errMsg = getErrorText(
+        error as AxiosError,
+        t('server.entity-fetch-error', { entity: t('label.tag-plural') })
+      );
+      showErrorToast(errMsg);
+      setTags([]);
+    } finally {
+      setIsTagsLoading(false);
+    }
+  };
+
+  const handleTagsPageChange: NextPreviousProps['pagingHandler'] = ({
+    currentPage,
+    cursorType,
+  }) => {
+    if (cursorType) {
+      fetchClassificationChildren(
+        currentClassification?.fullyQualifiedName ?? '',
+        {
+          [cursorType]: paging[cursorType],
+        }
+      );
+    }
+    handlePageChange(currentPage);
+  };
 
   const currentVersion = useMemo(
     () => currentClassification?.version ?? '0.1',
@@ -356,6 +406,12 @@ function ClassificationDetails({
       : '';
   }, [currentClassification, changeDescription]);
 
+  useEffect(() => {
+    if (currentClassification?.fullyQualifiedName) {
+      fetchClassificationChildren(currentClassification.fullyQualifiedName);
+    }
+  }, [currentClassification?.fullyQualifiedName, pageSize]);
+
   return (
     <div className="p-x-md" data-testid="tags-container">
       {currentClassification && (
@@ -496,12 +552,13 @@ function ClassificationDetails({
           size="small"
         />
 
-        {paging.total > PAGE_SIZE && (
+        {showPagination && !isTagsLoading && (
           <NextPrevious
             currentPage={currentPage}
-            pageSize={PAGE_SIZE}
+            pageSize={pageSize}
             paging={paging}
-            pagingHandler={handlePageChange}
+            pagingHandler={handleTagsPageChange}
+            onShowSizeChange={handlePageSizeChange}
           />
         )}
       </Space>

openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx

@@ -15,8 +15,8 @@ import { ColumnsType } from 'antd/lib/table';
 import React, { FC, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder';
-import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer';
+import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer';
 import Table from '../../../components/common/Table/Table';
 import { getContainerDetailPath } from '../../../constants/constants';
 import { Container } from '../../../generated/entity/data/container';

openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx

@@ -109,7 +109,7 @@ jest.mock('../../../utils/ContainerDetailUtils', () => ({
 }));
 
 jest.mock(
-  '../../../components/common/rich-text-editor/RichTextEditorPreviewer',
+  '../../../components/common/RichTextEditor/RichTextEditorPreviewer',
   () =>
     jest
       .fn()
@@ -136,7 +136,7 @@ jest.mock('../../../components/TableTags/TableTags.component', () =>
 );
 
 jest.mock(
-  '../../../components/common/error-with-placeholder/ErrorPlaceHolder',
+  '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder',
   () =>
     jest
       .fn()

openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx

@@ -23,7 +23,7 @@ import {
 import { EntityTags, TagFilterOptions } from 'Models';
 import React, { FC, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor';
 import { ColumnFilter } from '../../../components/Table/ColumnFilter/ColumnFilter.component';
 import TableDescription from '../../../components/TableDescription/TableDescription.component';

openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx

@@ -18,7 +18,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useParams } from 'react-router-dom';
 import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable';
-import DescriptionV1 from '../../components/common/description/DescriptionV1';
+import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1';
 import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader';
 import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine';
 import Loader from '../../components/Loader/Loader';

openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts

@@ -14,7 +14,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss
 import { Container } from '../../generated/entity/data/container';
 import { EntityHistory } from '../../generated/type/entityHistory';
 import { TagLabel } from '../../generated/type/tagLabel';
-import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface';
+import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface';
 
 export interface ContainerVersionProp {
   version: string;

openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx

@@ -41,7 +41,7 @@ jest.mock(
   })
 );
 
-jest.mock('../../components/common/description/DescriptionV1', () =>
+jest.mock('../../components/common/EntityDescription/DescriptionV1', () =>
   jest.fn().mockImplementation(() => <div>DescriptionV1</div>)
 );
 

openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx

@@ -14,8 +14,8 @@
 import { Button, PopoverProps, Tooltip } from 'antd';
 import React, { FunctionComponent } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as CopyIcon } from '../../../assets/svg/icon-copy.svg';
-import { useClipboard } from '../../../hooks/useClipBoard';
+import { ReactComponent as CopyIcon } from '../../assets/svg/icon-copy.svg';
+import { useClipboard } from '../../hooks/useClipBoard';
 
 interface Props {
   copyText: string;

openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx

@@ -41,9 +41,9 @@ import { handleSearchFilterOption } from '../../utils/CommonUtils';
 import { getEntityName } from '../../utils/EntityUtils';
 import SVGIcons, { Icons } from '../../utils/SvgUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
-import CopyToClipboardButton from '../buttons/CopyToClipboardButton/CopyToClipboardButton';
-import RichTextEditor from '../common/rich-text-editor/RichTextEditor';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
+import RichTextEditor from '../common/RichTextEditor/RichTextEditor';
+import CopyToClipboardButton from '../CopyToClipboardButton/CopyToClipboardButton';
 import Loader from '../Loader/Loader';
 import TeamsSelectable from '../TeamsSelectable/TeamsSelectable';
 import { CreateUserProps } from './CreateUser.interface';

openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx

@@ -21,7 +21,7 @@ jest.mock('../TeamsSelectable/TeamsSelectable', () => {
   return jest.fn().mockReturnValue(<p>TeamsSelectable component</p>);
 });
 
-jest.mock('../common/rich-text-editor/RichTextEditor', () => {
+jest.mock('../common/RichTextEditor/RichTextEditor', () => {
   return forwardRef(
     jest.fn().mockImplementation(({ initialValue }, ref) => {
       return <div ref={ref}>{initialValue}MarkdownWithPreview component</div>;

openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx

@@ -211,7 +211,7 @@ jest.mock('../../../utils/ToastUtils', () => ({
 }));
 
 jest.mock(
-  '../../../components/common/title-breadcrumb/title-breadcrumb.component',
+  '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component',
   () => jest.fn().mockImplementation(() => <div>BreadCrumb.component</div>)
 );
 

openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx

@@ -45,7 +45,7 @@ import { getSettingPath } from '../../../utils/RouterUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
 import ResizablePanels from '../../common/ResizablePanels/ResizablePanels';
 import ServiceDocPanel from '../../common/ServiceDocPanel/ServiceDocPanel';
-import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component';
+import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component';
 
 const AddCustomProperty = () => {
   const { entityTypeFQN } = useParams<{ entityTypeFQN: EntityType }>();

openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx

@@ -21,11 +21,11 @@ import {
 import React from 'react';
 import { CustomPropertyTable } from './CustomPropertyTable';
 
-jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => {
+jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => {
   return jest.fn().mockReturnValue(<p>RichTextEditorPreview</p>);
 });
 jest.mock(
-  '../../components/common/error-with-placeholder/ErrorPlaceHolder',
+  '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder',
   () => {
     return jest.fn().mockReturnValue(<p>ErrorPlaceHolder</p>);
   }

openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx

@@ -17,14 +17,14 @@ import React, { FC, Fragment, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as IconEdit } from '../../assets/svg/edit-new.svg';
 import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg';
-import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import Table from '../../components/common/Table/Table';
 import { CUSTOM_PROPERTIES_DOCS } from '../../constants/docs.constants';
 import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil';
 import { ERROR_PLACEHOLDER_TYPE, OPERATION } from '../../enums/common.enum';
 import { CustomProperty } from '../../generated/entity/type';
 import { getEntityName } from '../../utils/EntityUtils';
-import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer';
+import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer';
 import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal';
 import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor';
 import { CustomPropertyTableProp } from './CustomPropertyTable.interface';

openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx

@@ -23,12 +23,12 @@ import { Document } from '../../../generated/entity/docStore/document';
 import { getAllKnowledgePanels } from '../../../rest/DocStoreAPI';
 import { getWidgetWidthLabelFromKey } from '../../../utils/CustomizableLandingPageUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder';
+import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
+import './add-widget-modal.less';
 import {
   AddWidgetModalProps,
   WidgetSizeInfo,
 } from './AddWidgetModal.interface';
-import './AddWidgetModal.less';
 import AddWidgetTabContent from './AddWidgetTabContent';
 
 function AddWidgetModal({

openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx

@@ -51,11 +51,11 @@ import {
 import { getDecodedFqn } from '../../../utils/StringsUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
 import ActivityFeedProvider from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider';
-import { useAuthContext } from '../../authentication/auth-provider/AuthProvider';
-import PageLayoutV1 from '../../containers/PageLayoutV1';
+import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider';
+import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1';
 import AddWidgetModal from '../AddWidgetModal/AddWidgetModal';
+import './customize-my-data.less';
 import { CustomizeMyDataProps } from './CustomizeMyData.interface';
-import './CustomizeMyData.less';
 
 const ReactGridLayout = WidthProvider(RGL);
 

openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx

@@ -18,8 +18,8 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as AddPlaceHolderIcon } from '../../../assets/svg/add-placeholder.svg';
 import { SIZE } from '../../../enums/common.enum';
+import './empty-widget-placeholder.less';
 import { EmptyWidgetPlaceholderProps } from './EmptyWidgetPlaceholder.interface';
-import './EmptyWidgetPlaceholder.less';
 
 function EmptyWidgetPlaceholder({
   iconHeight = SIZE.MEDIUM,

openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx

@@ -23,14 +23,14 @@ import { useHistory, useParams } from 'react-router-dom';
 import { ReactComponent as ExternalLinkIcon } from '../../assets/svg/external-links.svg';
 import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider';
 import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component';
-import DescriptionV1 from '../../components/common/description/DescriptionV1';
-import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder';
-import PageLayoutV1 from '../../components/containers/PageLayoutV1';
+import { withActivityFeed } from '../../components/AppRouter/withActivityFeed';
+import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1';
+import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component';
 import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component';
 import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component';
 import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface';
-import { withActivityFeed } from '../../components/router/withActivityFeed';
+import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
 import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component';
 import TableDescription from '../../components/TableDescription/TableDescription.component';
 import TableTags from '../../components/TableTags/TableTags.component';
@@ -62,7 +62,7 @@ import {
 import { createTagObject, updateTierTag } from '../../utils/TagsUtils';
 import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils';
 import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel';
-import { useAuthContext } from '../authentication/auth-provider/AuthProvider';
+import { useAuthContext } from '../Auth/AuthProviders/AuthProvider';
 import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable';
 import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor';
 import { usePermissionProvider } from '../PermissionProvider/PermissionProvider';