diff --git a/components/Blocks/DynamicContent/Rewards/Redeem/ActiveRedeemedBadge.tsx b/components/Blocks/DynamicContent/Rewards/Redeem/ActiveRedeemedBadge.tsx
index 32f69b0f3..8ff056af3 100644
--- a/components/Blocks/DynamicContent/Rewards/Redeem/ActiveRedeemedBadge.tsx
+++ b/components/Blocks/DynamicContent/Rewards/Redeem/ActiveRedeemedBadge.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import { motion } from "framer-motion"
 import { useIntl } from "react-intl"
 
diff --git a/components/Blocks/DynamicContent/Rewards/Redeem/Campaign.tsx b/components/Blocks/DynamicContent/Rewards/Redeem/Flows/Campaign.tsx
similarity index 90%
rename from components/Blocks/DynamicContent/Rewards/Redeem/Campaign.tsx
rename to components/Blocks/DynamicContent/Rewards/Redeem/Flows/Campaign.tsx
index 0b3c0afd4..f8c0013a0 100644
--- a/components/Blocks/DynamicContent/Rewards/Redeem/Campaign.tsx
+++ b/components/Blocks/DynamicContent/Rewards/Redeem/Flows/Campaign.tsx
@@ -8,10 +8,10 @@ import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { toast } from "@/components/TempDesignSystem/Toasts"
 
-import { RewardIcon } from "../RewardIcon"
-import MembershipNumberBadge from "./MembershipNumberBadge"
+import { RewardIcon } from "../../RewardIcon"
+import MembershipNumberBadge from "../MembershipNumberBadge"
 
-import styles from "./redeem.module.css"
+import styles from "../redeem.module.css"
 
 import type { RewardWithRedeem } from "@/server/routers/contentstack/reward/output"
 
diff --git a/components/Blocks/DynamicContent/Rewards/Redeem/Tier.tsx b/components/Blocks/DynamicContent/Rewards/Redeem/Flows/Tier.tsx
similarity index 88%
rename from components/Blocks/DynamicContent/Rewards/Redeem/Tier.tsx
rename to components/Blocks/DynamicContent/Rewards/Redeem/Flows/Tier.tsx
index 596dcc051..0323ba7f8 100644
--- a/components/Blocks/DynamicContent/Rewards/Redeem/Tier.tsx
+++ b/components/Blocks/DynamicContent/Rewards/Redeem/Flows/Tier.tsx
@@ -7,13 +7,13 @@ import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { isRestaurantOnSiteTierReward } from "@/utils/rewards"
 
-import { RewardIcon } from "../RewardIcon"
-import ActiveRedeemedBadge from "./ActiveRedeemedBadge"
-import MembershipNumberBadge from "./MembershipNumberBadge"
-import TimedRedeemedBadge from "./TimedRedeemedBadge"
-import useRedeemFlow from "./useRedeemFlow"
+import { RewardIcon } from "../../RewardIcon"
+import ActiveRedeemedBadge from "../ActiveRedeemedBadge"
+import MembershipNumberBadge from "../MembershipNumberBadge"
+import TimedRedeemedBadge from "../TimedRedeemedBadge"
+import useRedeemFlow from "../useRedeemFlow"
 
-import styles from "./redeem.module.css"
+import styles from "../redeem.module.css"
 
 import type { RewardWithRedeem } from "@/server/routers/contentstack/reward/output"
 
diff --git a/components/Blocks/DynamicContent/Rewards/Redeem/TimedRedeemedBadge.tsx b/components/Blocks/DynamicContent/Rewards/Redeem/TimedRedeemedBadge.tsx
index 0797c8340..605187255 100644
--- a/components/Blocks/DynamicContent/Rewards/Redeem/TimedRedeemedBadge.tsx
+++ b/components/Blocks/DynamicContent/Rewards/Redeem/TimedRedeemedBadge.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import { useIntl } from "react-intl"
 
 import Countdown from "@/components/Countdown"
diff --git a/components/Blocks/DynamicContent/Rewards/Redeem/index.tsx b/components/Blocks/DynamicContent/Rewards/Redeem/index.tsx
index cec81df1e..ec8911d11 100644
--- a/components/Blocks/DynamicContent/Rewards/Redeem/index.tsx
+++ b/components/Blocks/DynamicContent/Rewards/Redeem/index.tsx
@@ -10,13 +10,11 @@ import {
 } from "react-aria-components"
 import { useIntl } from "react-intl"
 
-import { trpc } from "@/lib/trpc/client"
-
 import { CloseLargeIcon } from "@/components/Icons"
 import Button from "@/components/TempDesignSystem/Button"
 
-import Campaign from "./Campaign"
-import Tier from "./Tier"
+import Campaign from "./Flows/Campaign"
+import Tier from "./Flows/Tier"
 import { RedeemContext } from "./useRedeemFlow"
 
 import styles from "./redeem.module.css"