ref(checkout): Cleanup file structure (#103378)

isabellaenriquez · web-flow · commit 4e71bc1e2ad5 · 2025-11-17T10:36:24.000-05:00
Follow up PRs will deal with cleaning up unused code now that the new
checkout flow is GA'd for everyone.
diff --git a/static/gsApp/components/upsellModal/featureList.tsx b/static/gsApp/components/upsellModal/featureList.tsx
@@ -10,7 +10,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import testableTransition from 'sentry/utils/testableTransition';
 
-import MoreFeaturesLink from 'getsentry/views/amCheckout/moreFeaturesLink';
+import MoreFeaturesLink from 'getsentry/views/amCheckout/components/moreFeaturesLink';
 
 import type {Feature} from './types';
 
diff --git a/static/gsApp/views/amCheckout/components/billingCycleSelectCard.tsx b/static/gsApp/views/amCheckout/components/billingCycleSelectCard.tsx
@@ -10,7 +10,7 @@ import {t, tct} from 'sentry/locale';
 import {ANNUAL} from 'getsentry/constants';
 import type {Plan, Subscription} from 'getsentry/types';
 import {displayBudgetName, isDeveloperPlan} from 'getsentry/utils/billing';
-import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption';
+import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 type BillingCycleSelectCardProps = {
diff --git a/static/gsApp/views/amCheckout/components/cart.spec.tsx b/static/gsApp/views/amCheckout/components/cart.spec.tsx
@@ -25,7 +25,7 @@ import {
   PlanTier,
 } from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout/';
-import Cart from 'getsentry/views/amCheckout/cart';
+import Cart from 'getsentry/views/amCheckout/components/cart';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 // Jun 06 2022 - with milliseconds
diff --git a/static/gsApp/views/amCheckout/components/cart.tsx b/static/gsApp/views/amCheckout/components/cart.tsx
@@ -43,7 +43,7 @@ import {
 } from 'getsentry/utils/billing';
 import {getPlanCategoryName, getSingularCategoryName} from 'getsentry/utils/dataCategory';
 import type {State as CheckoutState} from 'getsentry/views/amCheckout/';
-import CartDiff from 'getsentry/views/amCheckout/cartDiff';
+import CartDiff from 'getsentry/views/amCheckout/components/cartDiff';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 import * as utils from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/components/cartDiff.spec.tsx b/static/gsApp/views/amCheckout/components/cartDiff.spec.tsx
@@ -10,7 +10,7 @@ import {
   type Plan,
   type Subscription,
 } from 'getsentry/types';
-import CartDiff from 'getsentry/views/amCheckout/cartDiff';
+import CartDiff from 'getsentry/views/amCheckout/components/cartDiff';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 describe('CartDiff', () => {
diff --git a/static/gsApp/views/amCheckout/components/cartDiff.tsx b/static/gsApp/views/amCheckout/components/cartDiff.tsx
diff --git a/static/gsApp/views/amCheckout/components/checkoutOption.tsx b/static/gsApp/views/amCheckout/components/checkoutOption.tsx
diff --git a/static/gsApp/views/amCheckout/components/checkoutOverview.spec.tsx b/static/gsApp/views/amCheckout/components/checkoutOverview.spec.tsx
@@ -9,7 +9,7 @@ import {render, screen, waitForElementToBeRemoved} from 'sentry-test/reactTestin
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {AddOnCategory, OnDemandBudgetMode, PlanTier} from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout/';
-import CheckoutOverview from 'getsentry/views/amCheckout/checkoutOverview';
+import CheckoutOverview from 'getsentry/views/amCheckout/components/checkoutOverview';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 describe('CheckoutOverview', () => {
diff --git a/static/gsApp/views/amCheckout/components/checkoutOverview.tsx b/static/gsApp/views/amCheckout/components/checkoutOverview.tsx
diff --git a/static/gsApp/views/amCheckout/components/checkoutOverviewV2.spec.tsx b/static/gsApp/views/amCheckout/components/checkoutOverviewV2.spec.tsx
@@ -7,7 +7,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {AddOnCategory, PlanTier} from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout/';
-import CheckoutOverviewV2 from 'getsentry/views/amCheckout/checkoutOverviewV2';
+import CheckoutOverviewV2 from 'getsentry/views/amCheckout/components/checkoutOverviewV2';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 describe('CheckoutOverviewV2', () => {
diff --git a/static/gsApp/views/amCheckout/components/checkoutOverviewV2.tsx b/static/gsApp/views/amCheckout/components/checkoutOverviewV2.tsx
diff --git a/static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx b/static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx
@@ -7,7 +7,7 @@ import {resetMockDate, setMockDate} from 'sentry-test/utils';
 
 import {PreviewDataFixture} from 'getsentry/__fixtures__/previewData';
 import {InvoiceItemType} from 'getsentry/types';
-import CheckoutSuccess from 'getsentry/views/amCheckout/checkoutSuccess';
+import CheckoutSuccess from 'getsentry/views/amCheckout/components/checkoutSuccess';
 
 describe('CheckoutSuccess', () => {
   const bizPlan = PlanDetailsLookupFixture('am3_business')!;
diff --git a/static/gsApp/views/amCheckout/components/checkoutSuccess.tsx b/static/gsApp/views/amCheckout/components/checkoutSuccess.tsx
diff --git a/static/gsApp/views/amCheckout/components/legacyPlanToggle.spec.tsx b/static/gsApp/views/amCheckout/components/legacyPlanToggle.spec.tsx
@@ -6,7 +6,7 @@ import {render, screen, waitForElementToBeRemoved} from 'sentry-test/reactTestin
 
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {CohortId} from 'getsentry/types';
-import LegacyPlanToggle from 'getsentry/views/amCheckout/legacyPlanToggle';
+import LegacyPlanToggle from 'getsentry/views/amCheckout/components/legacyPlanToggle';
 
 describe('LegacyPlanToggle', () => {
   const organization = OrganizationFixture();
diff --git a/static/gsApp/views/amCheckout/components/legacyPlanToggle.tsx b/static/gsApp/views/amCheckout/components/legacyPlanToggle.tsx
diff --git a/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx b/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx
diff --git a/static/gsApp/views/amCheckout/components/planFeatures.spec.tsx b/static/gsApp/views/amCheckout/components/planFeatures.spec.tsx
@@ -1,7 +1,7 @@
 import {PlanDetailsLookupFixture} from 'getsentry-test/fixtures/planDetailsLookup';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
-import PlanFeatures from 'getsentry/views/amCheckout/planFeatures';
+import PlanFeatures from 'getsentry/views/amCheckout/components/planFeatures';
 
 describe('PlanFeatures', () => {
   const freePlan = PlanDetailsLookupFixture('am3_f')!;
diff --git a/static/gsApp/views/amCheckout/components/planFeatures.tsx b/static/gsApp/views/amCheckout/components/planFeatures.tsx
diff --git a/static/gsApp/views/amCheckout/components/planSelectCard.tsx b/static/gsApp/views/amCheckout/components/planSelectCard.tsx
@@ -6,8 +6,8 @@ import {Heading, Text} from 'sentry/components/core/text';
 import {PAYG_BUSINESS_DEFAULT, PAYG_TEAM_DEFAULT} from 'getsentry/constants';
 import {OnDemandBudgetMode} from 'getsentry/types';
 import {isBizPlanFamily} from 'getsentry/utils/billing';
-import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption';
-import type {PlanSelectRowProps} from 'getsentry/views/amCheckout/steps/planSelectRow';
+import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption';
+import type {PlanSelectRowProps} from 'getsentry/views/amCheckout/components/planSelectRow';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 import {getShortInterval} from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/components/planSelectRow.tsx b/static/gsApp/views/amCheckout/components/planSelectRow.tsx
@@ -13,7 +13,7 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock';
 import {PAYG_BUSINESS_DEFAULT, PAYG_TEAM_DEFAULT} from 'getsentry/constants';
 import {OnDemandBudgetMode, type Plan, type Promotion} from 'getsentry/types';
 import {isBizPlanFamily} from 'getsentry/utils/billing';
-import MoreFeaturesLink from 'getsentry/views/amCheckout/moreFeaturesLink';
+import MoreFeaturesLink from 'getsentry/views/amCheckout/components/moreFeaturesLink';
 import type {CheckoutFormData, PlanContent} from 'getsentry/views/amCheckout/types';
 import {
   displayUnitPrice,
diff --git a/static/gsApp/views/amCheckout/components/stepHeader.spec.tsx b/static/gsApp/views/amCheckout/components/stepHeader.spec.tsx
@@ -1,6 +1,6 @@
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 
 describe('StepHeader', () => {
   let onEdit: any;
diff --git a/static/gsApp/views/amCheckout/components/stepHeader.tsx b/static/gsApp/views/amCheckout/components/stepHeader.tsx
@@ -10,7 +10,7 @@ import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 
 import type {PlanTier} from 'getsentry/types';
-import LegacyPlanToggle from 'getsentry/views/amCheckout/legacyPlanToggle';
+import LegacyPlanToggle from 'getsentry/views/amCheckout/components/legacyPlanToggle';
 import {getToggleTier} from 'getsentry/views/amCheckout/utils';
 
 // TODO(checkout v3): Remove isActive/isCompleted/onEdit/canSkip
diff --git a/static/gsApp/views/amCheckout/components/unitTypeItem.tsx b/static/gsApp/views/amCheckout/components/unitTypeItem.tsx
diff --git a/static/gsApp/views/amCheckout/components/volumeSliders.tsx b/static/gsApp/views/amCheckout/components/volumeSliders.tsx
@@ -22,7 +22,7 @@ import {
   isByteCategory,
 } from 'getsentry/utils/dataCategory';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
-import UnitTypeItem from 'getsentry/views/amCheckout/steps/unitTypeItem';
+import UnitTypeItem from 'getsentry/views/amCheckout/components/unitTypeItem';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import * as utils from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/index.tsx b/static/gsApp/views/amCheckout/index.tsx
@@ -69,16 +69,16 @@ import {getCompletedOrActivePromotion} from 'getsentry/utils/promotions';
 import {showSubscriptionDiscount} from 'getsentry/utils/promotionUtils';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
 import withPromotions from 'getsentry/utils/withPromotions';
-import Cart from 'getsentry/views/amCheckout/cart';
-import CheckoutOverview from 'getsentry/views/amCheckout/checkoutOverview';
-import CheckoutOverviewV2 from 'getsentry/views/amCheckout/checkoutOverviewV2';
-import CheckoutSuccess from 'getsentry/views/amCheckout/checkoutSuccess';
+import Cart from 'getsentry/views/amCheckout/components/cart';
+import CheckoutOverview from 'getsentry/views/amCheckout/components/checkoutOverview';
+import CheckoutOverviewV2 from 'getsentry/views/amCheckout/components/checkoutOverviewV2';
+import CheckoutSuccess from 'getsentry/views/amCheckout/components/checkoutSuccess';
 import AddBillingDetails from 'getsentry/views/amCheckout/steps/addBillingDetails';
+import AddBillingInformation from 'getsentry/views/amCheckout/steps/addBillingInfo';
 import AddDataVolume from 'getsentry/views/amCheckout/steps/addDataVolume';
 import AddPaymentMethod from 'getsentry/views/amCheckout/steps/addPaymentMethod';
-import AddBillingInformation from 'getsentry/views/amCheckout/steps/checkoutV3/addBillingInfo';
-import BuildYourPlan from 'getsentry/views/amCheckout/steps/checkoutV3/buildYourPlan';
-import ChooseYourBillingCycle from 'getsentry/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle';
+import BuildYourPlan from 'getsentry/views/amCheckout/steps/buildYourPlan';
+import ChooseYourBillingCycle from 'getsentry/views/amCheckout/steps/chooseYourBillingCycle';
 import ContractSelect from 'getsentry/views/amCheckout/steps/contractSelect';
 import OnDemandBudgetsStep from 'getsentry/views/amCheckout/steps/onDemandBudgets';
 import OnDemandSpend from 'getsentry/views/amCheckout/steps/onDemandSpend';
diff --git a/static/gsApp/views/amCheckout/steps/addBillingDetails.tsx b/static/gsApp/views/amCheckout/steps/addBillingDetails.tsx
@@ -21,7 +21,7 @@ import type {BillingDetails} from 'getsentry/types';
 import {AddressType} from 'getsentry/types';
 import {getCountryByCode} from 'getsentry/utils/ISO3166codes';
 import {getRegionChoiceName, getTaxFieldInfo} from 'getsentry/utils/salesTax';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 type State = {
diff --git a/static/gsApp/views/amCheckout/steps/addBillingInfo.spec.tsx b/static/gsApp/views/amCheckout/steps/addBillingInfo.spec.tsx
diff --git a/static/gsApp/views/amCheckout/steps/addBillingInfo.tsx b/static/gsApp/views/amCheckout/steps/addBillingInfo.tsx
@@ -10,7 +10,7 @@ import BillingDetailsPanel from 'getsentry/components/billingDetails/panel';
 import CreditCardPanel from 'getsentry/components/creditCardEdit/panel';
 import {useBillingDetails} from 'getsentry/hooks/useBillingDetails';
 import {FTCConsentLocation} from 'getsentry/types';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {CheckoutV3StepProps} from 'getsentry/views/amCheckout/types';
 import {hasBillingInfo} from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/steps/addDataVolume.tsx b/static/gsApp/views/amCheckout/steps/addDataVolume.tsx
@@ -13,8 +13,8 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock';
 import {PlanTier} from 'getsentry/types';
 import {displayBudgetName, isAmPlan} from 'getsentry/utils/billing';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
-import VolumeSliders from 'getsentry/views/amCheckout/steps/volumeSliders';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
+import VolumeSliders from 'getsentry/views/amCheckout/components/volumeSliders';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 function AddDataVolume({
diff --git a/static/gsApp/views/amCheckout/steps/addPaymentMethod.tsx b/static/gsApp/views/amCheckout/steps/addPaymentMethod.tsx
@@ -16,7 +16,7 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock';
 import CreditCardSetup from 'getsentry/components/creditCardEdit/setup';
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {FTCConsentLocation} from 'getsentry/types';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 type Props = StepProps;
diff --git a/static/gsApp/views/amCheckout/steps/buildYourPlan.spec.tsx b/static/gsApp/views/amCheckout/steps/buildYourPlan.spec.tsx
diff --git a/static/gsApp/views/amCheckout/steps/buildYourPlan.tsx b/static/gsApp/views/amCheckout/steps/buildYourPlan.tsx
@@ -18,10 +18,10 @@ import {
   isNewPayingCustomer,
   isTrialPlan,
 } from 'getsentry/utils/billing';
-import PlanFeatures from 'getsentry/views/amCheckout/planFeatures';
-import PlanSelectCard from 'getsentry/views/amCheckout/steps/planSelectCard';
+import PlanFeatures from 'getsentry/views/amCheckout/components/planFeatures';
+import PlanSelectCard from 'getsentry/views/amCheckout/components/planSelectCard';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import ProductSelect from 'getsentry/views/amCheckout/steps/productSelect';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
 import type {
   CheckoutFormData,
   CheckoutV3StepProps,
diff --git a/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.spec.tsx b/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.spec.tsx
diff --git a/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.tsx b/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.tsx
@@ -4,8 +4,8 @@ import {Flex, Grid} from 'sentry/components/core/layout';
 import {t} from 'sentry/locale';
 
 import {ANNUAL} from 'getsentry/constants';
-import BillingCycleSelectCard from 'getsentry/views/amCheckout/billingCycleSelectCard';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import BillingCycleSelectCard from 'getsentry/views/amCheckout/components/billingCycleSelectCard';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {CheckoutV3StepProps} from 'getsentry/views/amCheckout/types';
 import * as utils from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/steps/contractSelect.tsx b/static/gsApp/views/amCheckout/steps/contractSelect.tsx
@@ -11,8 +11,8 @@ import {space} from 'sentry/styles/space';
 
 import {ANNUAL, MONTHLY} from 'getsentry/constants';
 import {InvoiceItemType, type Plan} from 'getsentry/types';
-import PlanSelectRow from 'getsentry/views/amCheckout/steps/planSelectRow';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import PlanSelectRow from 'getsentry/views/amCheckout/components/planSelectRow';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {formatPrice, getReservedPriceCents} from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx b/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx
@@ -11,7 +11,7 @@ import {space} from 'sentry/styles/space';
 import type {OnDemandBudgets} from 'getsentry/types';
 import {OnDemandBudgetMode} from 'getsentry/types';
 import {displayBudgetName, isDeveloperPlan} from 'getsentry/utils/billing';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {getReservedPriceCents} from 'getsentry/views/amCheckout/utils';
 import OnDemandBudgetEdit from 'getsentry/views/onDemandBudgets/onDemandBudgetEdit';
diff --git a/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx b/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx
@@ -13,7 +13,7 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock';
 
 import {displayBudgetName} from 'getsentry/utils/billing';
 import {listDisplayNames} from 'getsentry/utils/dataCategory';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 type Props = StepProps;
diff --git a/static/gsApp/views/amCheckout/steps/planSelect.tsx b/static/gsApp/views/amCheckout/steps/planSelect.tsx
@@ -27,9 +27,9 @@ import {
 } from 'getsentry/utils/promotionUtils';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
 import usePromotionTriggerCheck from 'getsentry/utils/usePromotionTriggerCheck';
-import PlanSelectRow from 'getsentry/views/amCheckout/steps/planSelectRow';
+import PlanSelectRow from 'getsentry/views/amCheckout/components/planSelectRow';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import ProductSelect from 'getsentry/views/amCheckout/steps/productSelect';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
 import type {PlanContent, StepProps} from 'getsentry/views/amCheckout/types';
 import {
   formatPrice,
diff --git a/static/gsApp/views/amCheckout/steps/productSelect.tsx b/static/gsApp/views/amCheckout/steps/productSelect.tsx
@@ -31,7 +31,7 @@ import {
   getSingularCategoryName,
 } from 'getsentry/utils/dataCategory';
 import formatCurrency from 'getsentry/utils/formatCurrency';
-import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption';
+import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption';
 import {type StepProps} from 'getsentry/views/amCheckout/types';
 import * as utils from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/steps/reserveAdditionalVolume.spec.tsx b/static/gsApp/views/amCheckout/steps/reserveAdditionalVolume.spec.tsx
@@ -9,7 +9,7 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import {MONTHLY} from 'getsentry/constants';
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {PlanTier, type Subscription} from 'getsentry/types';
-import ReserveAdditionalVolume from 'getsentry/views/amCheckout/reserveAdditionalVolume';
+import ReserveAdditionalVolume from 'getsentry/views/amCheckout/steps/reserveAdditionalVolume';
 
 type SliderInfo = {
   billingInterval: string;
diff --git a/static/gsApp/views/amCheckout/steps/reserveAdditionalVolume.tsx b/static/gsApp/views/amCheckout/steps/reserveAdditionalVolume.tsx
@@ -11,7 +11,7 @@ import type {DataCategory} from 'sentry/types/core';
 import {PlanTier} from 'getsentry/types';
 import {isAmPlan, isDeveloperPlan} from 'getsentry/utils/billing';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
-import VolumeSliders from 'getsentry/views/amCheckout/steps/volumeSliders';
+import VolumeSliders from 'getsentry/views/amCheckout/components/volumeSliders';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {formatPrice, getBucket, getShortInterval} from 'getsentry/views/amCheckout/utils';
 
diff --git a/static/gsApp/views/amCheckout/steps/reviewAndConfirm.tsx b/static/gsApp/views/amCheckout/steps/reviewAndConfirm.tsx
@@ -19,7 +19,7 @@ import {useStripeInstance} from 'getsentry/hooks/useStripeInstance';
 import type {PreviewData, Subscription} from 'getsentry/types';
 import {InvoiceItemType} from 'getsentry/types';
 import {hasPartnerMigrationFeature} from 'getsentry/utils/billing';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepPropsWithApi} from 'getsentry/views/amCheckout/types';
 import type {IntentDetails} from 'getsentry/views/amCheckout/utils';
 import {
diff --git a/static/gsApp/views/amCheckout/steps/setPayAsYouGo.tsx b/static/gsApp/views/amCheckout/steps/setPayAsYouGo.tsx
@@ -21,7 +21,7 @@ import {OnDemandBudgetMode, type OnDemandBudgets} from 'getsentry/types';
 import {isBizPlanFamily} from 'getsentry/utils/billing';
 import {getPlanCategoryName} from 'getsentry/utils/dataCategory';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {getTotalBudget} from 'getsentry/views/onDemandBudgets/utils';
 
diff --git a/static/gsApp/views/amCheckout/steps/setSpendLimit.tsx b/static/gsApp/views/amCheckout/steps/setSpendLimit.tsx
@@ -6,8 +6,8 @@ import {t} from 'sentry/locale';
 import type {OnDemandBudgets} from 'getsentry/types';
 import {displayBudgetName} from 'getsentry/utils/billing';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
-import ReserveAdditionalVolume from 'getsentry/views/amCheckout/reserveAdditionalVolume';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
+import ReserveAdditionalVolume from 'getsentry/views/amCheckout/steps/reserveAdditionalVolume';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {
   getTotalBudget,
diff --git a/static/gsApp/views/spendLimits/spendLimitSettings.tsx b/static/gsApp/views/spendLimits/spendLimitSettings.tsx
@@ -35,9 +35,9 @@ import {
   getPlanCategoryName,
   getSingularCategoryName,
 } from 'getsentry/utils/dataCategory';
-import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption';
+import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption';
+import {renderPerformanceHovercard} from 'getsentry/views/amCheckout/components/volumeSliders';
 import {getProductCheckoutDescription} from 'getsentry/views/amCheckout/steps/productSelect';
-import {renderPerformanceHovercard} from 'getsentry/views/amCheckout/steps/volumeSliders';
 import {
   displayPrice,
   displayPriceWithCents,
