diff --git a/apps/webapp/app/components/billing/ConcurrentRunsChart.tsx b/apps/webapp/app/components/billing/v2/ConcurrentRunsChart.tsx
similarity index 98%
rename from apps/webapp/app/components/billing/ConcurrentRunsChart.tsx
rename to apps/webapp/app/components/billing/v2/ConcurrentRunsChart.tsx
index 5e1ef198e..88efe200a 100644
--- a/apps/webapp/app/components/billing/ConcurrentRunsChart.tsx
+++ b/apps/webapp/app/components/billing/v2/ConcurrentRunsChart.tsx
@@ -8,7 +8,7 @@ import {
   XAxis,
   YAxis,
 } from "recharts";
-import { Paragraph } from "../primitives/Paragraph";
+import { Paragraph } from "../../primitives/Paragraph";
 
 const tooltipStyle = {
   display: "flex",
diff --git a/apps/webapp/app/components/billing/DailyRunsChat.tsx b/apps/webapp/app/components/billing/v2/DailyRunsChat.tsx
similarity index 97%
rename from apps/webapp/app/components/billing/DailyRunsChat.tsx
rename to apps/webapp/app/components/billing/v2/DailyRunsChat.tsx
index 250f84e1e..ddc36785b 100644
--- a/apps/webapp/app/components/billing/DailyRunsChat.tsx
+++ b/apps/webapp/app/components/billing/v2/DailyRunsChat.tsx
@@ -1,5 +1,5 @@
 import { Label, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from "recharts";
-import { Paragraph } from "../primitives/Paragraph";
+import { Paragraph } from "../../primitives/Paragraph";
 
 const tooltipStyle = {
   display: "flex",
diff --git a/apps/webapp/app/components/billing/FreePlanUsage.tsx b/apps/webapp/app/components/billing/v2/FreePlanUsage.tsx
similarity index 96%
rename from apps/webapp/app/components/billing/FreePlanUsage.tsx
rename to apps/webapp/app/components/billing/v2/FreePlanUsage.tsx
index 6a4f66b5f..a09475a1a 100644
--- a/apps/webapp/app/components/billing/FreePlanUsage.tsx
+++ b/apps/webapp/app/components/billing/v2/FreePlanUsage.tsx
@@ -1,6 +1,6 @@
 import { ArrowUpCircleIcon } from "@heroicons/react/24/outline";
 import { motion, useMotionValue, useTransform } from "framer-motion";
-import { Paragraph } from "../primitives/Paragraph";
+import { Paragraph } from "../../primitives/Paragraph";
 import { Link } from "@remix-run/react";
 import { cn } from "~/utils/cn";
 
diff --git a/apps/webapp/app/components/billing/PricingCalculator.tsx b/apps/webapp/app/components/billing/v2/PricingCalculator.tsx
similarity index 98%
rename from apps/webapp/app/components/billing/PricingCalculator.tsx
rename to apps/webapp/app/components/billing/v2/PricingCalculator.tsx
index c82c6533c..ed4331f51 100644
--- a/apps/webapp/app/components/billing/PricingCalculator.tsx
+++ b/apps/webapp/app/components/billing/v2/PricingCalculator.tsx
@@ -1,9 +1,9 @@
 import * as Slider from "@radix-ui/react-slider";
 import { Plans, estimate } from "@trigger.dev/billing/v2";
 import { useCallback, useState } from "react";
-import { DefinitionTip } from "../DefinitionTooltip";
-import { Header2 } from "../primitives/Headers";
-import { Paragraph } from "../primitives/Paragraph";
+import { DefinitionTip } from "../../DefinitionTooltip";
+import { Header2 } from "../../primitives/Headers";
+import { Paragraph } from "../../primitives/Paragraph";
 import { formatCurrency, formatNumberCompact } from "~/utils/numberFormatter";
 import { cn } from "~/utils/cn";
 
diff --git a/apps/webapp/app/components/billing/PricingTiers.tsx b/apps/webapp/app/components/billing/v2/PricingTiers.tsx
similarity index 98%
rename from apps/webapp/app/components/billing/PricingTiers.tsx
rename to apps/webapp/app/components/billing/v2/PricingTiers.tsx
index 3c401bb7e..e86279f94 100644
--- a/apps/webapp/app/components/billing/PricingTiers.tsx
+++ b/apps/webapp/app/components/billing/v2/PricingTiers.tsx
@@ -7,12 +7,12 @@ import { useState } from "react";
 import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route";
 import { cn } from "~/utils/cn";
 import { formatNumberCompact } from "~/utils/numberFormatter";
-import { DefinitionTip } from "../DefinitionTooltip";
-import { Feedback } from "../Feedback";
-import { Button, LinkButton } from "../primitives/Buttons";
-import SegmentedControl from "../primitives/SegmentedControl";
+import { DefinitionTip } from "../../DefinitionTooltip";
+import { Feedback } from "../../Feedback";
+import { Button, LinkButton } from "../../primitives/Buttons";
+import SegmentedControl from "../../primitives/SegmentedControl";
 import { RunsVolumeDiscountTable } from "./RunsVolumeDiscountTable";
-import { Spinner } from "../primitives/Spinner";
+import { Spinner } from "../../primitives/Spinner";
 
 const pricingDefinitions = {
   concurrentRuns: {
diff --git a/apps/webapp/app/components/billing/RunsVolumeDiscountTable.tsx b/apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx
similarity index 93%
rename from apps/webapp/app/components/billing/RunsVolumeDiscountTable.tsx
rename to apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx
index 76a7ccf63..5c556e929 100644
--- a/apps/webapp/app/components/billing/RunsVolumeDiscountTable.tsx
+++ b/apps/webapp/app/components/billing/v2/RunsVolumeDiscountTable.tsx
@@ -1,6 +1,6 @@
 import { RunPriceBracket } from "@trigger.dev/billing/v2";
-import { Header2 } from "../primitives/Headers";
-import { Paragraph } from "../primitives/Paragraph";
+import { Header2 } from "../../primitives/Headers";
+import { Paragraph } from "../../primitives/Paragraph";
 import { formatNumberCompact } from "~/utils/numberFormatter";
 
 export function RunsVolumeDiscountTable({
diff --git a/apps/webapp/app/components/billing/UpgradePrompt.tsx b/apps/webapp/app/components/billing/v2/UpgradePrompt.tsx
similarity index 92%
rename from apps/webapp/app/components/billing/UpgradePrompt.tsx
rename to apps/webapp/app/components/billing/v2/UpgradePrompt.tsx
index fc9a41a27..05752c614 100644
--- a/apps/webapp/app/components/billing/UpgradePrompt.tsx
+++ b/apps/webapp/app/components/billing/v2/UpgradePrompt.tsx
@@ -4,9 +4,9 @@ import tileBgPath from "~/assets/images/error-banner-tile@2x.png";
 import { MatchedOrganization } from "~/hooks/useOrganizations";
 import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route";
 import { formatNumberCompact } from "~/utils/numberFormatter";
-import { LinkButton } from "../primitives/Buttons";
-import { Icon } from "../primitives/Icon";
-import { Paragraph } from "../primitives/Paragraph";
+import { LinkButton } from "../../primitives/Buttons";
+import { Icon } from "../../primitives/Icon";
+import { Paragraph } from "../../primitives/Paragraph";
 
 type UpgradePromptProps = {
   runsEnabled: boolean;
diff --git a/apps/webapp/app/components/billing/UsageBar.tsx b/apps/webapp/app/components/billing/v2/UsageBar.tsx
similarity index 98%
rename from apps/webapp/app/components/billing/UsageBar.tsx
rename to apps/webapp/app/components/billing/v2/UsageBar.tsx
index 8cd580bc0..1a86f7021 100644
--- a/apps/webapp/app/components/billing/UsageBar.tsx
+++ b/apps/webapp/app/components/billing/v2/UsageBar.tsx
@@ -1,7 +1,7 @@
 import { cn } from "~/utils/cn";
 import { formatNumberCompact } from "~/utils/numberFormatter";
-import { Paragraph } from "../primitives/Paragraph";
-import { SimpleTooltip } from "../primitives/Tooltip";
+import { Paragraph } from "../../primitives/Paragraph";
+import { SimpleTooltip } from "../../primitives/Tooltip";
 import { motion } from "framer-motion";
 
 type UsageBarProps = {
diff --git a/apps/webapp/app/components/layout/AppLayout.tsx b/apps/webapp/app/components/layout/AppLayout.tsx
index 1748337eb..84f0f9eb2 100644
--- a/apps/webapp/app/components/layout/AppLayout.tsx
+++ b/apps/webapp/app/components/layout/AppLayout.tsx
@@ -1,6 +1,6 @@
 import { useOptionalOrganization } from "~/hooks/useOrganizations";
 import { cn } from "~/utils/cn";
-import { useShowUpgradePrompt } from "../billing/UpgradePrompt";
+import { useShowUpgradePrompt } from "../billing/v2/UpgradePrompt";
 
 /** This container is used to surround the entire app, it correctly places the nav bar */
 export function AppContainer({ children }: { children: React.ReactNode }) {
diff --git a/apps/webapp/app/components/navigation/SideMenu.tsx b/apps/webapp/app/components/navigation/SideMenu.tsx
index 3159b848a..049c2e094 100644
--- a/apps/webapp/app/components/navigation/SideMenu.tsx
+++ b/apps/webapp/app/components/navigation/SideMenu.tsx
@@ -58,7 +58,7 @@ import { ImpersonationBanner } from "../ImpersonationBanner";
 import { LogoIcon } from "../LogoIcon";
 import { StepContentContainer } from "../StepContentContainer";
 import { UserProfilePhoto } from "../UserProfilePhoto";
-import { FreePlanUsage } from "../billing/FreePlanUsage";
+import { FreePlanUsage } from "../billing/v2/FreePlanUsage";
 import { Badge } from "../primitives/Badge";
 import { Button } from "../primitives/Buttons";
 import { Callout } from "../primitives/Callout";
diff --git a/apps/webapp/app/components/primitives/PageHeader.tsx b/apps/webapp/app/components/primitives/PageHeader.tsx
index a4341c5da..46861105b 100644
--- a/apps/webapp/app/components/primitives/PageHeader.tsx
+++ b/apps/webapp/app/components/primitives/PageHeader.tsx
@@ -4,7 +4,7 @@ import { useOptionalOrganization } from "~/hooks/useOrganizations";
 import { useOptionalProject } from "~/hooks/useProject";
 import { cn } from "~/utils/cn";
 import { plansPath } from "~/utils/pathBuilder";
-import { UpgradePrompt, useShowUpgradePrompt } from "../billing/UpgradePrompt";
+import { UpgradePrompt, useShowUpgradePrompt } from "../billing/v2/UpgradePrompt";
 import { BreadcrumbIcon } from "./BreadcrumbIcon";
 import { LinkButton } from "./Buttons";
 import { Header2 } from "./Headers";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx
index 51370c1ba..23843985f 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing._index/route.tsx
@@ -4,11 +4,11 @@ import { Await, useLoaderData } from "@remix-run/react";
 import { DataFunctionArgs, defer } from "@remix-run/server-runtime";
 import { Suspense } from "react";
 import { Bar, BarChart, ResponsiveContainer, Tooltip, TooltipProps, XAxis, YAxis } from "recharts";
-import { ConcurrentRunsChart } from "~/components/billing/ConcurrentRunsChart";
-import { UsageBar } from "~/components/billing/UsageBar";
+import { ConcurrentRunsChart } from "~/components/billing/v2/ConcurrentRunsChart";
+import { UsageBar } from "~/components/billing/v2/UsageBar";
 import { LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
-import { DailyRunsChart } from "~/components/billing/DailyRunsChat";
+import { DailyRunsChart } from "~/components/billing/v2/DailyRunsChat";
 import { DateTime } from "~/components/primitives/DateTime";
 import { Header2, Header3 } from "~/components/primitives/Headers";
 import { Paragraph } from "~/components/primitives/Paragraph";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx
index 67d9eee98..5406cb0c8 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.billing.plans/route.tsx
@@ -1,8 +1,8 @@
 import { LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
-import { PricingCalculator } from "~/components/billing/PricingCalculator";
-import { PricingTiers } from "~/components/billing/PricingTiers";
-import { RunsVolumeDiscountTable } from "~/components/billing/RunsVolumeDiscountTable";
+import { PricingCalculator } from "~/components/billing/v2/PricingCalculator";
+import { PricingTiers } from "~/components/billing/v2/PricingTiers";
+import { RunsVolumeDiscountTable } from "~/components/billing/v2/RunsVolumeDiscountTable";
 import { Callout } from "~/components/primitives/Callout";
 import { Header2 } from "~/components/primitives/Headers";
 import { featuresForRequest } from "~/features.server";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx
index f05a00c4b..89d0ef1bf 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx
@@ -1,9 +1,9 @@
 import { ChartBarIcon } from "@heroicons/react/20/solid";
 import { LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
-import { PricingCalculator } from "~/components/billing/PricingCalculator";
-import { PricingTiers } from "~/components/billing/PricingTiers";
-import { RunsVolumeDiscountTable } from "~/components/billing/RunsVolumeDiscountTable";
+import { PricingCalculator } from "~/components/billing/v2/PricingCalculator";
+import { PricingTiers } from "~/components/billing/v2/PricingTiers";
+import { RunsVolumeDiscountTable } from "~/components/billing/v2/RunsVolumeDiscountTable";
 import { Button } from "~/components/primitives/Buttons";
 import { Header1 } from "~/components/primitives/Headers";
 import {
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx
index 542faa3ba..d52b4b105 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.subscribed/route.tsx
@@ -1,7 +1,7 @@
 import { CheckBadgeIcon } from "@heroicons/react/24/solid";
 import { LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
-import { RunsVolumeDiscountTable } from "~/components/billing/RunsVolumeDiscountTable";
+import { RunsVolumeDiscountTable } from "~/components/billing/v2/RunsVolumeDiscountTable";
 import { MainCenteredContainer } from "~/components/layout/AppLayout";
 import { LinkButton } from "~/components/primitives/Buttons";
 import { FormButtons } from "~/components/primitives/FormButtons";
diff --git a/apps/webapp/app/routes/storybook.free-plan-usage/route.tsx b/apps/webapp/app/routes/storybook.free-plan-usage/route.tsx
index 8a1fc38d5..887f1dbd4 100644
--- a/apps/webapp/app/routes/storybook.free-plan-usage/route.tsx
+++ b/apps/webapp/app/routes/storybook.free-plan-usage/route.tsx
@@ -1,4 +1,4 @@
-import { FreePlanUsage } from "~/components/billing/FreePlanUsage";
+import { FreePlanUsage } from "~/components/billing/v2/FreePlanUsage";
 
 export default function Story() {
   return (
diff --git a/apps/webapp/app/routes/storybook.usage/route.tsx b/apps/webapp/app/routes/storybook.usage/route.tsx
index d0395d69c..ad25fb08e 100644
--- a/apps/webapp/app/routes/storybook.usage/route.tsx
+++ b/apps/webapp/app/routes/storybook.usage/route.tsx
@@ -1,4 +1,4 @@
-import { UsageBar } from "~/components/billing/UsageBar";
+import { UsageBar } from "~/components/billing/v2/UsageBar";
 import { Paragraph } from "~/components/primitives/Paragraph";
 
 export default function Story() {