chore(billing): Clean up checkout file structure

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';
 

static/gsApp/views/amCheckout/billingCycleSelectCard.tsx → 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 = {

static/gsApp/views/amCheckout/cart.spec.tsx → static/gsApp/views/amCheckout/components/cart/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/cart';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 // Jun 06 2022 - with milliseconds

static/gsApp/views/amCheckout/cart.tsx → static/gsApp/views/amCheckout/components/cart/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/cart/cartDiff';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 import * as utils from 'getsentry/views/amCheckout/utils';
 

static/gsApp/views/amCheckout/cartDiff.spec.tsx → static/gsApp/views/amCheckout/components/cart/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/cart/cartDiff';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 describe('CartDiff', () => {

static/gsApp/views/amCheckout/checkoutOverview.spec.tsx → static/gsApp/views/amCheckout/components/cart/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/cart/checkoutOverview';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 describe('CheckoutOverview', () => {

static/gsApp/views/amCheckout/checkoutOverviewV2.spec.tsx → static/gsApp/views/amCheckout/components/cart/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/cart/checkoutOverviewV2';
 import {type CheckoutFormData} from 'getsentry/views/amCheckout/types';
 
 describe('CheckoutOverviewV2', () => {

static/gsApp/views/amCheckout/checkoutSuccess.spec.tsx → static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx

@@ -6,7 +6,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary';
 import {resetMockDate, setMockDate} from 'sentry-test/utils';
 
 import {PreviewDataFixture} from 'getsentry/__fixtures__/previewData';
-import CheckoutSuccess from 'getsentry/views/amCheckout/checkoutSuccess';
+import CheckoutSuccess from 'getsentry/views/amCheckout/components/checkoutSuccess';
 
 describe('CheckoutSuccess', () => {
   const bizPlan = PlanDetailsLookupFixture('am3_business')!;

static/gsApp/views/amCheckout/legacyPlanToggle.spec.tsx → 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();

static/gsApp/views/amCheckout/planFeatures.spec.tsx → 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')!;

static/gsApp/views/amCheckout/reserveAdditionalVolume.spec.tsx → static/gsApp/views/amCheckout/components/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} from 'getsentry/types';
-import ReserveAdditionalVolume from 'getsentry/views/amCheckout/reserveAdditionalVolume';
+import ReserveAdditionalVolume from 'getsentry/views/amCheckout/components/reserveAdditionalVolume';
 
 type SliderInfo = {
   billingInterval: string;

static/gsApp/views/amCheckout/reserveAdditionalVolume.tsx → static/gsApp/views/amCheckout/components/reserveAdditionalVolume.tsx

@@ -13,7 +13,7 @@ import type {DataCategory} from 'sentry/types/core';
 import {PlanTier} from 'getsentry/types';
 import {isAmPlan} 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, getShortInterval} from 'getsentry/views/amCheckout/utils';
 

static/gsApp/views/amCheckout/steps/stepHeader.spec.tsx → 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;

static/gsApp/views/amCheckout/steps/stepHeader.tsx → static/gsApp/views/amCheckout/components/stepHeader.tsx

@@ -9,7 +9,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

static/gsApp/views/amCheckout/steps/volumeSliders.tsx → 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';
 

static/gsApp/views/amCheckout/index.tsx

@@ -72,22 +72,22 @@ 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 AddBillingDetails from 'getsentry/views/amCheckout/steps/addBillingDetails';
-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 ContractSelect from 'getsentry/views/amCheckout/steps/contractSelect';
-import OnDemandBudgetsStep from 'getsentry/views/amCheckout/steps/onDemandBudgets';
-import OnDemandSpend from 'getsentry/views/amCheckout/steps/onDemandSpend';
-import PlanSelect from 'getsentry/views/amCheckout/steps/planSelect';
-import ReviewAndConfirm from 'getsentry/views/amCheckout/steps/reviewAndConfirm';
-import SetPayAsYouGo from 'getsentry/views/amCheckout/steps/setPayAsYouGo';
+import Cart from 'getsentry/views/amCheckout/components/cart/cart';
+import CheckoutOverview from 'getsentry/views/amCheckout/components/cart/checkoutOverview';
+import CheckoutOverviewV2 from 'getsentry/views/amCheckout/components/cart/checkoutOverviewV2';
+import CheckoutSuccess from 'getsentry/views/amCheckout/components/checkoutSuccess';
+import AddBillingDetails from 'getsentry/views/amCheckout/legacySteps/addBillingDetails';
+import AddDataVolume from 'getsentry/views/amCheckout/legacySteps/addDataVolume';
+import AddPaymentMethod from 'getsentry/views/amCheckout/legacySteps/addPaymentMethod';
+import ContractSelect from 'getsentry/views/amCheckout/legacySteps/contractSelect';
+import OnDemandBudgetsStep from 'getsentry/views/amCheckout/legacySteps/onDemandBudgets';
+import OnDemandSpend from 'getsentry/views/amCheckout/legacySteps/onDemandSpend';
+import PlanSelect from 'getsentry/views/amCheckout/legacySteps/planSelect';
+import ReviewAndConfirm from 'getsentry/views/amCheckout/legacySteps/reviewAndConfirm';
+import SetPayAsYouGo from 'getsentry/views/amCheckout/legacySteps/setPayAsYouGo';
+import AddBillingInformation from 'getsentry/views/amCheckout/steps/addBillingInfo';
+import BuildYourPlan from 'getsentry/views/amCheckout/steps/buildYourPlan';
+import ChooseYourBillingCycle from 'getsentry/views/amCheckout/steps/chooseYourBillingCycle';
 import SetSpendLimit from 'getsentry/views/amCheckout/steps/setSpendLimit';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 import {getBucket} from 'getsentry/views/amCheckout/utils';

static/gsApp/views/amCheckout/steps/addBillingDetails.spec.tsx → static/gsApp/views/amCheckout/legacySteps/addBillingDetails.spec.tsx

@@ -8,7 +8,7 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {AddressType, PlanTier} from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout/';
-import AddBillingDetails from 'getsentry/views/amCheckout/steps/addBillingDetails';
+import AddBillingDetails from 'getsentry/views/amCheckout/legacySteps/addBillingDetails';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 // Stripe mocks handled by global setup.ts

static/gsApp/views/amCheckout/steps/addBillingDetails.tsx → static/gsApp/views/amCheckout/legacySteps/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 = {

static/gsApp/views/amCheckout/steps/addDataVolume.spec.tsx → static/gsApp/views/amCheckout/legacySteps/addDataVolume.spec.tsx

@@ -10,7 +10,7 @@ import {ANNUAL, MONTHLY} from 'getsentry/constants';
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {PlanTier} from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout/';
-import AddDataVolume from 'getsentry/views/amCheckout/steps/addDataVolume';
+import AddDataVolume from 'getsentry/views/amCheckout/legacySteps/addDataVolume';
 
 type SliderInfo = {
   billingInterval: string;

static/gsApp/views/amCheckout/steps/addDataVolume.tsx → static/gsApp/views/amCheckout/legacySteps/addDataVolume.tsx

@@ -13,8 +13,8 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock';
 import {PlanTier} from 'getsentry/types';
 import {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({

static/gsApp/views/amCheckout/steps/addPaymentMethod.spec.tsx → static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.spec.tsx

@@ -13,7 +13,7 @@ import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import type {Subscription as SubscriptionType} from 'getsentry/types';
 import {FTCConsentLocation, PlanTier} from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout/';
-import AddPaymentMethod from 'getsentry/views/amCheckout/steps/addPaymentMethod';
+import AddPaymentMethod from 'getsentry/views/amCheckout/legacySteps/addPaymentMethod';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 // Stripe mocks handled by global setup.ts

static/gsApp/views/amCheckout/steps/addPaymentMethod.tsx → static/gsApp/views/amCheckout/legacySteps/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;

static/gsApp/views/amCheckout/steps/contractSelect.tsx → static/gsApp/views/amCheckout/legacySteps/contractSelect.tsx

@@ -11,8 +11,8 @@ import {space} from 'sentry/styles/space';
 
 import {ANNUAL, MONTHLY} from 'getsentry/constants';
 import type {Plan} from 'getsentry/types';
-import PlanSelectRow from 'getsentry/views/amCheckout/steps/planSelectRow';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
+import StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
+import PlanSelectRow from 'getsentry/views/amCheckout/legacySteps/planSelectRow';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {formatPrice, getReservedPriceCents} from 'getsentry/views/amCheckout/utils';
 

static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx → static/gsApp/views/amCheckout/legacySteps/onDemandBudgets.tsx

@@ -11,7 +11,7 @@ import {space} from 'sentry/styles/space';
 import type {OnDemandBudgets} from 'getsentry/types';
 import {OnDemandBudgetMode} from 'getsentry/types';
 import {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';

static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx → static/gsApp/views/amCheckout/legacySteps/onDemandSpend.spec.tsx

@@ -9,7 +9,7 @@ import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import {PlanTier} from 'getsentry/types';
 import AMCheckout from 'getsentry/views/amCheckout';
-import OnDemandSpend from 'getsentry/views/amCheckout/steps/onDemandSpend';
+import OnDemandSpend from 'getsentry/views/amCheckout/legacySteps/onDemandSpend';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 
 describe('OnDemandSpend', () => {

static/gsApp/views/amCheckout/steps/onDemandSpend.tsx → static/gsApp/views/amCheckout/legacySteps/onDemandSpend.tsx

@@ -12,7 +12,7 @@ import {space} from 'sentry/styles/space';
 import TextBlock from 'sentry/views/settings/components/text/textBlock';
 
 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;

static/gsApp/views/amCheckout/steps/planSelect.tsx → static/gsApp/views/amCheckout/legacySteps/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 StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
+import PlanSelectRow from 'getsentry/views/amCheckout/legacySteps/planSelectRow';
 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,

static/gsApp/views/amCheckout/steps/planSelectCard.tsx → static/gsApp/views/amCheckout/legacySteps/planSelectCard.tsx

@@ -8,8 +8,8 @@ import type {SVGIconProps} from 'sentry/icons/svgIcon';
 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/legacySteps/planSelectRow';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 import {getShortInterval} from 'getsentry/views/amCheckout/utils';
 

static/gsApp/views/amCheckout/steps/planSelectRow.tsx → static/gsApp/views/amCheckout/legacySteps/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,

static/gsApp/views/amCheckout/steps/reviewAndConfirm.tsx → static/gsApp/views/amCheckout/legacySteps/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 {

static/gsApp/views/amCheckout/steps/setPayAsYouGo.tsx → static/gsApp/views/amCheckout/legacySteps/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';
 

static/gsApp/views/amCheckout/steps/checkoutV3/addBillingInfo.tsx → 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';
 

static/gsApp/views/amCheckout/steps/checkoutV3/buildYourPlan.tsx → static/gsApp/views/amCheckout/steps/buildYourPlan.tsx

@@ -16,10 +16,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 StepHeader from 'getsentry/views/amCheckout/components/stepHeader';
+import PlanSelectCard from 'getsentry/views/amCheckout/legacySteps/planSelectCard';
 import ProductSelect from 'getsentry/views/amCheckout/steps/productSelect';
-import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
 import type {
   CheckoutFormData,
   CheckoutV3StepProps,