diff --git a/src/app/btc-vault/components/modals/index.ts b/src/app/btc-vault/components/modals/index.ts
new file mode 100644
index 0000000000..ead954e6c7
--- /dev/null
+++ b/src/app/btc-vault/components/modals/index.ts
@@ -0,0 +1,2 @@
+export { BtcDepositModal } from './deposit/BtcDepositModal'
+export { BtcWithdrawModal } from './withdraw/BtcWithdrawModal'
diff --git a/src/app/btc-vault/components/BtcWithdrawModal.test.tsx b/src/app/btc-vault/components/modals/withdraw/BtcWithdrawModal.test.tsx
similarity index 98%
rename from src/app/btc-vault/components/BtcWithdrawModal.test.tsx
rename to src/app/btc-vault/components/modals/withdraw/BtcWithdrawModal.test.tsx
index 411e894a85..a4060dd33c 100644
--- a/src/app/btc-vault/components/BtcWithdrawModal.test.tsx
+++ b/src/app/btc-vault/components/modals/withdraw/BtcWithdrawModal.test.tsx
@@ -17,11 +17,11 @@ vi.mock('wagmi', () => ({
   useAccount: () => mockUseAccount(),
 }))
 
-vi.mock('../hooks/useUserPosition', () => ({
+vi.mock('../../../hooks/useUserPosition', () => ({
   useUserPosition: (address: string | undefined) => mockUseUserPosition(address),
 }))
 
-vi.mock('../hooks/useVaultMetrics', () => ({
+vi.mock('../../../hooks/useVaultMetrics', () => ({
   useVaultMetrics: () => mockUseVaultMetrics(),
 }))
 
diff --git a/src/app/btc-vault/components/BtcWithdrawModal.tsx b/src/app/btc-vault/components/modals/withdraw/BtcWithdrawModal.tsx
similarity index 97%
rename from src/app/btc-vault/components/BtcWithdrawModal.tsx
rename to src/app/btc-vault/components/modals/withdraw/BtcWithdrawModal.tsx
index dee4a44431..4cb6dca640 100644
--- a/src/app/btc-vault/components/BtcWithdrawModal.tsx
+++ b/src/app/btc-vault/components/modals/withdraw/BtcWithdrawModal.tsx
@@ -10,9 +10,9 @@ import { ProgressBar } from '@/components/ProgressBarNew'
 import { Header } from '@/components/Typography'
 import { VAULT_SHARE_DECIMALS } from '@/lib/constants'
 
-import { useUserPosition } from '../hooks/useUserPosition'
-import { useVaultMetrics } from '../hooks/useVaultMetrics'
-import { BTC_VAULT_WITHDRAWAL_FEE, WITHDRAWAL_STEP_PROGRESS } from '../services/constants'
+import { useUserPosition } from '../../../hooks/useUserPosition'
+import { useVaultMetrics } from '../../../hooks/useVaultMetrics'
+import { BTC_VAULT_WITHDRAWAL_FEE, WITHDRAWAL_STEP_PROGRESS } from '../../../services/constants'
 import { WithdrawAllowanceStep } from './WithdrawAllowanceStep'
 import { WithdrawAmountStep } from './WithdrawAmountStep'
 import { WithdrawReviewStep } from './WithdrawReviewStep'
diff --git a/src/app/btc-vault/components/WithdrawAllowanceStep.test.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawAllowanceStep.test.tsx
similarity index 100%
rename from src/app/btc-vault/components/WithdrawAllowanceStep.test.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawAllowanceStep.test.tsx
diff --git a/src/app/btc-vault/components/WithdrawAllowanceStep.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawAllowanceStep.tsx
similarity index 97%
rename from src/app/btc-vault/components/WithdrawAllowanceStep.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawAllowanceStep.tsx
index 69de43263f..6500c7e4e6 100644
--- a/src/app/btc-vault/components/WithdrawAllowanceStep.tsx
+++ b/src/app/btc-vault/components/modals/withdraw/WithdrawAllowanceStep.tsx
@@ -9,7 +9,7 @@ import { Divider } from '@/components/Divider'
 import { TransactionInProgressButton } from '@/components/StepActionButtons'
 import { Label, Paragraph } from '@/components/Typography'
 
-import { BTC_VAULT_WITHDRAW_TWO_TX_MESSAGE } from '../services/constants'
+import { BTC_VAULT_WITHDRAW_TWO_TX_MESSAGE } from '../../../services/constants'
 
 interface WithdrawAllowanceStepProps {
   sharesWei: bigint
diff --git a/src/app/btc-vault/components/WithdrawAmountStep.test.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawAmountStep.test.tsx
similarity index 100%
rename from src/app/btc-vault/components/WithdrawAmountStep.test.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawAmountStep.test.tsx
diff --git a/src/app/btc-vault/components/WithdrawAmountStep.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawAmountStep.tsx
similarity index 98%
rename from src/app/btc-vault/components/WithdrawAmountStep.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawAmountStep.tsx
index 2775a75a0b..d7d9019cb5 100644
--- a/src/app/btc-vault/components/WithdrawAmountStep.tsx
+++ b/src/app/btc-vault/components/modals/withdraw/WithdrawAmountStep.tsx
@@ -14,7 +14,7 @@ import { RBTC, VAULT_SHARE_DECIMALS } from '@/lib/constants'
 import { cn, formatCurrency, handleAmountInput } from '@/lib/utils'
 import { usePricesContext } from '@/shared/context'
 
-import { BTC_VAULT_WITHDRAWAL_DISCLAIMER } from '../services/constants'
+import { BTC_VAULT_WITHDRAWAL_DISCLAIMER } from '../../../services/constants'
 
 interface WithdrawAmountStepProps {
   amount: string
diff --git a/src/app/btc-vault/components/WithdrawReviewStep.stories.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.stories.tsx
similarity index 100%
rename from src/app/btc-vault/components/WithdrawReviewStep.stories.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.stories.tsx
diff --git a/src/app/btc-vault/components/WithdrawReviewStep.test.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.test.tsx
similarity index 100%
rename from src/app/btc-vault/components/WithdrawReviewStep.test.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.test.tsx
diff --git a/src/app/btc-vault/components/WithdrawReviewStep.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.tsx
similarity index 99%
rename from src/app/btc-vault/components/WithdrawReviewStep.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.tsx
index 4518293172..d6b15cadd9 100644
--- a/src/app/btc-vault/components/WithdrawReviewStep.tsx
+++ b/src/app/btc-vault/components/modals/withdraw/WithdrawReviewStep.tsx
@@ -16,7 +16,7 @@ import {
   BTC_VAULT_WITHDRAW_REQUEST_TX_HINT,
   BTC_VAULT_WITHDRAWAL_DISCLAIMER,
   WITHDRAWAL_EXPECTED_COMPLETION,
-} from '../services/constants'
+} from '../../../services/constants'
 
 interface WithdrawReviewStepProps {
   amount: string
diff --git a/src/app/btc-vault/components/WithdrawSteps.tsx b/src/app/btc-vault/components/modals/withdraw/WithdrawSteps.tsx
similarity index 100%
rename from src/app/btc-vault/components/WithdrawSteps.tsx
rename to src/app/btc-vault/components/modals/withdraw/WithdrawSteps.tsx
diff --git a/src/app/btc-vault/components/modals/withdraw/index.ts b/src/app/btc-vault/components/modals/withdraw/index.ts
new file mode 100644
index 0000000000..148f6be33a
--- /dev/null
+++ b/src/app/btc-vault/components/modals/withdraw/index.ts
@@ -0,0 +1 @@
+export { BtcWithdrawModal } from './BtcWithdrawModal'