diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
index 74ad85889..01e44b68e 100644
--- a/Demo/Demo.xcodeproj/project.pbxproj
+++ b/Demo/Demo.xcodeproj/project.pbxproj
@@ -227,6 +227,93 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		1001E2B62CF643270023A03C /* CardVault */ = {
+			isa = PBXGroup;
+			children = (
+				1001E2BD2CF644E00023A03C /* CardVaultViewModel */,
+				3B43290F2A8FD7FD00C5441A /* CardVaultViews */,
+			);
+			path = CardVault;
+			sourceTree = "<group>";
+		};
+		1001E2B72CF6432F0023A03C /* PayPalVault */ = {
+			isa = PBXGroup;
+			children = (
+				1001E2BC2CF644BE0023A03C /* PayPalVaultViewModel */,
+				3BB60B512B1F9EE400A298CF /* PayPalVaultViews */,
+			);
+			path = PayPalVault;
+			sourceTree = "<group>";
+		};
+		1001E2B82CF643350023A03C /* CardPayments */ = {
+			isa = PBXGroup;
+			children = (
+				1001E2BB2CF6449B0023A03C /* CardPaymentViewModel */,
+				3BA56FEA2A9DCBB30081D14F /* CardViewComponents */,
+			);
+			path = CardPayments;
+			sourceTree = "<group>";
+		};
+		1001E2B92CF6433C0023A03C /* PayPalWebPayments */ = {
+			isa = PBXGroup;
+			children = (
+				1001E2BA2CF644480023A03C /* PayPalWebViewModel */,
+				3BA56FFF2A9FF6630081D14F /* PayPalWebPaymentsView */,
+			);
+			path = PayPalWebPayments;
+			sourceTree = "<group>";
+		};
+		1001E2BA2CF644480023A03C /* PayPalWebViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				3BA56FFB2A9FEFE90081D14F /* PayPalWebViewModel.swift */,
+			);
+			path = PayPalWebViewModel;
+			sourceTree = "<group>";
+		};
+		1001E2BB2CF6449B0023A03C /* CardPaymentViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				3BA56FE62A9DC9D70081D14F /* CardPaymentViewModel.swift */,
+				3BA56FE82A9DCA520081D14F /* CardPaymentState.swift */,
+			);
+			path = CardPaymentViewModel;
+			sourceTree = "<group>";
+		};
+		1001E2BC2CF644BE0023A03C /* PayPalVaultViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				3BB60B542B1FA00C00A298CF /* PayPalVaultViewModel.swift */,
+			);
+			path = PayPalVaultViewModel;
+			sourceTree = "<group>";
+		};
+		1001E2BD2CF644E00023A03C /* CardVaultViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				3B20273E2A89F24E0007907E /* CardVaultViewModel.swift */,
+			);
+			path = CardVaultViewModel;
+			sourceTree = "<group>";
+		};
+		1001E2BE2CF6548E0023A03C /* VaultViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				3BA0A58A2B1E240300330681 /* VaultViewModel.swift */,
+				3B2027402A8A72050007907E /* VaultState.swift */,
+			);
+			path = VaultViewModel;
+			sourceTree = "<group>";
+		};
+		1001E2BF2CF6590E0023A03C /* Vault */ = {
+			isa = PBXGroup;
+			children = (
+				1001E2BE2CF6548E0023A03C /* VaultViewModel */,
+				3B2501052B2679F000903EAB /* VaultViews */,
+			);
+			path = Vault;
+			sourceTree = "<group>";
+		};
 		3B2501052B2679F000903EAB /* VaultViews */ = {
 			isa = PBXGroup;
 			children = (
@@ -248,22 +335,22 @@
 			path = CardVaultViews;
 			sourceTree = "<group>";
 		};
-		3BA56FEA2A9DCBB30081D14F /* CardPaymentViews */ = {
+		3BA56FEA2A9DCBB30081D14F /* CardViewComponents */ = {
 			isa = PBXGroup;
 			children = (
+				3BA56FF32A9DCD790081D14F /* CardPaymentView.swift */,
 				3BA56FEB2A9DCBF30081D14F /* CreateOrderCardPaymentView.swift */,
 				3BA56FED2A9DCC340081D14F /* OrderCreateCardResultView.swift */,
 				3BA56FEF2A9DCCFD0081D14F /* CardOrderApproveView.swift */,
 				3BA56FF12A9DCD440081D14F /* CardApprovalResultView.swift */,
-				3BA56FF32A9DCD790081D14F /* CardPaymentView.swift */,
-				3BA56FF52A9E9AAB0081D14F /* CardOrderActionButton.swift */,
 				3BA56FF72A9FDB5A0081D14F /* CardPaymentOrderCompletionView.swift */,
+				3BA56FF52A9E9AAB0081D14F /* CardOrderActionButton.swift */,
 				3BA56FF92A9FE4180081D14F /* CardOrderCompletionResultView.swift */,
 			);
-			path = CardPaymentViews;
+			path = CardViewComponents;
 			sourceTree = "<group>";
 		};
-		3BA56FFF2A9FF6630081D14F /* PayPalWebPayments */ = {
+		3BA56FFF2A9FF6630081D14F /* PayPalWebPaymentsView */ = {
 			isa = PBXGroup;
 			children = (
 				3BA570062AA0DF330081D14F /* PayPalWebButtonsView.swift */,
@@ -271,9 +358,8 @@
 				3BA570002AA052E80081D14F /* PayPalWebPaymentsView.swift */,
 				BE8117632B07E778009867B9 /* PayPalWebResultView.swift */,
 				3B6472A62AFAEB3A004745C4 /* PayPalWebTransactionView.swift */,
-				3BA56FFB2A9FEFE90081D14F /* PayPalWebViewModel.swift */,
 			);
-			path = PayPalWebPayments;
+			path = PayPalWebPaymentsView;
 			sourceTree = "<group>";
 		};
 		3BB60B512B1F9EE400A298CF /* PayPalVaultViews */ = {
@@ -300,13 +386,6 @@
 			path = CommonComponents;
 			sourceTree = "<group>";
 		};
-		53B9E8E828C93B2B00719239 /* Helpers */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Helpers;
-			sourceTree = "<group>";
-		};
 		805AB84C26B87A87003BEE0D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -349,8 +428,12 @@
 		806F1E3726B85367007A60E6 /* Demo */ = {
 			isa = PBXGroup;
 			children = (
+				1001E2BF2CF6590E0023A03C /* Vault */,
+				1001E2B92CF6433C0023A03C /* PayPalWebPayments */,
+				1001E2B72CF6432F0023A03C /* PayPalVault */,
+				1001E2B82CF643350023A03C /* CardPayments */,
+				1001E2B62CF643270023A03C /* CardVault */,
 				806C7A812C000626000E85E8 /* Demo.entitlements */,
-				53B9E8E828C93B2B00719239 /* Helpers */,
 				806F1E4126B85369007A60E6 /* Assets.xcassets */,
 				BED0422F2710833100C80954 /* Card */,
 				BECD849E27036D95007CCAE4 /* DemoSettings */,
@@ -360,7 +443,6 @@
 				80F33CEB26F8E799006811B1 /* Models */,
 				BE1766B526FA562B007EF438 /* Networking */,
 				BEDE3047275E998700D275FD /* SwiftUIComponents */,
-				BE4876A827567D4200802EAF /* ViewModels */,
 				3BCCFE482A9D96CA00C5102F /* DemoApp.swift */,
 			);
 			path = Demo;
@@ -411,19 +493,6 @@
 			path = Networking;
 			sourceTree = "<group>";
 		};
-		BE4876A827567D4200802EAF /* ViewModels */ = {
-			isa = PBXGroup;
-			children = (
-				3B20273E2A89F24E0007907E /* CardVaultViewModel.swift */,
-				3BA0A58A2B1E240300330681 /* VaultViewModel.swift */,
-				3B2027402A8A72050007907E /* VaultState.swift */,
-				3BA56FE62A9DC9D70081D14F /* CardPaymentViewModel.swift */,
-				3BA56FE82A9DCA520081D14F /* CardPaymentState.swift */,
-				3BB60B542B1FA00C00A298CF /* PayPalVaultViewModel.swift */,
-			);
-			path = ViewModels;
-			sourceTree = "<group>";
-		};
 		BECD849E27036D95007CCAE4 /* DemoSettings */ = {
 			isa = PBXGroup;
 			children = (
@@ -446,12 +515,7 @@
 		BEDE3047275E998700D275FD /* SwiftUIComponents */ = {
 			isa = PBXGroup;
 			children = (
-				3B2501052B2679F000903EAB /* VaultViews */,
-				3BB60B512B1F9EE400A298CF /* PayPalVaultViews */,
-				3BA56FFF2A9FF6630081D14F /* PayPalWebPayments */,
-				3BA56FEA2A9DCBB30081D14F /* CardPaymentViews */,
 				3BCCFE472A9D962E00C5102F /* CommonComponents */,
-				3B43290F2A8FD7FD00C5441A /* CardVaultViews */,
 				CB9ED44D28411B110081F4DE /* SwiftUIPaymentButtonDemo.swift */,
 				3BCCFE4A2A9D985F00C5102F /* FeatureSelectionView.swift */,
 				BE8117672B080472009867B9 /* CurrentState.swift */,
diff --git a/Demo/Demo/ViewModels/CardPaymentState.swift b/Demo/Demo/CardPayments/CardPaymentViewModel/CardPaymentState.swift
similarity index 100%
rename from Demo/Demo/ViewModels/CardPaymentState.swift
rename to Demo/Demo/CardPayments/CardPaymentViewModel/CardPaymentState.swift
diff --git a/Demo/Demo/ViewModels/CardPaymentViewModel.swift b/Demo/Demo/CardPayments/CardPaymentViewModel/CardPaymentViewModel.swift
similarity index 100%
rename from Demo/Demo/ViewModels/CardPaymentViewModel.swift
rename to Demo/Demo/CardPayments/CardPaymentViewModel/CardPaymentViewModel.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardApprovalResultView.swift b/Demo/Demo/CardPayments/CardViewComponents/CardApprovalResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CardApprovalResultView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CardApprovalResultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderActionButton.swift b/Demo/Demo/CardPayments/CardViewComponents/CardOrderActionButton.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderActionButton.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CardOrderActionButton.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderApproveView.swift b/Demo/Demo/CardPayments/CardViewComponents/CardOrderApproveView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderApproveView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CardOrderApproveView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderCompletionResultView.swift b/Demo/Demo/CardPayments/CardViewComponents/CardOrderCompletionResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderCompletionResultView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CardOrderCompletionResultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardPaymentOrderCompletionView.swift b/Demo/Demo/CardPayments/CardViewComponents/CardPaymentOrderCompletionView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CardPaymentOrderCompletionView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CardPaymentOrderCompletionView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardPaymentView.swift b/Demo/Demo/CardPayments/CardViewComponents/CardPaymentView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CardPaymentView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CardPaymentView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CreateOrderCardPaymentView.swift b/Demo/Demo/CardPayments/CardViewComponents/CreateOrderCardPaymentView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/CreateOrderCardPaymentView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/CreateOrderCardPaymentView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/OrderCreateCardResultView.swift b/Demo/Demo/CardPayments/CardViewComponents/OrderCreateCardResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardPaymentViews/OrderCreateCardResultView.swift
rename to Demo/Demo/CardPayments/CardViewComponents/OrderCreateCardResultView.swift
diff --git a/Demo/Demo/ViewModels/CardVaultViewModel.swift b/Demo/Demo/CardVault/CardVaultViewModel/CardVaultViewModel.swift
similarity index 100%
rename from Demo/Demo/ViewModels/CardVaultViewModel.swift
rename to Demo/Demo/CardVault/CardVaultViewModel/CardVaultViewModel.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardVaultViews/CardVaultView.swift b/Demo/Demo/CardVault/CardVaultViews/CardVaultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardVaultViews/CardVaultView.swift
rename to Demo/Demo/CardVault/CardVaultViews/CardVaultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenResultView.swift b/Demo/Demo/CardVault/CardVaultViews/UpdateSetupTokenResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenResultView.swift
rename to Demo/Demo/CardVault/CardVaultViews/UpdateSetupTokenResultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenView.swift b/Demo/Demo/CardVault/CardVaultViews/UpdateSetupTokenView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenView.swift
rename to Demo/Demo/CardVault/CardVaultViews/UpdateSetupTokenView.swift
diff --git a/Demo/Demo/ViewModels/PayPalVaultViewModel.swift b/Demo/Demo/PayPalVault/PayPalVaultViewModel/PayPalVaultViewModel.swift
similarity index 100%
rename from Demo/Demo/ViewModels/PayPalVaultViewModel.swift
rename to Demo/Demo/PayPalVault/PayPalVaultViewModel/PayPalVaultViewModel.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultResultView.swift b/Demo/Demo/PayPalVault/PayPalVaultViews/PayPalVaultResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultResultView.swift
rename to Demo/Demo/PayPalVault/PayPalVaultViews/PayPalVaultResultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultView.swift b/Demo/Demo/PayPalVault/PayPalVaultViews/PayPalVaultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultView.swift
rename to Demo/Demo/PayPalVault/PayPalVaultViews/PayPalVaultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebButtonsView.swift b/Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebButtonsView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebButtonsView.swift
rename to Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebButtonsView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebCreateOrderView.swift b/Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebCreateOrderView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebCreateOrderView.swift
rename to Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebCreateOrderView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebPaymentsView.swift b/Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebPaymentsView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebPaymentsView.swift
rename to Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebPaymentsView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebResultView.swift b/Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebResultView.swift
rename to Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebResultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebTransactionView.swift b/Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebTransactionView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebTransactionView.swift
rename to Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebTransactionView.swift
diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebViewModel.swift b/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebViewModel.swift
rename to Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift
diff --git a/Demo/Demo/ViewModels/VaultState.swift b/Demo/Demo/Vault/VaultViewModel/VaultState.swift
similarity index 100%
rename from Demo/Demo/ViewModels/VaultState.swift
rename to Demo/Demo/Vault/VaultViewModel/VaultState.swift
diff --git a/Demo/Demo/ViewModels/VaultViewModel.swift b/Demo/Demo/Vault/VaultViewModel/VaultViewModel.swift
similarity index 100%
rename from Demo/Demo/ViewModels/VaultViewModel.swift
rename to Demo/Demo/Vault/VaultViewModel/VaultViewModel.swift
diff --git a/Demo/Demo/SwiftUIComponents/VaultViews/CreatePaymentTokenView.swift b/Demo/Demo/Vault/VaultViews/CreatePaymentTokenView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/VaultViews/CreatePaymentTokenView.swift
rename to Demo/Demo/Vault/VaultViews/CreatePaymentTokenView.swift
diff --git a/Demo/Demo/SwiftUIComponents/VaultViews/CreateSetupTokenView.swift b/Demo/Demo/Vault/VaultViews/CreateSetupTokenView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/VaultViews/CreateSetupTokenView.swift
rename to Demo/Demo/Vault/VaultViews/CreateSetupTokenView.swift
diff --git a/Demo/Demo/SwiftUIComponents/VaultViews/PaymentTokenResultView.swift b/Demo/Demo/Vault/VaultViews/PaymentTokenResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/VaultViews/PaymentTokenResultView.swift
rename to Demo/Demo/Vault/VaultViews/PaymentTokenResultView.swift
diff --git a/Demo/Demo/SwiftUIComponents/VaultViews/SetupTokenResultView.swift b/Demo/Demo/Vault/VaultViews/SetupTokenResultView.swift
similarity index 100%
rename from Demo/Demo/SwiftUIComponents/VaultViews/SetupTokenResultView.swift
rename to Demo/Demo/Vault/VaultViews/SetupTokenResultView.swift