diff --git a/src/routes.tsx b/src/routes.tsx
index 8b86ab820..aefc1eeca 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -12,7 +12,7 @@ const AzureBreakdown = lazy(
 const AzureDetails = lazy(() => import(/* webpackChunkName: "azureDetails" */ 'routes/views/details/azureDetails'));
 const CostModelOld = lazy(() => import(/* webpackChunkName: "costModel" */ 'routes/costModels/costModel'));
 const CostModelsDetailsOld = lazy(() => import(/* lazy: "costModelsDetails" */ 'routes/costModels/costModelsDetails'));
-const CostModel = lazy(() => import(/* webpackChunkName: "costModel" */ 'routes/settings/costModel'));
+const CostModel = lazy(() => import(/* webpackChunkName: "costModel" */ 'routes/settings/costModels/costModel'));
 const Explorer = lazy(() => import(/* webpackChunkName: "explorer" */ 'routes/views/explorer'));
 const GcpBreakdown = lazy(() => import(/* webpackChunkName: "gcpBreakdown" */ 'routes/views/details/gcpBreakdown'));
 const GcpDetails = lazy(() => import(/* webpackChunkName: "gcpDetails" */ 'routes/views/details/gcpDetails'));
diff --git a/src/routes/costModels/costModel/addSourceWizard.tsx b/src/routes/costModels/costModel/addSourceWizard.tsx
index eea644e84..07e0ca088 100644
--- a/src/routes/costModels/costModel/addSourceWizard.tsx
+++ b/src/routes/costModels/costModel/addSourceWizard.tsx
@@ -145,7 +145,7 @@ class AddSourceWizardBase extends React.Component<AddSourceWizardProps, AddSourc
               </GridItem>
               <GridItem span={2}>
                 <TextContent>
-                  <Text component={TextVariants.p}>{intl.formatMessage(messages.costModelsSourceType)}</Text>
+                  <Text component={TextVariants.p}>{intl.formatMessage(messages.sourceType)}</Text>
                 </TextContent>
               </GridItem>
               <GridItem span={10}>
diff --git a/src/routes/costModels/costModel/table.tsx b/src/routes/costModels/costModel/table.tsx
index c83d28a2d..6a25cd07c 100644
--- a/src/routes/costModels/costModel/table.tsx
+++ b/src/routes/costModels/costModel/table.tsx
@@ -67,7 +67,7 @@ class TableBase extends React.Component<TableBaseProps, TableBaseState> {
     return (
       <>
         <Title headingLevel="h2" size={TitleSizes.md} style={styles.sourceTypeTitle}>
-          {intl.formatMessage(messages.costModelsSourceType)}: {current.source_type}
+          {intl.formatMessage(messages.sourceType)}: {current.source_type}
         </Title>
         <SourcesToolbar
           actionButtonProps={{
diff --git a/src/routes/costModels/costModelWizard/generalInformation.tsx b/src/routes/costModels/costModelWizard/generalInformation.tsx
index 464b90752..ea3aff6c5 100644
--- a/src/routes/costModels/costModelWizard/generalInformation.tsx
+++ b/src/routes/costModels/costModelWizard/generalInformation.tsx
@@ -130,7 +130,7 @@ class GeneralInformation extends React.Component<GeneralInformationProps, any> {
                   direction={SelectDirection.up}
                   appendMenuTo="inline"
                   maxHeight={styles.selector.maxHeight}
-                  label={messages.costModelsSourceType}
+                  label={messages.sourceType}
                   toggleAriaLabel={intl.formatMessage(messages.costModelsWizardEmptySourceTypeLabel)}
                   placeholderText={intl.formatMessage(messages.costModelsWizardEmptySourceTypeLabel)}
                   value={getValueLabel(type, sourceTypeOptions)}
diff --git a/src/routes/costModels/costModelsDetails/table.tsx b/src/routes/costModels/costModelsDetails/table.tsx
index 5a4657373..32c7048c3 100644
--- a/src/routes/costModels/costModelsDetails/table.tsx
+++ b/src/routes/costModels/costModelsDetails/table.tsx
@@ -70,7 +70,7 @@ class CostModelsTableBase extends React.Component<CostModelsTableProps, CostMode
       },
       { title: intl.formatMessage(messages.description) },
       {
-        title: intl.formatMessage(messages.costModelsSourceType),
+        title: intl.formatMessage(messages.sourceType),
         data: { orderName: 'source_type' },
         ...(rows.length && { transforms: [sortable] }),
       },
diff --git a/src/routes/costModels/costModelsDetails/utils/filters.tsx b/src/routes/costModels/costModelsDetails/utils/filters.tsx
index 440bbc91f..858931b76 100644
--- a/src/routes/costModels/costModelsDetails/utils/filters.tsx
+++ b/src/routes/costModels/costModelsDetails/utils/filters.tsx
@@ -270,7 +270,7 @@ const sourceTypeFilterMergeProps = (
   const chips = query.source_type ? [query.source_type] : [];
   return {
     chips,
-    categoryName: intl.formatMessage(messages.costModelsSourceType),
+    categoryName: intl.formatMessage(messages.sourceType),
     deleteChip: onDeleteChipGroup(router, { ...initialCostModelsQuery, ...query }, 'source_type'),
     filterType,
     intl,
diff --git a/src/routes/costModels/costModelsDetails/utils/toolbar.tsx b/src/routes/costModels/costModelsDetails/utils/toolbar.tsx
index ff6750ca5..2770d6680 100644
--- a/src/routes/costModels/costModelsDetails/utils/toolbar.tsx
+++ b/src/routes/costModels/costModelsDetails/utils/toolbar.tsx
@@ -69,7 +69,7 @@ const CostModelsFilterSelectorBase: React.FC<CostModelsFilterSelectorProps> = ({
       {intl.formatMessage(messages.description)}
     </SelectOption>,
     <SelectOption key="sourceType" value="sourceType">
-      {intl.formatMessage(messages.costModelsSourceType)}
+      {intl.formatMessage(messages.sourceType)}
     </SelectOption>,
   ];
   return (
diff --git a/src/routes/settings/components/__snapshots__/rateTable.test.tsx.snap b/src/routes/settings/costModels/components/__snapshots__/rateTable.test.tsx.snap
similarity index 100%
rename from src/routes/settings/components/__snapshots__/rateTable.test.tsx.snap
rename to src/routes/settings/costModels/components/__snapshots__/rateTable.test.tsx.snap
diff --git a/src/routes/settings/components/__snapshots__/warningIcon.test.tsx.snap b/src/routes/settings/costModels/components/__snapshots__/warningIcon.test.tsx.snap
similarity index 100%
rename from src/routes/settings/components/__snapshots__/warningIcon.test.tsx.snap
rename to src/routes/settings/costModels/components/__snapshots__/warningIcon.test.tsx.snap
diff --git a/src/routes/settings/components/addPriceList.test.tsx b/src/routes/settings/costModels/components/addPriceList.test.tsx
similarity index 99%
rename from src/routes/settings/components/addPriceList.test.tsx
rename to src/routes/settings/costModels/components/addPriceList.test.tsx
index e2b003ae3..c02c89e3b 100644
--- a/src/routes/settings/components/addPriceList.test.tsx
+++ b/src/routes/settings/costModels/components/addPriceList.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import type { Rate } from 'api/rates';
 import messages from 'locales/messages';
 import React from 'react';
-import { CostModelContext, defaultCostModelContext } from 'routes/settings/costModelWizard/context';
+import { CostModelContext, defaultCostModelContext } from 'routes/settings/costModels/costModelWizard/context';
 
 import AddPriceList from './addPriceList';
 
diff --git a/src/routes/settings/components/addPriceList.tsx b/src/routes/settings/costModels/components/addPriceList.tsx
similarity index 90%
rename from src/routes/settings/components/addPriceList.tsx
rename to src/routes/settings/costModels/components/addPriceList.tsx
index 485a210c7..b4fc12a47 100644
--- a/src/routes/settings/components/addPriceList.tsx
+++ b/src/routes/settings/costModels/components/addPriceList.tsx
@@ -17,9 +17,9 @@ import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
-import type { RateFormData } from 'routes/settings/components/rateForm';
-import { canSubmit as isReadyForSubmit, RateForm, useRateData } from 'routes/settings/components/rateForm';
-import { CostModelContext } from 'routes/settings/costModelWizard/context';
+import type { RateFormData } from 'routes/settings/costModels/components/rateForm';
+import { canSubmit as isReadyForSubmit, RateForm, useRateData } from 'routes/settings/costModels/components/rateForm';
+import { CostModelContext } from 'routes/settings/costModels/costModelWizard/context';
 
 interface AddPriceListOwnProps {
   cancel: () => void;
diff --git a/src/routes/settings/components/errorState.tsx b/src/routes/settings/costModels/components/errorState.tsx
similarity index 100%
rename from src/routes/settings/components/errorState.tsx
rename to src/routes/settings/costModels/components/errorState.tsx
diff --git a/src/routes/settings/components/filterLogic.test.ts b/src/routes/settings/costModels/components/filterLogic.test.ts
similarity index 100%
rename from src/routes/settings/components/filterLogic.test.ts
rename to src/routes/settings/costModels/components/filterLogic.test.ts
diff --git a/src/routes/settings/components/filterLogic.ts b/src/routes/settings/costModels/components/filterLogic.ts
similarity index 100%
rename from src/routes/settings/components/filterLogic.ts
rename to src/routes/settings/costModels/components/filterLogic.ts
diff --git a/src/routes/settings/components/forms/form.tsx b/src/routes/settings/costModels/components/forms/form.tsx
similarity index 100%
rename from src/routes/settings/components/forms/form.tsx
rename to src/routes/settings/costModels/components/forms/form.tsx
diff --git a/src/routes/settings/components/hoc/withPriceListSearch.test.tsx b/src/routes/settings/costModels/components/hoc/withPriceListSearch.test.tsx
similarity index 100%
rename from src/routes/settings/components/hoc/withPriceListSearch.test.tsx
rename to src/routes/settings/costModels/components/hoc/withPriceListSearch.test.tsx
diff --git a/src/routes/settings/components/hoc/withPriceListSearch.tsx b/src/routes/settings/costModels/components/hoc/withPriceListSearch.tsx
similarity index 95%
rename from src/routes/settings/components/hoc/withPriceListSearch.tsx
rename to src/routes/settings/costModels/components/hoc/withPriceListSearch.tsx
index a624b6e18..b6639f6cc 100644
--- a/src/routes/settings/components/hoc/withPriceListSearch.tsx
+++ b/src/routes/settings/costModels/components/hoc/withPriceListSearch.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { checkBoxLogic, deleteChip } from 'routes/settings/components/logic/selectCheckbox';
+import { checkBoxLogic, deleteChip } from 'routes/settings/costModels/components/logic/selectCheckbox';
 
 export interface PriceListSearchQuery {
   primary: string;
diff --git a/src/routes/settings/components/hoc/withStateMachine.test.tsx b/src/routes/settings/costModels/components/hoc/withStateMachine.test.tsx
similarity index 100%
rename from src/routes/settings/components/hoc/withStateMachine.test.tsx
rename to src/routes/settings/costModels/components/hoc/withStateMachine.test.tsx
diff --git a/src/routes/settings/components/hoc/withStateMachine.tsx b/src/routes/settings/costModels/components/hoc/withStateMachine.tsx
similarity index 100%
rename from src/routes/settings/components/hoc/withStateMachine.tsx
rename to src/routes/settings/costModels/components/hoc/withStateMachine.tsx
diff --git a/src/routes/settings/components/inputs/rateInput.styles.ts b/src/routes/settings/costModels/components/inputs/rateInput.styles.ts
similarity index 100%
rename from src/routes/settings/components/inputs/rateInput.styles.ts
rename to src/routes/settings/costModels/components/inputs/rateInput.styles.ts
diff --git a/src/routes/settings/components/inputs/rateInput.tsx b/src/routes/settings/costModels/components/inputs/rateInput.tsx
similarity index 100%
rename from src/routes/settings/components/inputs/rateInput.tsx
rename to src/routes/settings/costModels/components/inputs/rateInput.tsx
diff --git a/src/routes/settings/components/inputs/selector.tsx b/src/routes/settings/costModels/components/inputs/selector.tsx
similarity index 100%
rename from src/routes/settings/components/inputs/selector.tsx
rename to src/routes/settings/costModels/components/inputs/selector.tsx
diff --git a/src/routes/settings/components/inputs/simpleInput.tsx b/src/routes/settings/costModels/components/inputs/simpleInput.tsx
similarity index 100%
rename from src/routes/settings/components/inputs/simpleInput.tsx
rename to src/routes/settings/costModels/components/inputs/simpleInput.tsx
diff --git a/src/routes/settings/components/logic/__snapshots__/selectStateMachine.test.tsx.snap b/src/routes/settings/costModels/components/logic/__snapshots__/selectStateMachine.test.tsx.snap
similarity index 100%
rename from src/routes/settings/components/logic/__snapshots__/selectStateMachine.test.tsx.snap
rename to src/routes/settings/costModels/components/logic/__snapshots__/selectStateMachine.test.tsx.snap
diff --git a/src/routes/settings/components/logic/selectCheckbox.test.ts b/src/routes/settings/costModels/components/logic/selectCheckbox.test.ts
similarity index 100%
rename from src/routes/settings/components/logic/selectCheckbox.test.ts
rename to src/routes/settings/costModels/components/logic/selectCheckbox.test.ts
diff --git a/src/routes/settings/components/logic/selectCheckbox.ts b/src/routes/settings/costModels/components/logic/selectCheckbox.ts
similarity index 100%
rename from src/routes/settings/components/logic/selectCheckbox.ts
rename to src/routes/settings/costModels/components/logic/selectCheckbox.ts
diff --git a/src/routes/settings/components/logic/selectStateMachine.test.tsx b/src/routes/settings/costModels/components/logic/selectStateMachine.test.tsx
similarity index 100%
rename from src/routes/settings/components/logic/selectStateMachine.test.tsx
rename to src/routes/settings/costModels/components/logic/selectStateMachine.test.tsx
diff --git a/src/routes/settings/components/logic/selectStateMachine.ts b/src/routes/settings/costModels/components/logic/selectStateMachine.ts
similarity index 100%
rename from src/routes/settings/components/logic/selectStateMachine.ts
rename to src/routes/settings/costModels/components/logic/selectStateMachine.ts
diff --git a/src/routes/settings/components/logic/types.ts b/src/routes/settings/costModels/components/logic/types.ts
similarity index 100%
rename from src/routes/settings/components/logic/types.ts
rename to src/routes/settings/costModels/components/logic/types.ts
diff --git a/src/routes/settings/components/paginationToolbarTemplate.tsx b/src/routes/settings/costModels/components/paginationToolbarTemplate.tsx
similarity index 100%
rename from src/routes/settings/components/paginationToolbarTemplate.tsx
rename to src/routes/settings/costModels/components/paginationToolbarTemplate.tsx
diff --git a/src/routes/settings/components/priceListToolbar.styles.ts b/src/routes/settings/costModels/components/priceListToolbar.styles.ts
similarity index 100%
rename from src/routes/settings/components/priceListToolbar.styles.ts
rename to src/routes/settings/costModels/components/priceListToolbar.styles.ts
diff --git a/src/routes/settings/components/priceListToolbar.test.tsx b/src/routes/settings/costModels/components/priceListToolbar.test.tsx
similarity index 100%
rename from src/routes/settings/components/priceListToolbar.test.tsx
rename to src/routes/settings/costModels/components/priceListToolbar.test.tsx
diff --git a/src/routes/settings/components/priceListToolbar.tsx b/src/routes/settings/costModels/components/priceListToolbar.tsx
similarity index 100%
rename from src/routes/settings/components/priceListToolbar.tsx
rename to src/routes/settings/costModels/components/priceListToolbar.tsx
diff --git a/src/routes/settings/components/rateForm/canSubmit.tsx b/src/routes/settings/costModels/components/rateForm/canSubmit.tsx
similarity index 100%
rename from src/routes/settings/components/rateForm/canSubmit.tsx
rename to src/routes/settings/costModels/components/rateForm/canSubmit.tsx
diff --git a/src/routes/settings/components/rateForm/constants.ts b/src/routes/settings/costModels/components/rateForm/constants.ts
similarity index 100%
rename from src/routes/settings/components/rateForm/constants.ts
rename to src/routes/settings/costModels/components/rateForm/constants.ts
diff --git a/src/routes/settings/components/rateForm/hasDiff.ts b/src/routes/settings/costModels/components/rateForm/hasDiff.ts
similarity index 100%
rename from src/routes/settings/components/rateForm/hasDiff.ts
rename to src/routes/settings/costModels/components/rateForm/hasDiff.ts
diff --git a/src/routes/settings/components/rateForm/index.ts b/src/routes/settings/costModels/components/rateForm/index.ts
similarity index 100%
rename from src/routes/settings/components/rateForm/index.ts
rename to src/routes/settings/costModels/components/rateForm/index.ts
diff --git a/src/routes/settings/components/rateForm/rateForm.tsx b/src/routes/settings/costModels/components/rateForm/rateForm.tsx
similarity index 97%
rename from src/routes/settings/components/rateForm/rateForm.tsx
rename to src/routes/settings/costModels/components/rateForm/rateForm.tsx
index bf4885ed3..e8a540dd8 100644
--- a/src/routes/settings/components/rateForm/rateForm.tsx
+++ b/src/routes/settings/costModels/components/rateForm/rateForm.tsx
@@ -6,9 +6,9 @@ import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
-import { RateInput } from 'routes/settings/components/inputs/rateInput';
-import { Selector } from 'routes/settings/components/inputs/selector';
-import { SimpleInput } from 'routes/settings/components/inputs/simpleInput';
+import { RateInput } from 'routes/settings/costModels/components/inputs/rateInput';
+import { Selector } from 'routes/settings/costModels/components/inputs/selector';
+import { SimpleInput } from 'routes/settings/costModels/components/inputs/simpleInput';
 import { unitsLookupKey } from 'utils/format';
 
 import { TaggingRatesForm } from './taggingRatesForm';
diff --git a/src/routes/settings/components/rateForm/taggingRatesForm.tsx b/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx
similarity index 95%
rename from src/routes/settings/components/rateForm/taggingRatesForm.tsx
rename to src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx
index c0dc3aa7b..c4cf61ce8 100644
--- a/src/routes/settings/components/rateForm/taggingRatesForm.tsx
+++ b/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx
@@ -5,8 +5,8 @@ import messages from 'locales/messages';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
-import { RateInput } from 'routes/settings/components/inputs/rateInput';
-import { SimpleInput } from 'routes/settings/components/inputs/simpleInput';
+import { RateInput } from 'routes/settings/costModels/components/inputs/rateInput';
+import { SimpleInput } from 'routes/settings/costModels/components/inputs/simpleInput';
 
 import type { UseRateData } from './useRateForm';
 import type { RateFormErrors, RateFormTagValue } from './utils';
diff --git a/src/routes/settings/components/rateForm/useRateForm.test.tsx b/src/routes/settings/costModels/components/rateForm/useRateForm.test.tsx
similarity index 100%
rename from src/routes/settings/components/rateForm/useRateForm.test.tsx
rename to src/routes/settings/costModels/components/rateForm/useRateForm.test.tsx
diff --git a/src/routes/settings/components/rateForm/useRateForm.tsx b/src/routes/settings/costModels/components/rateForm/useRateForm.tsx
similarity index 100%
rename from src/routes/settings/components/rateForm/useRateForm.tsx
rename to src/routes/settings/costModels/components/rateForm/useRateForm.tsx
diff --git a/src/routes/settings/components/rateForm/utils.tsx b/src/routes/settings/costModels/components/rateForm/utils.tsx
similarity index 100%
rename from src/routes/settings/components/rateForm/utils.tsx
rename to src/routes/settings/costModels/components/rateForm/utils.tsx
diff --git a/src/routes/settings/components/rateTable.test.tsx b/src/routes/settings/costModels/components/rateTable.test.tsx
similarity index 100%
rename from src/routes/settings/components/rateTable.test.tsx
rename to src/routes/settings/costModels/components/rateTable.test.tsx
diff --git a/src/routes/settings/components/rateTable.tsx b/src/routes/settings/costModels/components/rateTable.tsx
similarity index 100%
rename from src/routes/settings/components/rateTable.tsx
rename to src/routes/settings/costModels/components/rateTable.tsx
diff --git a/src/routes/settings/components/readOnlyTooltip.test.tsx b/src/routes/settings/costModels/components/readOnlyTooltip.test.tsx
similarity index 100%
rename from src/routes/settings/components/readOnlyTooltip.test.tsx
rename to src/routes/settings/costModels/components/readOnlyTooltip.test.tsx
diff --git a/src/routes/settings/components/readOnlyTooltip.tsx b/src/routes/settings/costModels/components/readOnlyTooltip.tsx
similarity index 100%
rename from src/routes/settings/components/readOnlyTooltip.tsx
rename to src/routes/settings/costModels/components/readOnlyTooltip.tsx
diff --git a/src/routes/settings/components/toolbar/checkboxSelector.test.tsx b/src/routes/settings/costModels/components/toolbar/checkboxSelector.test.tsx
similarity index 100%
rename from src/routes/settings/components/toolbar/checkboxSelector.test.tsx
rename to src/routes/settings/costModels/components/toolbar/checkboxSelector.test.tsx
diff --git a/src/routes/settings/components/toolbar/checkboxSelector.tsx b/src/routes/settings/costModels/components/toolbar/checkboxSelector.tsx
similarity index 83%
rename from src/routes/settings/components/toolbar/checkboxSelector.tsx
rename to src/routes/settings/costModels/components/toolbar/checkboxSelector.tsx
index 6aef704b9..46b96144c 100644
--- a/src/routes/settings/components/toolbar/checkboxSelector.tsx
+++ b/src/routes/settings/costModels/components/toolbar/checkboxSelector.tsx
@@ -1,8 +1,8 @@
 import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
 import React from 'react';
-import { WithStateMachine } from 'routes/settings/components/hoc/withStateMachine';
-import { selectMachineState } from 'routes/settings/components/logic/selectStateMachine';
-import type { Option } from 'routes/settings/components/logic/types';
+import { WithStateMachine } from 'routes/settings/costModels/components/hoc/withStateMachine';
+import { selectMachineState } from 'routes/settings/costModels/components/logic/selectStateMachine';
+import type { Option } from 'routes/settings/costModels/components/logic/types';
 
 interface CheckboxSelectorProps {
   setSelections: (selection: string) => void;
diff --git a/src/routes/settings/components/toolbar/primarySelector.test.tsx b/src/routes/settings/costModels/components/toolbar/primarySelector.test.tsx
similarity index 100%
rename from src/routes/settings/components/toolbar/primarySelector.test.tsx
rename to src/routes/settings/costModels/components/toolbar/primarySelector.test.tsx
diff --git a/src/routes/settings/components/toolbar/primarySelector.tsx b/src/routes/settings/costModels/components/toolbar/primarySelector.tsx
similarity index 82%
rename from src/routes/settings/components/toolbar/primarySelector.tsx
rename to src/routes/settings/costModels/components/toolbar/primarySelector.tsx
index e426255fc..a5c30ae2c 100644
--- a/src/routes/settings/components/toolbar/primarySelector.tsx
+++ b/src/routes/settings/costModels/components/toolbar/primarySelector.tsx
@@ -1,9 +1,9 @@
 import { Select, SelectOption } from '@patternfly/react-core';
 import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
 import React from 'react';
-import { WithStateMachine } from 'routes/settings/components/hoc/withStateMachine';
-import { selectMachineState } from 'routes/settings/components/logic/selectStateMachine';
-import type { Option } from 'routes/settings/components/logic/types';
+import { WithStateMachine } from 'routes/settings/costModels/components/hoc/withStateMachine';
+import { selectMachineState } from 'routes/settings/costModels/components/logic/selectStateMachine';
+import type { Option } from 'routes/settings/costModels/components/logic/types';
 
 export interface PrimarySelectorProps {
   setPrimary: (primary: string) => void;
diff --git a/src/routes/settings/components/warningIcon.test.tsx b/src/routes/settings/costModels/components/warningIcon.test.tsx
similarity index 100%
rename from src/routes/settings/components/warningIcon.test.tsx
rename to src/routes/settings/costModels/components/warningIcon.test.tsx
diff --git a/src/routes/settings/components/warningIcon.tsx b/src/routes/settings/costModels/components/warningIcon.tsx
similarity index 100%
rename from src/routes/settings/components/warningIcon.tsx
rename to src/routes/settings/costModels/components/warningIcon.tsx
diff --git a/src/routes/settings/costModel/__snapshots__/dialog.test.tsx.snap b/src/routes/settings/costModels/costModel/__snapshots__/dialog.test.tsx.snap
similarity index 100%
rename from src/routes/settings/costModel/__snapshots__/dialog.test.tsx.snap
rename to src/routes/settings/costModels/costModel/__snapshots__/dialog.test.tsx.snap
diff --git a/src/routes/settings/costModel/addRateModal.styles.ts b/src/routes/settings/costModels/costModel/addRateModal.styles.ts
similarity index 100%
rename from src/routes/settings/costModel/addRateModal.styles.ts
rename to src/routes/settings/costModels/costModel/addRateModal.styles.ts
diff --git a/src/routes/settings/costModel/addRateModal.tsx b/src/routes/settings/costModels/costModel/addRateModal.tsx
similarity index 96%
rename from src/routes/settings/costModel/addRateModal.tsx
rename to src/routes/settings/costModels/costModel/addRateModal.tsx
index c42207d40..d13ac5fcd 100644
--- a/src/routes/settings/costModel/addRateModal.tsx
+++ b/src/routes/settings/costModels/costModel/addRateModal.tsx
@@ -12,8 +12,8 @@ import {
   mergeToRequest,
   RateForm,
   useRateData,
-} from 'routes/settings/components/rateForm';
-import { initialRateFormData } from 'routes/settings/components/rateForm/utils';
+} from 'routes/settings/costModels/components/rateForm';
+import { initialRateFormData } from 'routes/settings/costModels/components/rateForm/utils';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { metricsSelectors } from 'store/metrics';
diff --git a/src/routes/settings/costModel/addSourceStep.tsx b/src/routes/settings/costModels/costModel/addSourceStep.tsx
similarity index 97%
rename from src/routes/settings/costModel/addSourceStep.tsx
rename to src/routes/settings/costModels/costModel/addSourceStep.tsx
index 308a4fd5d..ed02f14ad 100644
--- a/src/routes/settings/costModel/addSourceStep.tsx
+++ b/src/routes/settings/costModels/costModel/addSourceStep.tsx
@@ -9,9 +9,9 @@ import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { EmptyFilterState } from 'routes/components/state/emptyFilterState';
 import { LoadingState } from 'routes/components/state/loadingState';
-import { SourcesModalErrorState } from 'routes/settings/components/errorState';
-import { addMultiValueQuery, removeMultiValueQuery } from 'routes/settings/components/filterLogic';
-import { WarningIcon } from 'routes/settings/components/warningIcon';
+import { SourcesModalErrorState } from 'routes/settings/costModels/components/errorState';
+import { addMultiValueQuery, removeMultiValueQuery } from 'routes/settings/costModels/components/filterLogic';
+import { WarningIcon } from 'routes/settings/costModels/components/warningIcon';
 import { createMapStateToProps } from 'store/common';
 import { sourcesActions, sourcesSelectors } from 'store/sourceSettings';
 
diff --git a/src/routes/settings/costModel/addSourceWizard.tsx b/src/routes/settings/costModels/costModel/addSourceWizard.tsx
similarity index 98%
rename from src/routes/settings/costModel/addSourceWizard.tsx
rename to src/routes/settings/costModels/costModel/addSourceWizard.tsx
index 5cd318543..d6627befc 100644
--- a/src/routes/settings/costModel/addSourceWizard.tsx
+++ b/src/routes/settings/costModels/costModel/addSourceWizard.tsx
@@ -17,7 +17,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { parseApiError } from 'routes/settings/costModelWizard/parseError';
+import { parseApiError } from 'routes/settings/costModels/costModelWizard/parseError';
 import { FetchStatus } from 'store/common';
 import { createMapStateToProps } from 'store/common';
 import { costModelsSelectors } from 'store/costModels';
@@ -145,7 +145,7 @@ class AddSourceWizardBase extends React.Component<AddSourceWizardProps, AddSourc
               </GridItem>
               <GridItem span={2}>
                 <TextContent>
-                  <Text component={TextVariants.p}>{intl.formatMessage(messages.costModelsSourceType)}</Text>
+                  <Text component={TextVariants.p}>{intl.formatMessage(messages.sourceType)}</Text>
                 </TextContent>
               </GridItem>
               <GridItem span={10}>
diff --git a/src/routes/settings/costModel/assignSourcesModalToolbar.tsx b/src/routes/settings/costModels/costModel/assignSourcesModalToolbar.tsx
similarity index 100%
rename from src/routes/settings/costModel/assignSourcesModalToolbar.tsx
rename to src/routes/settings/costModels/costModel/assignSourcesModalToolbar.tsx
diff --git a/src/routes/settings/costModel/costCalc.styles.ts b/src/routes/settings/costModels/costModel/costCalc.styles.ts
similarity index 100%
rename from src/routes/settings/costModel/costCalc.styles.ts
rename to src/routes/settings/costModels/costModel/costCalc.styles.ts
diff --git a/src/routes/settings/costModel/costModelInfo.styles.ts b/src/routes/settings/costModels/costModel/costModelInfo.styles.ts
similarity index 100%
rename from src/routes/settings/costModel/costModelInfo.styles.ts
rename to src/routes/settings/costModels/costModel/costModelInfo.styles.ts
diff --git a/src/routes/settings/costModel/costModelInfo.tsx b/src/routes/settings/costModels/costModel/costModelInfo.tsx
similarity index 94%
rename from src/routes/settings/costModel/costModelInfo.tsx
rename to src/routes/settings/costModels/costModel/costModelInfo.tsx
index 85846b4e8..18041c1a6 100644
--- a/src/routes/settings/costModel/costModelInfo.tsx
+++ b/src/routes/settings/costModels/costModel/costModelInfo.tsx
@@ -18,11 +18,11 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import DistributionCard from 'routes/settings/costModel/distribution';
-import MarkupCard from 'routes/settings/costModel/markup';
-import PriceListTable from 'routes/settings/costModel/priceListTable';
-import SourceTable from 'routes/settings/costModel/sourceTable';
-import { parseApiError } from 'routes/settings/costModelWizard/parseError';
+import DistributionCard from 'routes/settings/costModels/costModel/distribution';
+import MarkupCard from 'routes/settings/costModels/costModel/markup';
+import PriceListTable from 'routes/settings/costModels/costModel/priceListTable';
+import SourceTable from 'routes/settings/costModels/costModel/sourceTable';
+import { parseApiError } from 'routes/settings/costModels/costModelWizard/parseError';
 import { Loading } from 'routes/state/loading';
 import { NotAvailable } from 'routes/state/notAvailable';
 import { createMapStateToProps, FetchStatus } from 'store/common';
diff --git a/src/routes/settings/costModel/costModelsDetails.styles.ts b/src/routes/settings/costModels/costModel/costModelsDetails.styles.ts
similarity index 100%
rename from src/routes/settings/costModel/costModelsDetails.styles.ts
rename to src/routes/settings/costModels/costModel/costModelsDetails.styles.ts
diff --git a/src/routes/settings/costModel/dialog.test.tsx b/src/routes/settings/costModels/costModel/dialog.test.tsx
similarity index 100%
rename from src/routes/settings/costModel/dialog.test.tsx
rename to src/routes/settings/costModels/costModel/dialog.test.tsx
diff --git a/src/routes/settings/costModel/dialog.tsx b/src/routes/settings/costModels/costModel/dialog.tsx
similarity index 100%
rename from src/routes/settings/costModel/dialog.tsx
rename to src/routes/settings/costModels/costModel/dialog.tsx
diff --git a/src/routes/settings/costModel/distribution.tsx b/src/routes/settings/costModels/costModel/distribution.tsx
similarity index 97%
rename from src/routes/settings/costModel/distribution.tsx
rename to src/routes/settings/costModels/costModel/distribution.tsx
index dd953a827..fea59ad8e 100644
--- a/src/routes/settings/costModel/distribution.tsx
+++ b/src/routes/settings/costModels/costModel/distribution.tsx
@@ -16,7 +16,7 @@ import messages from 'locales/messages';
 import React from 'react';
 import { useIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { ReadOnlyTooltip } from 'routes/settings/components/readOnlyTooltip';
+import { ReadOnlyTooltip } from 'routes/settings/costModels/components/readOnlyTooltip';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { rbacSelectors } from 'store/rbac';
diff --git a/src/routes/settings/costModel/header.tsx b/src/routes/settings/costModels/costModel/header.tsx
similarity index 95%
rename from src/routes/settings/costModel/header.tsx
rename to src/routes/settings/costModels/costModel/header.tsx
index aaff2d6e5..46bce0555 100644
--- a/src/routes/settings/costModel/header.tsx
+++ b/src/routes/settings/costModels/costModel/header.tsx
@@ -27,10 +27,10 @@ import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { routes } from 'routes';
-import { ReadOnlyTooltip } from 'routes/settings/components/readOnlyTooltip';
-import { styles } from 'routes/settings/costModel/costModelsDetails.styles';
-import Dialog from 'routes/settings/costModel/dialog';
-import UpdateCostModelModal from 'routes/settings/costModel/updateCostModel';
+import { ReadOnlyTooltip } from 'routes/settings/costModels/components/readOnlyTooltip';
+import { styles } from 'routes/settings/costModels/costModel/costModelsDetails.styles';
+import Dialog from 'routes/settings/costModels/costModel/dialog';
+import UpdateCostModelModal from 'routes/settings/costModels/costModel/updateCostModel';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { rbacSelectors } from 'store/rbac';
diff --git a/src/routes/settings/costModel/index.ts b/src/routes/settings/costModels/costModel/index.ts
similarity index 100%
rename from src/routes/settings/costModel/index.ts
rename to src/routes/settings/costModels/costModel/index.ts
diff --git a/src/routes/settings/costModel/markup.tsx b/src/routes/settings/costModels/costModel/markup.tsx
similarity index 97%
rename from src/routes/settings/costModel/markup.tsx
rename to src/routes/settings/costModels/costModel/markup.tsx
index faf80721c..42f23f004 100644
--- a/src/routes/settings/costModel/markup.tsx
+++ b/src/routes/settings/costModels/costModel/markup.tsx
@@ -17,7 +17,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { ReadOnlyTooltip } from 'routes/settings/components/readOnlyTooltip';
+import { ReadOnlyTooltip } from 'routes/settings/costModels/components/readOnlyTooltip';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { rbacSelectors } from 'store/rbac';
diff --git a/src/routes/settings/costModel/priceListTable.tsx b/src/routes/settings/costModels/costModel/priceListTable.tsx
similarity index 96%
rename from src/routes/settings/costModel/priceListTable.tsx
rename to src/routes/settings/costModels/costModel/priceListTable.tsx
index 56a62bc93..d0ad4b836 100644
--- a/src/routes/settings/costModel/priceListTable.tsx
+++ b/src/routes/settings/costModels/costModel/priceListTable.tsx
@@ -28,12 +28,12 @@ import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { EmptyFilterState } from 'routes/components/state/emptyFilterState';
 import { LoadingState } from 'routes/components/state/loadingState';
-import { WithPriceListSearch } from 'routes/settings/components/hoc/withPriceListSearch';
-import { PriceListToolbar } from 'routes/settings/components/priceListToolbar';
-import { compareBy } from 'routes/settings/components/rateForm/utils';
-import { RateTable } from 'routes/settings/components/rateTable';
-import { CheckboxSelector } from 'routes/settings/components/toolbar/checkboxSelector';
-import { PrimarySelector } from 'routes/settings/components/toolbar/primarySelector';
+import { WithPriceListSearch } from 'routes/settings/costModels/components/hoc/withPriceListSearch';
+import { PriceListToolbar } from 'routes/settings/costModels/components/priceListToolbar';
+import { compareBy } from 'routes/settings/costModels/components/rateForm/utils';
+import { RateTable } from 'routes/settings/costModels/components/rateTable';
+import { CheckboxSelector } from 'routes/settings/costModels/components/toolbar/checkboxSelector';
+import { PrimarySelector } from 'routes/settings/costModels/components/toolbar/primarySelector';
 import { FetchStatus } from 'store/common';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
diff --git a/src/routes/settings/costModel/sourceTable.tsx b/src/routes/settings/costModels/costModel/sourceTable.tsx
similarity index 100%
rename from src/routes/settings/costModel/sourceTable.tsx
rename to src/routes/settings/costModels/costModel/sourceTable.tsx
diff --git a/src/routes/settings/costModel/sourcesTable.tsx b/src/routes/settings/costModels/costModel/sourcesTable.tsx
similarity index 100%
rename from src/routes/settings/costModel/sourcesTable.tsx
rename to src/routes/settings/costModels/costModel/sourcesTable.tsx
diff --git a/src/routes/settings/costModel/sourcesToolbar.tsx b/src/routes/settings/costModels/costModel/sourcesToolbar.tsx
similarity index 97%
rename from src/routes/settings/costModel/sourcesToolbar.tsx
rename to src/routes/settings/costModels/costModel/sourcesToolbar.tsx
index b695fd116..6427e2052 100644
--- a/src/routes/settings/costModel/sourcesToolbar.tsx
+++ b/src/routes/settings/costModels/costModel/sourcesToolbar.tsx
@@ -14,7 +14,7 @@ import {
 import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
 import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon';
 import React from 'react';
-import { ReadOnlyTooltip } from 'routes/settings/components/readOnlyTooltip';
+import { ReadOnlyTooltip } from 'routes/settings/costModels/components/readOnlyTooltip';
 
 interface FilterInputProps {
   id: string;
diff --git a/src/routes/settings/costModel/table.styles.ts b/src/routes/settings/costModels/costModel/table.styles.ts
similarity index 100%
rename from src/routes/settings/costModel/table.styles.ts
rename to src/routes/settings/costModels/costModel/table.styles.ts
diff --git a/src/routes/settings/costModel/table.tsx b/src/routes/settings/costModels/costModel/table.tsx
similarity index 96%
rename from src/routes/settings/costModel/table.tsx
rename to src/routes/settings/costModels/costModel/table.tsx
index 078dcb7b1..38a6a429d 100644
--- a/src/routes/settings/costModel/table.tsx
+++ b/src/routes/settings/costModels/costModel/table.tsx
@@ -7,8 +7,8 @@ import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { EmptyFilterState } from 'routes/components/state/emptyFilterState';
-import { addMultiValueQuery, removeMultiValueQuery } from 'routes/settings/components/filterLogic';
-import SourcesTable from 'routes/settings/costModel/sourcesTable';
+import { addMultiValueQuery, removeMultiValueQuery } from 'routes/settings/costModels/components/filterLogic';
+import SourcesTable from 'routes/settings/costModels/costModel/sourcesTable';
 import { createMapStateToProps } from 'store/common';
 import { rbacSelectors } from 'store/rbac';
 
@@ -67,7 +67,7 @@ class TableBase extends React.Component<TableBaseProps, TableBaseState> {
     return (
       <>
         <Title headingLevel="h2" size={TitleSizes.md} style={styles.sourceTypeTitle}>
-          {intl.formatMessage(messages.costModelsSourceType)}: {current.source_type}
+          {intl.formatMessage(messages.sourceType)}: {current.source_type}
         </Title>
         <SourcesToolbar
           actionButtonProps={{
diff --git a/src/routes/settings/costModel/updateCostModel.tsx b/src/routes/settings/costModels/costModel/updateCostModel.tsx
similarity index 100%
rename from src/routes/settings/costModel/updateCostModel.tsx
rename to src/routes/settings/costModels/costModel/updateCostModel.tsx
diff --git a/src/routes/settings/costModel/updateDistributionDialog.tsx b/src/routes/settings/costModels/costModel/updateDistributionDialog.tsx
similarity index 100%
rename from src/routes/settings/costModel/updateDistributionDialog.tsx
rename to src/routes/settings/costModels/costModel/updateDistributionDialog.tsx
diff --git a/src/routes/settings/costModel/updateMarkupDialog.tsx b/src/routes/settings/costModels/costModel/updateMarkupDialog.tsx
similarity index 100%
rename from src/routes/settings/costModel/updateMarkupDialog.tsx
rename to src/routes/settings/costModels/costModel/updateMarkupDialog.tsx
diff --git a/src/routes/settings/costModel/updateRateModel.test.tsx b/src/routes/settings/costModels/costModel/updateRateModel.test.tsx
similarity index 100%
rename from src/routes/settings/costModel/updateRateModel.test.tsx
rename to src/routes/settings/costModels/costModel/updateRateModel.test.tsx
diff --git a/src/routes/settings/costModel/updateRateModel.tsx b/src/routes/settings/costModels/costModel/updateRateModel.tsx
similarity index 97%
rename from src/routes/settings/costModel/updateRateModel.tsx
rename to src/routes/settings/costModels/costModel/updateRateModel.tsx
index 948f9bc41..f8ce9511e 100644
--- a/src/routes/settings/costModel/updateRateModel.tsx
+++ b/src/routes/settings/costModels/costModel/updateRateModel.tsx
@@ -7,7 +7,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { Form } from 'routes/settings/components/forms/form';
+import { Form } from 'routes/settings/costModels/components/forms/form';
 import {
   canSubmit as isReadyForSubmit,
   genFormDataFromRate,
@@ -15,7 +15,7 @@ import {
   mergeToRequest,
   RateForm,
   useRateData,
-} from 'routes/settings/components/rateForm';
+} from 'routes/settings/costModels/components/rateForm';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { metricsSelectors } from 'store/metrics';
diff --git a/src/routes/settings/costModelWizard/api.ts b/src/routes/settings/costModels/costModelWizard/api.ts
similarity index 100%
rename from src/routes/settings/costModelWizard/api.ts
rename to src/routes/settings/costModels/costModelWizard/api.ts
diff --git a/src/routes/settings/costModelWizard/assignSourcesToolbar.tsx b/src/routes/settings/costModels/costModelWizard/assignSourcesToolbar.tsx
similarity index 100%
rename from src/routes/settings/costModelWizard/assignSourcesToolbar.tsx
rename to src/routes/settings/costModels/costModelWizard/assignSourcesToolbar.tsx
diff --git a/src/routes/settings/costModelWizard/context.ts b/src/routes/settings/costModels/costModelWizard/context.ts
similarity index 100%
rename from src/routes/settings/costModelWizard/context.ts
rename to src/routes/settings/costModels/costModelWizard/context.ts
diff --git a/src/routes/settings/costModelWizard/costModelWizard.tsx b/src/routes/settings/costModels/costModelWizard/costModelWizard.tsx
similarity index 100%
rename from src/routes/settings/costModelWizard/costModelWizard.tsx
rename to src/routes/settings/costModels/costModelWizard/costModelWizard.tsx
diff --git a/src/routes/settings/costModelWizard/distribution.tsx b/src/routes/settings/costModels/costModelWizard/distribution.tsx
similarity index 98%
rename from src/routes/settings/costModelWizard/distribution.tsx
rename to src/routes/settings/costModels/costModelWizard/distribution.tsx
index 28db082a9..a10254909 100644
--- a/src/routes/settings/costModelWizard/distribution.tsx
+++ b/src/routes/settings/costModels/costModelWizard/distribution.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { Form } from 'routes/settings/components/forms/form';
+import { Form } from 'routes/settings/costModels/components/forms/form';
 import { createMapStateToProps } from 'store/common';
 
 import { CostModelContext } from './context';
diff --git a/src/routes/settings/costModelWizard/generalInformation.tsx b/src/routes/settings/costModels/costModelWizard/generalInformation.tsx
similarity index 96%
rename from src/routes/settings/costModelWizard/generalInformation.tsx
rename to src/routes/settings/costModels/costModelWizard/generalInformation.tsx
index a1613cb62..62e7c79de 100644
--- a/src/routes/settings/costModelWizard/generalInformation.tsx
+++ b/src/routes/settings/costModels/costModelWizard/generalInformation.tsx
@@ -14,8 +14,8 @@ import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { currencyOptions } from 'routes/components/currency';
-import { Form } from 'routes/settings/components/forms/form';
-import { Selector } from 'routes/settings/components/inputs/selector';
+import { Form } from 'routes/settings/costModels/components/forms/form';
+import { Selector } from 'routes/settings/costModels/components/inputs/selector';
 import { createMapStateToProps } from 'store/common';
 
 import { CostModelContext } from './context';
@@ -130,7 +130,7 @@ class GeneralInformation extends React.Component<GeneralInformationProps, any> {
                   direction={SelectDirection.up}
                   appendMenuTo="inline"
                   maxHeight={styles.selector.maxHeight}
-                  label={messages.costModelsSourceType}
+                  label={messages.sourceType}
                   toggleAriaLabel={intl.formatMessage(messages.costModelsWizardEmptySourceTypeLabel)}
                   placeholderText={intl.formatMessage(messages.costModelsWizardEmptySourceTypeLabel)}
                   value={getValueLabel(type, sourceTypeOptions)}
diff --git a/src/routes/settings/costModelWizard/index.ts b/src/routes/settings/costModels/costModelWizard/index.ts
similarity index 100%
rename from src/routes/settings/costModelWizard/index.ts
rename to src/routes/settings/costModels/costModelWizard/index.ts
diff --git a/src/routes/settings/costModelWizard/markup.tsx b/src/routes/settings/costModels/costModelWizard/markup.tsx
similarity index 98%
rename from src/routes/settings/costModelWizard/markup.tsx
rename to src/routes/settings/costModels/costModelWizard/markup.tsx
index 9781a3b30..bd6d2bf81 100644
--- a/src/routes/settings/costModelWizard/markup.tsx
+++ b/src/routes/settings/costModels/costModelWizard/markup.tsx
@@ -21,8 +21,8 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { Form } from 'routes/settings/components/forms/form';
-import { styles as costCalcStyles } from 'routes/settings/costModel/costCalc.styles';
+import { Form } from 'routes/settings/costModels/components/forms/form';
+import { styles as costCalcStyles } from 'routes/settings/costModels/costModel/costCalc.styles';
 import { createMapStateToProps } from 'store/common';
 import { countDecimals, isPercentageFormatValid } from 'utils/format';
 
diff --git a/src/routes/settings/costModelWizard/parseError.test.ts b/src/routes/settings/costModels/costModelWizard/parseError.test.ts
similarity index 100%
rename from src/routes/settings/costModelWizard/parseError.test.ts
rename to src/routes/settings/costModels/costModelWizard/parseError.test.ts
diff --git a/src/routes/settings/costModelWizard/parseError.ts b/src/routes/settings/costModels/costModelWizard/parseError.ts
similarity index 100%
rename from src/routes/settings/costModelWizard/parseError.ts
rename to src/routes/settings/costModels/costModelWizard/parseError.ts
diff --git a/src/routes/settings/costModelWizard/priceList.tsx b/src/routes/settings/costModels/costModelWizard/priceList.tsx
similarity index 83%
rename from src/routes/settings/costModelWizard/priceList.tsx
rename to src/routes/settings/costModels/costModelWizard/priceList.tsx
index 1f3483361..5fee8b803 100644
--- a/src/routes/settings/costModelWizard/priceList.tsx
+++ b/src/routes/settings/costModels/costModelWizard/priceList.tsx
@@ -1,8 +1,8 @@
 import type { Rate } from 'api/rates';
 import React from 'react';
-import AddPriceList from 'routes/settings/components/addPriceList';
-import type { RateFormData } from 'routes/settings/components/rateForm/index';
-import { transformFormDataToRequest } from 'routes/settings/components/rateForm/index';
+import AddPriceList from 'routes/settings/costModels/components/addPriceList';
+import type { RateFormData } from 'routes/settings/costModels/components/rateForm/index';
+import { transformFormDataToRequest } from 'routes/settings/costModels/components/rateForm/index';
 
 import { CostModelContext } from './context';
 import PriceListTable from './priceListTable';
diff --git a/src/routes/settings/costModelWizard/priceListTable.tsx b/src/routes/settings/costModels/costModelWizard/priceListTable.tsx
similarity index 94%
rename from src/routes/settings/costModelWizard/priceListTable.tsx
rename to src/routes/settings/costModels/costModelWizard/priceListTable.tsx
index 8cd79a8ef..5f2a5bcea 100644
--- a/src/routes/settings/costModelWizard/priceListTable.tsx
+++ b/src/routes/settings/costModels/costModelWizard/priceListTable.tsx
@@ -22,13 +22,13 @@ import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { EmptyFilterState } from 'routes/components/state/emptyFilterState';
-import { WithPriceListSearch } from 'routes/settings/components/hoc/withPriceListSearch';
-import { PaginationToolbarTemplate } from 'routes/settings/components/paginationToolbarTemplate';
-import { PriceListToolbar } from 'routes/settings/components/priceListToolbar';
-import { compareBy } from 'routes/settings/components/rateForm/utils';
-import { RateTable } from 'routes/settings/components/rateTable';
-import { CheckboxSelector } from 'routes/settings/components/toolbar/checkboxSelector';
-import { PrimarySelector } from 'routes/settings/components/toolbar/primarySelector';
+import { WithPriceListSearch } from 'routes/settings/costModels/components/hoc/withPriceListSearch';
+import { PaginationToolbarTemplate } from 'routes/settings/costModels/components/paginationToolbarTemplate';
+import { PriceListToolbar } from 'routes/settings/costModels/components/priceListToolbar';
+import { compareBy } from 'routes/settings/costModels/components/rateForm/utils';
+import { RateTable } from 'routes/settings/costModels/components/rateTable';
+import { CheckboxSelector } from 'routes/settings/costModels/components/toolbar/checkboxSelector';
+import { PrimarySelector } from 'routes/settings/costModels/components/toolbar/primarySelector';
 import { createMapStateToProps } from 'store/common';
 import { metricsSelectors } from 'store/metrics';
 import { unitsLookupKey } from 'utils/format';
diff --git a/src/routes/settings/costModelWizard/review.tsx b/src/routes/settings/costModels/costModelWizard/review.tsx
similarity index 97%
rename from src/routes/settings/costModelWizard/review.tsx
rename to src/routes/settings/costModels/costModelWizard/review.tsx
index 7f922cb49..2e80cf1b1 100644
--- a/src/routes/settings/costModelWizard/review.tsx
+++ b/src/routes/settings/costModels/costModelWizard/review.tsx
@@ -22,8 +22,8 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { RateTable } from 'routes/settings/components/rateTable';
-import { WarningIcon } from 'routes/settings/components/warningIcon';
+import { RateTable } from 'routes/settings/costModels/components/rateTable';
+import { WarningIcon } from 'routes/settings/costModels/components/warningIcon';
 import { createMapStateToProps } from 'store/common';
 
 import { CostModelContext } from './context';
diff --git a/src/routes/settings/costModelWizard/sources.tsx b/src/routes/settings/costModels/costModelWizard/sources.tsx
similarity index 92%
rename from src/routes/settings/costModelWizard/sources.tsx
rename to src/routes/settings/costModels/costModelWizard/sources.tsx
index 84fdc5956..f1bbcab20 100644
--- a/src/routes/settings/costModelWizard/sources.tsx
+++ b/src/routes/settings/costModels/costModelWizard/sources.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { LoadingState } from 'routes/components/state/loadingState';
-import { SourceStepErrorState } from 'routes/settings/components/errorState';
+import { SourceStepErrorState } from 'routes/settings/costModels/components/errorState';
 
 import { CostModelContext } from './context';
 import SourcesTable from './table';
diff --git a/src/routes/settings/costModelWizard/steps.tsx b/src/routes/settings/costModels/costModelWizard/steps.tsx
similarity index 100%
rename from src/routes/settings/costModelWizard/steps.tsx
rename to src/routes/settings/costModels/costModelWizard/steps.tsx
diff --git a/src/routes/settings/costModelWizard/table.tsx b/src/routes/settings/costModels/costModelWizard/table.tsx
similarity index 96%
rename from src/routes/settings/costModelWizard/table.tsx
rename to src/routes/settings/costModels/costModelWizard/table.tsx
index 24e3e07a6..d082b4597 100644
--- a/src/routes/settings/costModelWizard/table.tsx
+++ b/src/routes/settings/costModels/costModelWizard/table.tsx
@@ -5,9 +5,9 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { LoadingState } from 'routes/components/state/loadingState';
-import { addMultiValueQuery, removeMultiValueQuery } from 'routes/settings/components/filterLogic';
-import { PaginationToolbarTemplate } from 'routes/settings/components/paginationToolbarTemplate';
-import { WarningIcon } from 'routes/settings/components/warningIcon';
+import { addMultiValueQuery, removeMultiValueQuery } from 'routes/settings/costModels/components/filterLogic';
+import { PaginationToolbarTemplate } from 'routes/settings/costModels/components/paginationToolbarTemplate';
+import { WarningIcon } from 'routes/settings/costModels/components/warningIcon';
 
 import { AssignSourcesToolbar } from './assignSourcesToolbar';
 import { CostModelContext } from './context';
diff --git a/src/routes/settings/costModelWizard/wizard.styles.ts b/src/routes/settings/costModels/costModelWizard/wizard.styles.ts
similarity index 100%
rename from src/routes/settings/costModelWizard/wizard.styles.ts
rename to src/routes/settings/costModels/costModelWizard/wizard.styles.ts
diff --git a/src/routes/settings/costModelsDetails/__snapshots__/bottomPagination.test.tsx.snap b/src/routes/settings/costModels/costModelsDetails/__snapshots__/bottomPagination.test.tsx.snap
similarity index 100%
rename from src/routes/settings/costModelsDetails/__snapshots__/bottomPagination.test.tsx.snap
rename to src/routes/settings/costModels/costModelsDetails/__snapshots__/bottomPagination.test.tsx.snap
diff --git a/src/routes/settings/costModelsDetails/bottomPagination.test.tsx b/src/routes/settings/costModels/costModelsDetails/bottomPagination.test.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/bottomPagination.test.tsx
rename to src/routes/settings/costModels/costModelsDetails/bottomPagination.test.tsx
diff --git a/src/routes/settings/costModelsDetails/bottomPagination.tsx b/src/routes/settings/costModels/costModelsDetails/bottomPagination.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/bottomPagination.tsx
rename to src/routes/settings/costModels/costModelsDetails/bottomPagination.tsx
diff --git a/src/routes/settings/costModelsDetails/costModelsDetails.styles.ts b/src/routes/settings/costModels/costModelsDetails/costModelsDetails.styles.ts
similarity index 100%
rename from src/routes/settings/costModelsDetails/costModelsDetails.styles.ts
rename to src/routes/settings/costModels/costModelsDetails/costModelsDetails.styles.ts
diff --git a/src/routes/settings/costModelsDetails/costModelsDetails.tsx b/src/routes/settings/costModels/costModelsDetails/costModelsDetails.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/costModelsDetails.tsx
rename to src/routes/settings/costModels/costModelsDetails/costModelsDetails.tsx
diff --git a/src/routes/settings/costModelsDetails/createCostModelButton.tsx b/src/routes/settings/costModels/costModelsDetails/createCostModelButton.tsx
similarity index 93%
rename from src/routes/settings/costModelsDetails/createCostModelButton.tsx
rename to src/routes/settings/costModels/costModelsDetails/createCostModelButton.tsx
index 255ec3da3..69ccd5691 100644
--- a/src/routes/settings/costModelsDetails/createCostModelButton.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/createCostModelButton.tsx
@@ -6,8 +6,8 @@ import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
-import { ReadOnlyTooltip } from 'routes/settings/components/readOnlyTooltip';
-import { CostModelWizard } from 'routes/settings/costModelWizard';
+import { ReadOnlyTooltip } from 'routes/settings/costModels/components/readOnlyTooltip';
+import { CostModelWizard } from 'routes/settings/costModels/costModelWizard';
 import type { RootState } from 'store';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
 import { rbacSelectors } from 'store/rbac';
diff --git a/src/routes/settings/costModelsDetails/dialog.test.tsx b/src/routes/settings/costModels/costModelsDetails/dialog.test.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/dialog.test.tsx
rename to src/routes/settings/costModels/costModelsDetails/dialog.test.tsx
diff --git a/src/routes/settings/costModelsDetails/dialog.tsx b/src/routes/settings/costModels/costModelsDetails/dialog.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/dialog.tsx
rename to src/routes/settings/costModels/costModelsDetails/dialog.tsx
diff --git a/src/routes/settings/costModelsDetails/emptyStateBase.tsx b/src/routes/settings/costModels/costModelsDetails/emptyStateBase.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/emptyStateBase.tsx
rename to src/routes/settings/costModels/costModelsDetails/emptyStateBase.tsx
diff --git a/src/routes/settings/costModelsDetails/index.ts b/src/routes/settings/costModels/costModelsDetails/index.ts
similarity index 100%
rename from src/routes/settings/costModelsDetails/index.ts
rename to src/routes/settings/costModels/costModelsDetails/index.ts
diff --git a/src/routes/settings/costModelsDetails/noCostModels.tsx b/src/routes/settings/costModels/costModelsDetails/noCostModels.tsx
similarity index 95%
rename from src/routes/settings/costModelsDetails/noCostModels.tsx
rename to src/routes/settings/costModels/costModelsDetails/noCostModels.tsx
index 0475d2063..1d024c021 100644
--- a/src/routes/settings/costModelsDetails/noCostModels.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/noCostModels.tsx
@@ -3,7 +3,7 @@ import { intl as defaultIntl } from 'components/i18n';
 import messages from 'locales/messages';
 import React from 'react';
 import { injectIntl } from 'react-intl';
-import { CreateCostModelButton } from 'routes/settings/costModelsDetails/createCostModelButton';
+import { CreateCostModelButton } from 'routes/settings/costModels/costModelsDetails/createCostModelButton';
 
 import EmptyStateBase from './emptyStateBase';
 
diff --git a/src/routes/settings/costModelsDetails/table.test.tsx b/src/routes/settings/costModels/costModelsDetails/table.test.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/table.test.tsx
rename to src/routes/settings/costModels/costModelsDetails/table.test.tsx
diff --git a/src/routes/settings/costModelsDetails/table.tsx b/src/routes/settings/costModels/costModelsDetails/table.tsx
similarity index 98%
rename from src/routes/settings/costModelsDetails/table.tsx
rename to src/routes/settings/costModels/costModelsDetails/table.tsx
index bdf1d9fbf..31587e9c9 100644
--- a/src/routes/settings/costModelsDetails/table.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/table.tsx
@@ -69,7 +69,7 @@ class CostModelsTableBase extends React.Component<CostModelsTableProps, CostMode
       },
       { title: intl.formatMessage(messages.description) },
       {
-        title: intl.formatMessage(messages.costModelsSourceType),
+        title: intl.formatMessage(messages.sourceType),
         data: { orderName: 'source_type' },
         ...(rows.length && { transforms: [sortable] }),
       },
diff --git a/src/routes/settings/costModelsDetails/toolbar.test.tsx b/src/routes/settings/costModels/costModelsDetails/toolbar.test.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/toolbar.test.tsx
rename to src/routes/settings/costModels/costModelsDetails/toolbar.test.tsx
diff --git a/src/routes/settings/costModelsDetails/toolbar.tsx b/src/routes/settings/costModels/costModelsDetails/toolbar.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/toolbar.tsx
rename to src/routes/settings/costModels/costModelsDetails/toolbar.tsx
diff --git a/src/routes/settings/costModelsDetails/utils/dialog.tsx b/src/routes/settings/costModels/costModelsDetails/utils/dialog.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/utils/dialog.tsx
rename to src/routes/settings/costModels/costModelsDetails/utils/dialog.tsx
diff --git a/src/routes/settings/costModelsDetails/utils/filters.tsx b/src/routes/settings/costModels/costModelsDetails/utils/filters.tsx
similarity index 99%
rename from src/routes/settings/costModelsDetails/utils/filters.tsx
rename to src/routes/settings/costModels/costModelsDetails/utils/filters.tsx
index 440bbc91f..858931b76 100644
--- a/src/routes/settings/costModelsDetails/utils/filters.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/utils/filters.tsx
@@ -270,7 +270,7 @@ const sourceTypeFilterMergeProps = (
   const chips = query.source_type ? [query.source_type] : [];
   return {
     chips,
-    categoryName: intl.formatMessage(messages.costModelsSourceType),
+    categoryName: intl.formatMessage(messages.sourceType),
     deleteChip: onDeleteChipGroup(router, { ...initialCostModelsQuery, ...query }, 'source_type'),
     filterType,
     intl,
diff --git a/src/routes/settings/costModelsDetails/utils/query.tsx b/src/routes/settings/costModels/costModelsDetails/utils/query.tsx
similarity index 100%
rename from src/routes/settings/costModelsDetails/utils/query.tsx
rename to src/routes/settings/costModels/costModelsDetails/utils/query.tsx
diff --git a/src/routes/settings/costModelsDetails/utils/table.tsx b/src/routes/settings/costModels/costModelsDetails/utils/table.tsx
similarity index 97%
rename from src/routes/settings/costModelsDetails/utils/table.tsx
rename to src/routes/settings/costModels/costModelsDetails/utils/table.tsx
index db6f9be23..882548c42 100644
--- a/src/routes/settings/costModelsDetails/utils/table.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/utils/table.tsx
@@ -9,7 +9,7 @@ import { Link } from 'react-router-dom';
 import { routes } from 'routes';
 import { EmptyFilterState } from 'routes/components/state/emptyFilterState';
 import { LoadingState } from 'routes/components/state/loadingState';
-import NoCostModels from 'routes/settings/costModelsDetails/noCostModels';
+import NoCostModels from 'routes/settings/costModels/costModelsDetails/noCostModels';
 import { formatPath } from 'utils/paths';
 import type { RouteComponentProps } from 'utils/router';
 
diff --git a/src/routes/settings/costModelsDetails/utils/toolbar.tsx b/src/routes/settings/costModels/costModelsDetails/utils/toolbar.tsx
similarity index 98%
rename from src/routes/settings/costModelsDetails/utils/toolbar.tsx
rename to src/routes/settings/costModels/costModelsDetails/utils/toolbar.tsx
index ff6750ca5..2770d6680 100644
--- a/src/routes/settings/costModelsDetails/utils/toolbar.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/utils/toolbar.tsx
@@ -69,7 +69,7 @@ const CostModelsFilterSelectorBase: React.FC<CostModelsFilterSelectorProps> = ({
       {intl.formatMessage(messages.description)}
     </SelectOption>,
     <SelectOption key="sourceType" value="sourceType">
-      {intl.formatMessage(messages.costModelsSourceType)}
+      {intl.formatMessage(messages.sourceType)}
     </SelectOption>,
   ];
   return (
diff --git a/src/routes/settings/costModelsDetails/utils/types.ts b/src/routes/settings/costModels/costModelsDetails/utils/types.ts
similarity index 100%
rename from src/routes/settings/costModelsDetails/utils/types.ts
rename to src/routes/settings/costModels/costModelsDetails/utils/types.ts
diff --git a/src/routes/settings/costModels/index.ts b/src/routes/settings/costModels/index.ts
new file mode 100644
index 000000000..0d636809c
--- /dev/null
+++ b/src/routes/settings/costModels/index.ts
@@ -0,0 +1 @@
+export * from './costModelsDetails';
diff --git a/src/store/costModels/selectors.ts b/src/store/costModels/selectors.ts
index e6e7f1cf9..75444cc10 100644
--- a/src/store/costModels/selectors.ts
+++ b/src/store/costModels/selectors.ts
@@ -1,4 +1,4 @@
-import { parseApiError } from 'routes/settings/costModelWizard/parseError';
+import { parseApiError } from 'routes/settings/costModels/costModelWizard/parseError';
 import { FetchStatus } from 'store/common';
 import { selectPagination } from 'store/djangoUtils/pagination';
 import { selectQuery } from 'store/djangoUtils/query';
diff --git a/src/store/metrics/selectors.ts b/src/store/metrics/selectors.ts
index e1d185c5e..b4ac526f7 100644
--- a/src/store/metrics/selectors.ts
+++ b/src/store/metrics/selectors.ts
@@ -1,6 +1,6 @@
 import type { MetricHash } from 'api/metrics';
 import type { AxiosError } from 'axios';
-import { parseApiError } from 'routes/settings/costModelWizard/parseError';
+import { parseApiError } from 'routes/settings/costModels/costModelWizard/parseError';
 import type { FetchStatus } from 'store/common';
 import type { RootState } from 'store/rootReducer';