diff --git a/src/Stripe.net/Entities/Account.cs b/src/Stripe.net/Entities/Accounts/Account.cs
similarity index 94%
rename from src/Stripe.net/Entities/Account.cs
rename to src/Stripe.net/Entities/Accounts/Account.cs
index 5ff260ae7f..916784badc 100644
--- a/src/Stripe.net/Entities/Account.cs
+++ b/src/Stripe.net/Entities/Accounts/Account.cs
@@ -49,6 +49,9 @@ internal object InternalBusinessLogo
         [JsonProperty("currencies_supported")]
         public string[] CurrenciesSupported { get; set; }
 
+        [JsonProperty("keys")]
+        public CustomAccountKeys Keys { get; set; }
+
         [JsonProperty("debit_negative_balances")]
         public bool DebitNegativeBalances { get; set; }
 
@@ -82,6 +85,15 @@ internal object InternalBusinessLogo
         [JsonProperty("metadata")]
         public Dictionary<string, string> Metadata { get; set; }
 
+        [JsonProperty("payouts_enabled")]
+        public bool PayoutsEnabled { get; set; }
+
+        [JsonProperty("payout_schedule")]
+        public PayoutSchedule PayoutSchedule { get; set; }
+
+        [JsonProperty("payout_statement_descriptor")]
+        public string PayoutStatementDescriptor { get; set; }
+
         [JsonProperty("product_description")]
         public string ProductDescription { get; set; }
 
@@ -97,28 +109,16 @@ internal object InternalBusinessLogo
         [JsonProperty("support_url")]
         public string SupportUrl { get; set; }
 
+        [JsonProperty("tos_acceptance")]
+        public TermsOfServiceAcceptance TosAcceptance { get; set; }
+
         [JsonProperty("timezone")]
         public string Timezone { get; set; }
 
-        [JsonProperty("tos_acceptance")]
-        public TermsOfServiceAcceptance TermsOfServiceAcceptance { get; set; }
-
         [JsonProperty("type")]
         public string Type { get; set; }
 
-        [JsonProperty("payouts_enabled")]
-        public bool PayoutsEnabled { get; set; }
-
-        [JsonProperty("payout_schedule")]
-        public PayoutSchedule PayoutSchedule { get; set; }
-
-        [JsonProperty("payout_statement_descriptor")]
-        public string PayoutStatementDescriptor { get; set; }
-
         [JsonProperty("verification")]
-        public AccountVerification AccountVerification { get; set; }
-
-        [JsonProperty("keys")]
-        public CustomAccountKeys CustomAccountKeys { get; set; }
+        public AccountVerification Verification { get; set; }
      }
 }
diff --git a/src/Stripe.net/Entities/AccountVerification.cs b/src/Stripe.net/Entities/Accounts/AccountVerification.cs
similarity index 100%
rename from src/Stripe.net/Entities/AccountVerification.cs
rename to src/Stripe.net/Entities/Accounts/AccountVerification.cs
diff --git a/src/Stripe.net/Entities/AdditionalOwners.cs b/src/Stripe.net/Entities/Accounts/AdditionalOwners.cs
similarity index 100%
rename from src/Stripe.net/Entities/AdditionalOwners.cs
rename to src/Stripe.net/Entities/Accounts/AdditionalOwners.cs
diff --git a/src/Stripe.net/Entities/Accounts/AddressJapan.cs b/src/Stripe.net/Entities/Accounts/AddressJapan.cs
new file mode 100644
index 0000000000..12822b2500
--- /dev/null
+++ b/src/Stripe.net/Entities/Accounts/AddressJapan.cs
@@ -0,0 +1,10 @@
+namespace Stripe
+{
+    using Newtonsoft.Json;
+
+    public class AddressJapan : Address
+    {
+        [JsonProperty("town")]
+        public string Town { get; set; }
+    }
+}
diff --git a/src/Stripe.net/Entities/BirthDay.cs b/src/Stripe.net/Entities/Accounts/BirthDay.cs
similarity index 100%
rename from src/Stripe.net/Entities/BirthDay.cs
rename to src/Stripe.net/Entities/Accounts/BirthDay.cs
diff --git a/src/Stripe.net/Entities/CustomAccountKeys.cs b/src/Stripe.net/Entities/Accounts/CustomAccountKeys.cs
similarity index 100%
rename from src/Stripe.net/Entities/CustomAccountKeys.cs
rename to src/Stripe.net/Entities/Accounts/CustomAccountKeys.cs
diff --git a/src/Stripe.net/Entities/DeclineChargeOn.cs b/src/Stripe.net/Entities/Accounts/DeclineChargeOn.cs
similarity index 100%
rename from src/Stripe.net/Entities/DeclineChargeOn.cs
rename to src/Stripe.net/Entities/Accounts/DeclineChargeOn.cs
diff --git a/src/Stripe.net/Entities/LegalEntity.cs b/src/Stripe.net/Entities/Accounts/LegalEntity.cs
similarity index 86%
rename from src/Stripe.net/Entities/LegalEntity.cs
rename to src/Stripe.net/Entities/Accounts/LegalEntity.cs
index edc2dd2f62..bc7aadafd5 100644
--- a/src/Stripe.net/Entities/LegalEntity.cs
+++ b/src/Stripe.net/Entities/Accounts/LegalEntity.cs
@@ -12,10 +12,10 @@ public class LegalEntity : StripeEntity
         public Address Address { get; set; }
 
         [JsonProperty("address_kana")]
-        public Address AddressKana { get; set; }
+        public AddressJapan AddressKana { get; set; }
 
         [JsonProperty("address_kanji")]
-        public Address AddressKanji { get; set; }
+        public AddressJapan AddressKanji { get; set; }
 
         [JsonProperty("business_name")]
         public string BusinessName { get; set; }
@@ -39,7 +39,7 @@ public class LegalEntity : StripeEntity
         public bool BusinessVatIdProvided { get; set; }
 
         [JsonProperty("dob")]
-        public BirthDay BirthDay { get; set; }
+        public BirthDay Dob { get; set; }
 
         [JsonProperty("first_name")]
         public string FirstName { get; set; }
@@ -69,10 +69,10 @@ public class LegalEntity : StripeEntity
         public Address PersonalAddress { get; set; }
 
         [JsonProperty("personal_address_kana")]
-        public Address PersonalAddressKana { get; set; }
+        public AddressJapan PersonalAddressKana { get; set; }
 
         [JsonProperty("personal_address_kanji")]
-        public Address PersonalAddressKanji { get; set; }
+        public AddressJapan PersonalAddressKanji { get; set; }
 
         [JsonProperty("personal_id_number_provided")]
         public bool PersonalIdNumberProvided { get; set; }
@@ -81,7 +81,7 @@ public class LegalEntity : StripeEntity
         public string PhoneNumber { get; set; }
 
         [JsonProperty("ssn_last_4_provided")]
-        public bool SocialSecurityNumberLastFourProvided { get; set; }
+        public bool SsnLast4Provided { get; set; }
 
         [JsonProperty("tax_id_registrar")]
         public string TaxIdRegistrar { get; set; }
@@ -90,6 +90,6 @@ public class LegalEntity : StripeEntity
         public string Type { get; set; }
 
         [JsonProperty("verification")]
-        public LegalEntityVerification LegalEntityVerification { get; set; }
+        public LegalEntityVerification Verification { get; set; }
     }
 }
diff --git a/src/Stripe.net/Entities/LegalEntityVerification.cs b/src/Stripe.net/Entities/Accounts/LegalEntityVerification.cs
similarity index 100%
rename from src/Stripe.net/Entities/LegalEntityVerification.cs
rename to src/Stripe.net/Entities/Accounts/LegalEntityVerification.cs
diff --git a/src/Stripe.net/Entities/PayoutSchedule.cs b/src/Stripe.net/Entities/Accounts/PayoutSchedule.cs
similarity index 100%
rename from src/Stripe.net/Entities/PayoutSchedule.cs
rename to src/Stripe.net/Entities/Accounts/PayoutSchedule.cs
diff --git a/src/Stripe.net/Entities/TermsOfServiceAcceptance.cs b/src/Stripe.net/Entities/Accounts/TermsOfServiceAcceptance.cs
similarity index 100%
rename from src/Stripe.net/Entities/TermsOfServiceAcceptance.cs
rename to src/Stripe.net/Entities/Accounts/TermsOfServiceAcceptance.cs
diff --git a/src/Stripe.net/Entities/ApplePayDomain.cs b/src/Stripe.net/Entities/ApplePayDomains/ApplePayDomain.cs
similarity index 100%
rename from src/Stripe.net/Entities/ApplePayDomain.cs
rename to src/Stripe.net/Entities/ApplePayDomains/ApplePayDomain.cs
diff --git a/src/Stripe.net/Entities/ApplicationFeeRefund.cs b/src/Stripe.net/Entities/ApplicationFeeRefunds/ApplicationFeeRefund.cs
similarity index 100%
rename from src/Stripe.net/Entities/ApplicationFeeRefund.cs
rename to src/Stripe.net/Entities/ApplicationFeeRefunds/ApplicationFeeRefund.cs
diff --git a/src/Stripe.net/Entities/ApplicationFee.cs b/src/Stripe.net/Entities/ApplicationFees/ApplicationFee.cs
similarity index 100%
rename from src/Stripe.net/Entities/ApplicationFee.cs
rename to src/Stripe.net/Entities/ApplicationFees/ApplicationFee.cs
diff --git a/src/Stripe.net/Entities/Balance.cs b/src/Stripe.net/Entities/Balance/Balance.cs
similarity index 100%
rename from src/Stripe.net/Entities/Balance.cs
rename to src/Stripe.net/Entities/Balance/Balance.cs
diff --git a/src/Stripe.net/Entities/BalanceAmount.cs b/src/Stripe.net/Entities/Balance/BalanceAmount.cs
similarity index 100%
rename from src/Stripe.net/Entities/BalanceAmount.cs
rename to src/Stripe.net/Entities/Balance/BalanceAmount.cs
diff --git a/src/Stripe.net/Entities/BalanceTransaction.cs b/src/Stripe.net/Entities/BalanceTransactions/BalanceTransaction.cs
similarity index 100%
rename from src/Stripe.net/Entities/BalanceTransaction.cs
rename to src/Stripe.net/Entities/BalanceTransactions/BalanceTransaction.cs
diff --git a/src/Stripe.net/Entities/BalanceTransactionSource.cs b/src/Stripe.net/Entities/BalanceTransactions/BalanceTransactionSource.cs
similarity index 100%
rename from src/Stripe.net/Entities/BalanceTransactionSource.cs
rename to src/Stripe.net/Entities/BalanceTransactions/BalanceTransactionSource.cs
diff --git a/src/Stripe.net/Entities/Fee.cs b/src/Stripe.net/Entities/BalanceTransactions/Fee.cs
similarity index 100%
rename from src/Stripe.net/Entities/Fee.cs
rename to src/Stripe.net/Entities/BalanceTransactions/Fee.cs
diff --git a/src/Stripe.net/Entities/BankAccount.cs b/src/Stripe.net/Entities/BankAccounts/BankAccount.cs
similarity index 100%
rename from src/Stripe.net/Entities/BankAccount.cs
rename to src/Stripe.net/Entities/BankAccounts/BankAccount.cs
diff --git a/src/Stripe.net/Entities/Card.cs b/src/Stripe.net/Entities/Cards/Card.cs
similarity index 100%
rename from src/Stripe.net/Entities/Card.cs
rename to src/Stripe.net/Entities/Cards/Card.cs
diff --git a/src/Stripe.net/Entities/Charge.cs b/src/Stripe.net/Entities/Charges/Charge.cs
similarity index 100%
rename from src/Stripe.net/Entities/Charge.cs
rename to src/Stripe.net/Entities/Charges/Charge.cs
diff --git a/src/Stripe.net/Entities/ChargeLevel3.cs b/src/Stripe.net/Entities/Charges/ChargeLevel3.cs
similarity index 100%
rename from src/Stripe.net/Entities/ChargeLevel3.cs
rename to src/Stripe.net/Entities/Charges/ChargeLevel3.cs
diff --git a/src/Stripe.net/Entities/ChargeLevel3LineItem.cs b/src/Stripe.net/Entities/Charges/ChargeLevel3LineItem.cs
similarity index 100%
rename from src/Stripe.net/Entities/ChargeLevel3LineItem.cs
rename to src/Stripe.net/Entities/Charges/ChargeLevel3LineItem.cs
diff --git a/src/Stripe.net/Entities/Outcome.cs b/src/Stripe.net/Entities/Charges/Outcome.cs
similarity index 100%
rename from src/Stripe.net/Entities/Outcome.cs
rename to src/Stripe.net/Entities/Charges/Outcome.cs
diff --git a/src/Stripe.net/Entities/OutcomeRule.cs b/src/Stripe.net/Entities/Charges/OutcomeRule.cs
similarity index 100%
rename from src/Stripe.net/Entities/OutcomeRule.cs
rename to src/Stripe.net/Entities/Charges/OutcomeRule.cs
diff --git a/src/Stripe.net/Entities/Address.cs b/src/Stripe.net/Entities/Common/Address.cs
similarity index 88%
rename from src/Stripe.net/Entities/Address.cs
rename to src/Stripe.net/Entities/Common/Address.cs
index 8474981fa0..1d8740638e 100644
--- a/src/Stripe.net/Entities/Address.cs
+++ b/src/Stripe.net/Entities/Common/Address.cs
@@ -21,8 +21,5 @@ public class Address : StripeEntity
 
         [JsonProperty("state")]
         public string State { get; set; }
-
-        [JsonProperty("town")]
-        public string Town { get; set; }
     }
 }
diff --git a/src/Stripe.net/Entities/Application.cs b/src/Stripe.net/Entities/Common/Application.cs
similarity index 100%
rename from src/Stripe.net/Entities/Application.cs
rename to src/Stripe.net/Entities/Common/Application.cs
diff --git a/src/Stripe.net/Entities/PaymentSource.cs b/src/Stripe.net/Entities/Common/PaymentSource.cs
similarity index 100%
rename from src/Stripe.net/Entities/PaymentSource.cs
rename to src/Stripe.net/Entities/Common/PaymentSource.cs
diff --git a/src/Stripe.net/Entities/Review.cs b/src/Stripe.net/Entities/Common/Review.cs
similarity index 100%
rename from src/Stripe.net/Entities/Review.cs
rename to src/Stripe.net/Entities/Common/Review.cs
diff --git a/src/Stripe.net/Entities/Shipping.cs b/src/Stripe.net/Entities/Common/Shipping.cs
similarity index 100%
rename from src/Stripe.net/Entities/Shipping.cs
rename to src/Stripe.net/Entities/Common/Shipping.cs
diff --git a/src/Stripe.net/Entities/CountrySpec.cs b/src/Stripe.net/Entities/CountrySpecs/CountrySpec.cs
similarity index 100%
rename from src/Stripe.net/Entities/CountrySpec.cs
rename to src/Stripe.net/Entities/CountrySpecs/CountrySpec.cs
diff --git a/src/Stripe.net/Entities/Coupon.cs b/src/Stripe.net/Entities/Coupons/Coupon.cs
similarity index 100%
rename from src/Stripe.net/Entities/Coupon.cs
rename to src/Stripe.net/Entities/Coupons/Coupon.cs
diff --git a/src/Stripe.net/Entities/Customer.cs b/src/Stripe.net/Entities/Customers/Customer.cs
similarity index 100%
rename from src/Stripe.net/Entities/Customer.cs
rename to src/Stripe.net/Entities/Customers/Customer.cs
diff --git a/src/Stripe.net/Entities/CustomerTaxInfo.cs b/src/Stripe.net/Entities/Customers/CustomerTaxInfo.cs
similarity index 100%
rename from src/Stripe.net/Entities/CustomerTaxInfo.cs
rename to src/Stripe.net/Entities/Customers/CustomerTaxInfo.cs
diff --git a/src/Stripe.net/Entities/CustomerTaxInfoVerification.cs b/src/Stripe.net/Entities/Customers/CustomerTaxInfoVerification.cs
similarity index 100%
rename from src/Stripe.net/Entities/CustomerTaxInfoVerification.cs
rename to src/Stripe.net/Entities/Customers/CustomerTaxInfoVerification.cs
diff --git a/src/Stripe.net/Entities/Discount.cs b/src/Stripe.net/Entities/Discounts/Discount.cs
similarity index 100%
rename from src/Stripe.net/Entities/Discount.cs
rename to src/Stripe.net/Entities/Discounts/Discount.cs
diff --git a/src/Stripe.net/Entities/Dispute.cs b/src/Stripe.net/Entities/Disputes/Dispute.cs
similarity index 100%
rename from src/Stripe.net/Entities/Dispute.cs
rename to src/Stripe.net/Entities/Disputes/Dispute.cs
diff --git a/src/Stripe.net/Entities/Evidence.cs b/src/Stripe.net/Entities/Disputes/Evidence.cs
similarity index 100%
rename from src/Stripe.net/Entities/Evidence.cs
rename to src/Stripe.net/Entities/Disputes/Evidence.cs
diff --git a/src/Stripe.net/Entities/EvidenceDetails.cs b/src/Stripe.net/Entities/Disputes/EvidenceDetails.cs
similarity index 100%
rename from src/Stripe.net/Entities/EvidenceDetails.cs
rename to src/Stripe.net/Entities/Disputes/EvidenceDetails.cs
diff --git a/src/Stripe.net/Entities/EphemeralKey.cs b/src/Stripe.net/Entities/EphemeralKeys/EphemeralKey.cs
similarity index 100%
rename from src/Stripe.net/Entities/EphemeralKey.cs
rename to src/Stripe.net/Entities/EphemeralKeys/EphemeralKey.cs
diff --git a/src/Stripe.net/Entities/EphemeralkeyAssociatedObject.cs b/src/Stripe.net/Entities/EphemeralKeys/EphemeralkeyAssociatedObject.cs
similarity index 100%
rename from src/Stripe.net/Entities/EphemeralkeyAssociatedObject.cs
rename to src/Stripe.net/Entities/EphemeralKeys/EphemeralkeyAssociatedObject.cs
diff --git a/src/Stripe.net/Entities/Event.cs b/src/Stripe.net/Entities/Events/Event.cs
similarity index 100%
rename from src/Stripe.net/Entities/Event.cs
rename to src/Stripe.net/Entities/Events/Event.cs
diff --git a/src/Stripe.net/Entities/EventData.cs b/src/Stripe.net/Entities/Events/EventData.cs
similarity index 100%
rename from src/Stripe.net/Entities/EventData.cs
rename to src/Stripe.net/Entities/Events/EventData.cs
diff --git a/src/Stripe.net/Entities/EventRequest.cs b/src/Stripe.net/Entities/Events/EventRequest.cs
similarity index 100%
rename from src/Stripe.net/Entities/EventRequest.cs
rename to src/Stripe.net/Entities/Events/EventRequest.cs
diff --git a/src/Stripe.net/Entities/ExchangeRate.cs b/src/Stripe.net/Entities/ExchangeRates/ExchangeRate.cs
similarity index 100%
rename from src/Stripe.net/Entities/ExchangeRate.cs
rename to src/Stripe.net/Entities/ExchangeRates/ExchangeRate.cs
diff --git a/src/Stripe.net/Entities/ExternalAccount.cs b/src/Stripe.net/Entities/ExternalAccounts/ExternalAccount.cs
similarity index 100%
rename from src/Stripe.net/Entities/ExternalAccount.cs
rename to src/Stripe.net/Entities/ExternalAccounts/ExternalAccount.cs
diff --git a/src/Stripe.net/Entities/FileLink.cs b/src/Stripe.net/Entities/FileLinks/FileLink.cs
similarity index 100%
rename from src/Stripe.net/Entities/FileLink.cs
rename to src/Stripe.net/Entities/FileLinks/FileLink.cs
diff --git a/src/Stripe.net/Entities/File.cs b/src/Stripe.net/Entities/Files/File.cs
similarity index 100%
rename from src/Stripe.net/Entities/File.cs
rename to src/Stripe.net/Entities/Files/File.cs
diff --git a/src/Stripe.net/Entities/Invoice.cs b/src/Stripe.net/Entities/Invoices/Invoice.cs
similarity index 100%
rename from src/Stripe.net/Entities/Invoice.cs
rename to src/Stripe.net/Entities/Invoices/Invoice.cs
diff --git a/src/Stripe.net/Entities/InvoiceLineItem.cs b/src/Stripe.net/Entities/Invoices/InvoiceLineItem.cs
similarity index 100%
rename from src/Stripe.net/Entities/InvoiceLineItem.cs
rename to src/Stripe.net/Entities/Invoices/InvoiceLineItem.cs
diff --git a/src/Stripe.net/Entities/Issuing/Authorization.cs b/src/Stripe.net/Entities/Issuing/Authorizations/Authorization.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Authorization.cs
rename to src/Stripe.net/Entities/Issuing/Authorizations/Authorization.cs
diff --git a/src/Stripe.net/Entities/Issuing/AuthorizationControls.cs b/src/Stripe.net/Entities/Issuing/Authorizations/AuthorizationControls.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/AuthorizationControls.cs
rename to src/Stripe.net/Entities/Issuing/Authorizations/AuthorizationControls.cs
diff --git a/src/Stripe.net/Entities/Issuing/RequestHistory.cs b/src/Stripe.net/Entities/Issuing/Authorizations/RequestHistory.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/RequestHistory.cs
rename to src/Stripe.net/Entities/Issuing/Authorizations/RequestHistory.cs
diff --git a/src/Stripe.net/Entities/Issuing/VerificationData.cs b/src/Stripe.net/Entities/Issuing/Authorizations/VerificationData.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/VerificationData.cs
rename to src/Stripe.net/Entities/Issuing/Authorizations/VerificationData.cs
diff --git a/src/Stripe.net/Entities/Issuing/Cardholder.cs b/src/Stripe.net/Entities/Issuing/Cardholders/Cardholder.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Cardholder.cs
rename to src/Stripe.net/Entities/Issuing/Cardholders/Cardholder.cs
diff --git a/src/Stripe.net/Entities/Issuing/Card.cs b/src/Stripe.net/Entities/Issuing/Cards/Card.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Card.cs
rename to src/Stripe.net/Entities/Issuing/Cards/Card.cs
diff --git a/src/Stripe.net/Entities/Issuing/CardDetails.cs b/src/Stripe.net/Entities/Issuing/Cards/CardDetails.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/CardDetails.cs
rename to src/Stripe.net/Entities/Issuing/Cards/CardDetails.cs
diff --git a/src/Stripe.net/Entities/Issuing/CardShipping.cs b/src/Stripe.net/Entities/Issuing/Cards/CardShipping.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/CardShipping.cs
rename to src/Stripe.net/Entities/Issuing/Cards/CardShipping.cs
diff --git a/src/Stripe.net/Entities/Issuing/Billing.cs b/src/Stripe.net/Entities/Issuing/Common/Billing.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Billing.cs
rename to src/Stripe.net/Entities/Issuing/Common/Billing.cs
diff --git a/src/Stripe.net/Entities/Issuing/MerchantData.cs b/src/Stripe.net/Entities/Issuing/Common/MerchantData.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/MerchantData.cs
rename to src/Stripe.net/Entities/Issuing/Common/MerchantData.cs
diff --git a/src/Stripe.net/Entities/Issuing/Dispute.cs b/src/Stripe.net/Entities/Issuing/Disputes/Dispute.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Dispute.cs
rename to src/Stripe.net/Entities/Issuing/Disputes/Dispute.cs
diff --git a/src/Stripe.net/Entities/Issuing/Evidence.cs b/src/Stripe.net/Entities/Issuing/Disputes/Evidence.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Evidence.cs
rename to src/Stripe.net/Entities/Issuing/Disputes/Evidence.cs
diff --git a/src/Stripe.net/Entities/Issuing/EvidenceFraudulent.cs b/src/Stripe.net/Entities/Issuing/Disputes/EvidenceFraudulent.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/EvidenceFraudulent.cs
rename to src/Stripe.net/Entities/Issuing/Disputes/EvidenceFraudulent.cs
diff --git a/src/Stripe.net/Entities/Issuing/EvidenceOther.cs b/src/Stripe.net/Entities/Issuing/Disputes/EvidenceOther.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/EvidenceOther.cs
rename to src/Stripe.net/Entities/Issuing/Disputes/EvidenceOther.cs
diff --git a/src/Stripe.net/Entities/Issuing/Transaction.cs b/src/Stripe.net/Entities/Issuing/Transactions/Transaction.cs
similarity index 100%
rename from src/Stripe.net/Entities/Issuing/Transaction.cs
rename to src/Stripe.net/Entities/Issuing/Transactions/Transaction.cs
diff --git a/src/Stripe.net/Entities/LoginLink.cs b/src/Stripe.net/Entities/LoginLinks/LoginLink.cs
similarity index 100%
rename from src/Stripe.net/Entities/LoginLink.cs
rename to src/Stripe.net/Entities/LoginLinks/LoginLink.cs
diff --git a/src/Stripe.net/Entities/OAuthDeauthorize.cs b/src/Stripe.net/Entities/OAuth/OAuthDeauthorize.cs
similarity index 100%
rename from src/Stripe.net/Entities/OAuthDeauthorize.cs
rename to src/Stripe.net/Entities/OAuth/OAuthDeauthorize.cs
diff --git a/src/Stripe.net/Entities/OAuthToken.cs b/src/Stripe.net/Entities/OAuth/OAuthToken.cs
similarity index 100%
rename from src/Stripe.net/Entities/OAuthToken.cs
rename to src/Stripe.net/Entities/OAuth/OAuthToken.cs
diff --git a/src/Stripe.net/Entities/DeliveryEstimate.cs b/src/Stripe.net/Entities/Orders/DeliveryEstimate.cs
similarity index 100%
rename from src/Stripe.net/Entities/DeliveryEstimate.cs
rename to src/Stripe.net/Entities/Orders/DeliveryEstimate.cs
diff --git a/src/Stripe.net/Entities/Order.cs b/src/Stripe.net/Entities/Orders/Order.cs
similarity index 100%
rename from src/Stripe.net/Entities/Order.cs
rename to src/Stripe.net/Entities/Orders/Order.cs
diff --git a/src/Stripe.net/Entities/OrderItem.cs b/src/Stripe.net/Entities/Orders/OrderItem.cs
similarity index 100%
rename from src/Stripe.net/Entities/OrderItem.cs
rename to src/Stripe.net/Entities/Orders/OrderItem.cs
diff --git a/src/Stripe.net/Entities/OrderReturn.cs b/src/Stripe.net/Entities/Orders/OrderReturn.cs
similarity index 100%
rename from src/Stripe.net/Entities/OrderReturn.cs
rename to src/Stripe.net/Entities/Orders/OrderReturn.cs
diff --git a/src/Stripe.net/Entities/ShippingMethod.cs b/src/Stripe.net/Entities/Orders/ShippingMethod.cs
similarity index 100%
rename from src/Stripe.net/Entities/ShippingMethod.cs
rename to src/Stripe.net/Entities/Orders/ShippingMethod.cs
diff --git a/src/Stripe.net/Entities/StatusTransitions.cs b/src/Stripe.net/Entities/Orders/StatusTransitions.cs
similarity index 100%
rename from src/Stripe.net/Entities/StatusTransitions.cs
rename to src/Stripe.net/Entities/Orders/StatusTransitions.cs
diff --git a/src/Stripe.net/Entities/Payout.cs b/src/Stripe.net/Entities/Payouts/Payout.cs
similarity index 100%
rename from src/Stripe.net/Entities/Payout.cs
rename to src/Stripe.net/Entities/Payouts/Payout.cs
diff --git a/src/Stripe.net/Entities/Period.cs b/src/Stripe.net/Entities/Plans/Period.cs
similarity index 100%
rename from src/Stripe.net/Entities/Period.cs
rename to src/Stripe.net/Entities/Plans/Period.cs
diff --git a/src/Stripe.net/Entities/Plan.cs b/src/Stripe.net/Entities/Plans/Plan.cs
similarity index 100%
rename from src/Stripe.net/Entities/Plan.cs
rename to src/Stripe.net/Entities/Plans/Plan.cs
diff --git a/src/Stripe.net/Entities/PlanTier.cs b/src/Stripe.net/Entities/Plans/PlanTier.cs
similarity index 100%
rename from src/Stripe.net/Entities/PlanTier.cs
rename to src/Stripe.net/Entities/Plans/PlanTier.cs
diff --git a/src/Stripe.net/Entities/PlanTransformUsage.cs b/src/Stripe.net/Entities/Plans/PlanTransformUsage.cs
similarity index 100%
rename from src/Stripe.net/Entities/PlanTransformUsage.cs
rename to src/Stripe.net/Entities/Plans/PlanTransformUsage.cs
diff --git a/src/Stripe.net/Entities/PackageDimensions.cs b/src/Stripe.net/Entities/Products/PackageDimensions.cs
similarity index 100%
rename from src/Stripe.net/Entities/PackageDimensions.cs
rename to src/Stripe.net/Entities/Products/PackageDimensions.cs
diff --git a/src/Stripe.net/Entities/Product.cs b/src/Stripe.net/Entities/Products/Product.cs
similarity index 100%
rename from src/Stripe.net/Entities/Product.cs
rename to src/Stripe.net/Entities/Products/Product.cs
diff --git a/src/Stripe.net/Entities/Recipient.cs b/src/Stripe.net/Entities/Recipients/Recipient.cs
similarity index 100%
rename from src/Stripe.net/Entities/Recipient.cs
rename to src/Stripe.net/Entities/Recipients/Recipient.cs
diff --git a/src/Stripe.net/Entities/RecipientActiveAccount.cs b/src/Stripe.net/Entities/Recipients/RecipientActiveAccount.cs
similarity index 100%
rename from src/Stripe.net/Entities/RecipientActiveAccount.cs
rename to src/Stripe.net/Entities/Recipients/RecipientActiveAccount.cs
diff --git a/src/Stripe.net/Entities/Refund.cs b/src/Stripe.net/Entities/Refunds/Refund.cs
similarity index 100%
rename from src/Stripe.net/Entities/Refund.cs
rename to src/Stripe.net/Entities/Refunds/Refund.cs
diff --git a/src/Stripe.net/Entities/Reporting/Parameters.cs b/src/Stripe.net/Entities/Reporting/ReportRuns/Parameters.cs
similarity index 100%
rename from src/Stripe.net/Entities/Reporting/Parameters.cs
rename to src/Stripe.net/Entities/Reporting/ReportRuns/Parameters.cs
diff --git a/src/Stripe.net/Entities/Reporting/ReportRun.cs b/src/Stripe.net/Entities/Reporting/ReportRuns/ReportRun.cs
similarity index 100%
rename from src/Stripe.net/Entities/Reporting/ReportRun.cs
rename to src/Stripe.net/Entities/Reporting/ReportRuns/ReportRun.cs
diff --git a/src/Stripe.net/Entities/Reporting/ReportType.cs b/src/Stripe.net/Entities/Reporting/ReportTypes/ReportType.cs
similarity index 100%
rename from src/Stripe.net/Entities/Reporting/ReportType.cs
rename to src/Stripe.net/Entities/Reporting/ReportTypes/ReportType.cs
diff --git a/src/Stripe.net/Entities/Inventory.cs b/src/Stripe.net/Entities/Skus/Inventory.cs
similarity index 100%
rename from src/Stripe.net/Entities/Inventory.cs
rename to src/Stripe.net/Entities/Skus/Inventory.cs
diff --git a/src/Stripe.net/Entities/Sku.cs b/src/Stripe.net/Entities/Skus/Sku.cs
similarity index 100%
rename from src/Stripe.net/Entities/Sku.cs
rename to src/Stripe.net/Entities/Skus/Sku.cs
diff --git a/src/Stripe.net/Entities/SubscriptionItem.cs b/src/Stripe.net/Entities/SubscriptionItems/SubscriptionItem.cs
similarity index 100%
rename from src/Stripe.net/Entities/SubscriptionItem.cs
rename to src/Stripe.net/Entities/SubscriptionItems/SubscriptionItem.cs
diff --git a/src/Stripe.net/Entities/Subscription.cs b/src/Stripe.net/Entities/Subscriptions/Subscription.cs
similarity index 100%
rename from src/Stripe.net/Entities/Subscription.cs
rename to src/Stripe.net/Entities/Subscriptions/Subscription.cs
diff --git a/src/Stripe.net/Entities/ThreeDSecure.cs b/src/Stripe.net/Entities/ThreeDSecure/ThreeDSecure.cs
similarity index 100%
rename from src/Stripe.net/Entities/ThreeDSecure.cs
rename to src/Stripe.net/Entities/ThreeDSecure/ThreeDSecure.cs
diff --git a/src/Stripe.net/Entities/Token.cs b/src/Stripe.net/Entities/Tokens/Token.cs
similarity index 100%
rename from src/Stripe.net/Entities/Token.cs
rename to src/Stripe.net/Entities/Tokens/Token.cs
diff --git a/src/Stripe.net/Entities/Topup.cs b/src/Stripe.net/Entities/Topups/Topup.cs
similarity index 100%
rename from src/Stripe.net/Entities/Topup.cs
rename to src/Stripe.net/Entities/Topups/Topup.cs
diff --git a/src/Stripe.net/Entities/TransferReversal.cs b/src/Stripe.net/Entities/TransferReversals/TransferReversal.cs
similarity index 100%
rename from src/Stripe.net/Entities/TransferReversal.cs
rename to src/Stripe.net/Entities/TransferReversals/TransferReversal.cs
diff --git a/src/Stripe.net/Entities/Transfer.cs b/src/Stripe.net/Entities/Transfers/Transfer.cs
similarity index 100%
rename from src/Stripe.net/Entities/Transfer.cs
rename to src/Stripe.net/Entities/Transfers/Transfer.cs
diff --git a/src/Stripe.net/Entities/UsageRecordSummary.cs b/src/Stripe.net/Entities/UsageRecordSummaries/UsageRecordSummary.cs
similarity index 100%
rename from src/Stripe.net/Entities/UsageRecordSummary.cs
rename to src/Stripe.net/Entities/UsageRecordSummaries/UsageRecordSummary.cs
diff --git a/src/Stripe.net/Entities/UsageRecord.cs b/src/Stripe.net/Entities/UsageRecords/UsageRecord.cs
similarity index 100%
rename from src/Stripe.net/Entities/UsageRecord.cs
rename to src/Stripe.net/Entities/UsageRecords/UsageRecord.cs