diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/_index.scss
index bb01107f334f6..8f900ca8dc055 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/_index.scss
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/_index.scss
@@ -1,2 +1,2 @@
-@import 'tabs/checkup/index';
-@import 'tabs/overview/index';
+@import 'es_deprecations/index';
+@import 'overview/index';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/__fixtures__/checkup_api_response.json b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/__fixtures__/checkup_api_response.json
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/__fixtures__/checkup_api_response.json
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/__fixtures__/checkup_api_response.json
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/filter_bar.test.tsx.snap b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/__snapshots__/filter_bar.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/filter_bar.test.tsx.snap
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/__snapshots__/filter_bar.test.tsx.snap
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/group_by_bar.test.tsx.snap b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/__snapshots__/group_by_bar.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/group_by_bar.test.tsx.snap
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/__snapshots__/group_by_bar.test.tsx.snap
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/_index.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/_index.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/_index.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/constants.tsx
similarity index 70%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/constants.tsx
index a3e9ae783e812..feff6010efe38 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/constants.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/constants.tsx
@@ -7,16 +7,18 @@
 
 import { IconColor } from '@elastic/eui';
 import { invert } from 'lodash';
-import { DeprecationInfo } from '../../../../../common/types';
+import { DeprecationInfo } from '../../../../common/types';
 
 export const LEVEL_MAP: { [level: string]: number } = {
   warning: 0,
   critical: 1,
 };
 
-export const REVERSE_LEVEL_MAP: { [idx: number]: DeprecationInfo['level'] } = invert(
-  LEVEL_MAP
-) as any;
+interface ReverseLevelMap {
+  [idx: number]: DeprecationInfo['level'];
+}
+
+export const REVERSE_LEVEL_MAP: ReverseLevelMap = invert(LEVEL_MAP) as ReverseLevelMap;
 
 export const COLOR_MAP: { [level: string]: IconColor } = {
   warning: 'default',
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/controls.tsx
similarity index 95%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/controls.tsx
index 578e9344659c2..7212c2db4c6b4 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/controls.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/controls.tsx
@@ -9,13 +9,12 @@ import React, { FunctionComponent, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { DeprecationInfo } from '../../../../../common/types';
-import { GroupByOption, LevelFilterOption } from '../../types';
+import { DeprecationInfo } from '../../../../common/types';
+import { validateRegExpString } from '../../lib/utils';
+import { GroupByOption, LevelFilterOption } from '../types';
 import { FilterBar } from './filter_bar';
 import { GroupByBar } from './group_by_bar';
 
-import { validateRegExpString } from '../../../utils';
-
 interface CheckupControlsProps {
   allDeprecations?: DeprecationInfo[];
   isLoading: boolean;
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_tab.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_tab.tsx
index 3c4c747529915..a5ae341f1e424 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_tab.tsx
@@ -19,9 +19,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { LoadingErrorBanner } from '../../error_banner';
-import { useAppContext } from '../../../app_context';
-import { GroupByOption, LevelFilterOption, UpgradeAssistantTabProps } from '../../types';
+import { LoadingErrorBanner } from '../error_banner';
+import { useAppContext } from '../../app_context';
+import { GroupByOption, LevelFilterOption, UpgradeAssistantTabProps } from '../types';
 import { CheckupControls } from './controls';
 import { GroupedDeprecations } from './deprecations/grouped';
 
@@ -34,7 +34,7 @@ export interface CheckupTabProps extends UpgradeAssistantTabProps {
  * Displays a list of deprecations that filterable and groupable. Can be used for cluster,
  * nodes, or indices checkups.
  */
-export const CheckupTab: FunctionComponent<CheckupTabProps> = ({
+export const DeprecationTab: FunctionComponent<CheckupTabProps> = ({
   alertBanner,
   checkupLabel,
   deprecations,
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/_cell.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/_cell.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/_cell.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/_cell.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/_deprecations.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/_deprecations.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/_deprecations.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/_deprecations.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/_index.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/_index.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/_index.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/cell.tsx
similarity index 95%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/cell.tsx
index 890f7e63c9904..5f960bd09d286 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/cell.tsx
@@ -17,9 +17,9 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { EnrichedDeprecationInfo } from '../../../../../common/types';
+import { AppContext } from '../../../app_context';
 import { ReindexButton } from './reindex';
-import { AppContext } from '../../../../app_context';
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
 import { FixIndexSettingsButton } from './index_settings';
 
 interface DeprecationCellProps {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/count_summary.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/count_summary.tsx
similarity index 95%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/count_summary.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/count_summary.tsx
index 872e508494ed7..db176ba43d8ed 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/count_summary.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/count_summary.tsx
@@ -10,7 +10,7 @@ import React, { Fragment, FunctionComponent } from 'react';
 import { EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
+import { EnrichedDeprecationInfo } from '../../../../../common/types';
 
 export const DeprecationCountSummary: FunctionComponent<{
   deprecations: EnrichedDeprecationInfo[];
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/grouped.test.tsx
similarity index 98%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/grouped.test.tsx
index 0885286961b11..00059fe0456ce 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/grouped.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test/jest';
 import { EuiBadge, EuiPagination } from '@elastic/eui';
 
-import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
-import { GroupByOption, LevelFilterOption } from '../../../types';
+import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../common/types';
+import { GroupByOption, LevelFilterOption } from '../../types';
 import { DeprecationAccordion, filterDeps, GroupedDeprecations } from './grouped';
 
 describe('filterDeps', () => {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/grouped.tsx
similarity index 98%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/grouped.tsx
index 3c18d6fe8a609..9879b977f1cfd 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/grouped.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/grouped.tsx
@@ -19,8 +19,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
-import { GroupByOption, LevelFilterOption } from '../../../types';
+import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../common/types';
+import { GroupByOption, LevelFilterOption } from '../../types';
 
 import { DeprecationCountSummary } from './count_summary';
 import { DeprecationHealth } from './health';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/health.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/health.tsx
index d7e62684c4570..c489824b1059d 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/health.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/health.tsx
@@ -11,7 +11,7 @@ import React, { FunctionComponent } from 'react';
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DeprecationInfo } from '../../../../../../common/types';
+import { DeprecationInfo } from '../../../../../common/types';
 import { COLOR_MAP, LEVEL_MAP, REVERSE_LEVEL_MAP } from '../constants';
 
 const LocalizedLevels: { [level: string]: string } = {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index.tsx
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index.tsx
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/button.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/button.tsx
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/button.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/button.tsx
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/index.ts
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/index.ts
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/index.ts
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/remove_settings_provider.tsx
similarity index 98%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/remove_settings_provider.tsx
index e344d300be06c..1fd0c79dbbef3 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_settings/remove_settings_provider.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_settings/remove_settings_provider.tsx
@@ -8,7 +8,7 @@
 import React, { useState, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiCode, EuiConfirmModal } from '@elastic/eui';
-import { useAppContext } from '../../../../../app_context';
+import { useAppContext } from '../../../../app_context';
 
 interface Props {
   children: (
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_table.test.tsx
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_table.test.tsx
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_table.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_table.tsx
index da2f5f04effc4..216884d547eeb 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/index_table.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 
 import { EuiBasicTable } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { EnrichedDeprecationInfo } from '../../../../../common/types';
+import { AppContext } from '../../../app_context';
 import { ReindexButton } from './reindex';
-import { AppContext } from '../../../../app_context';
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
 import { FixIndexSettingsButton } from './index_settings';
 
 const PAGE_SIZES = [10, 25, 50, 100, 250, 500, 1000];
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/list.test.tsx
similarity index 96%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/list.test.tsx
index 1d646442ebee0..c1b6357d504eb 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/list.test.tsx
@@ -8,8 +8,8 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { EnrichedDeprecationInfo } from '../../../../../../common/types';
-import { GroupByOption } from '../../../types';
+import { EnrichedDeprecationInfo } from '../../../../../common/types';
+import { GroupByOption } from '../../types';
 import { DeprecationList } from './list';
 
 describe('DeprecationList', () => {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/list.tsx
similarity index 98%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/list.tsx
index eb9012b3bddd1..65b878fe36a86 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/list.tsx
@@ -7,8 +7,8 @@
 
 import React, { FunctionComponent } from 'react';
 
-import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
-import { GroupByOption } from '../../../types';
+import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../common/types';
+import { GroupByOption } from '../../types';
 
 import { COLOR_MAP, LEVEL_MAP } from '../constants';
 import { DeprecationCell } from './cell';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/_button.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/_button.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/_button.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/_button.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/_index.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/_index.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/_index.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/button.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/button.tsx
index 98c22308d9373..34c1328459cdb 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/button.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/button.tsx
@@ -13,13 +13,13 @@ import { Subscription } from 'rxjs';
 import { EuiButton, EuiLoadingSpinner, EuiText, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { DocLinksStart, HttpSetup } from 'src/core/public';
-import { API_BASE_PATH } from '../../../../../../../common/constants';
+import { API_BASE_PATH } from '../../../../../../common/constants';
 import {
   EnrichedDeprecationInfo,
   ReindexStatus,
   UIReindexOption,
-} from '../../../../../../../common/types';
-import { LoadingState } from '../../../../types';
+} from '../../../../../../common/types';
+import { LoadingState } from '../../../types';
 import { ReindexFlyout } from './flyout';
 import { ReindexPollingService, ReindexState } from './polling_service';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/_index.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_index.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/_index.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_step_progress.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/_step_progress.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/_step_progress.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/_step_progress.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/checklist_step.test.tsx
similarity index 94%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/checklist_step.test.tsx
index 5bea0d855e45e..f8d72addc2d18 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/checklist_step.test.tsx
@@ -9,8 +9,8 @@ import { shallow } from 'enzyme';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 
-import { ReindexStatus } from '../../../../../../../../common/types';
-import { LoadingState } from '../../../../../types';
+import { ReindexStatus } from '../../../../../../../common/types';
+import { LoadingState } from '../../../../types';
 import { ReindexState } from '../polling_service';
 import { ChecklistFlyoutStep } from './checklist_step';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/checklist_step.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/checklist_step.tsx
index fc4bdcc130e25..e852171a696b4 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/checklist_step.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/checklist_step.tsx
@@ -20,8 +20,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { ReindexStatus } from '../../../../../../../../common/types';
-import { LoadingState } from '../../../../../types';
+import { ReindexStatus } from '../../../../../../../common/types';
+import { LoadingState } from '../../../../types';
 import { ReindexState } from '../polling_service';
 import { ReindexProgress } from './progress';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/container.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/container.tsx
similarity index 99%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/container.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/container.tsx
index 2f776f3937b50..3e7b931452566 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/container.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/container.tsx
@@ -19,7 +19,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { EnrichedDeprecationInfo, ReindexStatus } from '../../../../../../../../common/types';
+import { EnrichedDeprecationInfo, ReindexStatus } from '../../../../../../../common/types';
 
 import { ReindexState } from '../polling_service';
 import { ChecklistFlyoutStep } from './checklist_step';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/index.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/index.tsx
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/index.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/index.tsx
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/progress.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/progress.test.tsx
similarity index 99%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/progress.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/progress.test.tsx
index 690775efb9d12..24a00af7a9fee 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/progress.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/progress.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../../common/types';
+import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../common/types';
 import { ReindexState } from '../polling_service';
 import { ReindexProgress } from './progress';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/progress.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/progress.tsx
similarity index 99%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/progress.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/progress.tsx
index 5d10111f3ae5e..088266f3a4840 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/progress.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/progress.tsx
@@ -17,8 +17,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../../common/types';
-import { LoadingState } from '../../../../../types';
+import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../common/types';
+import { LoadingState } from '../../../../types';
 import { ReindexState } from '../polling_service';
 import { StepProgress, StepProgressStep } from './step_progress';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/step_progress.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/step_progress.tsx
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/step_progress.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/step_progress.tsx
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warning_step.test.tsx
similarity index 88%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warning_step.test.tsx
index ca9c53354bf75..ff11b9f1a8450 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warning_step.test.tsx
@@ -9,14 +9,14 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { mount, shallow } from 'enzyme';
 import React from 'react';
 
-import { ReindexWarning } from '../../../../../../../../common/types';
-import { mockKibanaSemverVersion } from '../../../../../../../../common/constants';
+import { ReindexWarning } from '../../../../../../../common/types';
+import { mockKibanaSemverVersion } from '../../../../../../../common/constants';
 
 import { idForWarning, WarningsFlyoutStep } from './warnings_step';
 
-jest.mock('../../../../../../app_context', () => {
+jest.mock('../../../../../app_context', () => {
   const { docLinksServiceMock } = jest.requireActual(
-    '../../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
+    '../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
   );
 
   return {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warning_step_checkbox.tsx
similarity index 99%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warning_step_checkbox.tsx
index de41108886c00..a5e3260167218 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step_checkbox.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warning_step_checkbox.tsx
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { DocLinksStart } from 'kibana/public';
-import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../../common/types';
+import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../common/types';
 
 export const hasReindexWarning = (
   warnings: ReindexWarning[],
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warnings_step.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warnings_step.tsx
index 241884e95c1eb..4415811f6bf38 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/flyout/warnings_step.tsx
@@ -19,8 +19,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../../common/types';
-import { useAppContext } from '../../../../../../app_context';
+import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../common/types';
+import { useAppContext } from '../../../../../app_context';
 import {
   CustomTypeNameWarningCheckbox,
   DeprecatedSettingWarningCheckbox,
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/index.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/index.tsx
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/index.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/index.tsx
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/polling_service.test.ts b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/polling_service.test.ts
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/polling_service.test.ts
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/polling_service.test.ts
index e7f56fc1bdf79..13818e864783e 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/polling_service.test.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/polling_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReindexStatus, ReindexStep } from '../../../../../../../common/types';
+import { ReindexStatus, ReindexStep } from '../../../../../../common/types';
 import { ReindexPollingService } from './polling_service';
 import { httpServiceMock } from 'src/core/public/mocks';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/polling_service.ts b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/polling_service.ts
similarity index 96%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/polling_service.ts
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/polling_service.ts
index d6a4a8e7b5a56..239bd56bd2fa5 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/polling_service.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecations/reindex/polling_service.ts
@@ -8,15 +8,15 @@
 import { BehaviorSubject } from 'rxjs';
 
 import { HttpSetup } from 'src/core/public';
-import { API_BASE_PATH } from '../../../../../../../common/constants';
+import { API_BASE_PATH } from '../../../../../../common/constants';
 import {
   IndexGroup,
   ReindexOperation,
   ReindexStatus,
   ReindexStep,
   ReindexWarning,
-} from '../../../../../../../common/types';
-import { LoadingState } from '../../../../types';
+} from '../../../../../../common/types';
+import { LoadingState } from '../../../types';
 
 const POLL_INTERVAL = 1000;
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/filter_bar.test.tsx
similarity index 90%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/filter_bar.test.tsx
index 81e04ac780422..feac88cf4a525 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/filter_bar.test.tsx
@@ -7,9 +7,9 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { DeprecationInfo } from '../../../../../common/types';
+import { DeprecationInfo } from '../../../../common/types';
 
-import { LevelFilterOption } from '../../types';
+import { LevelFilterOption } from '../types';
 import { FilterBar } from './filter_bar';
 
 const defaultProps = {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/filter_bar.tsx
similarity index 94%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/filter_bar.tsx
index ffb81832b505d..7ef3ae2fc9332 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/filter_bar.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/filter_bar.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 import { EuiFilterButton, EuiFilterGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DeprecationInfo } from '../../../../../common/types';
-import { LevelFilterOption } from '../../types';
+import { DeprecationInfo } from '../../../../common/types';
+import { LevelFilterOption } from '../types';
 
 const LocalizedOptions: { [option: string]: string } = {
   all: i18n.translate('xpack.upgradeAssistant.checkupTab.controls.filterBar.allButtonLabel', {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/group_by_bar.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/group_by_bar.test.tsx
similarity index 95%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/group_by_bar.test.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/group_by_bar.test.tsx
index 825dd9b337e49..53f76d6d0f981 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/group_by_bar.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/group_by_bar.test.tsx
@@ -8,7 +8,7 @@
 import { mount, shallow } from 'enzyme';
 import React from 'react';
 
-import { GroupByOption } from '../../types';
+import { GroupByOption } from '../types';
 import { GroupByBar } from './group_by_bar';
 
 const defaultProps = {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/group_by_bar.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/group_by_bar.tsx
similarity index 97%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/group_by_bar.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/group_by_bar.tsx
index fc3971d4082b9..a80fe664ced2e 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/group_by_bar.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/group_by_bar.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { EuiFilterButton, EuiFilterGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { GroupByOption } from '../../types';
+import { GroupByOption } from '../types';
 
 const LocalizedOptions: { [option: string]: string } = {
   message: i18n.translate('xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel', {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/index.ts
new file mode 100644
index 0000000000000..8b7435b94b2c1
--- /dev/null
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { DeprecationTab } from './deprecation_tab';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/_index.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/_steps.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/_steps.scss
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/_steps.scss
rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/_steps.scss
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/deprecation_logging_toggle.tsx
similarity index 96%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/deprecation_logging_toggle.tsx
index b026b17c65f18..5ed46c25ecf17 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/deprecation_logging_toggle.tsx
@@ -10,8 +10,8 @@ import React, { useEffect, useState } from 'react';
 import { EuiLoadingSpinner, EuiSwitch } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { useAppContext } from '../../../app_context';
-import { ResponseError } from '../../../lib/api';
+import { useAppContext } from '../../app_context';
+import { ResponseError } from '../../lib/api';
 
 export const DeprecationLoggingToggle: React.FunctionComponent = () => {
   const { api } = useAppContext();
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/index.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/index.ts
similarity index 85%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/index.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/index.ts
index 8c04da8b7843a..c43c1415f6f7c 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/index.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { CheckupTab } from './checkup_tab';
+export { OverviewTab } from './overview';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/index.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx
similarity index 91%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/index.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx
index 8cd3bbebd7861..01677e7394a87 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/index.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { useAppContext } from '../../../app_context';
-import { LoadingErrorBanner } from '../../error_banner';
-import { UpgradeAssistantTabProps } from '../../types';
+import { useAppContext } from '../../app_context';
+import { LoadingErrorBanner } from '../error_banner';
+import { UpgradeAssistantTabProps } from '../types';
 import { Steps } from './steps';
 
 export const OverviewTab: FunctionComponent<UpgradeAssistantTabProps> = (props) => {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/steps.tsx
similarity index 99%
rename from x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx
rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/steps.tsx
index afd04fb02e6dd..095960ae93562 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/steps.tsx
@@ -20,9 +20,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { UpgradeAssistantTabProps } from '../../types';
+import { useAppContext } from '../../app_context';
+import { UpgradeAssistantTabProps } from '../types';
 import { DeprecationLoggingToggle } from './deprecation_logging_toggle';
-import { useAppContext } from '../../../app_context';
 
 // Leaving these here even if unused so they are picked up for i18n static analysis
 // Keep this until last minor release (when next major is also released).
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx
index 9875b4c5a1a33..231d9705bd0d9 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs.tsx
@@ -19,8 +19,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { LatestMinorBanner } from './latest_minor_banner';
-import { CheckupTab } from './tabs/checkup';
-import { OverviewTab } from './tabs/overview';
+import { DeprecationTab } from './es_deprecations';
+import { OverviewTab } from './overview';
 import { TelemetryState, UpgradeAssistantTabProps } from './types';
 import { useAppContext } from '../app_context';
 
@@ -58,7 +58,7 @@ export const UpgradeAssistantTabs: React.FunctionComponent = () => {
           defaultMessage: 'Cluster',
         }),
         content: (
-          <CheckupTab
+          <DeprecationTab
             key="cluster"
             deprecations={checkupData ? checkupData.cluster : undefined}
             checkupLabel={i18n.translate('xpack.upgradeAssistant.tabs.checkupTab.clusterLabel', {
@@ -75,7 +75,7 @@ export const UpgradeAssistantTabs: React.FunctionComponent = () => {
           defaultMessage: 'Indices',
         }),
         content: (
-          <CheckupTab
+          <DeprecationTab
             key="indices"
             deprecations={checkupData ? checkupData.indices : undefined}
             checkupLabel={i18n.translate('xpack.upgradeAssistant.checkupTab.indexLabel', {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/utils.test.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/utils.test.ts
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/utils.test.ts
rename to x-pack/plugins/upgrade_assistant/public/application/lib/utils.test.ts
diff --git a/x-pack/plugins/upgrade_assistant/public/application/utils.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/utils.ts
similarity index 100%
rename from x-pack/plugins/upgrade_assistant/public/application/utils.ts
rename to x-pack/plugins/upgrade_assistant/public/application/lib/utils.ts