diff --git a/apps/payment-ui/src/components/CancelledTransactionView.tsx b/apps/payment-ui/src/components/CheckoutSection/CancelledTransactionView.tsx
similarity index 100%
rename from apps/payment-ui/src/components/CancelledTransactionView.tsx
rename to apps/payment-ui/src/components/CheckoutSection/CancelledTransactionView.tsx
diff --git a/apps/payment-ui/src/components/ErrorView.tsx b/apps/payment-ui/src/components/CheckoutSection/ErrorView.tsx
similarity index 100%
rename from apps/payment-ui/src/components/ErrorView.tsx
rename to apps/payment-ui/src/components/CheckoutSection/ErrorView.tsx
diff --git a/apps/payment-ui/src/components/GeoBlockedView.tsx b/apps/payment-ui/src/components/CheckoutSection/GeoBlockedView.tsx
similarity index 100%
rename from apps/payment-ui/src/components/GeoBlockedView.tsx
rename to apps/payment-ui/src/components/CheckoutSection/GeoBlockedView.tsx
diff --git a/apps/payment-ui/src/components/PaymentLoadingView.tsx b/apps/payment-ui/src/components/CheckoutSection/PaymentLoadingView.tsx
similarity index 100%
rename from apps/payment-ui/src/components/PaymentLoadingView.tsx
rename to apps/payment-ui/src/components/CheckoutSection/PaymentLoadingView.tsx
diff --git a/apps/payment-ui/src/components/PaymentView.tsx b/apps/payment-ui/src/components/CheckoutSection/PaymentView.tsx
similarity index 96%
rename from apps/payment-ui/src/components/PaymentView.tsx
rename to apps/payment-ui/src/components/CheckoutSection/PaymentView.tsx
index dba0e052..99abba8a 100644
--- a/apps/payment-ui/src/components/PaymentView.tsx
+++ b/apps/payment-ui/src/components/CheckoutSection/PaymentView.tsx
@@ -2,7 +2,7 @@ import { PayToLabel } from '@/components/PayToLabel';
 import { PaymentMethodTab } from '@/components/PaymentMethodTab';
 import { getPaymentMethod } from '@/features/payment-options/paymentOptionsSlice';
 import { useSelector } from 'react-redux';
-import { QRCode } from './QRCode';
+import { QRCode } from '../QRCode';
 
 export const PaymentView: React.FC = () => {
     const paymentMethod = useSelector(getPaymentMethod);
diff --git a/apps/payment-ui/src/components/ThankYou.tsx b/apps/payment-ui/src/components/CheckoutSection/ThankYou.tsx
similarity index 93%
rename from apps/payment-ui/src/components/ThankYou.tsx
rename to apps/payment-ui/src/components/CheckoutSection/ThankYou.tsx
index 5aa122b1..11c2e3f6 100644
--- a/apps/payment-ui/src/components/ThankYou.tsx
+++ b/apps/payment-ui/src/components/CheckoutSection/ThankYou.tsx
@@ -1,5 +1,5 @@
 import Image from 'next/image';
-import FinishHandler from './handlers/FinishHandler';
+import FinishHandler from '../handlers/FinishHandler';
 
 export const ThankYouView = () => {
     return (
diff --git a/apps/payment-ui/src/components/CheckoutSection.tsx b/apps/payment-ui/src/components/CheckoutSection/index.tsx
similarity index 100%
rename from apps/payment-ui/src/components/CheckoutSection.tsx
rename to apps/payment-ui/src/components/CheckoutSection/index.tsx